callcatcher: remove some unused code

unotools/inc/unotools/accessiblestatesethelper.hxx

@@ -139,20 +139,6 @@ public:
     void    RemoveState(sal_Int16 aState)
         throw (::com::sun::star::uno::RuntimeException);
 
-    /** Compares the set with the set given by rComparativeValue and puts the results
-        into rOldStates and rNewStates.
-
-        rOldStates contains after call all states which are in the own set and
-        not in the comparative set.
-
-        rNewStates contains after call all states which are in the comparative
-         set and not in the own set.
-    */
-    sal_Bool Compare(const AccessibleStateSetHelper& rComparativeValue,
-                        AccessibleStateSetHelper& rOldStates,
-                        AccessibleStateSetHelper& rNewStates)
-        throw (::com::sun::star::uno::RuntimeException);
-
     //=====  XTypeProvider  ===================================================
 
     /** Returns a sequence of all supported interfaces.

unotools/inc/unotools/atom.hxx

@@ -58,8 +58,6 @@ namespace utl {
 
         int getAtom( const ::rtl::OUString&, sal_Bool bCreate = sal_False );
         const ::rtl::OUString& getString( int ) const;
-
-        void overrideAtom( int atom, const ::rtl::OUString& description );
     };
 
 
@@ -73,10 +71,6 @@ namespace utl {
         int getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate = sal_False );
 
         const ::rtl::OUString& getString( int atomClass, int atom ) const;
-
-        void overrideAtom( int atomClass, int atom, const ::rtl::OUString& description );
-        void overrideAtom( int atomClass, const ::com::sun::star::util::AtomDescription& newDescription )
-            { overrideAtom( atomClass, newDescription.atom, newDescription.description ); }
     };
 }
 

unotools/source/accessibility/accessiblestatesethelper.cxx

@@ -58,10 +58,6 @@ public:
         throw (uno::RuntimeException);
     void RemoveState(sal_Int16 aState)
         throw (uno::RuntimeException);
-    sal_Bool Compare(const AccessibleStateSetHelperImpl* pComparativeValue,
-                        AccessibleStateSetHelperImpl* pOldStates,
-                        AccessibleStateSetHelperImpl* pNewStates) const
-        throw (uno::RuntimeException);
 
     inline void AddStates( const sal_Int64 _nStates ) SAL_THROW( ( ) );
 
@@ -139,31 +135,6 @@ inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState)
     maStates &= aTempBitSet;
 }
 
-inline sal_Bool AccessibleStateSetHelperImpl::Compare(
-    const AccessibleStateSetHelperImpl* pComparativeValue,
-        AccessibleStateSetHelperImpl* pOldStates,
-        AccessibleStateSetHelperImpl* pNewStates) const
-    throw (uno::RuntimeException)
-{
-    sal_Bool bResult(sal_False);
-    if (pComparativeValue && pOldStates && pNewStates)
-    {
-        if (maStates == pComparativeValue->maStates)
-            bResult = sal_True;
-        else
-        {
-            sal_uInt64 aTempBitSet(maStates);
-            aTempBitSet ^= pComparativeValue->maStates;
-            pOldStates->maStates = aTempBitSet;
-            pOldStates->maStates &= maStates;
-            pNewStates->maStates = aTempBitSet;
-            pNewStates->maStates &= pComparativeValue->maStates;
-        }
-    }
-    return bResult;
-}
-
-
 //=====  internal  ============================================================
 
 AccessibleStateSetHelper::AccessibleStateSetHelper ()
@@ -280,17 +251,6 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
     mpHelperImpl->RemoveState(aState);
 }
 
-sal_Bool AccessibleStateSetHelper::Compare(
-    const AccessibleStateSetHelper& rComparativeValue,
-        AccessibleStateSetHelper& rOldStates,
-        AccessibleStateSetHelper& rNewStates)
-    throw (uno::RuntimeException)
-{
-    osl::MutexGuard aGuard (maMutex);
-    return mpHelperImpl->Compare(rComparativeValue.mpHelperImpl,
-        rOldStates.mpHelperImpl, rNewStates.mpHelperImpl);
-}
-
 //=====  XTypeProvider  =======================================================
 
 uno::Sequence< ::com::sun::star::uno::Type>

unotools/source/misc/atom.cxx

@@ -64,14 +64,6 @@ const ::rtl::OUString& AtomProvider::getString( int nAtom ) const
     return it == m_aStringMap.end() ? aEmpty : it->second;
 }
 
-void AtomProvider::overrideAtom( int atom, const ::rtl::OUString& description )
-{
-    m_aAtomMap[ description ] = atom;
-    m_aStringMap[ atom ] = description;
-    if( m_nAtoms <= atom )
-        m_nAtoms=atom+1;
-}
-
 // -----------------------------------------------------------------------
 
 MultiAtomProvider::MultiAtomProvider()
@@ -111,12 +103,4 @@ const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) c
     return aEmpty;
 }
 
-void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUString& description )
-{
-    ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass );
-    if( it == m_aAtomLists.end() )
-        m_aAtomLists[ atomClass ] = new AtomProvider();
-    m_aAtomLists[ atomClass ]->overrideAtom( atom, description );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

unusedcode.easy

@@ -2197,8 +2197,6 @@ unicode::isPunctuation(unsigned short)
 unicode::isTitle(unsigned short)
 unicode::isUnicodeScriptType(unsigned short, short)
 unographic::GraphicDescriptor::isValid() const
-utl::AccessibleStateSetHelper::Compare(utl::AccessibleStateSetHelper const&, utl::AccessibleStateSetHelper&, utl::AccessibleStateSetHelper&)
-utl::MultiAtomProvider::overrideAtom(int, int, rtl::OUString const&)
 utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
 utl::OConfigurationNode::appendNode(rtl::OUString const&, utl::OConfigurationNode const&) const
 utl::OConfigurationValueContainer::getServiceFactory() const