From bca5c1a4d0aa762f37d9f3f6976d3d17865f33a6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Aug 2011 22:50:17 +0100 Subject: The idl encoding table stuff appears to be a no-op, converts x to x 1.a) There is only one call to SvTokenStream::SetCharSet 2.b) That call is from SvTokenStream::InitCtor and the argument is gsl_getSystemTextEncoding() 2.a) SvTokenStream::SetCharSet is the sole caller of SvChar::GetTable i.e. pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() ); 2.b) so this is in practive only ever... pCharTab = SvChar::GetTable( gsl_getSystemTextEncoding(), gsl_getSystemTextEncoding() ); 3) SvChar::GetTable returns a table for converting from one encoding to another. 4) so the whole thing is a no-op, i.e. pCharTab can be dropped SvChar::GetTable is then unused and can be dropped SetCharSet and GetCharSet are then also unused --- idl/Executable_svidl.mk | 1 - idl/inc/char.hxx | 43 ------------------ idl/inc/lex.hxx | 5 --- idl/source/cmptools/char.cxx | 102 ------------------------------------------- idl/source/cmptools/lex.cxx | 14 ------ 5 files changed, 165 deletions(-) delete mode 100644 idl/inc/char.hxx delete mode 100644 idl/source/cmptools/char.cxx diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index c9d6d5ae5b0b..e73f15e27cd4 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Executable_add_linked_libs,svidl,\ )) $(eval $(call gb_Executable_add_exception_objects,svidl,\ - idl/source/cmptools/char \ idl/source/cmptools/hash \ idl/source/cmptools/lex \ idl/source/objects/basobj \ diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx deleted file mode 100644 index 0c0528d08a98..000000000000 --- a/idl/inc/char.hxx +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _CHAR_HXX -#define _CHAR_HXX - -#include - -class SvChar -{ -public: - static char * GetTable( CharSet nSource, CharSet nDest ); -}; - - -#endif // _CHAR_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 3aa22139a4dd..607f0ec67a8d 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -133,8 +133,6 @@ class SvTokenStream sal_uLong nLine, nColumn; int nBufPos; int c; // next character - CharSet nCharSet; - char * pCharTab; // pointer to conversion table sal_uInt16 nTabSize; // length of tabulator ByteString aStrTrue; ByteString aStrFalse; @@ -184,9 +182,6 @@ public: const String & GetFileName() const { return aFileName; } SvStream & GetStream() { return rInStream; } - void SetCharSet( CharSet nSet ); - CharSet GetCharSet() const { return nCharSet; } - void SetTabSize( sal_uInt16 nTabSizeP ) { nTabSize = nTabSizeP; } sal_uInt16 GetTabSize() const { return nTabSize; } diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx deleted file mode 100644 index 19848ffa96d4..000000000000 --- a/idl/source/cmptools/char.cxx +++ /dev/null @@ -1,102 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_idl.hxx" - -#include -#include - -#include - -#include - -static unsigned char EqualTab[ 256 ] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -100, 101, 102, 103, 104, 105, 106, 107, 108, 109, -110, 111, 112, 113, 114, 115, 116, 117, 118, 119, -120, 121, 122, 123, 124, 125, 126, 127, 128, 129, -130, 131, 132, 133, 134, 135, 136, 137, 138, 139, -140, 141, 142, 143, 144, 145, 146, 147, 148, 149, -150, 151, 152, 153, 154, 155, 156, 157, 158, 159, -160, 161, 162, 163, 164, 165, 166, 167, 168, 169, -170, 171, 172, 173, 174, 175, 176, 177, 178, 179, -180, 181, 182, 183, 184, 185, 186, 187, 188, 189, -190, 191, 192, 193, 194, 195, 196, 197, 198, 199, -200, 201, 202, 203, 204, 205, 206, 207, 208, 209, -210, 211, 212, 213, 214, 215, 216, 217, 218, 219, -220, 221, 222, 223, 224, 225, 226, 227, 228, 229, -230, 231, 232, 233, 234, 235, 236, 237, 238, 239, -240, 241, 242, 243, 244, 245, 246, 247, 248, 249, -250, 251, 252, 253, 254, 255 }; - - -/************************************************************************* -|* -|* RscChar::GetTable() -|* -*************************************************************************/ -Table * pCharTable = NULL; -unsigned char * pChange = EqualTab; -char * SvChar::GetTable( CharSet nSource , CharSet nDest ) -{ - if( nSource == nDest ) - return (char *)EqualTab; - - if( !pCharTable ) - pCharTable = new Table(); - - sal_uInt8 * pSet; - pSet = (sal_uInt8 *)pCharTable->Get( ((sal_uLong)nSource << 16) + (sal_uLong)nDest ); - - if( !pSet ) - { - pSet = new sal_uInt8[ 256 ]; - memcpy( pSet, EqualTab, sizeof( EqualTab ) ); - for( sal_uInt16 i = 128; i < 256; i++ ) - { - char c = ByteString::Convert( pSet[i], nSource, nDest ); - if( c ) - pSet[ i ] = (sal_uInt8)c; - } - pCharTable->Insert( ((sal_uLong)nSource << 16) + (sal_uLong)nDest, pSet ); - } - - return (char *)pSet; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index 12ce3e1ed4fd..244aa23069f1 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -99,7 +98,6 @@ SvToken & SvToken::operator = ( const SvToken & rObj ) void SvTokenStream::InitCtor() { - SetCharSet( gsl_getSystemTextEncoding() ); aStrTrue = "TRUE"; aStrFalse = "FALSE"; nLine = nColumn = 0; @@ -163,12 +161,6 @@ void SvTokenStream::FillTokenList() pCurToken = aTokList.begin(); } -void SvTokenStream::SetCharSet( CharSet nSet ) -{ - nCharSet = nSet; - pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() ); -} - int SvTokenStream::GetNextChar() { int nChar; @@ -332,12 +324,6 @@ sal_Bool SvTokenStream::MakeToken( SvToken & rToken ) } if( IsEof() || ( SVSTREAM_OK != rInStream.GetError() ) ) return sal_False; - char * pStr = (char *)aStr.GetBuffer(); - while( *pStr ) - { - *pStr = pCharTab[ (unsigned char)*pStr ]; - pStr++; - }; rToken.nType = SVTOKEN_STRING; rToken.aString = aStr; } -- cgit