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 -------------------------- 4 files changed, 80 deletions(-) (limited to 'dbaccess') 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, -- cgit