diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 21:01:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 09:41:00 -0600 |
| commit | a27462189d1d6a3d22be23a5eee603edca5d8ea3 (patch) | |
| tree | 065df066de07f3d7194178352f3449702bc34bd5 /sw/source/core/text/itrform2.cxx | |
| parent | 150420cbff39967e9376cab05b6af45b642edae8 (diff) | |
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/core/text/itrform2.cxx')
| -rw-r--r-- | sw/source/core/text/itrform2.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx index cc143573d786..08eca5eba198 100644 --- a/sw/source/core/text/itrform2.cxx +++ b/sw/source/core/text/itrform2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "hintids.hxx" #include <boost/scoped_ptr.hpp> @@ -154,7 +153,7 @@ KSHORT SwTxtFormatter::GetFrmRstHeight() const { // We want the rest height relative to the page. // If we're in a table, then pFrm->GetUpper() is not the page. - // + // GetFrmRstHeight() is being called with Ftn. // Wrong: const SwFrm *pUpper = pFrm->GetUpper(); const SwFrm *pPage = (const SwFrm*)pFrm->FindPageFrm(); @@ -874,7 +873,6 @@ void SwMetaPortion::Paint( const SwTxtPaintInfo &rInf ) const } } - /************************************************************************* * SwTxtFormatter::WhichTxtPor() *************************************************************************/ @@ -962,10 +960,10 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf ) // We assume that a font's characters are not larger than twice // as wide as heigh. // Very crazy: We need to take the ascent into account. - // + // Mind the trap! GetSize() contains the wished-for height, the real height // is only known in CalcAscent! - // + // The ratio is even crazier: a blank in Times New Roman has an ascent of // 182, a height of 200 and a width of 53! // It follows that a line with a lot of blanks is processed incorrectly. @@ -1004,7 +1002,6 @@ SwTxtPortion *SwTxtFormatter::NewTxtPortion( SwTxtFormatInfo &rInf ) return pPor; } - /************************************************************************* * SwTxtFormatter::WhichFirstPortion() *************************************************************************/ @@ -2053,7 +2050,6 @@ void SwTxtFormatter::CalcUnclipped( SwTwips& rTop, SwTwips& rBottom ) rTop -= nFlyAsc; } - void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, sal_Int32 nStartIdx, bool bAlways ) const { @@ -2176,7 +2172,6 @@ void SwTxtFormatter::UpdatePos( SwLineLayout *pCurrent, Point aStart, } } - void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const { OSL_ENSURE( ! pFrm->IsVertical() || pFrm->IsSwapped(), @@ -2224,7 +2219,6 @@ void SwTxtFormatter::AlignFlyInCntBase( long nBaseLine ) const } } - bool SwTxtFormatter::ChkFlyUnderflow( SwTxtFormatInfo &rInf ) const { OSL_ENSURE( rInf.GetTxtFly()->IsOn(), "SwTxtFormatter::ChkFlyUnderflow: why?" ); @@ -2519,7 +2513,6 @@ void SwTxtFormatter::CalcFlyWidth( SwTxtFormatInfo &rInf ) } } - SwFlyCntPortion *SwTxtFormatter::NewFlyCntPortion( SwTxtFormatInfo &rInf, SwTxtAttr *pHint ) const { |