This patch removes bogus comments found in Base.
I've added some "GERMAN comments" to mark some comments because I don't know
german
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 7eda908..ac05163 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);
@@ -1607,7 +1597,6 @@ void ORowSet::setStatementResultSetType( const Reference<
XPropertySet >& _rxSta
sal_Int32 nResultSetConcurrency( _nDesiredResultSetConcurrency );
// there *might* be a data source setting which tells use to be more
defensive with those settings
- // #i15113# / 2005-02-10 / frank.schoenh...@sun.com
sal_Bool bRespectDriverRST = sal_False;
Any aSetting;
if ( getDataSourceSetting( ::dbaccess::getDataSource( m_xActiveConnection
), "RespectDriverResultSetType", aSetting ) )
@@ -2318,7 +2307,6 @@ sal_Bool ORowSet::impl_initComposer_throw(
::rtl::OUString& _out_rCommandToExecu
{ // append a "0=1" filter
// don't simply overwrite an existent filter, this would lead to
problems if this existent
// filter contains paramters (since a keyset may add parameters itself)
- // 2003-12-12 - #23418# - f...@openoffice.org
m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) );
m_xComposer->setFilter( ::rtl::OUString::createFromAscii( "0 = 1" ) );
}
@@ -2363,32 +2351,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 +2396,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..629af0c 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();
}
@@ -1460,16 +1456,16 @@ void ORowSetCache::checkUpdateConditions(sal_Int32
columnIndex)
sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode
*pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString&
_sUpdateTableName)
{
sal_Bool bOk = sal_False;
- if (pNode->count() == 3 && // Ausdruck is geklammert
+ if (pNode->count() == 3 && // Ausdruck is geklammert GERMAN comment
SQL_ISPUNCTUATION(pNode->getChild(0),"(") &&
SQL_ISPUNCTUATION(pNode->getChild(2),")"))
{
bOk =
checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName);
}
- else if ((SQL_ISRULE(pNode,search_condition) ||
SQL_ISRULE(pNode,boolean_term)) && //
AND/OR-Verknuepfung:
+ else if ((SQL_ISRULE(pNode,search_condition) ||
SQL_ISRULE(pNode,boolean_term)) && //
AND/OR-Verknuepfung: GERMAN comment
pNode->count() == 3)
{
- // nur AND Verknüpfung zulassen
+ // nur AND Verkn�pfung zulassen GERMAN comment
if ( SQL_ISTOKEN(pNode->getChild(1),AND) )
bOk =
checkInnerJoin(pNode->getChild(0),_xConnection,_sUpdateTableName)
&&
checkInnerJoin(pNode->getChild(2),_xConnection,_sUpdateTableName);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index eea07de..99300f8 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -812,7 +812,6 @@ Reference< XNameAccess > SAL_CALL
OSingleSelectQueryComposer::getColumns( ) thr
aSQL.append( STR_WHERE );
// preserve the original WHERE clause
- // #i102234# / 2009-06-02 / frank.schoenh...@sun.com
::rtl::OUString sOriginalWhereClause = getSQLPart( Where,
m_aSqlIterator, sal_False );
if ( sOriginalWhereClause.getLength() )
{
@@ -1012,7 +1011,7 @@ sal_Bool
OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
sal_Bool bResult = sal_True;
for (int i = 0; bResult && i < 3; i+=2)
{
- // Ist das erste Element wieder eine OR-Verknuepfung?
+ // Ist das erste Element wieder eine OR-Verknuepfung? GERMAN
coment
// Dann rekursiv absteigen ...
//if (!i && SQL_ISRULE(pCondition->getChild(i),search_condition))
if (SQL_ISRULE(pCondition->getChild(i),search_condition))
@@ -1044,7 +1043,7 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria(
OSQLParseNode * pCondition,
DBG_ERROR("boolean_primary in And-Criteria");
return sal_False;
}
- // Das erste Element ist (wieder) eine AND-Verknuepfung
+ // Das erste Element ist (wieder) eine AND-Verknuepfung GERMAN coment
else if ( SQL_ISRULE(pCondition,boolean_term) && pCondition->count() == 3 )
{
return setANDCriteria(pCondition->getChild(0), _rIterator, rFilter,
xFormatter) &&
@@ -1263,12 +1262,12 @@ sal_Bool
OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
OSQLParseNode *pLhs = pCondition->getChild(0);
OSQLParseNode *pRhs = pCondition->getChild(2);
- // Feldnamen
+ // Feldnamen GERMAN coment
sal_uInt16 i;
for (i=0;i< pLhs->count();i++)
pLhs->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection,
xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) );
- // Kriterium
+ // Kriterium GERMAN coment
aItem.Handle = pCondition->getChild(1)->getNodeType();
aValue = pCondition->getChild(1)->getTokenValue();
for(i=0;i< pRhs->count();i++)
@@ -1711,7 +1710,7 @@ void OSingleSelectQueryComposer::setConditionByColumn(
const Reference< XPropert
lcl_addFilterCriteria_throw(nFilterOp,sEmpty,aSQL);
}
- // filter anhaengen
+ // filter anhaengen GERMAN coment
// select ohne where und order by aufbauen
::rtl::OUString sFilter = getFilter();
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.schoenh...@sun.com
setColumnsOutOfDate();
}
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index 21b0c68..de93453 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/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 9416539..58f2b64 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1041,7 +1041,6 @@ Reference< XModel >
ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
// However, in case that the document is implicitly created by
asking the data source for the document,
// then nobody would call the doc's attachResource. So, we do it
here, to ensure it's in a proper
// state, fires all events, and so on.
- // #i105505# / 2009-10-02 / frank.schoenh...@sun.com
xModel->attachResource( xModel->getURL(),
m_aMediaDescriptor.getPropertyValues() );
}
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index e584553..586404f 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -356,7 +356,6 @@ Reference< XInterface >
ODatabaseContext::loadObjectFromURL(const ::rtl::OUStrin
|| ( e.Code == IOErrorCode_NOT_EXISTING_PATH )
)
{
- // #i40463# #i39187#
String sErrorMessage( DBACORE_RESSTRING(
RID_STR_FILE_DOES_NOT_EXIST ) );
::svt::OFileNotation aTransformer( _sURL );
sErrorMessage.SearchAndReplaceAscii( "$file$", aTransformer.get(
::svt::OFileNotation::N_SYSTEM ) );
@@ -505,7 +504,6 @@ void ODatabaseContext::storeTransientProperties(
ODatabaseModelImpl& _rModelImpl
}
// additionally, remember the "failed password", which is not available as
property
- // #i86178# / 2008-02-19 / frank.schoenh...@sun.com
aRememberProps.put( "AuthFailedPassword", _rModelImpl.m_sFailedPassword );
::rtl::OUString sDocumentURL( _rModelImpl.getURL() );
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index d748154..3345952 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -198,7 +198,6 @@ ODatabaseDocument::ODatabaseDocument(const
::rtl::Reference<ODatabaseModelImpl>&
// if there previously was a document instance for the same Impl which was
already initialized,
// then consider ourself initialized, too.
- // #i94840#
if ( m_pImpl->hadInitializedDocument() )
{
// Note we set our init-state to "Initializing", not "Initialized".
We're created from inside the ModelImpl,
@@ -210,7 +209,6 @@ ODatabaseDocument::ODatabaseDocument(const
::rtl::Reference<ODatabaseModelImpl>&
{
// if the previous incarnation of the DatabaseDocument already had
an URL, then creating this incarnation
// here is effectively loading the document.
- // #i105505# / 2009-10-01 / frank.schoenh...@sun.com
m_aViewMonitor.onLoadedDocument();
}
}
@@ -830,7 +828,6 @@ void SAL_CALL ODatabaseDocument::disconnectController(
const Reference< XControl
if ( bLastControllerGone && !bIsClosing )
{
// if this was the last view, close the document as a whole
- // #i51157# / 2006-03-16 / frank.schoenh...@sun.com
try
{
close( sal_True );
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 6a11515..591facc 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.schoenh...@germany.sun.com
sUser = m_pImpl->m_sUser;
if (0 != m_pImpl->m_aPassword.getLength())
sPwd = m_pImpl->m_aPassword;
@@ -1405,7 +1404,6 @@ void SAL_CALL ODatabaseSource::flushed( const
EventObject& /*rEvent*/ ) throw (R
// XFlushListener at the embedded connection (which needs to provide the
XFlushable functionality).
// Then, when the connection is flushed, we commit both the database
storage and our main storage.
//
- // #i55274# / 2005-09-30 / frank.schoenh...@sun.com
OSL_ENSURE( m_pImpl->isEmbeddedDatabase(), "ODatabaseSource::flushed: no
embedded database?!" );
sal_Bool bWasModified = m_pImpl->m_bModified;
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index d8c997c..eb18141 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -565,7 +565,6 @@ void ODefinitionContainer::implAppend(const
::rtl::OUString& _rName, const Refer
// Somebody could create an object with name "foo", and insert it
as "bar"
// into a container. In this case, we need to ensure that the
object name
// is also "bar"
- // #i44786# / 2005-03-11 / frank.schoenh...@sun.com
lcl_ensureName( _rxNewObject, _rName );
::rtl::Reference< OContentHelper > pContent =
OContentHelper::getImplementation( _rxNewObject );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 7ab1703..fd7ba30 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1049,7 +1049,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.schoenh...@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..0cb88c7 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));
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 9e6781d..a10cee9 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1232,7 +1232,6 @@ namespace dbmm
// Unfortunately, the storage implementation does not complain if
you use invalid characters/names, but instead
// it silently accepts them, and produces garbage in the file
(#i95408).
// So, until especially the former is fixed, we need to strip the
name from all invalid characters.
- // #i95865# / 2008-11-06 / frank.schoenh...@sun.com
// The general idea is to replace invalid characters with '_'.
However, since "valid" essentially means
// ASCII only, this implies that for a lot of languages, we would
simply replace everything with '_',
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
