Another one...
Cheers,
Wol
>From b8f2f5fe713747a109f5fc26ab7460341aaf0b93 Mon Sep 17 00:00:00 2001
From: Wol <[email protected]>
Date: Tue, 23 Nov 2010 23:41:49 +0000
Subject: [PATCH 2/2] Dead code, spelling mistakes
---
.../ui/relationdesign/RTableConnectionData.cxx | 6 +---
.../ui/relationdesign/RelationController.cxx | 12 ++++----
.../source/ui/relationdesign/RelationTableView.cxx | 28 +------------------
3 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index 86a1dcd..e31abba 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -424,8 +424,6 @@ xKey.clear();
::dbtools::throwGenericSQLException(sError,NULL);
}
-// OSL_ENSURE(xKey.is(),"No key found have insertion!");
-
// The fields the relation marks may not be the same as our LineDatas mark
after the relation has been updated
if ( xColSup.is() )
{
@@ -454,8 +452,8 @@ xKey.clear();
m_vConnLineData.push_back(pNewData);
}
}
- } // if ( xColSup.is() )
- // NOTE : the caller is resposible for updating any other objects
referencing the old LineDatas (for instance a ConnLine)
+ }
+ // NOTE : the caller is responsible for updating any other objects
referencing the old LineDatas (for instance a ConnLine)
////////////////////////////////////////////////////////////
// Kardinalitaet bestimmen
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 3721d32..f38aedb 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -348,7 +348,7 @@ namespace
{
::comphelper::disposeComponent(xResult);
loadTableData(m_xTables->getByName(*pIter));
- } // if ( xResult.is() && xResult->next() )
+ }
}
catch( const Exception& )
{
@@ -410,7 +410,7 @@ namespace
}
else
continue; // table name could not be found so we
do not show this table releation
- } // if ( aFind == m_aTableData.end() )
+ }
TTableWindowData::value_type pReferencedTable =
aRefFind->second;
::rtl::OUString sKeyName;
@@ -454,7 +454,7 @@ namespace
pTabConnData->SetCardinality();
}
}
- } // if ( xKeys.is() )
+ }
}
}
@@ -478,7 +478,7 @@ void ORelationController::mergeData(const
TTableConnectionData& _aConnectionData
{
m_vTableData.push_back((*aConnDataIter)->getReferencedTable());
}
- } // for(;aConnDataIter != aConnDataEnd;++aConnDataIter)
+ }
if ( m_nThreadEvent )
{
--m_nThreadEvent;
@@ -535,8 +535,8 @@ void ORelationController::loadData()
nStart = nEnd;
nEnd += nMaxElements;
nEnd = ::std::min(nEnd,nCount);
- } // for(;pIter != pEnd;++pIter)
- } // if ( aMeta.supportsThreads() )
+ }
+ }
else
{
RelationLoader* pThread = new
RelationLoader(this,xMetaData,m_xTables,aNames,0,nCount);
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index ed62b88..9260882 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -180,7 +180,7 @@ void ORelationTableView::ReSync()
pTabConnDataList->erase(
::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end()
);
continue;
}
- } // if ( !arrInvalidTables.empty() )
+ }
addConnection( new ORelationTableConnection(this, *aConIter),
sal_False ); // don't add the data again
}
@@ -385,30 +385,6 @@ void ORelationTableView::RemoveTabWin( OTableWindow*
pTabWin )
}
}
//
-----------------------------------------------------------------------------
-//namespace
-//{
-// class OReleationAskDialog : public ButtonDialog
-// {
-// FixedImage m_aInfoImage;
-// FixedText m_aTitle;
-// FixedText m_aMessage;
-// public:
-// OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ |
WB_STDDIALOG)
-// ,m_aInfoImage(this)
-// ,m_aTitle(this,WB_WORDBREAK | WB_LEFT)
-// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT)
-// {
-// m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION));
-// m_aMessage.Show();
-//
-// // Changed as per BugID 79541 Branding/Configuration
-// String sDialogTitle( lcl_getProductName() );
-// SetText( sDialogTitle.AppendAscii( " Base" ) );
-// m_aTitle.Show();
-// }
-// };
-//}
-//
-----------------------------------------------------------------------------
void ORelationTableView::lookForUiActivities()
{
if(m_pExistingConnection)
@@ -477,7 +453,7 @@ void ORelationTableView::_elementRemoved( const
container::ContainerEvent& _rEve
m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO);
m_pView->getController().InvalidateFeature(ID_BROWSER_REDO);
}
- } // if ( _rEvent.Accessor >>= sName )
+ }
m_bInRemove = false;
}
//
-----------------------------------------------------------------------------
--
1.7.2.2
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
