summaryrefslogtreecommitdiff
path: root/linguistic/source/convdic.hxx
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /linguistic/source/convdic.hxx
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (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 'linguistic/source/convdic.hxx')
-rw-r--r--linguistic/source/convdic.hxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 5beb83f859b7..375acbbca2fa 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -44,7 +44,7 @@ sal_Bool IsConvDic( const String &rFileURL, sal_Int16 &nLang, sal_Int16 &nCon
struct StrLT
{
- bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const
+ bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const
{
return rTxt1 < rTxt2;
}
@@ -52,19 +52,19 @@ struct StrLT
struct StrEQ
{
- bool operator()( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 ) const
+ bool operator()( const OUString &rTxt1, const OUString &rTxt2 ) const
{
return rTxt1 == rTxt2;
}
};
-typedef boost::unordered_multimap< const rtl::OUString, rtl::OUString,
- const rtl::OUStringHash, StrEQ > ConvMap;
+typedef boost::unordered_multimap< const OUString, OUString,
+ const OUStringHash, StrEQ > ConvMap;
-typedef std::set< rtl::OUString, StrLT > ConvMapKeySet;
+typedef std::set< OUString, StrLT > ConvMapKeySet;
-typedef boost::unordered_multimap< const rtl::OUString, sal_Int16,
- rtl::OUStringHash, StrEQ > PropTypeMap;
+typedef boost::unordered_multimap< const OUString, sal_Int16,
+ OUStringHash, StrEQ > PropTypeMap;
class ConvDic :
@@ -88,7 +88,7 @@ protected:
std::auto_ptr< PropTypeMap > pConvPropType;
String aMainURL; // URL to file
- rtl::OUString aName;
+ OUString aName;
sal_Int16 nLanguage;
sal_Int16 nConversionType;
sal_Int16 nMaxLeftCharCount;
@@ -103,7 +103,7 @@ protected:
ConvDic(const ConvDic &);
ConvDic & operator = (const ConvDic &);
- ConvMap::iterator GetEntry( ConvMap &rMap, const rtl::OUString &rFirstText, const rtl::OUString &rSecondText );
+ ConvMap::iterator GetEntry( ConvMap &rMap, const OUString &rFirstText, const OUString &rSecondText );
void Load();
void Save();
@@ -116,21 +116,21 @@ public:
virtual ~ConvDic();
// XConversionDictionary
- virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversions( const ::rtl::OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeEntry( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException);
// XConversionPropertyType
- virtual void SAL_CALL setPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- virtual ::sal_Int16 SAL_CALL getPropertyType( const ::rtl::OUString& aLeftText, const ::rtl::OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
// XFlushable
virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException);
@@ -138,22 +138,22 @@ public:
virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
- static inline ::rtl::OUString
+ static inline OUString
getImplementationName_Static() throw();
- static com::sun::star::uno::Sequence< ::rtl::OUString >
+ static com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static() throw();
- sal_Bool HasEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
- void AddEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
- void RemoveEntry( const rtl::OUString &rLeftText, const rtl::OUString &rRightText );
+ sal_Bool HasEntry( const OUString &rLeftText, const OUString &rRightText );
+ void AddEntry( const OUString &rLeftText, const OUString &rRightText );
+ void RemoveEntry( const OUString &rLeftText, const OUString &rRightText );
};
-inline ::rtl::OUString ConvDic::getImplementationName_Static() throw()
+inline OUString ConvDic::getImplementationName_Static() throw()
{
return OUString( "com.sun.star.lingu2.ConvDic" );
}