From 2ec606730bc95b58390a609df0a88958869a4066 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 17 Aug 2013 23:43:14 +0200 Subject: fdo#62475 removed pointless comments Conflicts: dbaccess/source/filter/xml/xmlfilter.cxx dbaccess/source/ui/dlg/ConnectionPage.cxx dbaccess/source/ui/dlg/detailpages.cxx dbaccess/source/ui/dlg/odbcconfig.cxx dbaccess/source/ui/querydesign/querycontroller.cxx Change-Id: I3a05649efa3a43dd8d8fb069fc1bce14ca0a6338 Reviewed-on: https://gerrit.libreoffice.org/5484 Reviewed-by: Petr Mladek Tested-by: Petr Mladek --- dbaccess/source/core/api/BookmarkSet.cxx | 1 + dbaccess/source/core/api/CIndexes.cxx | 1 + dbaccess/source/core/api/CRowSetColumn.cxx | 1 + dbaccess/source/core/api/CRowSetDataColumn.cxx | 1 + dbaccess/source/core/api/CacheSet.cxx | 1 + dbaccess/source/core/api/FilteredContainer.cxx | 5 ++--- dbaccess/source/core/api/HelperCollections.hxx | 4 +--- dbaccess/source/core/api/KeySet.cxx | 11 ++++++--- dbaccess/source/core/api/OptimisticSet.cxx | 2 ++ dbaccess/source/core/api/RowSet.cxx | 2 ++ dbaccess/source/core/api/RowSetBase.cxx | 14 +++++------- dbaccess/source/core/api/RowSetBase.hxx | 3 --- dbaccess/source/core/api/RowSetCache.cxx | 1 + .../source/core/api/SingleSelectQueryComposer.cxx | 8 +++---- dbaccess/source/core/api/StaticSet.cxx | 1 + dbaccess/source/core/api/TableDeco.cxx | 5 ++--- dbaccess/source/core/api/View.cxx | 6 ++--- dbaccess/source/core/api/WrappedResultSet.cxx | 1 + dbaccess/source/core/api/column.cxx | 13 +++-------- dbaccess/source/core/api/columnsettings.cxx | 9 +------- dbaccess/source/core/api/datacolumn.cxx | 1 + dbaccess/source/core/api/datasettings.cxx | 7 ++---- dbaccess/source/core/api/definitioncolumn.cxx | 26 +++++++--------------- dbaccess/source/core/api/preparedstatement.cxx | 1 + dbaccess/source/core/api/query.cxx | 6 ++--- dbaccess/source/core/api/query.hxx | 11 +-------- dbaccess/source/core/api/querycomposer.cxx | 1 + dbaccess/source/core/api/querycontainer.cxx | 6 ++--- dbaccess/source/core/api/querydescriptor.cxx | 4 +--- dbaccess/source/core/api/querydescriptor.hxx | 9 +------- dbaccess/source/core/api/resultcolumn.cxx | 1 + dbaccess/source/core/api/resultset.cxx | 1 + dbaccess/source/core/api/table.cxx | 6 ++--- dbaccess/source/core/api/tablecontainer.cxx | 7 +++--- dbaccess/source/core/api/viewcontainer.cxx | 5 +---- 35 files changed, 67 insertions(+), 115 deletions(-) (limited to 'dbaccess/source/core/api') diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 0230f2e836c9..96636e93fefc 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -249,4 +249,5 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet } } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index dc83d81dd42e..8d6203c29553 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -89,4 +89,5 @@ void SAL_CALL OIndexes::disposing(void) else OIndexesHelper::disposing(); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index a1fa8c941fd8..004ec580dc09 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -89,4 +89,5 @@ void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, } } // namespace dbaccess + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index f9b00667a98a..25888060175b 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -255,4 +255,5 @@ void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColu void ORowSetDataColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) { } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index b712470d9aea..09519c72c1b8 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -689,4 +689,5 @@ bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCache void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const { } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 186f4e6fa3b0..58d102dbe54e 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -234,9 +234,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto return aReturn; } - //========================================================================== - //= OViewContainer - //========================================================================== + // OViewContainer OFilteredContainer::OFilteredContainer(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const Reference< XConnection >& _xCon, @@ -486,4 +484,5 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto } } // namespace + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 992b6c23c4ce..8ad3edfee7c1 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -74,9 +74,7 @@ namespace dbaccess }; typedef connectivity::sdbcx::OCollection OPrivateTables_BASE; - //========================================================================== - //= OPrivateTables - //========================================================================== + // OPrivateTables class OPrivateTables : public OPrivateTables_BASE { OSQLTables m_aTables; diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index c008916525fa..58135fe02db8 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -101,6 +101,7 @@ namespace } } } + DBG_NAME(OKeySet) OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, @@ -144,6 +145,7 @@ OKeySet::~OKeySet() DBG_DTOR(OKeySet,NULL); } + void OKeySet::initColumns() { Reference xMeta = m_xConnection->getMetaData(); @@ -224,6 +226,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, m_aAutoColumns.push_back( keyColumn->first ); } } + SAL_WNODEPRECATED_DECLARATIONS_POP namespace @@ -484,7 +487,6 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows static OUString aOr(" OR "); static OUString aEqual(" = ?"); - // use keys and indexes for exact postioning // first the keys Reference xKeyColumns = getKeyColumns(); @@ -577,7 +579,6 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if ( xIndexSup.is() ) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - ::std::vector< Reference > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); @@ -909,6 +910,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ tryRefetch(_rInsertRow,bRefetch); } } + void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch) { if ( bRefetch ) @@ -1257,6 +1259,7 @@ sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, Runtime { return absolute_checked(row,sal_True); } + sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ ) { SAL_INFO("dbaccess", "OKeySet::absolute" ); @@ -1339,6 +1342,7 @@ sal_Bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ ) } return m_aKeyIter != m_aKeyMap.begin(); } + sal_Bool SAL_CALL OKeySet::previous( ) throw(SQLException, RuntimeException) { return previous_checked(sal_True); @@ -1388,7 +1392,6 @@ bool OKeySet::doTryRefetch_throw() throw(SQLException, RuntimeException) return m_xSet->next(); } -// ----------------------------------------------------------------------------- void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException) { SAL_INFO("dbaccess", "OKeySet::refreshRow" ); @@ -1499,6 +1502,7 @@ bool OKeySet::fillAllRows() return true; } } + // XRow sal_Bool SAL_CALL OKeySet::wasNull( ) throw(SQLException, RuntimeException) { @@ -1758,4 +1762,5 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select break; } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 564720cbd57e..5e8aeabc0725 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -503,6 +503,7 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto o_aChangedColumns.push_back(aJoinIter->second); } } + namespace { struct PositionFunctor : ::std::unary_function @@ -684,4 +685,5 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const } } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index b0d300d10e0c..f451f9894c9a 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -2012,6 +2012,7 @@ void SAL_CALL ORowSet::removeRowSetApproveListener( const Reference< XRowSetAppr m_aApproveListeners.removeInterface(listener); } + // XRowsChangeBroadcaster void SAL_CALL ORowSet::addRowsChangeListener( const Reference< XRowsChangeListener >& listener ) throw(RuntimeException) { @@ -2704,6 +2705,7 @@ void ORowSet::impl_rebuild_throw(::osl::ResettableMutexGuard& _rGuard) m_pCache->reset(xResultSet); notifyAllListeners(_rGuard); } + // *********************************************************** // ORowSetClone // *********************************************************** diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index dc1e8777e445..2b41f105d406 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "RowSetBase.hxx" #include "CRowSetDataColumn.hxx" #include @@ -55,9 +54,7 @@ using namespace ::osl; namespace dbaccess { -// ========================================================================= -// = OEmptyCollection -// ========================================================================= +// OEmptyCollection class OEmptyCollection : public sdbcx::OCollection { protected: @@ -76,9 +73,7 @@ connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& / return connectivity::sdbcx::ObjectType(); } -// ========================================================================= -// = ORowSetBase -// ========================================================================= +// ORowSetBase DBG_NAME(ORowSetBase) ORowSetBase::ORowSetBase( const Reference& _rContext, ::cppu::OBroadcastHelper& _rBHelper, ::osl::Mutex* _pMutex ) @@ -470,7 +465,6 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx throwFunctionSequenceException(*m_pMySelf); } - checkCache(); sal_Bool bRet( notifyAllListenersCursorBeforeMove( aGuard ) ); @@ -1452,7 +1446,7 @@ sal_Int32 ORowSetBase::impl_getRowCount() const ++nRowCount; return nRowCount; } -// ============================================================================= + struct ORowSetNotifierImpl { ::std::vector aChangedColumns; @@ -1460,6 +1454,7 @@ struct ORowSetNotifierImpl ORowSetValueVector::Vector aRow; }; + DBG_NAME(ORowSetNotifier) ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) @@ -1544,6 +1539,7 @@ void ORowSetNotifier::firePropertyChange() m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess()); } } + } // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 185808602f88..780e000d00b0 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -44,7 +44,6 @@ #include - namespace com { namespace sun { namespace star { namespace sdb { struct RowChangeEvent; } namespace lang { struct Locale; } @@ -327,7 +326,6 @@ namespace dbaccess // is called when the rowset has deleted this bookmark _rBookmark void onDeletedRow( const ::com::sun::star::uno::Any& _rBookmark, sal_Int32 _nPos ); - // ========================================================== // granular access control struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } }; @@ -350,7 +348,6 @@ namespace dbaccess ::osl::Mutex* getMutex() const { return m_pMutex; } }; - // ======================================================================== /** eases the handling of the doCancelModification and notifyCancelInsert methods

The class can only be used on the stack, within a method of ORowSetBase (or derivees)

diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index adcb5c257d47..4ac763ebbfc4 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -1752,4 +1752,5 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_ } } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 0863f0ff57e5..a658e2d80332 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -114,7 +114,6 @@ namespace return pNewSqlParseNode; } - // ..................................................................... /** checks whether the given parse node describes a valid single select statement, throws an error if not */ @@ -142,7 +141,6 @@ namespace delete pOldNode; } - // ..................................................................... /** combines parseStatement_throwError and checkForSingleSelect_throwError */ void parseAndCheck_throwError( OSQLParser& _rParser, const OUString& _rStatement, @@ -153,7 +151,6 @@ namespace checkForSingleSelect_throwError( pNode, _rIterator, _rxContext, _rStatement ); } - // ..................................................................... /** transforms a parse node describing a complete statement into a pure select statement, without any filter/order/groupby/having clauses */ @@ -300,6 +297,7 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void) clearCurrentCollections(); } + IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer) IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER) IMPLEMENT_TYPEPROVIDER3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer) @@ -983,7 +981,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr //OSQLParseTreeIterator::appendColumns it creates some labels using those real names //but the evo address book gives them proper labels of First Name, Second Name and City //the munge means that here we have e.g. just "City" as a label because it matches - // + //This is all a horrible mess if (bMissingSomeColumnLabels) aNames.clear(); @@ -1066,7 +1064,6 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, OUString aValue; OUString aColumnName; - pCondition->parseNodeToStr( aValue, m_xConnection, NULL ); pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL ); @@ -1868,4 +1865,5 @@ OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIt sRet = sKeyword + sRet; return sRet; } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 433450e712e1..5d252a59b1ba 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -357,4 +357,5 @@ void SAL_CALL OStaticSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept { SAL_INFO("dbaccess", "OStaticSet::moveToCurrentRow" ); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 2707b124de1b..d46fe96ddf82 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -56,9 +56,7 @@ using namespace ::comphelper; using namespace ::dbtools; using namespace ::cppu; -//========================================================================== -//= ODBTableDecorator -//========================================================================== +// ODBTableDecorator DBG_NAME(ODBTableDecorator) ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnection, const Reference< XColumnsSupplier >& _rxNewTable, @@ -682,4 +680,5 @@ void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::c SAL_INFO("dbaccess", "ODBTableDecorator::setName" ); throwFunctionNotSupportedException( "XNamed::setName", *this ); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 82c9d5561a94..df46822f99bc 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "View.hxx" #include "dbastrings.hrc" @@ -56,9 +55,7 @@ namespace dbaccess } return sSupportService; } - //==================================================================== - //= View - //==================================================================== + // View View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName ) :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName ) @@ -133,4 +130,5 @@ namespace dbaccess } } // namespace dbaccess + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index a7c312316988..2cdf5192751e 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -234,4 +234,5 @@ void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xPar } } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 2b5fabb4225c..43dca97d7091 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ContainerMediator.hxx" #include "apitools.hxx" #include "column.hxx" @@ -63,9 +62,7 @@ using namespace ::cppu; DBG_NAME(OColumn) -//============================================================ -//= OColumn -//============================================================ +// OColumn OColumn::OColumn( const bool _bNameIsReadOnly ) :OColumnBase( m_aMutex ) ,::comphelper::OPropertyContainer( OColumnBase::rBHelper ) @@ -153,9 +150,7 @@ void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHand ::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue ); } -//============================================================ -//= OColumns -//============================================================ +// OColumns DBG_NAME(OColumns); OColumns::OColumns(::cppu::OWeakObject& _rParent, @@ -221,7 +216,6 @@ Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeExcept return aSNS; } -//------------------------------------------------------------------ void OColumns::append( const OUString& _rName, OColumn* _pColumn ) { MutexGuard aGuard(m_rMutex); @@ -235,7 +229,6 @@ void OColumns::append( const OUString& _rName, OColumn* _pColumn ) insertElement( _rName, _pColumn ); } -//------------------------------------------------------------------ void OColumns::clearColumns() { MutexGuard aGuard(m_rMutex); @@ -331,7 +324,6 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) Sequence< Type > aSecTypes(OColumns_BASE::getTypes()); - const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for (;pBegin != pEnd ; ++pBegin) @@ -445,4 +437,5 @@ void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) thr ::osl::MutexGuard aGuard(m_rMutex); m_xParent = _xParent; } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index 6ea73ad6fa3e..58eb794e5efb 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "columnsettings.hxx" #include "dbastrings.hrc" @@ -28,10 +27,8 @@ #include #include -//........................................................................ namespace dbaccess { -//........................................................................ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; @@ -50,9 +47,7 @@ namespace dbaccess namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - //============================================================================== - //= OColumnSettings - //============================================================================== + // OColumnSettings DBG_NAME( OColumnSettings ) OColumnSettings::OColumnSettings() @@ -160,8 +155,6 @@ namespace dbaccess return true; } -//........................................................................ } // namespace dbaccess -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index d08f59c81633..421d23df8be3 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -414,4 +414,5 @@ void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeExcepti m_xRowUpdate->updateObject(m_nPos, x); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index cfdf5cff3a78..eeb64c4b68f1 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "datasettings.hxx" #include "apitools.hxx" #include "dbastrings.hrc" @@ -32,7 +31,6 @@ #include - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::lang; @@ -42,9 +40,7 @@ using namespace ::cppu; namespace dbaccess { -//========================================================================== -//= ODataSettings -//========================================================================== +// ODataSettings void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem) { if ( m_bQuery ) @@ -209,4 +205,5 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau } } // namespace dbaccess + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index adfb0be5b4bf..962011bc862b 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -56,9 +56,7 @@ namespace const sal_Int32 HAS_TABLENAME = 0x00000040; } -//============================================================ -//= OTableColumnDescriptor -//============================================================ +// OTableColumnDescriptor IMPLEMENT_FORWARD_XINTERFACE2(OTableColumnDescriptor,OColumn,TXChild) void OTableColumnDescriptor::impl_registerProperties() @@ -130,9 +128,8 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& ::osl::MutexGuard aGuard(m_aMutex); m_xParent = _xParent; } -//============================================================ -//= OTableColumn -//============================================================ + +// OTableColumn DBG_NAME(OTableColumn); OTableColumn::OTableColumn( const OUString& _rName ) @@ -164,9 +161,7 @@ OUString OTableColumn::getImplementationName( ) throw (RuntimeException) return OTableColumnDescriptor::createArrayHelper(); } -// ========================================================================= -//= OQueryColumn -// ========================================================================= +// OQueryColumn DBG_NAME( OQueryColumn ); OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel ) @@ -322,9 +317,7 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand } } -//========================================================================== -//= OColumnWrapper -//========================================================================== +// OColumnWrapper DBG_NAME(OColumnWrapper); OColumnWrapper::OColumnWrapper( const Reference< XPropertySet > & rCol, const bool _bNameIsReadOnly ) @@ -420,9 +413,7 @@ sal_Int64 SAL_CALL OColumnWrapper::getSomething( const Sequence< sal_Int8 >& aId return 0; } -//============================================================ -//= OTableColumnDescriptorWrapper -//============================================================ +// OTableColumnDescriptorWrapper OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< XPropertySet >& _rCol, const bool _bPureWrap, const bool _bIsDescriptor ) :OColumnWrapper( _rCol, !_bIsDescriptor ) ,m_bPureWrap( _bPureWrap ) @@ -575,9 +566,7 @@ void OTableColumnDescriptorWrapper::setFastPropertyValue_NoBroadcast( } } -//============================================================ -//= OTableColumnWrapper -//============================================================ +// OTableColumnWrapper OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol, const Reference< XPropertySet >& _xColDefintion, const bool _bPureWrap ) :OTableColumnDescriptorWrapper( rCol, _bPureWrap, false ) @@ -626,4 +615,5 @@ Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (Ru { return OTableColumnDescriptorWrapper::createArrayHelper( nId ); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index f8f9680b6150..811d5450004a 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -420,4 +420,5 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim m_xAggregateAsParameters->clearParameters(); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 5bb8cb1e8586..12d959a8aba0 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "query.hxx" #include "dbastrings.hrc" #include @@ -66,9 +65,7 @@ using namespace ::utl; namespace dbaccess { -//========================================================================== -//= OQuery -//========================================================================== +// OQuery DBG_NAME(OQuery) OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition @@ -368,4 +365,5 @@ OUString OQuery::determineContentType() const } } // namespace dbaccess + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index a0a8e781954f..cb96412d748a 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -35,14 +35,10 @@ namespace dbtools class IWarningsContainer; } -//........................................................................ namespace dbaccess { -//........................................................................ -//========================================================================== -//= OQuery - an object implementing the sdb.Query service -//========================================================================== +// OQuery - an object implementing the sdb.Query service typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::sdbcx::XRename @@ -51,7 +47,6 @@ class OQuery; class OColumn; typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase; - class OQuery :public OContentHelper ,public OQueryDescriptor_Base ,public OQuery_Base @@ -76,7 +71,6 @@ protected: enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING }; AGGREGATE_ACTION m_eDoingCurrently; - // ------------------------------------------------------------------------ /** a class which automatically resets m_eDoingCurrently in it's destructor */ class OAutoActionReset; // just for the following friend declaration @@ -155,11 +149,8 @@ private: void registerProperties(); }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_COREAPI_QUERY_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 70cc6cee2829..3f7c5d50f0cb 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -323,4 +323,5 @@ void SAL_CALL OQueryComposer::release() throw() { OSubComponent::release(); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index fc5ccfcdbce9..fca43df761d3 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "querycontainer.hxx" #include "dbastrings.hrc" #include "query.hxx" @@ -58,9 +57,7 @@ using namespace ::cppu; namespace dbaccess { -//========================================================================== -//= OQueryContainer -//========================================================================== +// OQueryContainer DBG_NAME(OQueryContainer) OQueryContainer::OQueryContainer( @@ -408,4 +405,5 @@ Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(Runtime } } // namespace dbaccess + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 78f549984951..1c2f6501ec32 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -42,9 +42,7 @@ using namespace ::cppu; namespace dbaccess { -//========================================================================== -//= OQueryDescriptor -//========================================================================== +// OQueryDescriptor DBG_NAME(OQueryDescriptor) OQueryDescriptor::OQueryDescriptor() diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index ccd51749c862..27c8d0d35c41 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -35,14 +35,10 @@ #include #include -//........................................................................ namespace dbaccess { -//........................................................................ -//========================================================================== -//= OQueryDescriptor_Base - a query descriptor (as the name suggests :) -//========================================================================== +// OQueryDescriptor_Base - a query descriptor (as the name suggests :) typedef ::cppu::ImplHelper3< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::lang::XUnoTunnel, @@ -142,11 +138,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); }; -//........................................................................ } // namespace dbaccess -//........................................................................ #endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index e2dd8ba86fa5..d47a6327c6a7 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -311,4 +311,5 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 3476b654a3f6..f11a4ec8bfde 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -1098,4 +1098,5 @@ void OResultSet::checkBookmarkable() const if ( !m_bIsBookmarkable ) throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) ); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 2cd8ef522813..55bcc6870d4c 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include #include "table.hxx" @@ -61,9 +60,7 @@ using namespace ::osl; using namespace ::comphelper; using namespace ::cppu; -//========================================================================== -//= ODBTable -//========================================================================== +// ODBTable DBG_NAME(ODBTable) ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables @@ -399,4 +396,5 @@ sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames) SAL_INFO("dbaccess", "ODBTable::createIndexes" ); return new OIndexes(this,m_aMutex,_rNames,NULL); } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 34da7b91ef98..422a2fe9ecaa 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tablecontainer.hxx" #include "dbastrings.hrc" #include "table.hxx" @@ -94,9 +93,8 @@ namespace return sal_False; } } -//========================================================================== -//= OTableContainer -//========================================================================== + +// OTableContainer DBG_NAME(OTableContainer) OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, @@ -483,4 +481,5 @@ void OTableContainer::addMasterContainerListener() DBG_UNHANDLED_EXCEPTION(); } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index c839d8b9b939..9e66780750cc 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "viewcontainer.hxx" #include "dbastrings.hrc" #include "core_resource.hxx" @@ -57,9 +56,7 @@ using namespace ::comphelper; using namespace ::cppu; using namespace ::connectivity::sdbcx; -//========================================================================== -//= OViewContainer -//========================================================================== +// OViewContainer DBG_NAME(OViewContainer) OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent -- cgit