[Libreoffice-commits] .: dbaccess/source
Noel Power
noelp at kemper.freedesktop.org
Mon Oct 11 02:46:17 PDT 2010
dbaccess/source/core/api/RowSet.cxx | 43 -----------------
dbaccess/source/core/api/RowSetCache.cxx | 4 -
dbaccess/source/core/api/query.cxx | 1
dbaccess/source/core/api/tablecontainer.cxx | 1
dbaccess/source/core/dataaccess/datasource.cxx | 1
dbaccess/source/core/dataaccess/documentdefinition.cxx | 1
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 4 -
7 files changed, 2 insertions(+), 53 deletions(-)
New commits:
commit 1362e62f0c9510d74e853ec26ff303b0223817f7
Author: Rubén Jáñez <rjanezfer at gmail.com>
Date: Mon Oct 11 10:39:25 2010 +0100
Removes some bogus comments found in Base.
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 5f6f43b..b194a2a 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -803,17 +803,7 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
checkUpdateConditions(columnIndex);
checkUpdateIterator();
- //if(((*m_aCurrentRow)->get())[columnIndex].getTypeKind() == DataType::BLOB)
- //{
- // ::connectivity::ORowSetValue aOldValue = ((*m_aCurrentRow)->get())[columnIndex];
- // m_pCache->updateBinaryStream(columnIndex,x,length);
- // ((*m_aCurrentRow)->get())[columnIndex] = makeAny(x);
- // ((*m_aCurrentRow)->get())[columnIndex].setTypeKind(DataType::BLOB);
- // firePropertyChange(columnIndex-1 ,aOldValue);
- // fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False);
- //}
- //else
- {
+ {
Sequence<sal_Int8> aSeq;
if(x.is())
x->readBytes(aSeq,length);
@@ -2363,32 +2353,6 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
Reference< XNameAccess > xTables( impl_getTables_throw() );
if ( xTables->hasByName(m_aCommand) )
{
-/*
- Reference< XPropertySet > xTable;
- try
- {
- xTables->getByName( m_aCommand ) >>= xTable;
- }
- catch(const WrappedTargetException& e)
- {
- SQLException e2;
- if ( e.TargetException >>= e2 )
- throw e2;
- }
- catch(Exception&)
- {
- DBG_UNHANDLED_EXCEPTION();
- }
-
- Reference<XColumnsSupplier> xSup(xTable,UNO_QUERY);
- if ( xSup.is() )
- m_xColumns = xSup->getColumns();
-
- sCommand = rtl::OUString::createFromAscii("SELECT * FROM ");
- ::rtl::OUString sCatalog, sSchema, sTable;
- ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
- sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable );
-*/
}
else
{
@@ -2434,11 +2398,6 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable;
if(aTable.getLength())
m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, sal_False, ::dbtools::eInDataManipulation );
-/*
- Reference<XColumnsSupplier> xSup(xQuery,UNO_QUERY);
- if(xSup.is())
- m_xColumns = xSup->getColumns();
-*/
}
}
else
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 86c20ff..cbe9046 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -1056,10 +1056,6 @@ sal_Bool ORowSetCache::last( )
moveWindow();
// we have to repositioning because moveWindow can modify the cache
m_pCacheSet->last();
-// if(m_nPosition > m_nFetchSize)
-// m_aMatrixIter = m_pMatrix->end() -1;
-// else
-// m_aMatrixIter = m_pMatrix->begin() + m_nPosition - 1;
OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
m_aMatrixIter = calcPosition();
}
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 93f5741..7bd27b0 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -320,7 +320,6 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
if ( PROPERTY_ID_COMMAND == _nHandle )
// the columns are out of date if we are based on a new statement ....
- // 90573 - 16.08.2001 - frank.schoenheit at sun.com
setColumnsOutOfDate();
}
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 0c62966..ab63265 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -415,7 +415,6 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
- // #104282# OJ
if ( bIsView ) // here we have a view
aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
else
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 6a11515..0ee04b8 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -700,7 +700,6 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
if ((0 == sUser.getLength()) && (0 == sPwd.getLength()) && (0 != m_pImpl->m_sUser.getLength()))
{ // ease the usage of this method. data source which are intended to have a user automatically
// fill in the user/password combination if the caller of this method does not specify otherwise
- // 86951 - 05/08/2001 - frank.schoenheit at germany.sun.com
sUser = m_pImpl->m_sUser;
if (0 != m_pImpl->m_aPassword.getLength())
sPwd = m_pImpl->m_aPassword;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 803ae20..907c6e2 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1050,7 +1050,6 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
}
// if the object is already opened, do nothing
- // #i89509# / 2008-05-22 / frank.schoenheit at sun.com
if ( m_xEmbeddedObject.is() )
{
sal_Int32 nCurrentState = m_xEmbeddedObject->getCurrentState();
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 10c9361..fe78af3 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -217,8 +217,6 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_DOMAIN_USR.Enable(FALSE);
- // m_ET_SYSUSR.setUpperCase();
- // m_ET_CONUSR.setUpperCase();
}
@@ -250,7 +248,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_NF_DATADEVSPACE_SIZE.SetDecimalDigits(0);
m_NF_CACHE_SIZE.SetDecimalDigits(0);
- m_ET_DATABASENAME.SetMaxTextLen( 8 ); //98292
+ m_ET_DATABASENAME.SetMaxTextLen( 8 );
m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
More information about the Libreoffice-commits
mailing list