diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:57:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-05 07:57:26 +0000 |
| commit | 78335768aa6f3bb70f9ff38725352b9963329f53 (patch) | |
| tree | cd396b6adc4896ff63909802d82c47bd232b002a /psprint | |
| parent | 5f4957f32f4b434a8e9322c5cab52b432fb9e33e (diff) | |
INTEGRATION: CWS vcl57 (1.20.22); FILE MERGED
2006/03/29 16:28:22 pl 1.20.22.1: #i56669# ensure uniqueness of PSName
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/printergfx/glyphset.cxx | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/psprint/source/printergfx/glyphset.cxx b/psprint/source/printergfx/glyphset.cxx index 82db64ed0a35..0b027f398bd1 100644 --- a/psprint/source/printergfx/glyphset.cxx +++ b/psprint/source/printergfx/glyphset.cxx @@ -4,9 +4,9 @@ * * $RCSfile: glyphset.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: obo $ $Date: 2006-01-16 12:55:02 $ + * last change: $Author: rt $ $Date: 2006-05-05 08:57:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,10 @@ #include <rtl/ustring.hxx> #endif +#ifndef _RTL_STRBUF_HXX_ +#include <rtl/strbuf.hxx> +#endif + #ifndef __SUBFONT_H #define NO_LIST #include <../fontsubset/sft.h> @@ -379,9 +383,13 @@ GlyphSet::GetCharSetName (sal_Int32 nGlyphSetID) { if (meBaseType == fonttype::TrueType) { - return maBaseName - + (mbVertical ? OString ("VSet") : OString ("HSet") ) - + OString::valueOf (nGlyphSetID); + OStringBuffer aSetName( maBaseName.getLength() + 32 ); + aSetName.append( maBaseName ); + aSetName.append( "FID" ); + aSetName.append( mnFontID ); + aSetName.append( mbVertical ? "VCSet" : "HCSet" ); + aSetName.append( nGlyphSetID ); + return aSetName.makeStringAndClear(); } else /* (meBaseType == fonttype::Type1 || meBaseType == fonttype::Builtin) */ @@ -395,9 +403,13 @@ GlyphSet::GetGlyphSetName (sal_Int32 nGlyphSetID) { if (meBaseType == fonttype::TrueType) { - return maBaseName - + (mbVertical ? OString ("VGSet") : OString ("HGSet") ) - + OString::valueOf (nGlyphSetID); + OStringBuffer aSetName( maBaseName.getLength() + 32 ); + aSetName.append( maBaseName ); + aSetName.append( "FID" ); + aSetName.append( mnFontID ); + aSetName.append( mbVertical ? "VGSet" : "HGSet" ); + aSetName.append( nGlyphSetID ); + return aSetName.makeStringAndClear(); } else /* (meBaseType == fonttype::Type1 || meBaseType == fonttype::Builtin) */ |