summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOcke Janssen <oj@openoffice.org>2005-07-05 06:51:12 +0000
committerOcke Janssen <oj@openoffice.org>2005-07-05 06:51:12 +0000
commit44a77fa129418874196dd62c38d69cccfac4b7a9 (patch)
tree27ab15478ef787baccd42b783a6445c658ab12ed
parent81b8115b7cf6f60dd0130a739300a0329e6b51d4 (diff)
remove illegal commit back to version 1.2
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx36
1 files changed, 4 insertions, 32 deletions
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index b416de76f1c8..3dfbb977254a 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: HTable.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: oj $ $Date: 2005-07-05 06:11:41 $
+ * last change: $Author: oj $ $Date: 2005-07-05 07:51:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -348,7 +348,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCol
sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ALTER COLUMN "));
const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString( );
- OColumn* pColumn = new OHSQLColumn(sal_True);
+ OColumn* pColumn = new OColumn(sal_True);
Reference<XPropertySet> xProp = pColumn;
::comphelper::copyProperties(_xDescriptor,xProp);
xProp->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),makeAny(nNewType));
@@ -408,35 +408,7 @@ void OHSQLTable::executeStatement(const ::rtl::OUString& _rStatement )
}
}
// -----------------------------------------------------------------------------
-Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException)
-{
- if ( ! m_Type.compareToAscii("VIEW") )
- {
- Sequence< Type > aTypes = OTableHelper::getTypes();
- ::std::vector<Type> aOwnTypes;
- aOwnTypes.reserve(aTypes.getLength());
- const Type* pIter = aTypes.getConstArray();
- const Type* pEnd = pIter + aTypes.getLength();
- for(;pIter != pEnd;++pIter)
- {
- if( *pIter != ::getCppuType((const Reference<XRename>*)0) )
- {
- aOwnTypes.push_back(*pIter);
- }
- }
- Type *pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
- return Sequence< Type >(pTypes, aOwnTypes.size());
- }
- return OTableHelper::getTypes();
-}
-// -------------------------------------------------------------------------
-Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException)
-{
- if( !m_Type.compareToAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) )
- return Any();
- return OTableHelper::queryInterface(rType);
-}
-// -------------------------------------------------------------------------
+