diff options
-rw-r--r-- | dbaccess/source/core/api/RowSetCacheIterator.cxx | 5 | ||||
-rw-r--r-- | dbaccess/source/core/api/RowSetCacheIterator.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/unoobj/celllistsource.hxx | 6 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.cxx | 19 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellvaluebinding.hxx | 6 | ||||
-rw-r--r-- | unusedcode.easy | 3 |
7 files changed, 1 insertions, 55 deletions
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index 555d28b60a77..106893bc0ec3 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -124,9 +124,4 @@ bool ORowSetCacheIterator::isNull() const return bRet; } -::osl::Mutex* ORowSetCacheIterator::getMutex() const -{ - return m_pRowSet ? m_pRowSet->getMutex() : NULL; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 083a82ff2308..82d118e499a2 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -73,7 +73,6 @@ namespace dbaccess void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); ::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; } - ::osl::Mutex* getMutex() const; ORowSetCacheMap::iterator getIter() const { return m_aIter; } }; diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 574cfdaa6ad3..919159720653 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -42,22 +42,6 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -#ifdef DBG_UTIL - const char* OCellListSource::checkConsistency_static( const void* _pThis ) - { - return static_cast< const OCellListSource* >( _pThis )->checkConsistency( ); - } - - const char* OCellListSource::checkConsistency( ) const - { - const char* pAssertion = NULL; - - // TODO: place any checks here to ensure consistency of this instance - - return pAssertion; - } -#endif - OCellListSource::OCellListSource( const Reference< XSpreadsheetDocument >& _rxDocument ) :OCellListSource_Base( m_aMutex ) ,OCellListSource_PBase( OCellListSource_Base::rBHelper ) diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index fc8a1a90a34f..03b1e670fd8d 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -146,12 +146,6 @@ namespace calc OCellListSource(); // never implemented OCellListSource( const OCellListSource& ); // never implemented OCellListSource& operator=( const OCellListSource& ); // never implemented - -#ifdef DBG_UTIL - private: - static const char* checkConsistency_static( const void* _pThis ); - const char* checkConsistency( ) const; -#endif }; } // namespace calc diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 6a3433997d3b..1bce4afcfb8b 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -47,25 +47,6 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; -#ifdef DBG_UTIL - const char* OCellValueBinding::checkConsistency_static( const void* _pThis ) - { - return static_cast< const OCellValueBinding* >( _pThis )->checkConsistency( ); - } - - const char* OCellValueBinding::checkConsistency( ) const - { - const char* pAssertion = NULL; - if ( m_xCellText.is() && !m_xCell.is() ) - // there are places (e.g. getSupportedTypes) which rely on the fact - // that m_xCellText.is() implies m_xCell.is() - pAssertion = "cell references inconsistent!"; - - // TODO: place any additional checks here to ensure consistency of this instance - return pAssertion; - } -#endif - OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos ) :OCellValueBinding_Base( m_aMutex ) ,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper ) diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 2e19ac9e2f69..4b1ff8067615 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -141,12 +141,6 @@ namespace calc OCellValueBinding(); // never implemented OCellValueBinding( const OCellValueBinding& ); // never implemented OCellValueBinding& operator=( const OCellValueBinding& ); // never implemented - -#ifdef DBG_UTIL - private: - static const char* checkConsistency_static( const void* _pThis ); - const char* checkConsistency( ) const; -#endif }; } // namespace calc diff --git a/unusedcode.easy b/unusedcode.easy index ad3ba9c3f2a1..4379f7fe3b8e 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -169,14 +169,13 @@ apitest::XTextContent::testAttach() apitest::XTextContent::testGetAnchor() apitest::XTextField::testGetPresentation() basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&) -calc::OCellListSource::checkConsistency_static(void const*) -calc::OCellValueBinding::checkConsistency_static(void const*) canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&) chart::BaseGFXHelper::B2IRectangleToAWTRectangle(basegfx::B2IRange const&) chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) chart::InternalData::isDefaultData() chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) comphelper::OAccessibleImplementationAccess::setStateBit(short, bool) +comphelper::ThreadPool::getSharedOptimalPool() comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const |