drop CharSet typedef

Change-Id: Ia160d7cbaa2ee71773483c3f91306f89cdad5947

5 files changed, 17 insertions, 17 deletions

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 50354b3abfa5..313b423d5e03 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2395,7 +2395,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
     return bTableRowEnd;
 }
 
-CharSet SwWW8ImplReader::GetCurrentCharSet()
+rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
 {
     /*
     #i2015
@@ -2403,7 +2403,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet()
     character run that has set the charset, if not then fallback to the
     current underlying paragraph style.
     */
-    CharSet eSrcCharSet = eHardCharSet;
+    rtl_TextEncoding eSrcCharSet = eHardCharSet;
     if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
     {
         if (!maFontSrcCharSets.empty())
@@ -2434,7 +2434,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet()
 }
 
 //Takashi Ono for CJK
-CharSet SwWW8ImplReader::GetCurrentCJKCharSet()
+rtl_TextEncoding SwWW8ImplReader::GetCurrentCJKCharSet()
 {
     /*
     #i2015
@@ -2442,7 +2442,7 @@ CharSet SwWW8ImplReader::GetCurrentCJKCharSet()
     character run that has set the charset, if not then fallback to the
     current underlying paragraph style.
     */
-    CharSet eSrcCharSet = eHardCharSet;
+    rtl_TextEncoding eSrcCharSet = eHardCharSet;
     if (eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)
     {
         if (!maFontSrcCJKCharSets.empty())
@@ -2652,9 +2652,9 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs)
     else
         nStrLen = STRING_MAXLEN-1;
 
-    const CharSet eSrcCharSet = bVer67 ? GetCurrentCharSet() :
+    const rtl_TextEncoding eSrcCharSet = bVer67 ? GetCurrentCharSet() :
         RTL_TEXTENCODING_MS_1252;
-    const CharSet eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() :
+    const rtl_TextEncoding eSrcCJKCharSet = bVer67 ? GetCurrentCJKCharSet() :
         RTL_TEXTENCODING_MS_1252;
 
     // allocate unicode string data
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 775137e213ab..789a5a6b1534 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -312,8 +312,8 @@ public:
     {
         return pOutlineNumrule;
     }
-    CharSet GetCharSet() const;
-    CharSet GetCJKCharSet() const;
+    rtl_TextEncoding GetCharSet() const;
+    rtl_TextEncoding GetCJKCharSet() const;
 };
 
 //-----------------------------------------
@@ -1808,8 +1808,8 @@ public:     // eigentlich private, geht aber leider nur public
     const OUString& GetBaseURL() const { return sBaseURL; }
     // Laden eines kompletten DocFiles
     sal_uLong LoadDoc( SwPaM&,WW8Glossary *pGloss=0);
-    CharSet GetCurrentCharSet();
-    CharSet GetCurrentCJKCharSet();
+    rtl_TextEncoding GetCurrentCharSet();
+    rtl_TextEncoding GetCurrentCJKCharSet();
 
     void PostProcessAttrs();
 };
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 88d30f29a793..70492ba5512a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -598,7 +598,7 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFmt &rNum, WW8_ANLV &rAV,
     const sal_uInt8* pTxt, bool bOutline)
 {
     bool bInsert = false;                       // Default
-    CharSet eCharSet = eStructCharSet;
+    rtl_TextEncoding eCharSet = eStructCharSet;
 
     const WW8_FFN* pF = pFonts->GetFont(SVBT16ToShort(rAV.ftc)); // FontInfo
     bool bListSymbol = pF && ( pF->chs == 2 );      // Symbol/WingDings/...
@@ -4472,14 +4472,14 @@ void WW8RStyle::Import()
     pIo->pAktColl = 0;
 }
 
-CharSet SwWW8StyInf::GetCharSet() const
+rtl_TextEncoding SwWW8StyInf::GetCharSet() const
 {
     if ((pFmt) && (pFmt->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
         return eRTLFontSrcCharSet;
     return eLTRFontSrcCharSet;
 }
 
-CharSet SwWW8StyInf::GetCJKCharSet() const
+rtl_TextEncoding SwWW8StyInf::GetCJKCharSet() const
 {
     if ((pFmt) && (pFmt->GetFrmDir().GetValue() == FRMDIR_HORI_RIGHT_TOP))
         return eRTLFontSrcCharSet;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index ba481f3853f6..5a72a197ff10 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2146,7 +2146,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, OUString& rStr)
             FontFamily eFamily;
             OUString aFontName;
             FontPitch ePitch;
-            CharSet eSrcCharSet;
+            rtl_TextEncoding eSrcCharSet;
             if( GetFontParams( i, eFamily, aFontName, ePitch, eSrcCharSet )
                 && aFontName=="Wingdings" )
             {
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 61b5e2d30ea7..90038c8412b8 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3359,7 +3359,7 @@ void SwWW8ImplReader::Read_UnderlineColor(sal_uInt16, const sal_uInt8* pData, sh
     }
 }
 bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode, FontFamily& reFamily,
-    OUString& rName, FontPitch& rePitch, CharSet& reCharSet )
+    OUString& rName, FontPitch& rePitch, rtl_TextEncoding& reCharSet )
 {
     // Die Defines, aus denen diese Tabellen erzeugt werden, stehen in windows.h
     static const FontPitch ePitchA[] =
@@ -3434,7 +3434,7 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
     FontFamily eFamily;
     OUString aName;
     FontPitch ePitch;
-    CharSet eSrcCharSet;
+    rtl_TextEncoding eSrcCharSet;
 
     if( !GetFontParams( nFCode, eFamily, aName, ePitch, eSrcCharSet ) )
     {
@@ -3473,7 +3473,7 @@ bool SwWW8ImplReader::SetNewFontAttr(sal_uInt16 nFCode, bool bSetEnums,
         return false;
     }
 
-    CharSet eDstCharSet = eSrcCharSet;
+    rtl_TextEncoding eDstCharSet = eSrcCharSet;
 
     SvxFontItem aFont( eFamily, aName, aEmptyOUStr, ePitch, eDstCharSet, nWhich);