From 958f7b512cff932f7f2d52d128c297d0f0ab6354 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 21 Oct 2013 11:31:31 +0100
Subject: drop CharSet typedef

Change-Id: Ia160d7cbaa2ee71773483c3f91306f89cdad5947
---
 sc/source/core/data/column3.cxx  | 6 +++---
 sc/source/core/data/documen4.cxx | 2 +-
 sc/source/core/data/documen9.cxx | 2 +-
 sc/source/core/data/global.cxx   | 6 +++---
 sc/source/core/data/table3.cxx   | 2 +-
 sc/source/core/tool/compiler.cxx | 1 +
 6 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'sc/source/core')

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 02ed182bfbce..e656d5173db9 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2475,7 +2475,7 @@ class MaxStringLenHandler
     sal_Int32 mnMaxLen;
     const ScColumn& mrColumn;
     SvNumberFormatter* mpFormatter;
-    CharSet meCharSet;
+    rtl_TextEncoding meCharSet;
     bool mbOctetEncoding;
 
     void processCell(size_t nRow, ScRefCellValue& rCell)
@@ -2507,7 +2507,7 @@ class MaxStringLenHandler
     }
 
 public:
-    MaxStringLenHandler(const ScColumn& rColumn, CharSet eCharSet) :
+    MaxStringLenHandler(const ScColumn& rColumn, rtl_TextEncoding eCharSet) :
         mnMaxLen(0),
         mrColumn(rColumn),
         mpFormatter(rColumn.GetDoc().GetFormatTable()),
@@ -2545,7 +2545,7 @@ public:
 
 }
 
-sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const
+sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, rtl_TextEncoding eCharSet ) const
 {
     MaxStringLenHandler aFunc(*this, eCharSet);
     sc::ParseAllNonEmpty(maCells.begin(), maCells, nRowStart, nRowEnd, aFunc);
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index d5e842942800..590737ce63ba 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -588,7 +588,7 @@ void ScDocument::InvalidateTableArea()
 }
 
 sal_Int32 ScDocument::GetMaxStringLen( SCTAB nTab, SCCOL nCol,
-        SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const
+        SCROW nRowStart, SCROW nRowEnd, rtl_TextEncoding eCharSet ) const
 {
     if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab])
         return maTabs[nTab]->GetMaxStringLen( nCol, nRowStart, nRowEnd, eCharSet );
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 3d9110b3936a..6f339fbb5d75 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -553,7 +553,7 @@ void ScDocument::UpdateFontCharSet()
 
     bool bUpdateOld = ( nSrcVer < SC_FONTCHARSET );
 
-    CharSet eSysSet = osl_getThreadTextEncoding();
+    rtl_TextEncoding eSysSet = osl_getThreadTextEncoding();
     if ( eSrcSet != eSysSet || bUpdateOld )
     {
         sal_uInt32 nCount,i;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 6a99807b70da..0b76d336ec3f 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -688,7 +688,7 @@ void ScGlobal::Clear()
 
 //------------------------------------------------------------------------
 
-CharSet ScGlobal::GetCharsetValue( const OUString& rCharSet )
+rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet )
 {
     // new TextEncoding values
     if ( CharClass::isAsciiNumeric( rCharSet ) )
@@ -696,7 +696,7 @@ CharSet ScGlobal::GetCharsetValue( const OUString& rCharSet )
         sal_Int32 nVal = rCharSet.toInt32();
         if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
             return osl_getThreadTextEncoding();
-        return (CharSet) nVal;
+        return (rtl_TextEncoding) nVal;
     }
     // old CharSet values for compatibility
     else if (rCharSet.equalsIgnoreAsciiCase("ANSI")     ) return RTL_TEXTENCODING_MS_1252;
@@ -713,7 +713,7 @@ CharSet ScGlobal::GetCharsetValue( const OUString& rCharSet )
 
 //------------------------------------------------------------------------
 
-OUString ScGlobal::GetCharsetString( CharSet eVal )
+OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal )
 {
     const sal_Char* pChar;
     switch ( eVal )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1e2162190f6b..61aa6373b6b8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2330,7 +2330,7 @@ sal_uLong ScTable::GetCodeCount() const
 }
 
 sal_Int32 ScTable::GetMaxStringLen( SCCOL nCol, SCROW nRowStart,
-        SCROW nRowEnd, CharSet eCharSet ) const
+        SCROW nRowEnd, rtl_TextEncoding eCharSet ) const
 {
     if ( ValidCol(nCol) )
         return aCol[nCol].GetMaxStringLen( nRowStart, nRowEnd, eCharSet );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a77f0ecd7e46..33ba8899501b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -28,6 +28,7 @@
 #include <sal/macros.h>
 #include <tools/rcid.h>
 #include <tools/solar.h>
+#include <tools/string.hxx>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
-- 
cgit v1.2.3