rtf$BFI$_9~$_LdBj$N%Q%C%A$r>/[EMAIL
(BPROTECTED]"(Blinux$BHG$G$N(Brtf$B=q$-=P$7LdBj$r2r7h$9$kDI(B
$B2C%Q%C%A$G$9!#(B
(B
(B680$B%3!<%I%i%$%s$N%S%k%I$K$^$@@.8y$7$F$$$J$$(B(^_^;$B$N$G!"(Bcurvirgo$B$5$s$N$H$3$m$G;n$7$F$_(B
(B[EMAIL PROTECTED]&$+!#(B
(B
$B3:Ev%=!<%9$,[EMAIL PROTECTED]'$G$-$F$$$^$9!#(B
(B
(B--- svtools/source/svrtf/parrtf.cxx.orig 2004-11-16 21:44:52.000000000
(B+0900
(B+++ svtools/source/svrtf/parrtf.cxx 2005-01-30 09:05:04.000000000 +0900
(B@@ -371,7 +371,7 @@
(B case '\'':
(B {
(B
(B-#if 1
(B+#if 0
(B // #i35653 patch from cmc
(B ByteString
(BaByteString(static_cast<char>(GetHexValue()));
(B if (aByteString.Len())
(B@@ -380,15 +380,15 @@
(B ByteString aByteString;
(B while (1)
(B {
(B- aByteString.Append((char)GetHexValue());
(B+
(BaByteString.Append(static_cast<char>(GetHexValue()));
(B
(B bool bBreak = false;
(B- sal_Char nSlash;
(B+ sal_Unicode nSlash;
(B while (!bBreak)
(B {
(B- nSlash = (sal_Char)GetNextChar();
(B+ nSlash = GetNextChar();
(B while (nSlash == 0xD || nSlash == 0xA)
(B- nSlash = (sal_Char)GetNextChar();
(B+ nSlash = GetNextChar();
(B
(B switch (nSlash)
(B {
(B@@ -398,7 +398,7 @@
(B bBreak = true;
(B break;
(B default:
(B- aByteString.Append(nSlash);
(B+ aByteString.Append(ByteString(nSlash,
(BGetSrcEncoding()));
(B break;
(B }
(B }
(B--- sw/source/filter/rtf/wrtrtf.hxx.orig 2004-10-28 22:05:56.000000000
(B+0900
(B+++ sw/source/filter/rtf/wrtrtf.hxx 2005-01-30 09:14:02.000000000 +0900
(B@@ -151,7 +151,8 @@
(B const SwPageDesc* pAktPageDesc; // aktuell gesetzter PageDesc.
(B USHORT nBkmkTabPos; // akt. Position in der
(BBookmark-Tabelle
(B USHORT nCurScript; // actual scripttype
(B- rtl_TextEncoding eCurrentCharSet;
(B+ rtl_TextEncoding eDefaultEncoding;
(B+ rtl_TextEncoding eCurrentEncoding;
(B
(B #if defined(MAC) || defined(UNX)
(B static const sal_Char sNewLine; // nur
(B\012
(Boder \015
(B@@ -264,7 +265,7 @@
(B
(B
(B // einige Funktions-Deklarationen
(B-Writer& OutRTF_AsByteString( Writer& rWrt, const String& rStr );
(B+Writer& OutRTF_AsByteString( Writer& rWrt, const String& rStr,
(Brtl_TextEncoding
(BeEncoding);
(B Writer& OutRTF_SwFmt( Writer& rWrt, const SwFmt& );
(B Writer& OutRTF_SwTblNode(Writer& , const SwTableNode&);
(B Writer& OutRTF_SwSectionNode( Writer& , SwSectionNode & );
(B--- sw/source/filter/rtf/wrtrtf.cxx.orig 2004-10-28 22:05:42.000000000
(B+0900
(B+++ sw/source/filter/rtf/wrtrtf.cxx 2005-01-30 09:31:30.000000000 +0900
(B@@ -233,8 +233,7 @@
(B SV_DECL_VARARR( RTFColorTbl, Color, 5, 8 )
(B SV_IMPL_VARARR( RTFColorTbl, Color )
(B
(B-
(B-SwRTFWriter::SwRTFWriter( const String& rFltName ) :
(BeCurrentCharSet(DEF_ENCODING)
(B+SwRTFWriter::SwRTFWriter( const String& rFltName ) : eDefaultEncoding
(B(rtl_getTextEncodingFromWindowsCharset(sw::ms::rtl_TextEncodingToWinCharset
(B(DEF_ENCODING))), eCurrentEncoding(eDefaultEncoding)
(B {
(B // schreibe Win-RTF-HelpFileFmt
(B bWriteHelpFmt = 'W' == rFltName.GetChar( 0 );
(B@@ -679,7 +678,7 @@
(B sOut += DB_DELIM;
(B sOut += (String)aData.sCommand;
(B RTFOutFuncs::Out_String( Strm(), sOut,
(B-
(B DEF_ENCODING, bWriteHelpFmt );
(B+
(B eDefaultEncoding, bWriteHelpFmt );
(B Strm() << "}{" << sRTF_FLDRSLT << " }}";
(B break;
(B }
(B@@ -715,20 +714,20 @@
(B {
(B if (rContent.Len())
(B {
(B- bool bNeedUnicodeWrapper = !CharsetSufficient(rContent, DEF_ENCODING);
(B+ bool bNeedUnicodeWrapper = !CharsetSufficient(rContent,
(BeDefaultEncoding);
(B
(B if (bNeedUnicodeWrapper)
(B Strm() << '{' << sRTF_UPR;
(B
(B Strm() << '{' << pToken << ' ';
(B- OutRTF_AsByteString(*this, rContent);
(B+ OutRTF_AsByteString(*this, rContent, eDefaultEncoding);
(B Strm() << '}';
(B
(B if (bNeedUnicodeWrapper)
(B {
(B OutComment(*this, sRTF_UD);
(B Strm() << '{' << pToken << ' ';
(B- RTFOutFuncs::Out_String(Strm(), rContent, DEF_ENCODING,
(B+ RTFOutFuncs::Out_String(Strm(), rContent, eDefaultEncoding,
(B bWriteHelpFmt);
(B Strm() << "}}}";
(B }
(B@@ -1023,7 +1022,7 @@
(B {
(B rRTFWrt.Strm() << '{';
(B // rWrt.bWriteHelpFmt
(B- RTFOutFuncs::Out_String( rRTFWrt.Strm(), *aIter, DEF_ENCODING,
(B rRTFWrt.bWriteHelpFmt ) << ";}";
(B+ RTFOutFuncs::Out_String( rRTFWrt.Strm(), *aIter,
(BrRTFWrt.eDefaultEncoding,
(B rRTFWrt.bWriteHelpFmt ) << ";}";
(B }
(B rRTFWrt.Strm() << '}' << SwRTFWriter::sNewLine;
(B }
(B@@ -1195,7 +1194,7 @@
(B }
(B
(B Strm() << ' ';
(B- RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(),
(BGET_POOLID_TXTCOLL ), DEF_ENCODING,
(B+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pColl->GetName(),
(BGET_POOLID_TXTCOLL ), eDefaultEncoding,
(B bWriteHelpFmt ) << ";}" <<
(BSwRTFWriter::sNewLine;
(B }
(B
(B@@ -1222,7 +1221,7 @@
(B }
(B
(B Strm() << ' ';
(B- RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(),
(BGET_POOLID_CHRFMT ), DEF_ENCODING,
(B+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( pFmt->GetName(),
(BGET_POOLID_CHRFMT ), eDefaultEncoding,
(B bWriteHelpFmt ) << ";}" <<
(BSwRTFWriter::sNewLine;
(B }
(B
(B@@ -1393,13 +1392,13 @@
(B else
(B {
(B Strm() << ' ';
(B- OutRTF_AsByteString( *this,
(BpBookmark->GetShortName
(B() );
(B+ OutRTF_AsByteString( *this,
(BpBookmark->GetShortName
(B(), eDefaultEncoding );
(B }
(B Strm() << '}';
(B }
(B OutComment( *this, sRTF_BKMKSTART ) << ' ';
(B RTFOutFuncs::Out_String( Strm(), pBookmark->GetName(),
(B- DEF_ENCODING,
(BbWriteHelpFmt ) << '}';
(B+
(BeDefaultEncoding,
(BbWriteHelpFmt ) << '}';
(B }
(B
(B if (pEndPos->nNode.GetIndex() == pCurPam->GetPoint()->nNode.GetIndex()
(B&&
(B@@ -1422,13 +1421,13 @@
(B else
(B {
(B Strm() << ' ';
(B- OutRTF_AsByteString( *this,
(BpBookmark->GetShortName
(B() );
(B+ OutRTF_AsByteString( *this,
(BpBookmark->GetShortName
(B(), eDefaultEncoding );
(B }
(B Strm() << '}';
(B }
(B OutComment( *this, sRTF_BKMKEND ) << ' ';
(B RTFOutFuncs::Out_String( Strm(), pBookmark->GetName(),
(B- DEF_ENCODING,
(BbWriteHelpFmt ) << '}';
(B+
(BeDefaultEncoding,
(BbWriteHelpFmt ) << '}';
(B
(B if( ++nBkmkTabPos >= pDoc->GetBookmarks().Count() )
(B nBkmkTabPos = USHRT_MAX;
(B@@ -1563,7 +1562,7 @@
(B break;
(B Strm() << sRTF_PGDSCNXT;
(B OutULong( i ) << ' ';
(B- RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(),
(BGET_POOLID_PAGEDESC ), DEF_ENCODING,
(B+ RTFOutFuncs::Out_String( Strm(), XlateFmtName( rPageDesc.GetName(),
(BGET_POOLID_PAGEDESC ), eDefaultEncoding,
(B bWriteHelpFmt ) << ";}";
(B }
(B Strm() << '}' << SwRTFWriter::sNewLine;
(B--- sw/source/filter/rtf/rtfatr.cxx.orig 2005-01-23 14:39:52.000000000
(B+0900
(B+++ sw/source/filter/rtf/rtfatr.cxx 2005-01-30 09:27:30.000000000 +0900
(B@@ -435,9 +435,9 @@
(B return (rWrt.Strm() << '{' << sRTF_IGNORE << pStr);
(B }
(B
(B-Writer& OutRTF_AsByteString( Writer& rWrt, const String& rStr )
(B+Writer& OutRTF_AsByteString( Writer& rWrt, const String& rStr,
(Brtl_TextEncoding
(BeEncoding)
(B {
(B- ByteString sOutStr( rStr, DEF_ENCODING );
(B+ ByteString sOutStr( rStr, eEncoding );
(B rWrt.Strm() << sOutStr.GetBuffer();
(B return rWrt;
(B }
(B@@ -1302,7 +1302,7 @@
(B sURL = aTmp.GetFull();
(B }
(B */ rWrt.Strm() << '\"';
(B- RTFOutFuncs::Out_String( rWrt.Strm(), sURL,
(BrRTFWrt.eCurrentCharSet,
(B+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL,
(BrRTFWrt.eCurrentEncoding,
(B
(B rRTFWrt.bWriteHelpFmt ) << "\" ";
(B sURL = aTmp.GetMark();
(B }
(B@@ -1311,7 +1311,7 @@
(B {
(B rWrt.Strm() << "\\\\l \"";
(B sURL.Erase( 0, 1 );
(B- RTFOutFuncs::Out_String( rWrt.Strm(), sURL,
(BrRTFWrt.eCurrentCharSet,
(B+ RTFOutFuncs::Out_String( rWrt.Strm(), sURL,
(BrRTFWrt.eCurrentEncoding,
(B
(B rRTFWrt.bWriteHelpFmt ) << "\" ";
(B }
(B
(B@@ -1319,7 +1319,7 @@
(B {
(B rWrt.Strm() << "\\\\t \"";
(B RTFOutFuncs::Out_String( rWrt.Strm(),
(BrURL.GetTargetFrame(),
(B- DEF_ENCODING,
(BrRTFWrt.bWriteHelpFmt
(B) << "\" ";
(B+ rRTFWrt.eDefaultEncoding,
(BrRTFWrt.bWriteHelpFmt ) << "\" ";
(B }
(B
(B rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' ';
(B@@ -1590,7 +1590,7 @@
(B if (nStrPos != nEnde)
(B {
(B RTFOutFuncs::Out_String(rWrt.Strm(), String(rStr.GetChar
(B(nStrPos)),
(B- rRTFWrt.eCurrentCharSet, rRTFWrt.bWriteHelpFmt);
(B+ rRTFWrt.eCurrentEncoding, rRTFWrt.bWriteHelpFmt);
(B }
(B }
(B
(B@@ -1887,7 +1887,7 @@
(B // Bitmap als File-Referenz speichern
(B rRTFWrt.Strm() << sRTF_FIELD << sRTF_FLDPRIV;
(B OutComment( rRTFWrt, sRTF_FLDINST ) << "{\\\\import ";
(B- RTFOutFuncs::Out_String( rWrt.Strm(), aGrfNm, DEF_ENCODING,
(B+ RTFOutFuncs::Out_String( rWrt.Strm(), aGrfNm, rRTFWrt.eDefaultEncoding,
(B
(B rRTFWrt.bWriteHelpFmt );
(B rRTFWrt.Strm() << "}}{" << sRTF_FLDRSLT << " }}";
(B rRTFWrt.Strm() << '}' << SwRTFWriter::sNewLine;
(B@@ -2373,7 +2373,7 @@
(B const sal_Char* pCmd = bAssoc ? sRTF_AF : sRTF_F;
(B rWrt.Strm() << pCmd;
(B rWrt.OutULong(rRTFWrt.GetId(rFont));
(B- rRTFWrt.eCurrentCharSet = rFont.GetCharSet();
(B+ rRTFWrt.eCurrentEncoding = rtl_getTextEncodingFromWindowsCharset
(B(sw::ms::rtl_TextEncodingToWinCharset(rFont.GetCharSet()));
(B }
(B return rWrt;
(B }
(B@@ -2888,11 +2888,11 @@
(B rWrt.Strm() << aFldStt.GetBuffer() << "EQ \\\\o
(B(\\\\s\\\\up
(B";
(B rWrt.OutLong( nHeight/2 ) << '(';
(B RTFOutFuncs::Out_String( rWrt.Strm(), rFldPar1.Copy
(B(0,nAbove),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B rWrt.Strm() << "), \\\\s\\\\do ";
(B rWrt.OutLong( nHeight/5 ) << '(';
(B RTFOutFuncs::Out_String( rWrt.Strm(), rFldPar1.Copy(
(BnAbove
(B),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt )
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt )
(B << "))";
(B }
(B break;
(B@@ -2903,7 +2903,7 @@
(B case RES_USERFLD:
(B rWrt.Strm() << aFldStt.GetBuffer();
(B RTFOutFuncs::Out_String( rWrt.Strm(), pFld->GetTyp()->
(BGetName(),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B break;
(B case RES_GETREFFLD:
(B {
(B@@ -2915,7 +2915,7 @@
(B case REF_SETREFATTR:
(B case REF_BOOKMARK:
(B RTFOutFuncs::Out_String( rWrt.Strm(),
(BrRFld.GetSetRefName(),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B nFldTyp = 3;
(B break;
(B }
(B@@ -2987,7 +2987,7 @@
(B sOut += DB_DELIM;
(B sOut += (String)aData.sCommand;
(B RTFOutFuncs::Out_String( rWrt.Strm(), sOut,
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B }
(B break;
(B case RES_AUTHORFLD:
(B@@ -2997,11 +2997,11 @@
(B case RES_HIDDENTXTFLD:
(B if( TYP_CONDTXTFLD ==
(B((SwHiddenTxtField*)pFld)->GetSubType
(B() )
(B RTFOutFuncs::Out_String( rWrt.Strm(),
(BpFld->Expand
(B(),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B else
(B {
(B rWrt.Strm() << '{' << sRTF_V << ' ';
(B- OutRTF_AsByteString( rWrt, pFld->GetPar2()
(B).Strm()
(B+ OutRTF_AsByteString( rWrt, pFld->GetPar2(),
(BrRTFWrt.eDefaultEncoding ).Strm()
(B << '}' <<
(BSwRTFWriter::sNewLine;
(B }
(B return rWrt; // nicht bis zum Ende, kein
(BRTF-Feld
(B!!
(B@@ -3053,7 +3053,7 @@
(B if( ' ' != cCh ) // vorweg immer
(Beinen Trenner
(B rWrt.Strm() << ' ';
(B RTFOutFuncs::Out_String( rWrt.Strm(), pFld->Expand(),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B }
(B break;
(B }
(B@@ -3062,7 +3062,7 @@
(B {
(B rWrt.Strm() << "}{" << sRTF_FLDRSLT << ' ';
(B RTFOutFuncs::Out_String( rWrt.Strm(), pFld->Expand(),
(B-
(B DEF_ENCODING, rRTFWrt.bWriteHelpFmt );
(B+
(B rRTFWrt.eDefaultEncoding, rRTFWrt.bWriteHelpFmt );
(B rWrt.Strm() << "}}";
(B rRTFWrt.bOutFmtAttr = FALSE;
(B }
(B@@ -3109,12 +3109,12 @@
(B }
(B else
(B {
(B- OutRTF_AsByteString( rWrt, rFtn.GetNumStr() );
(B+ OutRTF_AsByteString( rWrt, rFtn.GetNumStr(),
(BrRTFWrt.eDefaultEncoding );
(B OutComment( rWrt, sRTF_FOOTNOTE );
(B if( rFtn.IsEndNote() )
(B rWrt.Strm() << sRTF_FTNALT;
(B rWrt.Strm() << ' ';
(B- OutRTF_AsByteString( rWrt, rFtn.GetNumStr() );
(B+ OutRTF_AsByteString( rWrt, rFtn.GetNumStr(),
(BrRTFWrt.eDefaultEncoding );
(B }
(B RTFSaveData aSaveData( rRTFWrt, nStart, nEnd );
(B // damit kein \par ausgegeben wird !!
(B@@ -3131,7 +3131,7 @@
(B static Writer& OutRTF_SwHardBlank( Writer& rWrt, const SfxPoolItem& rHt)
(B {
(B RTFOutFuncs::Out_String(rWrt.Strm(),
(B- String(((SwFmtHardBlank&)rHt).GetChar()), DEF_ENCODING,
(B+ String(((SwFmtHardBlank&)rHt).GetChar()), ((SwRTFWriter&)
(BrWrt).eDefaultEncoding,
(B ((SwRTFWriter&)rWrt).bWriteHelpFmt);
(B return rWrt;
(B }
(B@@ -3212,7 +3212,7 @@
(B << " EQ \\\\* jc" << cJC
(B << " \\\\* \"Font:";
(B RTFOutFuncs::Out_String( rWrt.Strm(), pFont->GetFamilyName(),
(B- DEF_ENCODING,
(BrRTFWrt.bWriteHelpFmt );
(B+
(BrRTFWrt.eDefaultEncoding,
(BrRTFWrt.bWriteHelpFmt );
(B rWrt.Strm() << "\" \\\\* hps";
(B rWrt.OutLong( nHeight );
(B rWrt.Strm() << " \\\\o";
(B@@ -3240,7 +3240,7 @@
(B rWrt.Strm() << ' ';
(B }
(B RTFOutFuncs::Out_String( rWrt.Strm(), rRuby.GetText(),
(B- DEF_ENCODING,
(BrRTFWrt.bWriteHelpFmt );
(B+
(BrRTFWrt.eDefaultEncoding,
(BrRTFWrt.bWriteHelpFmt );
(B if( pFmt )
(B rWrt.Strm() << '}';
(B
(B--- sw/source/filter/rtf/rtfnum.cxx.orig 2004-04-27 23:08:30.000000000
(B+0900
(B+++ sw/source/filter/rtf/rtfnum.cxx 2005-01-30 09:33:48.000000000 +0900
(B@@ -1216,7 +1216,7 @@
(B Strm() << "\\'";
(B OutHex( sOut.Len() );
(B RTFOutFuncs::Out_String( Strm(), sOut,
(B-
(B DEF_ENCODING, bWriteHelpFmt );
(B+
(B eDefaultEncoding, bWriteHelpFmt );
(B }
(B }
(B else
(B@@ -1245,7 +1245,7 @@
(B
(B if( rFmt.GetPrefix().Len() )
(B RTFOutFuncs::Out_String( Strm(),
(BrFmt.GetPrefix(),
(B-
(B DEF_ENCODING, bWriteHelpFmt );
(B+
(B eDefaultEncoding, bWriteHelpFmt );
(B
(B
(B for( xub_StrLen x = 0; x < sNumStr.Len(); ++x )
(B@@ -1259,7 +1259,7 @@
(B
(B if( rFmt.GetSuffix().Len() )
(B RTFOutFuncs::Out_String( Strm(),
(BrFmt.GetSuffix(),
(B-
(B DEF_ENCODING, bWriteHelpFmt );
(B+
(B eDefaultEncoding, bWriteHelpFmt );
(B }
(B
(B // write the levelnumbers
(B@@ -1296,7 +1296,7 @@
(B if( !pRule->IsAutoRule() )
(B {
(B Strm() << '{' << sRTF_LISTNAME << ' ';
(B- RTFOutFuncs::Out_String( Strm(), pRule->GetName(),
(BDEF_ENCODING,
(B+ RTFOutFuncs::Out_String( Strm(), pRule->GetName(),
(BeDefaultEncoding,
(B
(B bWriteHelpFmt ) << ";}" ;
(B }
(B Strm() << sRTF_LISTID;
(B@@ -1428,7 +1428,7 @@
(B
(B if (sTxt.Len())
(B {
(B- RTFOutFuncs::Out_String(Strm(), sTxt,
(BDEF_ENCODING,
(B+ RTFOutFuncs::Out_String(Strm(), sTxt,
(BeDefaultEncoding,
(B bWriteHelpFmt);
(B }
(B
(B
(B----
(B Takashi Ono(HK Freak)
(B mailto:[EMAIL PROTECTED] or [EMAIL PROTECTED]
(B (Personal Address, checked every morning/evening and holidays)
(B mailto:[EMAIL PROTECTED]
(B (Address for business, checked every working days)
(B http://www.hkfreak.net
(B
(B---------------------------------------------------------------------
(BTo unsubscribe, e-mail: [EMAIL PROTECTED]
(BFor additional commands, e-mail: [EMAIL PROTECTED]
