sw/source/core/doc/dbgoutsw.cxx | 1 + sw/source/core/docnode/ndtbl.cxx | 4 ++-- sw/source/ui/index/cnttab.cxx | 24 ++++++------------------ sw/source/ui/misc/outline.cxx | 25 ++++++++----------------- sw/source/ui/uiview/view2.cxx | 3 +-- 5 files changed, 18 insertions(+), 39 deletions(-)
New commits: commit 5050dfc73f194d1d59222cac72e69a917655d816 Author: Philipp Riemer <ruderphil...@gmail.com> Date: Sun Sep 29 19:24:44 2013 +0200 fdo#62475 - remove visual noise and fix existing comments Conflicts: sw/source/ui/index/cnttab.cxx sw/source/ui/misc/outline.cxx sw/source/ui/uiview/view2.cxx Change-Id: Ib75355808599401f8c0a8a626ce034f1699c9104 Reviewed-on: https://gerrit.libreoffice.org/6085 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index f0f54c1..6b1e234 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -826,6 +826,7 @@ SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes) return dbg_out(lcl_dbg_out(rNodes)); } +//FIXME: this method seems to do nothing at all static String lcl_dbg_out(const SwRewriter & rRewriter) { (void) rRewriter; diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 1b5b2c1..a223284 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -847,7 +847,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts, } } - // Check the Boxes' for Numbers + // Check the boxes for numbers if( IsInsTblFormatNum() ) { for (size_t nBoxes = pNdTbl->GetTabSortBoxes().size(); nBoxes; ) @@ -1983,7 +1983,7 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn ) } } - // No Fly? Thus Header or Footer: always leave a TextNode + // No Fly? Then it is a Header or Footer, so keep always a TextNode ++aIdx; if (GetIDocumentUndoRedo().DoesUndo()) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 091fb23..a7c0f4f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1898,9 +1898,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet m_pSecondKeyLB->SelectEntryPos(0); m_pThirdKeyLB->SelectEntryPos(0); } -/* -------------------------------------------------- - pVoid is used as signal to change all levels of the example - --------------------------------------------------*/ +// pVoid is used as signal to change all levels of the example IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid) { UpdateDescriptor(); @@ -2163,11 +2161,9 @@ void SwTOXEntryTabPage::PreTokenButtonRemoved(const SwFormToken& rToken) sal_uInt16 nPos = m_pAuthFieldsLB->InsertEntry(sTemp); m_pAuthFieldsLB->SetEntryData(nPos, (void*)(sal_uIntPtr)(nData)); } -/*----------------------------------------------------------------------- -This function inizializes the default value in the Token -put here the UI dependent initializations - -----------------------------------------------------------------------*/ +// This function inizializes the default value in the Token +// put here the UI dependent initializations IMPL_LINK(SwTOXEntryTabPage, InsertTokenHdl, PushButton*, pBtn) { String sText; @@ -3234,11 +3230,8 @@ String SwTokenWindow::GetPattern() const return sRet; } -/* -------------------------------------------------- - Description: Check if a control of the specified - TokenType is already contained in the list - --------------------------------------------------*/ +// Check if a control of the specified TokenType is already contained in the list sal_Bool SwTokenWindow::Contains(FormTokenType eSearchFor) const { bool bRet = false; @@ -3565,9 +3558,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) return 0; } -/*-------------------------------------------------------------------- - Description: allocate templates - --------------------------------------------------------------------*/ +// allocate templates IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl) { sal_uInt16 nLevPos = m_pLevelLB->GetSelectEntryPos(); @@ -3624,9 +3615,7 @@ IMPL_LINK_NOARG_INLINE_START(SwTOXStylesTabPage, DoubleClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwTOXStylesTabPage, DoubleClickHdl) -/*-------------------------------------------------------------------- - Description: enable only when selected - --------------------------------------------------------------------*/ +// enable only when selected IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl) { m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); @@ -3687,7 +3676,6 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde xController = new ::svt::EditCellController(&aCellEdit); xCheckController = new ::svt::CheckBoxCellController(&aCellCheckBox); - ////////////////////////////////////////////////////////////////////// // HACK: BrowseBox doesn't invalidate its children, how it should be. // That's why WB_CLIPCHILDREN is reset in order to enforce the // children' invalidation diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index e9cc4c6..3fafc63 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -74,9 +74,7 @@ public: sal_uInt16 GetCurEntryPos() const { return m_pFormBox->GetSelectEntryPos(); } }; -/*------------------------------------------------------------------------ - Description: remember selected entry -------------------------------------------------------------------------*/ +// remember selected entry IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox ) { m_pFormEdit->SetText(pBox->GetSelectEntry()); @@ -85,11 +83,10 @@ IMPL_LINK_INLINE_START( SwNumNamesDlg, SelectHdl, ListBox *, pBox ) } IMPL_LINK_INLINE_END( SwNumNamesDlg, SelectHdl, ListBox *, pBox ) -/*------------------------------------------------------------------------ - Description: set user defined names - Parameter: list of user defined names; - unknown positions for the user are 0. -------------------------------------------------------------------------*/ +/** set user defined names + * + * @param pList list of user defined names; unknown positions for the user are 0. + */ void SwNumNamesDlg::SetUserNames(const String *pList[]) { sal_uInt16 nSelect = 0; @@ -107,9 +104,7 @@ void SwNumNamesDlg::SetUserNames(const String *pList[]) SelectHdl(m_pFormBox); } -/*------------------------------------------------------------------------ - Description: unlock OK-Button when text is in Edit -------------------------------------------------------------------------*/ +// unlock OK-Button when text is in Edit IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) { m_pOKBtn->Enable(!pBox->GetText().isEmpty()); @@ -117,9 +112,7 @@ IMPL_LINK_INLINE_START( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) } IMPL_LINK_INLINE_END( SwNumNamesDlg, ModifyHdl, Edit *, pBox ) -/*------------------------------------------------------------------------ - Description: DoubleClickHdl -------------------------------------------------------------------------*/ +// DoubleClickHdl IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl) { EndDialog(RET_OK); @@ -893,9 +886,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumberingPreview(Window *pP return new NumberingPreview(pParent); } -/*-------------------------------------------------- - paint numbering's preview ---------------------------------------------------*/ +// paint numbering's preview void NumberingPreview::Paint( const Rectangle& /*rRect*/ ) { Size aSize(PixelToLogic(GetOutputSizePixel())); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 39939fb..9b578c6 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -2323,7 +2323,6 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) } else { - // check whether the OUString sSource; if(!GetWrtShell().IsFieldDataSourceAvailable(sSource)) { @@ -2379,7 +2378,7 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) } else { - //call documents and template dialog + // call documents and template dialog SfxApplication* pSfxApp = SFX_APP(); Window* pTopWin = pSfxApp->GetTopWindow(); SvtDocumentTemplateDialog* pDocTemplDlg = new SvtDocumentTemplateDialog( pTopWin );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits