From 91a1342aa2930268006614680ec439c6ebecdedb Mon Sep 17 00:00:00 2001 From: dennisroczek Date: Sat, 1 Apr 2017 15:26:28 +0000 Subject: tdf#39468 cleanup source code comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * translate German source code comments * remove ascii art * remove bogus source Code comments * remove old StarOffice/Sun internal bug tracker references Change-Id: I443bf2fdba3780c411d69809111daf3aa3a48451 Reviewed-on: https://gerrit.libreoffice.org/36005 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- comphelper/source/property/opropertybag.cxx | 3 +-- connectivity/source/commontools/parameters.cxx | 5 ++--- connectivity/source/drivers/mysql/YCatalog.cxx | 1 - connectivity/source/parse/sqliterator.cxx | 23 +++++++++---------- cppuhelper/source/factory.cxx | 3 +-- sfx2/source/appl/app.cxx | 3 +-- svtools/source/uno/genericunodialog.cxx | 5 ++--- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 26 ++++++---------------- sw/source/core/doc/DocumentDeviceManager.cxx | 3 +-- ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 18 +++++---------- vcl/source/control/group.cxx | 3 +-- 11 files changed, 32 insertions(+), 61 deletions(-) diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index a2e4abdc7a14..4fbdb8bfe96e 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -524,8 +524,7 @@ namespace comphelper // (Note that this probably would belong into the base class. However, this would mean we would need // to check all existent usages of the base class, where MAYBEDEFAULT is *not* set, but // a default is nonetheless supplied/used. This is hard to accomplish reliably, in the - // current phase. - // #i78593# / 2007-07-07 / frank.schoenheit@sun.com + // current phase. #i78593# ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper(); sal_Int16 nAttributes(0); diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 70e1883ff41f..4f0caca3b4de 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -265,9 +265,8 @@ namespace dbtools if ( pMasterFields->isEmpty() || pDetailFields->isEmpty() ) continue; - // if not even the master part of the relationship exists in the parent , the - // link is invalid as a whole - // #i63674# / 2006-03-28 / frank.schoenheit@sun.com + // if not even the master part of the relationship exists in the parent, the + // link is invalid as a whole #i63674# if ( !_rxParentColumns->hasByName( *pMasterFields ) ) { bNeedExchangeLinks = true; diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 38f0b24e211b..eb755309fd41 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -74,7 +74,6 @@ void OMySQLCatalog::refreshViews() // let's simply assume the server is new enough to support views. Current drivers // as of this writing might not return the proper information in getTableTypes, so // don't rely on it. - // during #73245# / 2007-10-26 / frank.schoenheit@sun.com bool bSupportsViews = true; TStringVector aVector; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 341c30c26298..959e0ca4733b 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -334,8 +334,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu OSQLParseTreeIterator aSubQueryIterator( *this, m_rParser, pSubQueryNode.get() ); aSubQueryIterator.impl_traverse( TraversalParts::Parameters | TraversalParts::SelectColumns ); - // SelectColumns might also contain parameters - // #i77635# - 2007-07-23 / frank.schoenheit@sun.com + // SelectColumns might also contain parameters #i77635# pSubQueryParameterColumns = aSubQueryIterator.getParameters(); aSubQueryIterator.dispose(); @@ -574,13 +573,13 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, if ( SQL_ISRULE( pQueryExpression, select_statement ) ) { getSelect_statement( *m_pImpl->m_pSubTables, pQueryExpression ); - // LEM TODO: now, we need to setup a OSQLTable from pQueryExpression in some way - // and stick it in _rTables[rTableRange]. Probably fake it by - // setting up a full OSQLParseTreeIterator on pQueryExpression - // and using its m_aSelectColumns - // This is necessary in stuff like "SELECT * FROM tbl1 INNER JOIN (SELECT foo, bar FROM tbl2) AS tbl3" - // so that setSelectColumnName() can expand the "*" correctly. - // See e.g. R_UserAndLastSubscription query of https://bugs.libreoffice.org/attachment.cgi?id=71871 + // TODO: now, we need to setup a OSQLTable from pQueryExpression in some way + // and stick it in _rTables[rTableRange]. Probably fake it by + // setting up a full OSQLParseTreeIterator on pQueryExpression + // and using its m_aSelectColumns + // This is necessary in stuff like "SELECT * FROM tbl1 INNER JOIN (SELECT foo, bar FROM tbl2) AS tbl3" + // so that setSelectColumnName() can expand the "*" correctly. + // See e.g. R_UserAndLastSubscription query of https://bugs.libreoffice.org/attachment.cgi?id=71871 } else { @@ -989,9 +988,9 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele if ( pColumnRef->isRule() ) { - // LEM FIXME: the if condition is not quite right - // many expressions are rules, e.g. "5+3" - // or even: "colName + 1" + // FIXME: the if condition is not quite right + // many expressions are rules, e.g. "5+3" + // or even: "colName + 1" bFkt = true; nType = getFunctionReturnType(pColumnRef); } diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index 9ed9d0d6b320..3c521ab02b41 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -182,8 +182,7 @@ Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndCont Reference< XInterface > xRet( createInstanceWithContext( xContext ) ); Reference< lang::XInitialization > xInit( xRet, UNO_QUERY ); - // always call initialize, even if there are no arguments. - // #i63511# / 2006-03-27 / frank.schoenheit@sun.com + // always call initialize, even if there are no arguments. #i63511# if (xInit.is()) { xInit->initialize( rArguments ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 234fa72c0f95..323e6322671e 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -343,8 +343,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) // even if the frame actually didn't change, ensure its document is forwarded // to SfxObjectShell::SetCurrentComponent. // Otherwise, the CurrentComponent might not be correct, in case it has meanwhile - // been reset to some other document, by some non-SFX component. - // #i49133# / 2007-12-19 / frank.schoenheit@sun.com + // been reset to some other document, by some non-SFX component. #i49133# if ( pFrame && pFrame->GetViewShell() ) pFrame->GetViewShell()->SetCurrentDocument(); } diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 894d90403427..94578e4cbe03 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -104,7 +104,7 @@ sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { - // TODO : need some handling if we're currently executing ... + // TODO: need some handling if we're currently executing ... OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, rValue); @@ -185,8 +185,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() if ( !m_bTitleAmbiguous ) pDialog->SetText( sTitle ); - // be notified when the dialog is killed by somebody else - // #i65958# / 2006-07-07 / frank.schoenheit@sun.com + // be notified when the dialog is killed by somebody else #i65958# pDialog->AddEventListener( LINK( this, OGenericUnoDialog, OnDialogDying ) ); m_pDialog = pDialog; diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index f84880d1f53e..8b56a1569ae5 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -93,12 +93,6 @@ repaint error in form wizard in bugdoc database http://www.openoffice.org/issues/show_bug.cgi?id=72694 form control artifacts when scrolling a text fast - -issues in the old (Sun-internal) bug tracking system: - -#110592# -form controls being in redlining or in hidden section are visible in alive-mode - */ @@ -221,8 +215,7 @@ namespace sdr { namespace contact { { // no check whether we're valid, this is the responsibility of the caller - // don't call setPosSize when pos/size did not change - // #i104181# / 2009-08-18 / frank.schoenheit@sun.com + // don't call setPosSize when pos/size did not change #i104181# ::tools::Rectangle aCurrentRect( getPosSize() ); if ( aCurrentRect != _rPosSize ) { @@ -497,7 +490,7 @@ namespace sdr { namespace contact { public ViewObjectContactOfUnoControl_Impl_Base { private: - // fdo#41935 note that access to members is protected with SolarMutex; + // tdf#41935 note that access to members is protected with SolarMutex; // the class previously had its own mutex but that is prone to deadlock /// the instance whose IMPL we are @@ -1010,8 +1003,7 @@ namespace sdr { namespace contact { // which it is not really prepared for. // /me thinks that re-entrance should be caught on a higher level, i.e. the Drawing Layer should not allow - // reentrant paint requests. For the moment, until /me can discuss this with AW, catch it here. - // 2009-08-27 / #i104544# frank.schoenheit@sun.com + // reentrant paint requests. For the moment, until /me can discuss this with AW, catch it here. #i104544# return false; } @@ -1028,8 +1020,7 @@ namespace sdr { namespace contact { // - we don't belong to a page view, and are simply painted onto different devices // The first sounds strange (doesn't it?), the second means we could perhaps // optimize this in the future - there is no need to re-create the control every time, - // is it? - // #i74523# / 2007-02-15 / frank.schoenheit@sun.com + // is it? #i74523# if ( m_xContainer.is() ) impl_switchContainerListening_nothrow( false ); impl_switchControlListening_nothrow( false ); @@ -1305,8 +1296,7 @@ namespace sdr { namespace contact { // some code below - in particular our disposal - might trigger actions which require the // SolarMutex. In particular, in our disposal, we remove ourself as listener from the control, // which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex - - // is the real bug. Toolkit really is infested with solar mutex usage ... :( - // #i82169# / 2007-11-14 / frank.schoenheit@sun.com + // is the real bug. Toolkit really is infested with solar mutex usage ... :( #i82169# if ( !m_aControl.is() ) return; @@ -1406,8 +1396,7 @@ namespace sdr { namespace contact { // some code below - in particular our disposal - might trigger actions which require the // SolarMutex. In particular, in our disposal, we remove ourself as listener from the control, // which alone needs the SolarMutex. Of course this - a removeFooListener needed the SolarMutex - - // is the real bug. Toolkit really is infested with solar mutex usage ... :( - // #i82169# / 2007-11-14 / frank.schoenheit@sun.com + // is the real bug. Toolkit really is infested with solar mutex usage ... :( #i82169# DBG_ASSERT( Event.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::elementRemoved: where did this come from?" ); if ( m_aControl == Event.Element ) @@ -1680,8 +1669,7 @@ namespace sdr { namespace contact { // remove this when #i115754# is fixed return drawinglayer::primitive2d::Primitive2DContainer(); - // ignore existing controls which are in alive mode and manually switched to "invisible" - // #102090# / 2009-06-05 / frank.schoenheit@sun.com + // ignore existing controls which are in alive mode and manually switched to "invisible" #i102090# const ControlHolder& rControl( m_pImpl->getExistentControl() ); if ( rControl.is() && !rControl.isDesignMode() && !rControl.isVisible() ) return drawinglayer::primitive2d::Primitive2DContainer(); diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx index 8caf93afa187..fbcfdb7dfe2d 100644 --- a/sw/source/core/doc/DocumentDeviceManager.cxx +++ b/sw/source/core/doc/DocumentDeviceManager.cxx @@ -73,8 +73,7 @@ void DocumentDeviceManager::setPrinter(/*[in]*/ SfxPrinter *pP,/*[in]*/ bool bDe mpPrt = pP; // our printer should always use TWIP. Don't rely on this being set in SwViewShell::InitPrt, there - // are situations where this isn't called. - // #i108712# / 2010-02-26 / frank.schoenheit@sun.com + // are situations where this isn't called. #i108712# if ( mpPrt ) { MapMode aMapMode( mpPrt->GetMapMode() ); diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 3c81aa249115..d03b789821ca 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -18,12 +18,6 @@ */ -/************************************************************************** - TODO - ************************************************************************** - - *************************************************************************/ - #include "osl/diagnose.h" #include "rtl/ref.hxx" #include "cppuhelper/weak.hxx" @@ -107,10 +101,10 @@ OfficeDocumentsManager::OfficeDocumentsManager( OfficeDocumentsManager::~OfficeDocumentsManager() { //OSL_ENSURE( m_aDocs.empty(), "document list not empty!" ); - // no need to assert this: Normal shutdown of OOo could already trigger it, since the order in which - // objects are actually released/destroyed upon shutdown is not defined. And when we arrive *here*, - // OOo *is* shutting down currently, since we're held by the TDOC provider, which is disposed - // upon shutdown. + // no need to assert this: Normal shutdown of LibreOffice could already trigger it, since the order + // in which objects are actually released/destroyed upon shutdown is not defined. And when we + // arrive *here*, LibreOffice *is* shutting down currently, since we're held by the TDOC provider, + // which is disposed upon shutdown. m_xDocCloseListener->Dispose(); } @@ -248,7 +242,7 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured( { // Document has been closed (unloaded) - // #163732# - Official event "OnUnload" does not work here. Event + // Official event "OnUnload" does not work here. Event // gets fired to early. Other OnUnload listeners called after this // listener may still need TDOC access to the document. Remove the // document from TDOC docs list on XCloseListener::notifyClosing. @@ -418,8 +412,6 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured( // *after* OnUnload and all other On* events. // In agreement with MBA, the implementation for SfxBaseModel::Close should be changed to also send notifyClosing // as last event. When this happens, the assertion here must be enabled, again. - // There is no bug for this, yet - IZ is currently down due to the Kenai migration. - // 2011-02-23 / frank.schoenheit@sun.com } } } diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index e23b836a846d..a9dd7cf8af7b 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -155,8 +155,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, pDev->DrawLine( Point( rPos.X()+rSize.Width()-2, rPos.Y()+rSize.Height()-2 ), Point( rPos.X()+rSize.Width()-2, nTop ) ); bool bIsPrinter = OUTDEV_PRINTER == pDev->GetOutDevType(); - // if we're drawing onto a printer, spare the 3D effect - // #i46986# / 2005-04-13 / frank.schoenheit@sun.com + // if we're drawing onto a printer, spare the 3D effect #i46986# if ( !bIsPrinter && !(nDrawFlags & DrawFlags::Mono) ) { -- cgit