summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorPhilipp Weissenbacher <p.weissenbacher@gmail.com>2012-06-19 00:58:26 +0200
committerPhilipp Weissenbacher <p.weissenbacher@gmail.com>2012-06-20 13:04:53 +0200
commit204985e42d7c1b4da95e3cfd4a148f8666d5c488 (patch)
tree0b6d5e053152fb64aaa799a7f3a697d12e0a1d79 /sw
parent9390507bfcd21063f549166f302536f5c372a477 (diff)
Clean up previous translation
Change-Id: Ie1400dc5a835dd97e22f72f89b42b0538adffe68
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/text/frmform.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 47111d04120b..51322a861c74 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -513,8 +513,8 @@ void SwTxtFrm::AdjustFrm( const SwTwips nChgHght, sal_Bool bHasToFit )
}
/*************************************************************************
- * SwTxtFrm::AdjustFollow()
- * AdjustFollow expects the following situtation:
+ * SwTxtFrm::AdjustFollow()
+ * AdjustFollow expects the following situation:
* The SwTxtIter points to the lower end of the Master, the Offset is set in
* the Follow.
* nOffset holds the Offset in the text string, from which the Master closes
@@ -529,8 +529,8 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
SwFrmSwapper aSwapper( this, sal_False );
// We got the rest of the text mass: Delete all Follows
- // DummyPortions() are a special caseSonderfall
- // - special cases are controlled by parameter <nMode>.
+ // DummyPortions() are a special case.
+ // Special cases are controlled by parameter <nMode>.
if( HasFollow() && !(nMode & 1) && nOffset == nEnd )
{
while( GetFollow() )
@@ -546,7 +546,7 @@ void SwTxtFrm::_AdjustFollow( SwTxtFormatter &rLine,
return;
}
- // Dancing on the vulcano: We'll just format the last line quickly
+ // Dancing on the volcano: We'll just format the last line quickly
// for the QuoVadis stuff.
// The Offset can move of course:
const xub_StrLen nNewOfst = ( IsInFtn() && ( !GetIndNext() || HasFollow() ) ) ?
@@ -585,7 +585,7 @@ SwCntntFrm *SwTxtFrm::JoinFrm()
SwTxtFrm *pNxt = pFoll->GetFollow();
- // All footnotes of the to-be-destroyed Follow are reloacted to us
+ // All footnotes of the to-be-destroyed Follow are relocated to us
xub_StrLen nStart = pFoll->GetOfst();
if ( pFoll->HasFtn() )
{
@@ -679,7 +679,7 @@ SwCntntFrm *SwTxtFrm::SplitFrm( const xub_StrLen nTxtPos )
}
// If footnotes end up in pNew bz our actions, we need
- // to reregister them
+ // to re-register them
if ( HasFtn() )
{
const SwpHints *pHints = GetTxtNode()->GetpSwpHints();
@@ -1289,7 +1289,7 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
// Optimization: If rReformat starts after the first word of the line
// this line cannot possibly influence the previous one.
// Unfortunately it can: Text size changes + FlyFrames.
- // The backlash can affact multiple lines (Frame!)!
+ // The backlash can affect multiple lines (Frame!)!
// #i46560#
// FME: Yes, consider this case: (word) has to go to the next line
@@ -1554,8 +1554,8 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
if( rRepaint.HasArea() )
SetRepaint();
rLine.SetTruncLines( sal_False );
- if( nOldBottom ) // We check if, for paragraphs that need scrolling
- // can be shrunk, so that the don't need scrolling anymore
+ if( nOldBottom ) // We check whether paragraphs that need scrolling can
+ // be shrunk, so that they don't need scrolling anymore
{
rLine.Bottom();
SwTwips nNewBottom = rLine.Y();
@@ -1698,7 +1698,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
CalcAdditionalFirstLineOffset();
- // The raneg autopilot or the BASIC interface pass us TxtFrms with
+ // The range autopilot or the BASIC interface pass us TxtFrms with
// a width <= 0 from time to time
if( (Prt().*fnRect->fnGetWidth)() <= 0 )
{
@@ -1769,7 +1769,7 @@ void SwTxtFrm::Format( const SwBorderAttrs * )
if( CalcPreps() )
; // nothing
- // We return if already formated, but if the TxtFrm was just created
+ // We return if already formatted, but if the TxtFrm was just created
// and does not have any format information
else if( !bNew && !aAccess.GetPara()->GetReformat()->Len() )
{