[PATCH] Comment fixes - dead code and spelling mistakes
Wol
anthony at youngman.org.uk
Thu Nov 18 05:17:46 PST 2010
---
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 --
dbaccess/source/ui/control/FieldDescControl.cxx | 8 +++-----
dbaccess/source/ui/control/dbtreelistbox.cxx | 6 +++---
dbaccess/source/ui/control/marktree.cxx | 8 ++++----
dbaccess/source/ui/control/tabletree.cxx | 4 ++--
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 8dc0b41..5786aa2 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -73,7 +73,6 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -87,7 +86,6 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
case tpColumnName:
break;
default:
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index a7fa752..f85af16 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -410,7 +410,6 @@ void OFieldDescControl::CheckScrollBars()
{
m_pVertScroll->Show();
m_pVertScroll->SetRangeMax(nActive - nLastVisible);
-// m_pVertScroll->SetThumbPos(0);
m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) );
}
@@ -425,7 +424,6 @@ void OFieldDescControl::CheckScrollBars()
{
m_pHorzScroll->Show();
m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP);
-// m_pHorzScroll->SetThumbPos(0);
m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) );
}
@@ -516,7 +514,7 @@ sal_Int32 OFieldDescControl::GetMaxControlHeight() const
const Size aTemp( ppAggregates[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) );
if ( aTemp.Height() > aHeight.Height() )
aHeight.Height() = aTemp.Height();
- } // if ( ppAggregates[i] )
+ }
}
return aHeight.Height();
@@ -1194,7 +1192,7 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
case 4:
aSize.Width() = CONTROL_WIDTH_4;
break;
- } // switch( nCol )
+ }
}
@@ -1710,7 +1708,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr )
catch(const Exception&)
{
}
- } // if ( sDefault.getLength() )
+ }
else
pFieldDescr->SetControlDefault(Any());
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 1ddba15..8251442 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -515,7 +515,7 @@ namespace
{
lcl_adjustMenuItemIDs( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
const USHORT nCommandId = _rCommandController.registerCommandURL( aCommand );
_rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), _rMenu.GetItemImage( nId ),
@@ -551,7 +551,7 @@ namespace
{
lcl_insertMenuItemImages( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
if ( xFrame.is() )
_rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE));
@@ -692,7 +692,7 @@ PopupMenu* DBTreeListBox::CreateContextMenu( void )
// the interceptors only know command URLs, but our menus primarily work
// with IDs -> we need to translate the commands to IDs
lcl_adjustMenuItemIDs( *pModifiedMenu, m_pContextMenuProvider->getCommandController() );
- } // if ( bModifiedMenu )
+ }
return pContextMenu.release();
}
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index bca4ebe..e001a60 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -152,8 +152,8 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
// we did not finish the loop because at least one of the children is in tristate
eState = SV_BUTTON_TRISTATE;
- // but this means that we did not finish all the siblings of pChildLoop, so their checking may be
- // incorrect at the moment
+ // but this means that we did not finish all the siblings of pChildLoop,
+ // so their checking may be incorrect at the moment
// -> correct this
// 88485 - 20.06.2001 - frank.schoenheit at sun.com
while (pChildLoop)
@@ -163,9 +163,9 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry)
}
}
else
- // none if the children is in tristate
+ // none if the children are in tristate
if (nCheckedChildren)
- // we have at least one chil checked
+ // we have at least one child checked
if (nCheckedChildren != nChildrenOverall)
// not all children are checked
eState = SV_BUTTON_TRISTATE;
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 396a3f7..94a35e1 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -384,8 +384,8 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry);
- // if an entry has children, it makes a difference if the entry is checked because alls children are checked
- // or if the user checked it explicitly.
+ // if an entry has children, it makes a difference if the entry is checked
+ // because all children are checked or if the user checked it explicitly.
// So we track explicit (un)checking
SvButtonState eState = GetCheckButtonState(_pEntry);
--
1.7.2.2
--------------080104010200040205050904--
More information about the LibreOffice
mailing list