summaryrefslogtreecommitdiff
path: root/linguistic/inc
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/inc
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/inc')
-rw-r--r--linguistic/inc/iprcache.hxx6
-rw-r--r--linguistic/inc/linguistic/hyphdta.hxx44
-rw-r--r--linguistic/inc/linguistic/lngprophelp.hxx6
-rw-r--r--linguistic/inc/linguistic/misc.hxx18
-rw-r--r--linguistic/inc/linguistic/spelldta.hxx36
5 files changed, 55 insertions, 55 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index ffc497a75a4a..c38264f29dbc 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -96,7 +96,7 @@ class SpellCache :
xFlushLstnr;
FlushListener *pFlushLstnr;
- typedef std::set< ::rtl::OUString > WordList_t;
+ typedef std::set< OUString > WordList_t;
typedef std::map< LanguageType, WordList_t > LangWordList_t;
LangWordList_t aWordLists;
@@ -111,8 +111,8 @@ public:
// Flushable
virtual void Flush();
- void AddWord( const ::rtl::OUString& rWord, LanguageType nLang );
- bool CheckWord( const ::rtl::OUString& rWord, LanguageType nLang );
+ void AddWord( const OUString& rWord, LanguageType nLang );
+ bool CheckWord( const OUString& rWord, LanguageType nLang );
};
diff --git a/linguistic/inc/linguistic/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx
index 81c52ce9255e..9dec2d6dc15e 100644
--- a/linguistic/inc/linguistic/hyphdta.hxx
+++ b/linguistic/inc/linguistic/hyphdta.hxx
@@ -36,8 +36,8 @@ class HyphenatedWord :
::com::sun::star::linguistic2::XHyphenatedWord
>
{
- ::rtl::OUString aWord;
- ::rtl::OUString aHyphenatedWord;
+ OUString aWord;
+ OUString aHyphenatedWord;
sal_Int16 nHyphPos;
sal_Int16 nHyphenationPos;
sal_Int16 nLanguage;
@@ -48,12 +48,12 @@ class HyphenatedWord :
HyphenatedWord & operator = (const HyphenatedWord &);
public:
- HyphenatedWord(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
- const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
+ HyphenatedWord(const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
virtual ~HyphenatedWord();
// XHyphenatedWord
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL
@@ -62,7 +62,7 @@ public:
virtual sal_Int16 SAL_CALL
getHyphenationPos()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getHyphenatedWord()
throw(::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL
@@ -72,15 +72,15 @@ public:
isAlternativeSpelling()
throw(::com::sun::star::uno::RuntimeException);
- ::rtl::OUString GetWord() { return aWord; }
- ::rtl::OUString GetHyphenatedWord() { return aHyphenatedWord; }
+ OUString GetWord() { return aWord; }
+ OUString GetHyphenatedWord() { return aHyphenatedWord; }
sal_Int16 GetLanguage() { return nLanguage; }
- void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
- void SetHyphenatedWord( ::rtl::OUString &rTxt ) { aHyphenatedWord = rTxt; }
+ void SetWord( OUString &rTxt ) { aWord = rTxt; }
+ void SetHyphenatedWord( OUString &rTxt ) { aHyphenatedWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
static com::sun::star::uno::Reference <com::sun::star::linguistic2::XHyphenatedWord> LNG_DLLPUBLIC CreateHyphenatedWord(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
- const ::rtl::OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nHyphenationPos,
+ const OUString &rHyphenatedWord, sal_Int16 nHyphenPos );
};
@@ -90,8 +90,8 @@ class PossibleHyphens :
::com::sun::star::linguistic2::XPossibleHyphens
>
{
- ::rtl::OUString aWord;
- ::rtl::OUString aWordWithHyphens;
+ OUString aWord;
+ OUString aWordWithHyphens;
::com::sun::star::uno::Sequence< sal_Int16 > aOrigHyphenPos;
sal_Int16 nLanguage;
@@ -100,33 +100,33 @@ class PossibleHyphens :
PossibleHyphens & operator = (const PossibleHyphens &);
public:
- PossibleHyphens(const ::rtl::OUString &rWord, sal_Int16 nLang,
- const ::rtl::OUString &rHyphWord,
+ PossibleHyphens(const OUString &rWord, sal_Int16 nLang,
+ const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
virtual ~PossibleHyphens();
// XPossibleHyphens
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getWord()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::lang::Locale SAL_CALL
getLocale()
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getPossibleHyphens()
throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL
getHyphenationPositions()
throw(::com::sun::star::uno::RuntimeException);
- ::rtl::OUString GetWord() { return aWord; }
+ OUString GetWord() { return aWord; }
sal_Int16 GetLanguage() { return nLanguage; }
- void SetWord( ::rtl::OUString &rTxt ) { aWord = rTxt; }
+ void SetWord( OUString &rTxt ) { aWord = rTxt; }
void SetLanguage( sal_Int16 nLang ) { nLanguage = nLang; }
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XPossibleHyphens > LNG_DLLPUBLIC CreatePossibleHyphens
- (const ::rtl::OUString &rWord, sal_Int16 nLang,
- const ::rtl::OUString &rHyphWord,
+ (const OUString &rWord, sal_Int16 nLang,
+ const OUString &rHyphWord,
const ::com::sun::star::uno::Sequence< sal_Int16 > &rPositions);
};
} // namespace linguistic
diff --git a/linguistic/inc/linguistic/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx
index 201310995ee8..3995d87cc1e4 100644
--- a/linguistic/inc/linguistic/lngprophelp.hxx
+++ b/linguistic/inc/linguistic/lngprophelp.hxx
@@ -59,7 +59,7 @@ typedef cppu::WeakImplHelper2
class PropertyChgHelper :
public PropertyChgHelperBase
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropNames;
+ ::com::sun::star::uno::Sequence< OUString > aPropNames;
::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > xMyEvtObj;
::cppu::OInterfaceContainerHelper aLngSvcEvtListeners;
@@ -85,7 +85,7 @@ protected:
virtual void SetDefaultValues();
virtual void GetCurrentValues();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &
+ ::com::sun::star::uno::Sequence< OUString > &
GetPropNames() { return aPropNames; }
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
@@ -135,7 +135,7 @@ public:
void LaunchEvent(
const ::com::sun::star::linguistic2::LinguServiceEvent& rEvt );
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &
+ const ::com::sun::star::uno::Sequence< OUString > &
GetPropNames() const { return aPropNames; }
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > &
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx
index 5b1e417eef1e..c15d2fc70dab 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -91,7 +91,7 @@ LNG_DLLPUBLIC ::osl::Mutex& GetLinguMutex();
LocaleDataWrapper & GetLocaleDataWrapper( sal_Int16 nLang );
-sal_Int32 LevDistance( const rtl::OUString &rTxt1, const rtl::OUString &rTxt2 );
+sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 );
/** Convert Locale to LanguageType for legacy handling.
Linguistic specific handling of an empty locale denoting LANGUAGE_NONE.
@@ -123,18 +123,18 @@ sal_Bool IsReadOnly( const String &rURL, sal_Bool *pbExist = 0 );
sal_Bool FileExists( const String &rURL );
-::rtl::OUString GetDictionaryWriteablePath();
-::com::sun::star::uno::Sequence< ::rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL );
+OUString GetDictionaryWriteablePath();
+::com::sun::star::uno::Sequence< OUString > GetDictionaryPaths( sal_Int16 nPathFlags = PATH_FLAG_ALL );
/// @returns an URL for a new and writable dictionary rDicName.
/// The URL will point to the path given by 'GetDictionaryWriteablePath'
LNG_DLLPUBLIC String GetWritableDictionaryURL( const String &rDicName );
-LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const rtl::OUString &rTxt, sal_Int32 nPos );
+LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const OUString &rTxt, sal_Int32 nPos );
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord >
- RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord,
+ RebuildHyphensAndControlChars( const OUString &rOrigWord,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord );
@@ -145,7 +145,7 @@ inline sal_Bool IsUpper( const String &rText, sal_Int16 nLanguage ) {
LNG_DLLPUBLIC CapType SAL_CALL capitalType(const OUString&, CharClass *);
String ToLower( const String &rText, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString &rText );
+LNG_DLLPUBLIC sal_Bool HasDigits( const OUString &rText );
LNG_DLLPUBLIC sal_Bool IsNumeric( const String &rText );
@@ -167,13 +167,13 @@ sal_Bool IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rP
::com::sun::star::linguistic2::XDictionaryEntry >
SearchDicList(
const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList >& rDicList,
- const ::rtl::OUString& rWord, sal_Int16 nLanguage,
+ const OUString& rWord, sal_Int16 nLanguage,
sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry );
LNG_DLLPUBLIC sal_uInt8 AddEntryToDic(
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic,
- const ::rtl::OUString &rWord, sal_Bool bIsNeg,
- const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang,
+ const OUString &rWord, sal_Bool bIsNeg,
+ const OUString &rRplcTxt, sal_Int16 nRplcLang,
sal_Bool bStripDot = sal_True );
LNG_DLLPUBLIC sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList );
diff --git a/linguistic/inc/linguistic/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx
index 220a406e9dd9..92f9cd680c77 100644
--- a/linguistic/inc/linguistic/spelldta.hxx
+++ b/linguistic/inc/linguistic/spelldta.hxx
@@ -43,28 +43,28 @@ namespace com { namespace sun { namespace star {
namespace linguistic
{
-::com::sun::star::uno::Sequence< ::rtl::OUString >
+::com::sun::star::uno::Sequence< OUString >
MergeProposalSeqs(
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt1,
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt2,
+ ::com::sun::star::uno::Sequence< OUString > &rAlt1,
+ ::com::sun::star::uno::Sequence< OUString > &rAlt2,
sal_Bool bAllowDuplicates );
void SeqRemoveNegEntries(
- ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
+ ::com::sun::star::uno::Sequence< OUString > &rSeq,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &rxDicList,
sal_Int16 nLanguage );
sal_Bool SeqHasEntry(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rSeq,
- const ::rtl::OUString &rTxt);
+ const ::com::sun::star::uno::Sequence< OUString > &rSeq,
+ const OUString &rTxt);
///////////////////////////////////////////////////////////////////////////
-void SearchSimilarText( const rtl::OUString &rText, sal_Int16 nLanguage,
+void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSearchableDictionaryList > &xDicList,
- std::vector< rtl::OUString > & rDicListProps );
+ std::vector< OUString > & rDicListProps );
///////////////////////////////////////////////////////////////////////////
@@ -77,34 +77,34 @@ class SpellAlternatives
>
, private ::boost::noncopyable
{
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aAlt; // list of alternatives, may be empty.
- ::rtl::OUString aWord;
+ ::com::sun::star::uno::Sequence< OUString > aAlt; // list of alternatives, may be empty.
+ OUString aWord;
sal_Int16 nType; // type of failure
sal_Int16 nLanguage;
public:
LNG_DLLPUBLIC SpellAlternatives();
- SpellAlternatives(const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlternatives );
+ SpellAlternatives(const OUString &rWord, sal_Int16 nLang, sal_Int16 nFailureType,
+ const ::com::sun::star::uno::Sequence< OUString > &rAlternatives );
virtual ~SpellAlternatives();
// XSpellAlternatives
- virtual ::rtl::OUString SAL_CALL getWord( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getWord( ) 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 getFailureType( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getAlternativesCount( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAlternatives( ) throw (::com::sun::star::uno::RuntimeException);
// XSetSpellAlternatives
- virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setAlternatives( const ::com::sun::star::uno::Sequence< OUString >& aAlternatives ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setFailureType( ::sal_Int16 nFailureType ) throw (::com::sun::star::uno::RuntimeException);
// non-interface specific functions
- void LNG_DLLPUBLIC SetWordLanguage(const ::rtl::OUString &rWord, sal_Int16 nLang);
+ void LNG_DLLPUBLIC SetWordLanguage(const OUString &rWord, sal_Int16 nLang);
void LNG_DLLPUBLIC SetFailureType(sal_Int16 nTypeP);
- void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ void LNG_DLLPUBLIC SetAlternatives( const ::com::sun::star::uno::Sequence< OUString > &rAlt );
static com::sun::star::uno::Reference < com::sun::star::linguistic2::XSpellAlternatives > LNG_DLLPUBLIC CreateSpellAlternatives(
- const ::rtl::OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< ::rtl::OUString > &rAlt );
+ const OUString &rWord, sal_Int16 nLang, sal_Int16 nTypeP, const ::com::sun::star::uno::Sequence< OUString > &rAlt );
};