diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:06:37 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-04-04 07:06:37 +0000 |
commit | 32bc8b4de164eea2242341c94e2e416e6e7a8479 (patch) | |
tree | 2f9a2c576516d120915ec9bf6f67dfd59a9cd1c7 /starmath/source/symbol.cxx | |
parent | 22330038e9fce01372e85c949eeabaa79e17574b (diff) |
INTEGRATION: CWS tl07 (1.23.6); FILE MERGED
2004/12/16 12:24:33 tl 1.23.6.1: #i39124# removed code that is used only in the binfilter now
Diffstat (limited to 'starmath/source/symbol.cxx')
-rw-r--r-- | starmath/source/symbol.cxx | 80 |
1 files changed, 2 insertions, 78 deletions
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 5644945cee9f..5e42d1eed28f 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -2,9 +2,9 @@ * * $RCSfile: symbol.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: hr $ $Date: 2004-11-26 23:00:23 $ + * last change: $Author: rt $ $Date: 2005-04-04 08:06:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -201,40 +201,6 @@ SmSym& SmSym::operator = (const SmSym& rSymbol) return *this; } -SvStream& operator << (SvStream& rStream, const SmSym& rSymbol) -{ - rStream.WriteByteString( ExportString(rSymbol.Name) ); - rStream << rSymbol.Face; - - rtl_TextEncoding eEnc = rSymbol.Face.GetCharSet(); - if (RTL_TEXTENCODING_DONTKNOW == eEnc) - eEnc = RTL_TEXTENCODING_SYMBOL; - rStream << ByteString::ConvertFromUnicode( rSymbol.Character, eEnc ); - - return rStream; -} - -SvStream& operator >> (SvStream& rStream, SmSym& rSymbol) -{ - ByteString aByteStr; - - rStream.ReadByteString( aByteStr ); - rSymbol.Name = ImportString( aByteStr ); - if (SF_Ident == SF_SM20IDENT) - ReadSM20Font(rStream, rSymbol.Face); - else - rStream >> rSymbol.Face; - sal_Char cTemp; - rStream >> cTemp; - - rtl_TextEncoding eEnc = rSymbol.Face.GetCharSet(); - if (RTL_TEXTENCODING_DONTKNOW == eEnc) - eEnc = RTL_TEXTENCODING_SYMBOL; - rSymbol.Character = ByteString::ConvertToUnicode( cTemp, eEnc ); - - return rStream; -} - /**************************************************************************/ SmSymSet::SmSymSet() : @@ -332,40 +298,6 @@ USHORT SmSymSet::GetSymbolPos(const String& rName) return SYMBOL_NONE; } -SvStream& operator << (SvStream& rStream, const SmSymSet& rSymbolSet) -{ - rStream.WriteByteString(ExportString(rSymbolSet.Name)); - rStream << rSymbolSet.GetCount(); - - for (int i = 0; i < rSymbolSet.GetCount(); i++) - rStream << rSymbolSet.GetSymbol(i); - - return rStream; -} - - -SvStream& operator >> (SvStream& rStream, SmSymSet& rSymbolSet) -{ - USHORT n; - SmSym *pSymbol; - ByteString aByteStr; - - rStream.ReadByteString( aByteStr ); - rSymbolSet.Name = ImportString( aByteStr ); - rStream >> n; - - for (int i = 0; i < n; i++) - { - if ((pSymbol = new SmSym) == 0) - break; - - rStream >> *pSymbol; - rSymbolSet.AddSymbol(pSymbol); - } - - return rStream; -} - /**************************************************************************/ SmSymSetManager_Impl::SmSymSetManager_Impl( @@ -704,11 +636,3 @@ void SmSymSetManager::Save() } -void ReadSM20SymSet(SvStream *pStream, SmSymSet *pSymbolSet) -{ - SF_Ident = SF_SM20IDENT; - *pStream >> *pSymbolSet; - SF_Ident = SF_IDENT; -} - - |