[Libreoffice-commits] core.git: sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Sep 29 15:22:45 PDT 2015
sw/source/core/frmedt/fecopy.cxx | 4 ++--
sw/source/core/frmedt/fetab.cxx | 2 +-
sw/source/core/frmedt/tblsel.cxx | 2 +-
sw/source/core/inc/DocumentLayoutManager.hxx | 2 +-
sw/source/core/inc/node2lay.hxx | 2 +-
sw/source/core/inc/scriptinfo.hxx | 2 +-
sw/source/core/layout/anchoreddrawobject.cxx | 2 +-
sw/source/core/layout/atrfrm.cxx | 2 +-
sw/source/core/layout/flowfrm.cxx | 2 +-
sw/source/core/layout/fly.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/layact.cxx | 4 ++--
sw/source/core/layout/pagechg.cxx | 2 +-
sw/source/core/layout/pagedesc.cxx | 2 +-
sw/source/core/layout/paintfrm.cxx | 6 +++---
15 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit ef1bafb588eb20a5d35df14e79a1a948885c721a
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:11:39 2015 +0200
Fix typos
Change-Id: Ifb7b1f0e4cffb575f6af7437bbca6c4c22a9c00e
Reviewed-on: https://gerrit.libreoffice.org/18985
Reviewed-by: Joren De Cuyper <jorendc at libreoffice.org>
Tested-by: Joren De Cuyper <jorendc at libreoffice.org>
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index da98b59..df8d852 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -642,7 +642,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
pDestShell->GetDoc()->getIDocumentRedlineAccess().SetRedlineMode_intern( eOldRedlMode );
mpDoc->SetCopyIsMove( bCopyIsMove );
- // have new table formules been inserted?
+ // have new table formulas been inserted?
if( pTableFieldTyp->HasWriterListeners() )
{
// finish old actions: the table frames are created and
@@ -661,7 +661,7 @@ bool SwFEShell::Copy( SwFEShell* pDestShell, const Point& rSttPt,
return bRet;
}
-// Paste for the interal clipboard. Copy the content of the clipboard
+// Paste for the internal clipboard. Copy the content of the clipboard
// in the document
namespace {
typedef std::shared_ptr<SwPaM> PaMPtr;
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index f996e1e..8fcd6b3 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -1084,7 +1084,7 @@ sal_uInt16 SwFEShell::GetRowSelectionFromTop() const
* a follow frame
*
* 2. case: bRepeat = false
- * returns true if the current frame is localed inside a table headline OR
+ * returns true if the current frame is located inside a table headline OR
* inside the first line of a table!!!
*/
bool SwFEShell::CheckHeadline( bool bRepeat ) const
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 26ef88f..99b4e9e 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -874,7 +874,7 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam )
if( bRet )
{
- // now check for paragraph bound flyes
+ // now check for paragraph bound flies
const SwFrameFormats& rFormats = *rPam.GetDoc()->GetSpzFrameFormats();
sal_uLong nSttIdx = rPam.GetPoint()->nNode.GetIndex(),
nEndIdx = rBox.GetSttNd()->EndOfSectionIndex(),
diff --git a/sw/source/core/inc/DocumentLayoutManager.hxx b/sw/source/core/inc/DocumentLayoutManager.hxx
index b6c1441..3258517 100644
--- a/sw/source/core/inc/DocumentLayoutManager.hxx
+++ b/sw/source/core/inc/DocumentLayoutManager.hxx
@@ -38,7 +38,7 @@ public:
DocumentLayoutManager( SwDoc& i_rSwdoc );
virtual const SwViewShell *GetCurrentViewShell() const SAL_OVERRIDE;
- virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be able to communicate to a SwViewShell.This is going to be removerd later.
+ virtual SwViewShell *GetCurrentViewShell() SAL_OVERRIDE; //< It must be able to communicate to a SwViewShell.This is going to be removed later.
virtual void SetCurrentViewShell( SwViewShell* pNew ) SAL_OVERRIDE;
virtual const SwRootFrm *GetCurrentLayout() const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 8ae69de..923d02c 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -33,7 +33,7 @@
*
* This class is an interface between the method and a SwClientIter: it
* chooses the right SwModify depending on the task, creates a SwClientIter
- * and filters its iterations depeding on the task.
+ * and filters its iterations depending on the task.
* The task is determined by the choice of ctor.
*
* 1. Collecting the UpperFrms (so that later on it becomes RestoreUpperFrms)
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 5ad950f..ee476ac 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -299,7 +299,7 @@ public:
/** retrieves kashida opportunities for a given text range.
returns the number of kashida positions in the given text range
- pKashidaPositions: buffer to reveive the char indices of the
+ pKashidaPositions: buffer to receive the char indices of the
kashida opportunties relative to the paragraph
*/
sal_Int32 GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 00ae70f..e32e357 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -246,7 +246,7 @@ void SwAnchoredDrawObject::MakeObjPos()
{
if ( IsPositioningInProgress() )
{
- // nothind to do - positioning already in progress
+ // nothing to do - positioning already in progress
return;
}
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a1512f4..4a1b549 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1705,7 +1705,7 @@ bool SwFormatAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
if (FLY_AT_PAGE == GetAnchorId())
{
// If the anchor type is page and a valid page number
- // is set, the content paoition has to be deleted to not
+ // is set, the content position has to be deleted to not
// confuse the layout (frmtool.cxx). However, if the
// anchor type is not page, any content position will
// be kept.
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 5e22d59..d26e7c0 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -791,7 +791,7 @@ bool SwFrm::WrongPageDesc( SwPageFrm* pNew )
{
// Now it's getting a bit complicated:
- // Maybe i'm bringing a Pagedesc myself; in that case,
+ // Maybe I'm bringing a Pagedesc myself; in that case,
// the pagedesc of the next page needs to correspond.
// Otherwise, I'll have to dig a bit deeper to see where
// the following Pagedesc is coming from.
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 311cb61..47838b1 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -776,7 +776,7 @@ void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
// wrapping style.
//rInvFlags |= 0x40;
rInvFlags |= 0x41;
- // The background needs to messaged and invalidated
+ // The background needs to be messaged and invalidated
const SwRect aTmp( GetObjRectWithSpaces() );
NotifyBackground( FindPageFrm(), aTmp, PREP_FLY_ATTR_CHG );
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index e9abe6c..829faae 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1299,7 +1299,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
//If the page breaks, for "open" sections a follow will created.
//For nested sections (which have, however, not a nested layout),
//the SwActualSection class has a member, which points to an upper(section).
- //When the "inner" section finishs, the upper will used instead.
+ //When the "inner" section finishes, the upper will used instead.
while( true )
{
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index cf748d4..085b7aa 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2229,9 +2229,9 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) :
{
// UnlockPaint overwrite the selection from the
// CrsrShell and calls the virtual method paint
- // to fill the virtual device. This fill dont have
+ // to fill the virtual device. This fill don't have
// paint the selection! -> Set the focus flag at
- // CrsrShell and it dont paint the selection.
+ // CrsrShell and it doesn't paint the selection.
pCrsrShell->ShLooseFcs();
pCrsrShell->UnlockPaint( true );
pCrsrShell->ShGetFcs( false );
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index b806c2a..68854e4 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2149,7 +2149,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi
}
else
{
- // in non-book view, dont add x gap before
+ // in non-book view, don't add x gap before
// 1. the last empty page in a row
// 2. after an empty page
const bool bDontAddGap = ( pPageToAdjust->IsEmptyPage() && pPageToAdjust->GetNext() == pEndOfRow ) ||
diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx
index d03673a..a82518b 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -165,7 +165,7 @@ const SwTextFormatColl* SwPageDesc::GetRegisterFormatColl() const
return static_cast<const SwTextFormatColl*>(pReg);
}
-/// notifie all affected page frames
+/// notify all affected page frames
void SwPageDesc::RegisterChange()
{
// #117072# - During destruction of the document <SwDoc>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index db70553..1a1c111 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1892,7 +1892,7 @@ bool DrawFillAttributes(
// AAed regions does not add to no transparence (0.5 opacity covered by 0.5 opacity
// is not full opacity but 0.75 opacity) we need some overlap here to avoid paint
// artifacts. Checked experimentally - a little bit more in Y is needed, probably
- // due to still existing integer alignment and cruncing in writer.
+ // due to still existing integer alignment and crunching in writer.
static double fExpandX = 0.55;
static double fExpandY = 0.70;
const basegfx::B2DVector aSingleUnit(rOut.GetInverseViewTransformation() * basegfx::B2DVector(fExpandX, fExpandY));
@@ -2153,7 +2153,7 @@ void DrawGraphic(
// background) is transparent drawn and the background color is
// "no fill" respectively "auto fill", if background transparency
// has to be considered.
- // If YES, memorise transparency of background graphic.
+ // If YES, memorize transparency of background graphic.
// check also, if background graphic bitmap is transparent.
bool bTransparentGrfWithNoFillBackgrd = false;
sal_Int32 nGrfTransparency = 0;
@@ -2247,7 +2247,7 @@ void DrawGraphic(
{
// background region have to be drawn transparent.
// Thus, create a poly-polygon from the region and draw it with
- // the corresponding transparency precent.
+ // the corresponding transparency percent.
tools::PolyPolygon aDrawPoly( rOut.SVRect() );
if ( aGrf.HasArea() )
{
More information about the Libreoffice-commits
mailing list