diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-12-13 23:32:59 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-14 09:52:49 +0000 |
commit | fbfeb0cb787ff010a4c96bbce3e21c9029421b63 (patch) | |
tree | 383713f07e0a8cbd1d06b395a80de1291746a91e /unotools | |
parent | 59bf1b583f235dbf0ffee971840f2c6524effa06 (diff) |
callcatcher: remove some unused code
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/inc/unotools/accessiblestatesethelper.hxx | 14 | ||||
-rw-r--r-- | unotools/inc/unotools/atom.hxx | 6 | ||||
-rw-r--r-- | unotools/source/accessibility/accessiblestatesethelper.cxx | 40 | ||||
-rw-r--r-- | unotools/source/misc/atom.cxx | 16 |
4 files changed, 0 insertions, 76 deletions
diff --git a/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx index 5ef72a89f7eb..9f600523a286 100644 --- a/unotools/inc/unotools/accessiblestatesethelper.hxx +++ b/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. diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx index 40f707ca6746..ed57113feea5 100644 --- a/unotools/inc/unotools/atom.hxx +++ b/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 ); } }; } diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index f28fb9966e9d..aa631c4e1ff1 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/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> diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index 614cb91f2e8b..a5093a9eb379 100644 --- a/unotools/source/misc/atom.cxx +++ b/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: */ |