Kaydet (Commit) 9c15d1ad authored tarafından Noel Grandin's avatar Noel Grandin

in editeng module, convert remains of String to OUString

Change-Id: I634e1fc2b63461d94a9e7d27c809d559740da7c0
üst 0d586f5b
...@@ -67,7 +67,7 @@ class EditRTFParser : public SvxRTFParser ...@@ -67,7 +67,7 @@ class EditRTFParser : public SvxRTFParser
private: private:
EditSelection aCurSel; EditSelection aCurSel;
EditEngine* mpEditEngine; EditEngine* mpEditEngine;
CharSet eDestCharSet; rtl_TextEncoding eDestCharSet;
MapMode aRTFMapMode; MapMode aRTFMapMode;
MapMode aEditMapMode; MapMode aEditMapMode;
...@@ -102,8 +102,9 @@ public: ...@@ -102,8 +102,9 @@ public:
virtual SvParserState CallParser(); virtual SvParserState CallParser();
void SetDestCharSet( CharSet eCharSet ) { eDestCharSet = eCharSet; } void SetDestCharSet( rtl_TextEncoding eCharSet ) { eDestCharSet = eCharSet; }
CharSet GetDestCharSet() const { return eDestCharSet; } rtl_TextEncoding
GetDestCharSet() const { return eDestCharSet; }
sal_uInt16 GetDefTab() const { return nDefTab; } sal_uInt16 GetDefTab() const { return nDefTab; }
Font GetDefFont() { return GetFont( nDefFont ); } Font GetDefFont() { return GetFont( nDefFont ); }
......
...@@ -421,7 +421,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) ...@@ -421,7 +421,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel )
} }
rOutput.WriteNumber( static_cast<sal_uInt32>( nVal ) ); rOutput.WriteNumber( static_cast<sal_uInt32>( nVal ) );
CharSet eChrSet = pFontItem->GetCharSet(); rtl_TextEncoding eChrSet = pFontItem->GetCharSet();
DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" ); DBG_ASSERT( eChrSet != 9, "SystemCharSet?!" );
if( RTL_TEXTENCODING_DONTKNOW == eChrSet ) if( RTL_TEXTENCODING_DONTKNOW == eChrSet )
eChrSet = osl_getThreadTextEncoding(); eChrSet = osl_getThreadTextEncoding();
......
...@@ -444,7 +444,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) ...@@ -444,7 +444,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
case 19: case 19:
{ {
sal_Int32 nVal = 0; pValues[nProp] >>= nVal; sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
rSwFlags.aBulletFont.SetCharSet(CharSet(nVal)); rSwFlags.aBulletFont.SetCharSet(rtl_TextEncoding(nVal));
} }
break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset", break; // "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset",
case 20: case 20:
...@@ -520,7 +520,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit) ...@@ -520,7 +520,7 @@ void SvxSwAutoCorrCfg::Load(sal_Bool bInit)
case 45 : case 45 :
{ {
sal_Int32 nVal = 0; pValues[nProp] >>= nVal; sal_Int32 nVal = 0; pValues[nProp] >>= nVal;
rSwFlags.aByInputBulletFont.SetCharSet(CharSet(nVal)); rSwFlags.aByInputBulletFont.SetCharSet(rtl_TextEncoding(nVal));
} }
break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset", break;// "Format/ByInput/ApplyNumbering/SpecialCharacter/FontCharset",
case 46 : case 46 :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment