diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-01-19 17:44:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-01-19 17:44:40 +0000 |
| commit | d5f3b7f85c5562e06758ea5f7a47e97460afac78 (patch) | |
| tree | 8e84b2034f0d5eb107bbd6039e8a1cd9a07fb026 /goodies | |
| parent | f177218306e3b32129d72b010e9aee01f1633246 (diff) | |
INTEGRATION: CWS gcc41 (1.13.30); FILE MERGED
2006/01/05 13:02:58 pmladek 1.13.30.1: #i58972#
Some more fixes for gcc-4.1 by Stephan Bergmann <Stephan.Bergmann@sun.com>
Diffstat (limited to 'goodies')
| -rw-r--r-- | goodies/source/filter.vcl/eos2met/eos2met.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx index 8177c43dc7f2..60398bf7c775 100644 --- a/goodies/source/filter.vcl/eos2met/eos2met.cxx +++ b/goodies/source/filter.vcl/eos2met/eos2met.cxx @@ -4,9 +4,9 @@ * * $RCSfile: eos2met.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2005-10-05 13:06:14 $ + * last change: $Author: obo $ $Date: 2006-01-19 18:44:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,7 +120,7 @@ struct METChrSet { struct METChrSet * pSucc; BYTE nSet; - ByteString aName; + String aName; FontWeight eWeight; }; @@ -423,7 +423,7 @@ void METWriter::CreateChrSet(const Font & rFont) pCS = new METChrSet; pCS->pSucc = pChrSetList; pChrSetList=pCS; pCS->nSet = nNextChrSetId++; - pCS->aName = ByteString( rFont.GetName(), gsl_getSystemTextEncoding() ); + pCS->aName = rFont.GetName(); pCS->eWeight = rFont.GetWeight(); } } @@ -488,10 +488,11 @@ void METWriter::WriteChrSets() *pMET << (BYTE)0x03 << (BYTE)0x52; *pMET << (BYTE)0x24 << (BYTE)0x02 << (BYTE)0x08 << (BYTE)0x00; + ByteString n(pCS->aName, gsl_getSystemTextEncoding()); for (i=0; i<32; i++) { if ( i == 0 || c != 0 ) - c = pCS->aName.GetChar( i ); + c = n.GetChar( i ); *pMET << c; } } |