summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-08-03 01:51:34 +0200
committerThomas Arnhold <thomas@arnhold.org>2011-08-03 01:54:39 +0200
commit1b5f37d262718920f4efe6387287d76d97daeba4 (patch)
treed4010e93b3b373bb48aaadff6eefcd1200754904 /vcl
parent1e54169bb51f46a866857960afbb5065681c5745 (diff)
callcatcher: remove unused methods
Diffstat (limited to 'vcl')
-rw-r--r--vcl/Library_vclplug_gen.mk1
-rw-r--r--vcl/unx/generic/gdi/salcvt.cxx339
-rw-r--r--vcl/unx/generic/gdi/salcvt.hxx95
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx1
4 files changed, 0 insertions, 436 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index c671fd78ed04..aae1ed97a342 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -98,7 +98,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/gdi/gcach_xpeer \
vcl/unx/generic/gdi/pspgraphics \
vcl/unx/generic/gdi/salbmp \
- vcl/unx/generic/gdi/salcvt \
vcl/unx/generic/gdi/salgdi2 \
vcl/unx/generic/gdi/salgdi3 \
vcl/unx/generic/gdi/salgdi \
diff --git a/vcl/unx/generic/gdi/salcvt.cxx b/vcl/unx/generic/gdi/salcvt.cxx
deleted file mode 100644
index b67b5828bf13..000000000000
--- a/vcl/unx/generic/gdi/salcvt.cxx
+++ /dev/null
@@ -1,339 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-#include "salcvt.hxx"
-
-
-SalConverterCache::SalConverterCache()
-{
-}
-
-SalConverterCache*
-SalConverterCache::GetInstance ()
-{
- static SalConverterCache* pCvt = NULL;
- if (pCvt == NULL)
- pCvt = new SalConverterCache;
-
- return pCvt;
-}
-
-SalConverterCache::~SalConverterCache()
-{
-}
-
-// ---> FIXME
-#include <stdio.h>
-
-rtl_UnicodeToTextConverter
-SalConverterCache::GetU2TConverter( rtl_TextEncoding nEncoding )
-{
- if( rtl_isOctetTextEncoding( nEncoding ) )
- {
- ConverterT& rConverter( m_aConverters[ nEncoding ] );
- if ( rConverter.mpU2T == NULL )
- {
- rConverter.mpU2T =
- rtl_createUnicodeToTextConverter( nEncoding );
-// ---> FIXME
-if ( rConverter.mpU2T == NULL )
- fprintf( stderr, "failed to create Unicode -> %i converter\n", nEncoding);
- }
- return rConverter.mpU2T;
- }
- return NULL;
-}
-
-rtl_TextToUnicodeConverter
-SalConverterCache::GetT2UConverter( rtl_TextEncoding nEncoding )
-{
- if( rtl_isOctetTextEncoding( nEncoding ) )
- {
- ConverterT& rConverter( m_aConverters[ nEncoding ] );
- if ( rConverter.mpT2U == NULL )
- {
- rConverter.mpT2U =
- rtl_createTextToUnicodeConverter( nEncoding );
-// ---> FIXME
-if ( rConverter.mpT2U == NULL )
- fprintf( stderr, "failed to create %i -> Unicode converter\n", nEncoding );
- }
- return rConverter.mpT2U;
- }
- return NULL;
-}
-
-Bool
-SalConverterCache::IsSingleByteEncoding( rtl_TextEncoding nEncoding )
-{
- if( rtl_isOctetTextEncoding( nEncoding ) )
- {
- ConverterT& rConverter( m_aConverters[ nEncoding ] );
- if ( ! rConverter.mbValid )
- {
- rConverter.mbValid = True;
-
- rtl_TextEncodingInfo aTextEncInfo;
- aTextEncInfo.StructSize = sizeof( aTextEncInfo );
- rtl_getTextEncodingInfo( nEncoding, &aTextEncInfo );
-
- if ( aTextEncInfo.MinimumCharSize == aTextEncInfo.MaximumCharSize
- && aTextEncInfo.MinimumCharSize == 1)
- rConverter.mbSingleByteEncoding = True;
- else
- rConverter.mbSingleByteEncoding = False;
- }
-
- return rConverter.mbSingleByteEncoding;
- }
- return False;
-}
-
-// check whether the character set nEncoding contains the unicode
-// code point nChar. This list has been compiled from the according
-// ttmap files in /usr/openwin/lib/X11/fonts/TrueType/ttmap/
-Bool
-SalConverterCache::EncodingHasChar( rtl_TextEncoding nEncoding,
- sal_Unicode nChar )
-{
- Bool bMatch = False;
-
- switch ( nEncoding )
- {
- case RTL_TEXTENCODING_DONTKNOW:
- bMatch = False;
- break;
-
- case RTL_TEXTENCODING_MS_1252:
- case RTL_TEXTENCODING_ISO_8859_1:
- case RTL_TEXTENCODING_ISO_8859_15:
- // handle iso8859-15 and iso8859-1 the same (and both with euro)
- // handle them also like ms1252
- // this is due to the fact that so many X fonts say they are iso8859-1
- // but have the other glyphs anyway because they are really ms1252
- bMatch = ( /*nChar >= 0x0000 &&*/ nChar <= 0x00ff )
- || ( nChar == 0x20ac )
- || ( nChar == 0x201a )
- || ( nChar == 0x0192 )
- || ( nChar == 0x201e )
- || ( nChar == 0x2026 )
- || ( nChar == 0x2020 )
- || ( nChar == 0x2021 )
- || ( nChar == 0x02c6 )
- || ( nChar == 0x2030 )
- || ( nChar == 0x0160 )
- || ( nChar == 0x2039 )
- || ( nChar == 0x0152 )
- || ( nChar == 0x017d )
- || ( nChar == 0x2018 )
- || ( nChar == 0x2019 )
- || ( nChar == 0x201c )
- || ( nChar == 0x201d )
- || ( nChar == 0x2022 )
- || ( nChar == 0x2013 )
- || ( nChar == 0x2014 )
- || ( nChar == 0x02dc )
- || ( nChar == 0x2122 )
- || ( nChar == 0x0161 )
- || ( nChar == 0x203a )
- || ( nChar == 0x0153 )
- || ( nChar == 0x017e )
- || ( nChar == 0x0178 )
- ;
- break;
-
- case RTL_TEXTENCODING_ISO_8859_2:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x017e )
- || ( nChar >= 0x02c7 && nChar <= 0x02dd );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_4:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x017e )
- || ( nChar >= 0x02c7 && nChar <= 0x02db );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_5:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00ad )
- || ( nChar >= 0x0401 && nChar <= 0x045f )
- || ( nChar == 0x2116 );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_6:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x0600 && nChar <= 0x06ff )
- || ( nChar >= 0xfb50 && nChar <= 0xfffe );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_7:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00bd )
- || ( nChar == 0x02bd )
- || ( nChar >= 0x0384 && nChar <= 0x03ce )
- || ( nChar >= 0x2014 && nChar <= 0x2019 );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_8:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00f7 )
- || ( nChar >= 0x05d0 && nChar <= 0x05ea )
- || ( nChar == 0x2017 );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_9:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x015f );
- break;
-
- case RTL_TEXTENCODING_ISO_8859_13:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x017e )
- || ( nChar >= 0x2019 && nChar <= 0x201e );
- break;
-
- /* real case for RTL_TEXTENCODING_ISO_8859_15
- case RTL_TEXTENCODING_ISO_8859_15:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00ff )
- || ( nChar >= 0x0152 && nChar <= 0x017e )
- || ( nChar == 0x20ac );
- break;
- */
-
- case RTL_TEXTENCODING_JIS_X_0201:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0xff61 && nChar <= 0xff9f );
- break;
-
- case RTL_TEXTENCODING_MS_1251:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00bb )
- || ( nChar >= 0x0401 && nChar <= 0x045f )
- || ( nChar >= 0x0490 && nChar <= 0x0491 )
- || ( nChar >= 0x2013 && nChar <= 0x203a )
- || ( nChar >= 0x2116 && nChar <= 0x2122 );
- break;
-
- case RTL_TEXTENCODING_KOI8_R:
- bMatch = ( nChar >= 0x0020 && nChar <= 0x007e )
- || ( nChar >= 0x00a0 && nChar <= 0x00b7 )
- || ( nChar == 0x00f7 )
- || ( nChar >= 0x0401 && nChar <= 0x0451 )
- || ( nChar >= 0x2219 && nChar <= 0x221a )
- || ( nChar >= 0x2248 && nChar <= 0x2265 )
- || ( nChar >= 0x2320 && nChar <= 0x2321 )
- || ( nChar >= 0x2500 && nChar <= 0x25a0 );
- break;
-
- case RTL_TEXTENCODING_UNICODE:
- bMatch = True;
- break;
-
- case RTL_TEXTENCODING_EUC_KR:
- case RTL_TEXTENCODING_BIG5:
- case RTL_TEXTENCODING_GBK:
- case RTL_TEXTENCODING_GB_2312:
- case RTL_TEXTENCODING_MS_1361:
- case RTL_TEXTENCODING_JIS_X_0208:
-
- // XXX Big5 and Korean EUC contain Ascii chars, but Solaris
- // *-big5-1 and *-ksc5601.1992-3 fonts dont, in general CJK fonts
- // are monospaced, so dont trust them for latin chars
- if (nChar <= 0xFF)
- {
- bMatch = False;
- break;
- }
-
- default:
- // XXX really convert the unicode char into the encoding
- // and check for conversion errors, this is expensive !
- rtl_UnicodeToTextConverter aConverter;
- rtl_UnicodeToTextContext aContext;
-
- aConverter = GetU2TConverter(nEncoding);
- aContext = rtl_createUnicodeToTextContext( aConverter );
-
- // ---> FIXME
- if ( aConverter == NULL )
- return False;
-
- sal_Char pConversionBuffer[ 32 ];
- sal_uInt32 nConversionInfo;
- sal_Size nConvertedChars;
- sal_Size nSize;
-
- nSize = rtl_convertUnicodeToText( aConverter, aContext,
- &nChar, 1, pConversionBuffer, sizeof(pConversionBuffer),
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
- | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR,
- &nConversionInfo, &nConvertedChars );
-
- rtl_destroyUnicodeToTextContext( aConverter, aContext );
-
- bMatch = (nConvertedChars == 1)
- && (nSize == 1 || nSize == 2) // XXX Fix me this is a hack
- && ((nConversionInfo & RTL_UNICODETOTEXT_INFO_ERROR) == 0);
- break;
- }
-
- return bMatch;
-}
-
-// wrapper for rtl_convertUnicodeToText that handles the usual cases for
-// textconversion in drawtext and gettextwidth routines
-sal_Size
-SalConverterCache::ConvertStringUTF16( const sal_Unicode *pText, int nTextLen,
- sal_Char *pBuffer, sal_Size nBufferSize, rtl_TextEncoding nEncoding )
-{
- rtl_UnicodeToTextConverter aConverter = GetU2TConverter(nEncoding);
-
- const sal_uInt32 nCvtFlags =
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE
- | RTL_UNICODETOTEXT_FLAGS_UNDEFINED_QUESTIONMARK
- | RTL_UNICODETOTEXT_FLAGS_INVALID_QUESTIONMARK ;
- sal_uInt32 nCvtInfo;
- sal_Size nCvtChars;
-
- rtl_UnicodeToTextContext aContext =
- rtl_createUnicodeToTextContext( aConverter );
-
- sal_Size nSize = rtl_convertUnicodeToText( aConverter, aContext,
- pText, nTextLen, pBuffer, nBufferSize,
- nCvtFlags, &nCvtInfo, &nCvtChars );
-
- rtl_destroyUnicodeToTextContext( aConverter, aContext );
-
- return nSize;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salcvt.hxx b/vcl/unx/generic/gdi/salcvt.hxx
deleted file mode 100644
index 896ae4f30b36..000000000000
--- a/vcl/unx/generic/gdi/salcvt.hxx
+++ /dev/null
@@ -1,95 +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
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef SAL_CONVERTER_CACHE_HXX_
-#define SAL_CONVERTER_CACHE_HXX_
-
-#include <rtl/tencinfo.h>
-#include <rtl/textcvt.h>
-
-#include <unx/salunx.h>
-
-#include <map>
-
-extern "C" const char*
-pGetEncodingName( rtl_TextEncoding nEncoding );
-
-//
-// Cache TextToUnicode and UnicodeToText converter and conversion info which is
-// used in DrawXYZ routines and in the Event loop
-//
-
-class SalConverterCache {
-
- public:
- SalConverterCache();
- ~SalConverterCache();
- Bool EncodingHasChar(
- rtl_TextEncoding nEncoding, sal_Unicode nChar );
- rtl_UnicodeToTextConverter
- GetU2TConverter( rtl_TextEncoding nEncoding );
- rtl_TextToUnicodeConverter
- GetT2UConverter( rtl_TextEncoding nEncoding );
- Bool IsSingleByteEncoding( rtl_TextEncoding nEncoding );
- sal_Size ConvertStringUTF16( const sal_Unicode *pText, int nTextLen,
- sal_Char *pBuffer, sal_Size nBufferSize,
- rtl_TextEncoding nEncoding);
-
- static SalConverterCache*
- GetInstance ();
-
- private:
-
- struct ConverterT {
- rtl_UnicodeToTextConverter mpU2T;
- rtl_TextToUnicodeConverter mpT2U;
- Bool mbSingleByteEncoding;
- Bool mbValid;
- ConverterT() :
- mpU2T( NULL ),
- mpT2U( NULL ),
- mbSingleByteEncoding( False ),
- mbValid( False )
- {
- }
- ~ConverterT()
- {
- if( mpU2T )
- rtl_destroyUnicodeToTextConverter( mpU2T );
- if( mpT2U )
- rtl_destroyTextToUnicodeConverter( mpT2U );
- }
- };
-
- std::map< rtl_TextEncoding, ConverterT > m_aConverters;
-};
-
-
-
-#endif /* SAL_CONVERTER_CACHE_HXX_ */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 49ab62fb2044..f03bc353a740 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -71,7 +71,6 @@
#include "unx/pspgraphics.h"
#include "unx/salvd.h"
-#include "salcvt.hxx"
#include "gcach_xpeer.hxx"
#include "xrender_peer.hxx"
#include "impfont.hxx"