[Libreoffice-commits] .: dbaccess/source reportdesign/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Feb 8 09:51:37 PST 2011
dbaccess/source/core/api/RowSet.cxx | 1 -
dbaccess/source/core/api/RowSetBase.cxx | 3 +--
dbaccess/source/core/dataaccess/datasource.cxx | 3 +--
dbaccess/source/sdbtools/connection/objectnames.cxx | 2 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +-
dbaccess/source/ui/browser/brwctrlr.cxx | 1 -
dbaccess/source/ui/browser/genericcontroller.cxx | 3 +--
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 8 --------
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 1 -
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/dbfindex.cxx | 1 -
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 2 +-
dbaccess/source/ui/misc/TokenWriter.cxx | 2 +-
dbaccess/source/ui/misc/WCPage.cxx | 1 -
dbaccess/source/ui/misc/WCopyTable.cxx | 3 +--
dbaccess/source/ui/querydesign/JoinTableView.cxx | 1 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 +-
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 2 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 3 +--
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2 +-
reportdesign/source/core/api/ReportComponent.cxx | 2 +-
23 files changed, 13 insertions(+), 35 deletions(-)
New commits:
commit ca3b6a4e65f27fda6170ec4a88a4d84daeebb039
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Mon Feb 7 20:20:28 2011 +0100
Clean-up bogus comments in base.
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 0fdb60d..ff50e3f 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2277,7 +2277,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# - fs at openoffice.org
m_xComposer->setElementaryQuery( m_xComposer->getQuery( ) );
m_xComposer->setFilter( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "0 = 1" ) ) );
}
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 0531efe..9f9df1e 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1135,7 +1135,6 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
OSL_ENSURE(rRow.is() ,"Invalid size of vector!");
#endif
// the cache could repositioned so we need to adjust the cache
- // #104144# OJ
if ( _bMoved && m_aCurrentRow.isNull() )
{
positionCache( MOVE_NONE_REFRESH_ONLY );
@@ -1281,7 +1280,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
try
{
TDataColumns::iterator aEnd = m_aDataColumns.end();
- for(TDataColumns::iterator aIter = m_aDataColumns.begin();aIter != aEnd;++aIter,++i) // #104278# OJ ++i inserted
+ for(TDataColumns::iterator aIter = m_aDataColumns.begin();aIter != aEnd;++aIter,++i)
(*aIter)->fireValueChange(_rOldRow.is() ? (_rOldRow->get())[i+1] : ::connectivity::ORowSetValue());
}
catch(Exception&)
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index b82b179..db1f8e4 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -379,14 +379,13 @@ Reference<XConnection> OSharedConnectionManager::getConnection( const rtl::OUStr
aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter"));
aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter;
aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter"));
- aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter; // #22377# OJ
+ aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter;
::rtl::OUString sUser = user;
::rtl::OUString sPassword = password;
if ((0 == sUser.getLength()) && (0 == sPassword.getLength()) && (0 != _pDataSource->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 = _pDataSource->m_pImpl->m_sUser;
if (0 != _pDataSource->m_pImpl->m_aPassword.getLength())
sPassword = _pDataSource->m_pImpl->m_aPassword;
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index d7a4872..d8aadca 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -202,7 +202,7 @@ namespace sdbtools
|| ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) //
|| ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) //
|| ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) //
- || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars
+ || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // removed unparsable chars
)
return ErrorCondition::DB_QUERY_NAME_WITH_QUOTES;
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index df09876..4cfce1d 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1153,7 +1153,7 @@ void OAppDetailPageHelper::showPreview( const ::rtl::OUString& _sDataSourceName,
m_xFrame = Reference < XFrame > ( getBorderWin().getView()->getORB()->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY );
m_xFrame->initialize( m_xWindow );
- // work-around for #150518#: no layout manager (and thus no toolbars) in the preview
+ // no layout manager (and thus no toolbars) in the preview
// Must be called after initialize ... but before any other call to this frame.
// Otherwise frame throws "life time exceptions" as e.g. NON_INITIALIZED
Reference< XPropertySet > xFrameProps( m_xFrame, UNO_QUERY_THROW );
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index b8a9d1b..5220eb3 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2095,7 +2095,6 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
// should be intercepted by GetState. Normally.
// Unfortunately ID_BROWSER_PASTE is a 'fast call' slot, which means it may be executed without checking if it is
// enabled. This would be really deadly herein if the current cell has no controller ...
- // (FS - 13.04.99 - #64694#)
return;
Edit& rEdit = (Edit&)xCurrentController->GetWindow();
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index b66ded2..2a36ff7 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -539,7 +539,6 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF
// it is possible that listeners are registered or revoked while
// we are notifying them, so we must use a copy of m_arrStatusListener, not
// m_arrStatusListener itself
- // #121276# / 2005-05-19 / frank.schoenheit at sun.com
Dispatch aNotifyLoop( m_arrStatusListener );
DispatchIterator iterSearch = aNotifyLoop.begin();
DispatchIterator iterEnd = aNotifyLoop.end();
@@ -762,7 +761,7 @@ void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatch
void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException)
{
SolarMutexGuard aSolarGuard;
- // Since the fix for #123967#, the SolarMutex is not locked anymore when the framework calls into
+ // The SolarMutex is not locked anymore when the framework calls into
// here. So, lock it ourself. The real solution would be to lock it only in the places
// where it's needed, but a) this might turn out difficult, since we then also need to care
// for locking in the proper order (SolarMutex and m_aMutex), and b) this would be too many places
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index b9b3783..f553c24 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -47,7 +47,6 @@ namespace dbaui
{
//.........................................................................
- // #106016# --------------
enum IS_PATH_EXIST
{
PATH_NOT_EXIST = 0,
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index bb1b54c..e1f4646 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -56,7 +56,6 @@
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/awt/XWindow.hpp>
-// #106016# ------------------------------------
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 96eba05..68541da 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -42,14 +42,6 @@
namespace dbaui
{
//.........................................................................
-/* // #106016# --------------
- enum IS_PATH_EXIST
- {
- PATH_NOT_EXIST = 0,
- PATH_EXIST,
- PATH_NOT_KNOWN
- };
- */
class IDatabaseSettingsDialog;
//=========================================================================
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 8bc1464..7dcaf3f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -51,7 +51,6 @@
#include <comphelper/types.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-// #106016# ------------------------------------
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 9792261..5f97c24 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -55,7 +55,6 @@
#include <comphelper/types.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-// #106016# ------------------------------------
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <svl/filenotation.hxx>
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 40da43d..9a593cd 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -543,7 +543,6 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
// simply silent this. The strange algorithm here does a lot of things even if no files at all were
// created or accessed, so it's possible that the file we're trying to delete does not even exist,
// and this is a valid condition.
- // 2003-05-15 - #109677# - fs at openoffice.org
}
}
}
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index b3d40d3..3eed627 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -38,7 +38,7 @@ namespace dbaui
{
//==================================================================
// Ableitung von TabPage ist ein Trick von TH,
- // um Aenderungen der Systemfarben zu bemerken (Bug #53905)
+ // um Aenderungen der Systemfarben zu bemerken
class OTableDesignHelpBar : public TabPage
,public IClipboardTest
{
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 04ba753..f57061b 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -1041,7 +1041,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
if ( bStrikeout ) TAG_ON( OOO_STRING_SVTOOLS_HTML_strike );
if ( !rValue.Len() )
- TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle
+ TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // keine komplett leere Zelle
else
HTMLOutFuncs::Out_String( (*m_pStream), rValue ,m_eDestEnc);
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 930eeee..2fe4da7 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -304,7 +304,6 @@ sal_Bool OCopyTable::checkAppendData()
xTables->getByName( m_edTableName.GetText() ) >>= xTable;
ObjectCopySource aTableCopySource( m_pParent->m_xDestConnection, xTable );
m_pParent->loadData( aTableCopySource, m_pParent->m_vDestColumns, m_pParent->m_aDestVec );
- // #90027#
const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector();
ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin();
ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end();
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 242d27b..ad151c4 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -616,8 +616,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD
impl_loadSourceData();
bool bAllowViews = true;
- // if the source is a, don't allow creating views #100644# (oj)
- // (fs: Hmm? A SELECT * FROM <view> would be created, where #100644# claims this is nonsense. Why?
+ // if the source is a, don't allow creating views
if ( m_rSourceObject.isView() )
bAllowViews = false;
// no views if the target connection does not support creating them
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index f4053ff..b4a95c1 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -473,7 +473,6 @@ namespace
BOOL bFitsVert= (aUpperLeft.Y() >= 0) && (aLowerRight.Y() <= aSize.Height());
if (!bFitsHor || !bFitsVert)
{
- // #100386# OJ
if (!bFitsHor)
{
// ensure the visibility of the right border
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 7b66ccb..67cb2cf 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1426,7 +1426,7 @@ sal_Int8 OSelectionBrowseBox::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
if ( IsEditing() )
{
- // #100271# OJ allow the asterix again
+ // allow the asterix again
m_bDisableErrorBox = sal_True;
SaveModified();
m_bDisableErrorBox = sal_False;
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 42d4c4a..f4f30d1 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -223,7 +223,7 @@ void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPi
OJoinTableView* pCont = m_pTabWin->getTableView();
if (!pCont->getDesignView()->getController().isReadOnly() && pCont->getDesignView()->getController().isConnected())
{
- // #100271# OJ asterix was not allowed to be copied to selection browsebox
+ // asterix was not allowed to be copied to selection browsebox
sal_Bool bFirstNotAllowed = FirstSelected() == First() && m_pTabWin->GetData()->IsShowAll();
EndSelection();
// create a description of the source
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index 9e3805c..c4ba706 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -379,7 +379,6 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
// check the columns for double names
if(!checkColumns(bNew || !xTables->hasByName(m_sName)))
{
- // #105323# OJ
return sal_False;
}
@@ -1016,7 +1015,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star::
pNewRow->SetFieldType( pTypeInfo );
OFieldDescription* pActFieldDescr = pNewRow->GetActFieldDescr();
- pActFieldDescr->SetAutoIncrement(sal_False); // #95927# pTypeInfo->bAutoIncrement
+ pActFieldDescr->SetAutoIncrement(sal_False);
pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS);
pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) ));
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 0ecd0de..0356365 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -40,7 +40,7 @@ namespace dbaui
class OFieldDescription;
//==================================================================
// Ableitung von TabPage ist ein Trick von TH,
- // um Aenderungen der Systemfarben zu bemerken (Bug #53905)
+ // um Aenderungen der Systemfarben zu bemerken
class OTableFieldDescWin : public TabPage
,public IClipboardTest
{
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index f9bcd00..776d850 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -55,7 +55,7 @@ void lcl_getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rCTLFont,Langu
{
LanguageType eLatin = _eLatin;
- // #108374# / #107782#: If the UI language is Korean, the default Latin font has to
+ // If the UI language is Korean, the default Latin font has to
// be queried for Korean, too (the Latin language from the document can't be Korean).
// This is the same logic as in SwDocShell::InitNew.
LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
More information about the Libreoffice-commits
mailing list