From c1e467f7999592f1144ce0c1c6563fa21f54cbbd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 6 Mar 2012 00:52:50 +0000 Subject: remove TransliterationWrapper::compareSubstring --- unotools/inc/unotools/transliterationwrapper.hxx | 4 ---- unotools/source/config/configmgr.cxx | 7 +++++++ unotools/source/i18n/transliterationwrapper.cxx | 20 -------------------- 3 files changed, 7 insertions(+), 24 deletions(-) (limited to 'unotools') diff --git a/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx index c4c340d30150..d6ac07d9fb6a 100644 --- a/unotools/inc/unotools/transliterationwrapper.hxx +++ b/unotools/inc/unotools/transliterationwrapper.hxx @@ -118,10 +118,6 @@ public: const String& rStr1, sal_Int32 nPos1, sal_Int32 nCount1, sal_Int32& nMatch1, const String& rStr2, sal_Int32 nPos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) const; - sal_Int32 compareSubstring( - const String& rStr1, sal_Int32 nOff1, sal_Int32 nLen1, - const String& rStr2, sal_Int32 nOff2, sal_Int32 nLen2 ) const; - sal_Int32 compareString( const String& rStr1, const String& rStr2 ) const; diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index f761c5f0901f..14bc4358dca0 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -227,6 +227,10 @@ utl::ConfigManager::addConfigItem(utl::ConfigItem & item) { } void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) { + static int hack = 0; + fprintf(stderr, "remove %d of %p\n", hack, &item); + ++hack; + for (std::list< ConfigItem * >::iterator i(items_.begin()); i != items_.end(); ++i) { @@ -239,6 +243,9 @@ void utl::ConfigManager::removeConfigItem(utl::ConfigItem & item) { void utl::ConfigManager::registerConfigItem(utl::ConfigItem * item) { OSL_ASSERT(item != 0); + static int hack = 0; + fprintf(stderr, "add %d is %p\n", hack, item); + ++hack; items_.push_back(item); } diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index eaae56b0b87f..ea7aaa856de5 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -217,26 +217,6 @@ sal_Bool TransliterationWrapper::equals( return sal_False; } - -sal_Int32 TransliterationWrapper::compareSubstring( - const String& rStr1, sal_Int32 nOff1, sal_Int32 nLen1, - const String& rStr2, sal_Int32 nOff2, sal_Int32 nLen2 ) const -{ - try - { - if( bFirstCall ) - loadModuleImpl(); - if ( xTrans.is() ) - return xTrans->compareSubstring( rStr1, nOff1, nLen1, rStr2, nOff2, nLen2 ); - } - catch (const Exception& e) - { - SAL_WARN( "unotools.i18n", "compareSubstring: Exception caught " << e.Message ); - } - return 0; -} - - sal_Int32 TransliterationWrapper::compareString( const String& rStr1, const String& rStr2 ) const { try -- cgit