diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:20:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 12:20:14 +0000 |
| commit | 14f675bb68001a7c73b71c9b3ba955468fd07a62 (patch) | |
| tree | b957a32213cd7cc02fdfb8ea9fd02a933deb6a73 /sc/source/filter/excel/xeescher.cxx | |
| parent | 327cdc5f8f7d6c3b7e8fd127f986ea8206465bd1 (diff) | |
INTEGRATION: CWS dr51 (1.16.84); FILE MERGED
2006/11/08 09:30:24 dr 1.16.84.1: #i71033# use app-font text encoding if CODEPAGE is missing, remane 'CharSet' -> 'rtl_TextEncoding'
Diffstat (limited to 'sc/source/filter/excel/xeescher.cxx')
| -rw-r--r-- | sc/source/filter/excel/xeescher.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 220147afdb83..bc958409633d 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xeescher.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: kz $ $Date: 2006-07-21 11:53:54 $ + * last change: $Author: ihi $ $Date: 2006-12-19 13:20:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -353,7 +353,7 @@ XclExpObjTbxCtrl::XclExpObjTbxCtrl( if( aCtrlProp.GetProperty( nShortVal, CREATE_OUSTRING( "FontFamily" ) ) ) aFontData.SetApiFamily( nShortVal ); if( aCtrlProp.GetProperty( nShortVal, CREATE_OUSTRING( "FontCharset" ) ) ) - aFontData.SetApiCharSet( nShortVal ); + aFontData.SetApiFontEncoding( nShortVal ); if( aCtrlProp.GetProperty( nShortVal, CREATE_OUSTRING( "FontSlant" ) ) ) aFontData.SetApiPosture( static_cast< ::com::sun::star::awt::FontSlant >( nShortVal ) ); if( aCtrlProp.GetProperty( fFloatVal, CREATE_OUSTRING( "FontWeight" ) ) ) @@ -716,7 +716,7 @@ XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, switch( rRoot.GetBiff() ) { case EXC_BIFF5: - maNoteText = ByteString( aNoteText, rRoot.GetCharSet() ); + maNoteText = ByteString( aNoteText, rRoot.GetTextEncoding() ); break; case EXC_BIFF8: |