From 2106d8e648449d34b195068eef5f672a14ea64a8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 10 Jun 2012 21:51:19 +0100 Subject: callcatcher: update unused code Change-Id: Id5f730fc447b11000b266954f9e7f5287bad02f4 --- dbaccess/source/core/api/KeySet.cxx | 33 --------------------------------- dbaccess/source/core/api/KeySet.hxx | 12 ------------ dbaccess/source/ui/inc/UITools.hxx | 9 --------- dbaccess/source/ui/misc/UITools.cxx | 26 -------------------------- oox/inc/oox/helper/containerhelper.hxx | 2 -- oox/source/helper/containerhelper.cxx | 10 ---------- unotools/inc/unotools/ucbhelper.hxx | 3 --- unotools/source/ucbhelper/ucbhelper.cxx | 28 ---------------------------- unusedcode.easy | 12 +++--------- 9 files changed, 3 insertions(+), 132 deletions(-) diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 3a114a9c7f59..5e9f23362980 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1667,39 +1667,6 @@ sal_Bool SAL_CALL OKeySet::rowDeleted( ) throw(SQLException, RuntimeException) return bDeleted; } -::rtl::OUString OKeySet::getComposedTableName(const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getComposedTableName" ); - ::rtl::OUString aComposedName; - Reference xMetaData = m_xConnection->getMetaData(); - - if( xMetaData.is() && xMetaData->supportsTableCorrelationNames() ) - { - aComposedName = ::dbtools::composeTableName( xMetaData, _sCatalog, _sSchema, _sTable, sal_False, ::dbtools::eInDataManipulation ); - // first we have to check if the composed tablename is in the select clause or if an alias is used - Reference xTabSup(m_xComposer,UNO_QUERY); - Reference xSelectTables = xTabSup->getTables(); - OSL_ENSURE(xSelectTables.is(),"No Select tables!"); - if(xSelectTables.is()) - { - if(!xSelectTables->hasByName(aComposedName)) - { // the composed name isn't used in the select clause so we have to find out which name is used instead - ::rtl::OUString sCatalog,sSchema,sTable; - ::dbtools::qualifiedNameComponents(xMetaData,m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - } - else - aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, _sCatalog, _sSchema, _sTable ); - } - } - else - aComposedName = ::dbtools::composeTableNameForSelect( m_xConnection, _sCatalog, _sSchema, _sTable ); - - return aComposedName; -} - namespace dbaccess { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index b98086dbb625..bbf35688c359 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -110,18 +110,6 @@ namespace dbaccess sal_Bool m_bRowCountFinal; - /** - getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename - - @return the composed name - */ - ::rtl::OUString getComposedTableName( const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable); - /** copies the values from the insert row into the key row * * \param _rInsertRow the row which was inserted diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index c4c8ccb96d74..4e0cb09ce32a 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -130,15 +130,6 @@ namespace dbaui Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); - /** return a vector which contains all key columns for the @see com::sun::star::sdbc::KeyType _nKeyType - @param _rxTable the table which must be a @see com::sun::star::sdbcx::XColumnsSupplier - @param _nKeyType @see com::sun::star::sdbc::KeyType - */ - - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> > - getKeyColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxKeys, - sal_Int32 _nKeyType); - /** fills a map and a vector with localized type names @param _rxConnection the connection to acces the metadata @param _rsTypeNames a list of localized type names seperated with ';' diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index cc5409441d91..78c57565dbc1 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -305,32 +305,6 @@ void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< ::dbtools::showError(_rInfo,VCLUnoHelper::GetInterface(_pParent),_xFactory); } -// ----------------------------------------------------------------------------- -::std::vector< Reference > getKeyColumns(const Reference& _rxKeys, - sal_Int32 _nKeyType) -{ - // use keys and indexes for excat postioning - // first the keys - ::std::vector< Reference > vRet; - if(_rxKeys.is()) - { - Reference xProp; - for(sal_Int32 i=0;i< _rxKeys->getCount();++i) - { - _rxKeys->getByIndex(i) >>= xProp; - sal_Int32 nKeyType = 0; - xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; - if(_nKeyType == nKeyType) - { - Reference xKeyColsSup(xProp,UNO_QUERY); - OSL_ENSURE(xKeyColsSup.is(),"Columnsupplier is null!"); - vRet.push_back(xKeyColsSup->getColumns()); - } - } - } - - return vRet; -} // ----------------------------------------------------------------------------- TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, diff --git a/oox/inc/oox/helper/containerhelper.hxx b/oox/inc/oox/helper/containerhelper.hxx index ce71d5216b94..bed8990dcd92 100644 --- a/oox/inc/oox/helper/containerhelper.hxx +++ b/oox/inc/oox/helper/containerhelper.hxx @@ -86,8 +86,6 @@ public: /** Returns the ordered list of all value ranges. */ inline const ValueRangeVector& getRanges() const { return maRanges; } - /** Returns an intersection of the range list and the passed range. */ - ValueRangeVector getIntersection( const ValueRange& rRange ) const; private: ValueRangeVector maRanges; diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index a19e9b40713b..a888552d8659 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -92,16 +92,6 @@ void ValueRangeSet::insert( const ValueRange& rRange ) } } -ValueRangeVector ValueRangeSet::getIntersection( const ValueRange& rRange ) const -{ - ValueRangeVector aRanges; - // find the range that contains nFirst or the first range that follows nFirst - ValueRangeVector::const_iterator aIt = ::std::lower_bound( maRanges.begin(), maRanges.end(), rRange, ValueRangeComp() ); - for( ValueRangeVector::const_iterator aEnd = maRanges.end(); (aIt != aEnd) && (aIt->mnFirst <= rRange.mnLast); ++aIt ) - aRanges.push_back( ValueRange( ::std::max( aIt->mnFirst, rRange.mnFirst ), ::std::min( aIt->mnLast, rRange.mnLast ) ) ); - return aRanges; -} - // ============================================================================ Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Reference< XComponentContext >& rxContext ) diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 358d8e119c60..13dd45a89db9 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -55,9 +55,6 @@ UNOTOOLS_DLLPUBLIC bool Kill(rtl::OUString const & url); UNOTOOLS_DLLPUBLIC com::sun::star::uno::Any GetProperty( rtl::OUString const & url, rtl::OUString const & property); -UNOTOOLS_DLLPUBLIC bool MakeFolder( - rtl::OUString const & url, bool exclusive = false); - UNOTOOLS_DLLPUBLIC bool MakeFolder( ucbhelper::Content & parent, rtl::OUString const & title, ucbhelper::Content & result, bool exclusive = false); diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index cbb9ee917cb2..3dc4c9352c30 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -243,34 +243,6 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) { } } -bool utl::UCBContentHelper::MakeFolder( - rtl::OUString const & url, bool exclusive) -{ - INetURLObject o(url); - SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"'); - rtl::OUString title( - o.getName( - INetURLObject::LAST_SEGMENT, true, - INetURLObject::DECODE_WITH_CHARSET)); - o.removeSegment(); - ucbhelper::Content parent; - ucbhelper::Content res; - return - ucbhelper::Content::create( - o.GetMainURL(INetURLObject::NO_DECODE), - new ucbhelper::CommandEnvironment( - css::uno::Reference( - (css::uno::Reference( - comphelper::getProcessServiceFactory(), - css::uno::UNO_SET_THROW)-> - createInstance( - rtl::OUString( "com.sun.star.uui.InteractionHandler"))), - css::uno::UNO_QUERY_THROW), - css::uno::Reference()), - parent) - && MakeFolder(parent, title, res, exclusive); -} - bool utl::UCBContentHelper::MakeFolder( ucbhelper::Content & parent, rtl::OUString const & title, ucbhelper::Content & result, bool exclusive) diff --git a/unusedcode.easy b/unusedcode.easy index 4458f6268484..f7f94ed6c2ef 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -161,12 +161,6 @@ SwMailMergeChildWindow::GetChildWindowId() SwOutlineNodes::Insert(SwNode* const&, unsigned short&) SwOutlineNodes::Insert(SwNode* const*, unsigned short) SwOutlineNodes::Insert(SwOutlineNodes const*, unsigned short, unsigned short) -SwPosFlyFrms::DeleteAndDestroy(unsigned short, unsigned short) -SwPosFlyFrms::Insert(SwPosFlyFrm* const&, unsigned short&) -SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short) -SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short) -SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short) -SwPosFlyFrms::Remove(unsigned short, unsigned short) SwRects::Replace(SwRect const&, unsigned short) SwRects::Replace(SwRect const*, unsigned short, unsigned short) SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect const&, void*), void*) @@ -174,7 +168,6 @@ SwRedlineDataParentSortArr::DeleteAndDestroy(unsigned short, unsigned short) SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const&) SwRedlineDataParentSortArr::Insert(SwRedlineDataParent* const*, unsigned short) SwRedlineDataParentSortArr::Insert(SwRedlineDataParentSortArr const*, unsigned short, unsigned short) -SwSections::DeleteAndDestroy(unsigned short, unsigned short) SwSelBoxes::Insert(SwTableBox* const&, unsigned short&) SwSelBoxes::Remove(SwTableBox* const&, unsigned short) SwSortElements::Insert(SwSortElement* const&, unsigned short&) @@ -647,7 +640,6 @@ connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) connectivity::toString(com::sun::star::uno::Any const&) cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, boost::shared_ptr const&) -dbaui::getKeyColumns(com::sun::star::uno::Reference const&, int) dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&) dbtools::SQLExceptionInfo::SQLExceptionInfo(com::sun::star::sdb::SQLErrorEvent const&) dbtools::SQLExceptionIteratorHelper::SQLExceptionIteratorHelper(com::sun::star::sdb::SQLContext const&) @@ -664,9 +656,10 @@ nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&) nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges::ConnectedComponents const&) nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges::ConnectedComponents const&) -oox::PropertyMap::dump(com::sun::star::uno::Reference) +oox::drawingml::TextListStyle::dump() const oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) +oox::xls::CellBlock::RichStringCell::RichStringCell(com::sun::star::table::CellAddress const&, boost::shared_ptr const&, oox::xls::Font const*) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) @@ -677,6 +670,7 @@ std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference >::~vector() std::__cxx1998::vector >::~vector() std::__cxx1998::vector >::~vector() +std::__cxx1998::vector, std::allocator >, std::basic_string, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >::~vector() svxform::DataNavigatorManager::GetChildWindowId() svxform::FmFilterNavigatorWinMgr::GetChildWindowId() svxform::NavigatorFrameManager::GetChildWindowId() -- cgit v1.2.3