diff options
| author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-09 22:43:28 +0200 |
|---|---|---|
| committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-08-09 22:44:41 +0200 |
| commit | 028875ca5e007650932af4111cc9913fe33adc94 (patch) | |
| tree | 4f0f66de3700a5a07804faa1ac4b0c6c9f70a4e9 | |
| parent | c6e54b85348f27bb82ec922f8a0d092af08d66d7 (diff) | |
deleted code that was commented out
Change-Id: Ifc59843bc460ccba0feeafc45ebaaca1ea4a55fe
| -rw-r--r-- | sw/source/core/doc/docredln.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index 89eb3a1aeff8..cdc7bda0e2d2 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -659,7 +659,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete ) case POS_OVERLAP_BEFORE: case POS_OVERLAP_BEHIND: if( pRedl->IsOwnRedline( *pNewRedl ) && -// 1 == pRedl->GetStackCount() && pRedl->CanCombine( *pNewRedl )) { // If that's the case we can merge it, meaning diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 1a6c848fe4cf..c5b594cd40b8 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -2842,10 +2842,7 @@ static bool lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam, pTmpBox = pTmpBox->GetUpper()->GetUpper(); nBoxPos = pTmpBox->GetUpper()->GetTabBoxes().GetPos( pTmpBox ); } -// if( nBoxPos ) - nTmpWidth = pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth(); -// else -// nTmpWidth = 0; + nTmpWidth = pTmpBox->GetFrmFmt()->GetFrmSize().GetWidth(); } if( nTmpWidth < nDiff || nTmpWidth - nDiff < MINLAY ) |