diff options
| author | Armin Weiss <aw@openoffice.org> | 2001-08-06 07:34:08 +0000 |
|---|---|---|
| committer | Armin Weiss <aw@openoffice.org> | 2001-08-06 07:34:08 +0000 |
| commit | 33ebacd235ddbc13d1c26a618fed2e5ad830c05b (patch) | |
| tree | 9fd4b82ee302a24058452b292f5a0f02396b6959 /svx/source/svdraw/svdotxln.cxx | |
| parent | b2fdf9bb6d9f82c01245c6c8c30d1dcd04c6b7a1 (diff) | |
#90477# added support for GetSOLoadTextEncoding and GetSOStoreTextEncoding
Diffstat (limited to 'svx/source/svdraw/svdotxln.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index c5a91c2f2366..63c3648baf2a 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdotxln.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ka $ $Date: 2001-07-30 13:17:08 $ + * last change: $Author: aw $ $Date: 2001-08-06 08:32:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,6 +94,11 @@ #include <svtools/urihelper.hxx> +// #90477# +#ifndef _TOOLS_TENCCVT_HXX +#include <tools/tenccvt.hxx> +#endif + #ifndef SVX_LIGHT //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -239,7 +244,9 @@ void ImpSdrObjTextLinkUserData::WriteData(SvStream& rOut) // UNICODE: rOut << aFilterName; rOut.WriteByteString(aFilterName); - rOut << UINT16(GetStoreCharSet(eCharSet)); + // #90477# rOut << UINT16(GetStoreCharSet(eCharSet)); + rOut << UINT16(GetSOStoreTextEncoding(eCharSet, (sal_uInt16)rOut.GetVersion())); + rOut << UINT32(aFileDate0.GetDate()); rOut << UINT32(aFileDate0.GetTime()); } @@ -273,7 +280,10 @@ void ImpSdrObjTextLinkUserData::ReadData(SvStream& rIn) // UNICODE: rIn >> aFilterName; rIn.ReadByteString(aFilterName); - rIn >> nTmp16; eCharSet = rtl_TextEncoding(nTmp16); + // #90477# rIn >> nTmp16; eCharSet = rtl_TextEncoding(nTmp16); + rIn >> nTmp16; + eCharSet = (rtl_TextEncoding)GetSOLoadTextEncoding((rtl_TextEncoding)nTmp16, (sal_uInt16)rIn.GetVersion()); + rIn >> nTmp32; aFileDate0.SetDate(nTmp32); rIn >> nTmp32; aFileDate0.SetTime(nTmp32); } @@ -402,7 +412,9 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& rFilterName if( pIStm ) { - pIStm->SetStreamCharSet( eCharSet ); + // #90477# pIStm->SetStreamCharSet( eCharSet ); + pIStm->SetStreamCharSet(GetSOLoadTextEncoding(eCharSet, (sal_uInt16)pIStm->GetVersion())); + char cRTF[5]; cRTF[4] = 0; pIStm->Read(cRTF, 5); |