[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 6 14:39:28 PDT 2012
sw/source/core/layout/calcmove.cxx | 47 ++++++++++++++++++-------------------
sw/source/core/layout/flylay.cxx | 14 +++++------
sw/source/core/layout/newfrm.cxx | 3 +-
3 files changed, 33 insertions(+), 31 deletions(-)
New commits:
commit 3ee906137f6dc658d882cb0c34e9c1b2ce2f2b31
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 6 23:34:57 2012 +0200
sw: tweak comment translations
c589da46 d71b97c1 b4aa7d03 414848b2 561c30b3
Change-Id: I364af06741f0400e25901bb7a4faccf674f991b7
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 70aafc0..ec72b37 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -85,16 +85,16 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
// The most common case is the following: The Frm wants to float to
// somewhere where the FixSize is the same that the Frm itself has already.
// In that case it's pretty easy to check if the Frm has enough space
- // for it's VarSize. If this is NOT the case, we already know that
+ // for its VarSize. If this is NOT the case, we already know that
// we don't need to move.
// The Frm checks itself whether it has enough space - respecting the fact
- // that it could probably split itself if needed.
- // If, however, the FixSize differs from the Frm or there are Flys involved
- // (either in the old or the new position), we don't need to check anything,
+ // that it could possibly split itself if needed.
+ // If, however, the FixSize differs from the Frm or Flys are involved
+ // (either in the old or the new position), checking is pointless,
// and we have to move the Frm just to see what happens - if there's
// some space available to do it, that is.
- // The FixSize of the surroundings of Cntnts is always the width.
+ // The FixSize of the containers of Cntnts is always the width.
// If we moved more than one sheet back (for example jumping over empty
// pages), we have to move either way. Otherwise, if the Frm doesn't fit
@@ -124,9 +124,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
SWRECTFNX( pNewUpper )
if( Abs( (pNewUpper->Prt().*fnRectX->fnGetWidth)() -
(GetUpper()->Prt().*fnRect->fnGetWidth)() ) > 1 ) {
- // In this case, only a _WouldFit with relocating is possible
- // TODO after translating the comment: what did the original german "umhaengen"
- // mean? What does actually make sense in context of the code here?
+ // In this case, only a _WouldFit with test move is possible
nMoveAnyway = 2;
}
@@ -193,16 +191,18 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
{
if ( nSpace )
{
- // Not respecting footnotes which are stuck to the paragraph:
- // This would require extremely confusing code, regarding the widths
+ // Do not notify footnotes which are stuck to the paragraph:
+ // This would require extremely confusing code, taking into
+ // account the widths
// and Flys, that in turn influence the footnotes, ...
- // _WouldFit can only be used if the width is the same and ONLY
- // with self-anchored Flys.
+ // _WouldFit can only be used if the width is the same and
+ // ONLY self-anchored Flys are present.
- // _WouldFit can also be used if ONLY Flys anchored somewhere else are present.
- // In this case, the width doesn't even matter, because we're running a TestFormat
- // in the new surrounding.
+ // _WouldFit can also be used if ONLY Flys anchored
+ // somewhere else are present.
+ // In this case, the width doesn't even matter,
+ // because we're running a TestFormat in the new upper.
const sal_uInt8 nBwdMoveNecessaryResult =
BwdMoveNecessary( pNewPage, aRect);
const bool bObjsInNewUpper( nBwdMoveNecessaryResult == 2 ||
@@ -489,7 +489,7 @@ void SwFrm::PrepareCrsr()
|*
|*************************************************************************/
-// Here we return GetPrev(); however we will overlook empty SectionFrms
+// Here we return GetPrev(); however we will ignore empty SectionFrms
SwFrm* lcl_Prev( SwFrm* pFrm, sal_Bool bSectPrv = sal_True )
{
SwFrm* pRet = pFrm->GetPrev();
@@ -993,7 +993,7 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
ViewShell *pSh = getRootFrm()->GetCurrShell();
SwTwips nWidthArea;
if( pSh && 0!=(nWidthArea=(pSh->VisArea().*fnRect->fnGetWidth)()) &&
- GetUpper()->IsPageBodyFrm() && // Not against for BodyFrms in Columns
+ GetUpper()->IsPageBodyFrm() && // but not for BodyFrms in Columns
pSh->GetViewOptions()->getBrowseMode() )
{
// Do not protrude the edge of the visible area. The page may be
@@ -1283,8 +1283,9 @@ void SwCntntFrm::MakeAll()
bMovedFwd = true;
if ( bMovedBwd )
{
- // while floating back, the Upper was encouraged to completely
- // re-paint itself. We can skip this now after floating sideways.
+ // While flowing back, the Upper was encouraged to
+ // completely re-paint itself. We can skip this now after
+ // flowing back and forth.
GetUpper()->ResetCompletePaint();
// The predecessor was invalidated, so this is obsolete as well now.
OSL_ENSURE( pPre, "missing old Prev" );
@@ -1635,11 +1636,11 @@ void SwCntntFrm::MakeAll()
}
/* --------------------------------------------------
* In earlier days, we never tried to fit TextFrms in
- * frames and sections using bMoveOrFit by setting aside
- * the attributes (Widows, Keep).
+ * frames and sections using bMoveOrFit by ignoring
+ * its attributes (Widows, Keep).
* This should have been done at least for column frames;
* as it must be tried anyway with linked frames and sections.
- * Exception: If we sit in FormatWidthCols, we may not ignore
+ * Exception: If we sit in FormatWidthCols, we must not ignore
* the attributes.
* --------------------------------------------------*/
else if ( !bFtn && bMoveable &&
@@ -1865,7 +1866,7 @@ sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
{
// This is going to get a bit insidious now. If you're faint of heart,
// you'd better look away here. If a Fly contains columns, then the Cntnts
- // are movable, except the one in the last column (see SwFrm::IsMoveable()).
+ // are movable, except ones in the last column (see SwFrm::IsMoveable()).
// Of course they're allowed to float back. WouldFit() only returns a usable
// value if the Frm is movable. To fool WouldFit() into believing there's
// a movable Frm, I'm just going to hang it somewhere else for the time.
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 669f6df..53e273a 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -113,7 +113,7 @@ TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
|* SwFlyFreeFrm::NotifyBackground()
|*
|* Description notifies the background (all CntntFrms that currently
-|* are overlapping. Additionally, the window is also directly
+|* are overlapping). Additionally, the window is also directly
|* invalidated (especially where there are no overlapping CntntFrms)
|* This also takes CntntFrms within other Flys into account.
|*
@@ -151,7 +151,7 @@ void SwFlyFreeFrm::MakeAll()
if( !GetPageFrm() )
return;
- Lock(); // The courtain drops
+ Lock(); // The curtain drops
// takes care of the notification in the dtor
const SwFlyNotify aNotify( this );
@@ -320,7 +320,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
{
SwFrm* pHeader = FindFooterOrHeader();
// In a header, correction of the position is no good idea.
- // If the fly moves, some paragraphs has to be formatted, this
+ // If the fly moves, some paragraphs have to be formatted, this
// could cause a change of the height of the headerframe,
// now the flyframe can change its position and so on ...
if ( !pHeader || !pHeader->IsHeaderFrm() )
@@ -353,8 +353,8 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
else
{
// If we reach this branch, the Frm protrudes into forbidden
- // sections, and correcting the position is neither allowed
- // nor possible nor required.
+ // areas, and correcting the position is not allowed or not
+ // possible or not required.
// For Flys with OLE objects as lower, we make sure that
// we always resize proportionally
@@ -445,7 +445,7 @@ void SwFlyFreeFrm::CheckClip( const SwFmtFrmSize &rSz )
}
// Now change the Frm; for columns, we put the new values into the attributes,
- // otherwise we'll end up with unwanted side-effects
+ // otherwise we'll end up with unwanted side-effects/oscillations
const long nPrtHeightDiff = Frm().Height() - Prt().Height();
const long nPrtWidthDiff = Frm().Width() - Prt().Width();
maUnclippedFrm = SwRect( Frm() );
@@ -1178,7 +1178,7 @@ sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove )
}
if ( pCell )
{
- // CellFrms might also sit in unallowed sections. In this case,
+ // CellFrms might also sit in unallowed areas. In this case,
// the Fly is allowed to do so as well
SwRect aTmp( pCell->Prt() );
aTmp += pCell->Frm().Pos();
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index b1bfc86..14f8ecf 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -507,7 +507,8 @@ void SwRootFrm::Init( SwFrmFmt* pFmt )
IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess();
const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess();
pTimerAccess->StopIdling();
- pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); // Helps creating the Flys by MakeFrms() //swmod 071108//swmod 071225
+ // For creating the Flys by MakeFrms()
+ pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() );
bCallbackActionEnabled = sal_False; // needs to be set to sal_True before leaving!
SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel();
More information about the Libreoffice-commits
mailing list