summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-08 11:28:10 +0200
committerNoel Grandin <noel@peralex.com>2015-04-08 11:40:15 +0200
commit79b2059fa8e3c69088532f0ce521a285af5455cf (patch)
treeecce1ea865e24b4657b0aa424b10cb78928d1256 /lingucomponent
parent704edbf7dc844e52404bf52f9d5dc768cfd024d0 (diff)
convert CapType to scoped enum
Change-Id: I88fa3672a1f933ae818368c9bc400c6a845babb6
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx6
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx10
2 files changed, 8 insertions, 8 deletions
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index d561fd00412e..435e9fbfad06 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -319,7 +319,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
if (eEnc == RTL_TEXTENCODING_DONTKNOW)
return NULL;
- sal_uInt16 ct = capitalType(aWord, pCC);
+ CapType ct = capitalType(aWord, pCC);
// first convert any smart quotes or apostrophes to normal ones
OUStringBuffer rBuf(aWord);
@@ -444,12 +444,12 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
OUString repHyph;
switch (ct)
{
- case CAPTYPE_ALLCAP:
+ case CapType::ALLCAP:
{
repHyph = makeUpperCase(repHyphlow, pCC);
break;
}
- case CAPTYPE_INITCAP:
+ case CapType::INITCAP:
{
if (nHyphenationPosAlt == -1)
repHyph = makeInitCap(repHyphlow, pCC);
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 7ab514cfa3e3..6eab10c50978 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -285,7 +285,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
OUString rTerm(qTerm);
OUString pTerm(qTerm);
- sal_uInt16 ct = CAPTYPE_UNKNOWN;
+ CapType ct = CapType::UNKNOWN;
sal_Int32 stem = 0;
sal_Int32 stem2 = 0;
@@ -424,16 +424,16 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
}
}
- sal_uInt16 ct1 = capitalType(sTerm, pCC);
- if (CAPTYPE_MIXED == ct1)
+ CapType ct1 = capitalType(sTerm, pCC);
+ if (CapType::MIXED == ct1)
ct = ct1;
OUString cTerm;
switch (ct)
{
- case CAPTYPE_ALLCAP:
+ case CapType::ALLCAP:
cTerm = makeUpperCase(sTerm, pCC);
break;
- case CAPTYPE_INITCAP:
+ case CapType::INITCAP:
cTerm = makeInitCap(sTerm, pCC);
break;
default: