diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 11:31:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-21 14:26:31 +0100 |
| commit | 958f7b512cff932f7f2d52d128c297d0f0ab6354 (patch) | |
| tree | 33d65c06a9575aafde39e3258d2a9c27130cfaab /sw/source/ui/config | |
| parent | fix GetSelectedText use in OSL_DEBUG_LEVEL > 1 (diff) | |
| download | core-958f7b512cff932f7f2d52d128c297d0f0ab6354.tar.gz core-958f7b512cff932f7f2d52d128c297d0f0ab6354.zip | |
drop CharSet typedef
Change-Id: Ia160d7cbaa2ee71773483c3f91306f89cdad5947
Diffstat (limited to 'sw/source/ui/config')
| -rw-r--r-- | sw/source/ui/config/uinums.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx index 12bf8130b494..7a9b63e6f9d4 100644 --- a/sw/source/ui/config/uinums.cxx +++ b/sw/source/ui/config/uinums.cxx @@ -221,7 +221,7 @@ const SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName SwNumRulesWithName::SwNumRulesWithName( SvStream &rStream, sal_uInt16 nVersion ) { - CharSet eEncoding = osl_getThreadTextEncoding(); + rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); maName = rStream.ReadUniOrByteString(eEncoding); char c; @@ -260,7 +260,7 @@ void SwNumRulesWithName::MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const void SwNumRulesWithName::Store( SvStream &rStream ) { - CharSet eEncoding = osl_getThreadTextEncoding(); + rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); rStream.WriteUniOrByteString(maName, eEncoding); for( sal_uInt16 n = 0; n < MAXLEVEL; ++n ) @@ -317,7 +317,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, sal_uInt16 nVersion ) : nCharPoolId( USHRT_MAX ) { - CharSet eEncoding = osl_getThreadTextEncoding(); + rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); { sal_uInt16 nUS; short nShort; @@ -379,7 +379,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream, { Font aFont( static_cast<FontFamily>(nFamily), Size( nWidth, nHeight ) ); aFont.SetName( aName ); - aFont.SetCharSet( (CharSet)nCharSet ); + aFont.SetCharSet( (rtl_TextEncoding)nCharSet ); aFont.SetPitch( (FontPitch)nPitch ); aFmt.SetBulletFont( &aFont ); @@ -452,7 +452,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::~_SwNumFmtGlobal() void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream ) { - CharSet eEncoding = osl_getThreadTextEncoding(); + rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); { OUString aName; sal_uInt16 nFamily = FAMILY_DONTKNOW, nCharSet = 0, nPitch = 0; |