diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 7e592a08a512..e383de8b1ea1 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\ )) $(eval $(call gb_Library_add_exception_objects,dbase,\ - connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ connectivity/source/drivers/dbase/DStatement \ connectivity/source/drivers/dbase/DPreparedStatement \ diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx deleted file mode 100644 index 3052faa1d37e..000000000000 --- a/connectivity/source/drivers/dbase/DCode.cxx +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dbase/DCode.hxx" -#include -#include "dbase/DIndex.hxx" -#include "dbase/DIndexIter.hxx" - - -using namespace connectivity::dbase; -using namespace connectivity::file; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbcx; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::container; - -TYPEINIT1(OFILEOperandAttr, OOperandAttr); - -OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos, - const Reference< XPropertySet>& _xColumn, - const Reference< XNameAccess>& _xIndexes) - : OOperandAttr(_nPos,_xColumn) -{ - if(_xIndexes.is()) - { - OUString sName; - Reference xColInfo = _xColumn->getPropertySetInfo(); - Reference xIndex; - - Sequence< OUString> aSeq = _xIndexes->getElementNames(); - const OUString* pBegin = aSeq.getConstArray(); - const OUString* pEnd = pBegin + aSeq.getLength(); - for(;pBegin != pEnd;++pBegin) - { - _xIndexes->getByName(*pBegin) >>= xIndex; - if(xIndex.is()) - { - Reference xColsSup(xIndex,UNO_QUERY); - Reference xNameAccess = xColsSup->getColumns(); - _xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sName; - if(xNameAccess->hasByName(sName)) - { - m_xIndex = xIndex; - break; - } - else if(xColInfo->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME))) - { - _xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME)) >>= sName; - if(xNameAccess->hasByName(sName)) - { - m_xIndex = xIndex; - break; - } - } - } - } - } - -} - -bool OFILEOperandAttr::isIndexed() const -{ - return m_xIndex.is(); -} - -OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight) -{ - OEvaluateSet* pEvaluateSet = NULL; - if (isIndexed()) - { - Reference xTunnel(m_xIndex,UNO_QUERY); - if(xTunnel.is()) - { - ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) ); - if(pIndex) - { - OIndexIterator* pIter = pIndex->createIterator(pOp,pRight); - - if (pIter) - { - pEvaluateSet = new OEvaluateSet(); - sal_uIntPtr nRec = pIter->First(); - while (nRec != NODE_NOTFOUND) - { - (*pEvaluateSet)[nRec] = nRec; - nRec = pIter->Next(); - } - } - delete pIter; - } - } - } - return pEvaluateSet; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index a5d9782407ed..22089c542d79 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -24,7 +24,6 @@ #include #include "dbase/DIndex.hxx" #include "dbase/DIndexIter.hxx" -#include "dbase/DCode.hxx" #include #include #include "resource/dbase_res.hrc" diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx deleted file mode 100644 index 14b815f61806..000000000000 --- a/connectivity/source/inc/dbase/DCode.hxx +++ /dev/null @@ -1,49 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX - -#include "file/fanalyzer.hxx" -#include -#include -#include "file/fcode.hxx" - -namespace connectivity -{ - namespace dbase - { - // Attributes from a result row - class OFILEOperandAttr : public file::OOperandAttr - { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xIndex; - public: - OFILEOperandAttr(sal_uInt16 _nPos, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL); - - virtual bool isIndexed() const SAL_OVERRIDE; - virtual file::OEvaluateSet* preProcess(file::OBoolOperator* pOp, file::OOperand* pRight = 0) SAL_OVERRIDE; - TYPEINFO_OVERRIDE(); - }; - } -} - -#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */