diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:24:36 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-08 15:24:36 +0000 |
| commit | 52c4eefaa5e74e311d5b50653c9c32fb5892974f (patch) | |
| tree | cea70f3af013f2deea4ad0788cc370c9f42d1f27 /sc/source/filter/excel/xehelper.cxx | |
| parent | 82ae9ee4c2f0d064166f000a9ad1d27b5e08d53f (diff) | |
INTEGRATION: CWS calc06 (1.2.4.1.42); FILE MERGED
2003/03/31 15:46:04 sab 1.2.4.1.42.3: RESYNC: (1.2.4.1-1.2.4.2); FILE MERGED
2003/03/27 16:07:24 dr 1.2.4.1.42.2: #107688# import/export of cell styles
2003/03/25 16:18:56 jmarmion 1.2.4.1.42.1: #108188# fix export to excel of text greater than length of 255
Diffstat (limited to 'sc/source/filter/excel/xehelper.cxx')
| -rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index fb838eca6ba3..3f06bea740a5 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xehelper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2003-03-26 18:04:34 $ + * last change: $Author: rt $ $Date: 2003-04-08 16:24:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -348,13 +348,13 @@ sal_uInt16 XclExpString::CalcStrLen( sal_Int32 nCurrLen, sal_uInt16 nMaxLen ) void XclExpString::Init( XclStrFlags nFlags, sal_Int32 nCurrLen, sal_uInt16 nMaxLen, bool bBiff8 ) { DBG_ASSERT( (nFlags & ~(bBiff8 ? nAllowedFlags : nAllowedFlags27)) == 0, "XclExpString::Init - unknown flag" ); - mnLen = CalcStrLen( nCurrLen, nMaxLen ); mbIsBiff8 = bBiff8; mbIsUnicode = bBiff8 && ::get_flag( nFlags, EXC_STR_FORCEUNICODE ); mb8BitLen = ::get_flag( nFlags, EXC_STR_8BITLENGTH ); mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS ); mbKeepZero = ::get_flag( nFlags, EXC_STR_KEEPZEROCHARS ); mbWrapped = false; + mnLen = CalcStrLen( nCurrLen, nMaxLen ); maFormats.clear(); if( mbIsBiff8 ) @@ -625,7 +625,7 @@ void XclExpHFConverter::AppendPortion( String& rHFString, const EditTextObject* aAttr.GetFont( aFont, SC_AUTOCOL_RAW ); // font name and style - aNewData.maName = aFont.GetName(); + aNewData.maName = XclTools::GetXclFontName( aFont.GetName() ); aNewData.mnWeight = (aFont.GetWeight() > WEIGHT_NORMAL) ? EXC_FONTWGHT_BOLD : EXC_FONTWGHT_NORMAL; aNewData.mbItalic = (aFont.GetItalic() != ITALIC_NONE); bool bNewFont = !(aFontData.maName == aNewData.maName); @@ -722,7 +722,7 @@ void XclExpHFConverter::AppendPortion( String& rHFString, const EditTextObject* else { String aPortionText( mrEE.GetText( aSel ) ); - aPortionText.SearchAndReplaceAll( String( '&' ), String::CreateFromAscii( "&&" ) ); + aPortionText.SearchAndReplaceAll( String( '&' ), String( RTL_CONSTASCII_USTRINGPARAM( "&&" ) ) ); aParaText.Append( aPortionText ); } } |