diff options
| -rw-r--r-- | dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/marktree.cxx | 8 | ||||
| -rw-r--r-- | 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 094b1c6f4271..db9bd6809d7a 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 b635d01c8147..db5bc13ac1e3 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 a1515498a6ce..1c272c4839b3 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 1ecb15575ca9..01c32a851269 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@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 320b462aa89f..73212e395748 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); |