[Libreoffice-commits] core.git: sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Oct 1 05:27:52 PDT 2015
sw/source/core/layout/sectfrm.cxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 2 +-
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2 +-
sw/source/core/text/itrcrsr.cxx | 4 ++--
sw/source/core/text/itrform2.hxx | 2 +-
sw/source/core/text/porglue.cxx | 2 +-
sw/source/core/text/txtfly.cxx | 2 +-
sw/source/core/text/wrong.cxx | 2 +-
sw/source/core/txtnode/fntcache.cxx | 4 ++--
sw/source/core/txtnode/txtatr2.cxx | 4 ++--
sw/source/core/undo/rolbck.cxx | 2 +-
sw/source/core/unocore/unosect.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
sw/source/core/unocore/unotextmarkup.cxx | 2 +-
sw/source/filter/ascii/ascatr.cxx | 2 +-
15 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit d575d6b53f1888208c7845b097cc27a4547fed41
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Oct 1 14:04:11 2015 +0200
Fix typos
Change-Id: I85e0c180df952c51b537b5408653160aad8b9a32
Reviewed-on: https://gerrit.libreoffice.org/18986
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index ddd92e9..8c374cc 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -396,7 +396,7 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling )
/**
|* Here it's decided whether the this-SectionFrm should break up
|* the passed (Section)frm (or not).
-|* Initiall, all superior sections are broken up. Later on that could
+|* Initially, all superior sections are broken up. Later on that could
|* be made configurable.
|*/
bool SwSectionFrm::HasToBreak( const SwFrm* pFrm ) const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 318bb3a..9d7e43e 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3987,7 +3987,7 @@ void SwRowFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAtt
}
else
{
- // pTmpRow is a first row in the table structue.
+ // pTmpRow is a first row in the table structure.
// We go up in the table structure:
pTmpRow = pTmpRow->GetUpper()->GetUpper() &&
pTmpRow->GetUpper()->GetUpper()->IsRowFrm() ?
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 784bd11..4d9de62 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -665,7 +665,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
}
else
{
- // if there isn't enough space in the (colmuned)
+ // if there isn't enough space in the (columned)
// section, leave it and set available space <nAvail>
// to the space below the section.
// if the new available space isn't also enough,
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index d11918f..aa1d6ac 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -277,8 +277,8 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrm *pNewFrm, SwTextSizeInfo *pNewI
case SVX_INTER_LINE_SPACE_PROP:
{
long nTmp = pSpace->GetPropLineSpace();
- // 50% is the minimumm, at 0% we switch to
- // the default value 100% ...
+ // 50% is the minimum, at 0% we switch to
+ // the default value 100%...
if( nTmp < 50 )
nTmp = nTmp ? 50 : 100;
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index ca31e5c..802e230 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -45,7 +45,7 @@ class SwTextFormatter : public SwTextPainter
bool bTruncLines : 1; // Flag for extending the repaint rect, if needed
bool bUnclipped : 1; // Flag whether repaint is larger than the fixed line height
size_t m_nHintEndIndex; // HACK for TryNewNoLengthPortion
- SwLinePortion* m_pFirstOfBorderMerge; // The first text portion of a joined border (during portion bulding)
+ SwLinePortion* m_pFirstOfBorderMerge; // The first text portion of a joined border (during portion building)
SwLinePortion *NewPortion( SwTextFormatInfo &rInf );
SwTextPortion *NewTextPortion( SwTextFormatInfo &rInf );
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 18b09ba..0a0b5e7 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -253,7 +253,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr )
}
}
}
- // If no left Glue remaines we set the break condition.
+ // If no left Glue remains, we set the break condition.
pRight = pLeft ? pLeft : this;
}
}
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7a24c66..796f4c9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -1049,7 +1049,7 @@ bool SwTextFly::ForEach( const SwRect &rRect, SwRect* pRect, bool bAvoid ) const
{
// If the text flows below, it has no influence on
// formatting. In LineIter::DrawText() it is "just"
- // necessary to clevely set the ClippingRegions
+ // necessary to cleverly set the ClippingRegions
const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if( ( SURROUND_THROUGHT == rSur.GetSurround() &&
( !rSur.IsAnchorOnly() ||
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 1fb87d9..cde5b7e 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -193,7 +193,7 @@ sal_uInt16 SwWrongList::GetWrongPos( sal_Int32 nValue ) const
if( nMax > 0 )
{
// For smart tag lists, we may not use a binary search. We return the
- // position of the first smart tag which coveres nValue
+ // position of the first smart tag which covers nValue
if ( !maList[0].maType.isEmpty() || maList[0].mpSubList )
{
for (std::vector<SwWrongArea>::const_iterator aIter(maList.begin()), aEnd(maList.end()); aIter != aEnd; ++aIter)
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index fba875c..e7a3770 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -166,7 +166,7 @@ void SwFntObj::CreatePrtFont( const OutputDevice& rPrt )
*
* 1. RefDef == OutDev (text formatting, online layout...)
* 2. PDF export from online layout
- * 3. Prospect/PagePreview pringing
+ * 3. Prospect/PagePreview printing
*/
static bool lcl_IsFontAdjustNecessary( const vcl::RenderContext& rOutDev,
const vcl::RenderContext& rRefDev )
@@ -325,7 +325,7 @@ sal_uInt16 SwFntObj::GetFontHeight( const SwViewShell* pSh, const OutputDevice&
nPrtHeight = static_cast<sal_uInt16>(rRefDev.GetTextHeight());
#if OSL_DEBUG_LEVEL > 0
- // Check if vcl did not change the meading of GetTextHeight
+ // Check if vcl did not change the meaning of GetTextHeight
const FontMetric aOutMet( rRefDev.GetFontMetric() );
long nTmpPrtHeight = (sal_uInt16)aOutMet.GetAscent() + aOutMet.GetDescent();
(void) nTmpPrtHeight;
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index e9bbcc4..74d301d 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -138,7 +138,7 @@ SwCharFormat* SwTextINetFormat::GetCharFormat()
OSL_ENSURE( false, "<SwTextINetFormat::GetCharFormat()> - missing character format at hyperlink attribute");
}
- // JP 10.02.2000, Bug 72806: dont modify the doc for getting the
+ // JP 10.02.2000, Bug 72806: don't modify the doc for getting the
// correct charstyle.
bool bResetMod = !pDoc->getIDocumentState().IsModified();
Link<bool,void> aOle2Lnk;
@@ -260,7 +260,7 @@ SwCharFormat* SwTextRuby::GetCharFormat()
? static_cast<sal_uInt16>(RES_POOLCHR_RUBYTEXT)
: rFormat.GetCharFormatId();
- // JP 10.02.2000, Bug 72806: dont modify the doc for getting the
+ // JP 10.02.2000, Bug 72806: don't modify the doc for getting the
// correct charstyle.
const bool bResetMod = !pDoc->getIDocumentState().IsModified();
Link<bool,void> aOle2Lnk;
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index a30bd42..cde87b4 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -991,7 +991,7 @@ void SwHistory::Add(
//UUUU To be able to include the DrawingLayer FillItems something more
// general has to be done to check if an Item is default than to check
- // if it's pointzer equals that in Writer's global PoolDefaults (held in
+ // if its pointer equals that in Writer's global PoolDefaults (held in
// aAttrTab and used to fill the pool defaults in Writer - looks as if
// Writer is *older* than the SfxItemPool ?). I checked the possibility to
// get the SfxItemPool here (works), but decided to use the SfxPoolItem's
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 20262c2..8bc2ccd 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -396,7 +396,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
SwSection *const pRet =
pDoc->InsertSwSection( aPam, aSect, 0, aSet.Count() ? &aSet : 0 );
- if (!pRet) // fdo#42450 text range could parially overlap existing section
+ if (!pRet) // fdo#42450 text range could partially overlap existing section
{
// shouldn't have created an undo object yet
pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_INSSECTION, NULL );
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 815b274..8c27b03 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3473,7 +3473,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
if(bVal)
{
- // Header/footer gets switched on, create defauts and the needed SfxSetItem
+ // Header/footer gets switched on, create defaults and the needed SfxSetItem
SfxItemSet aTempSet(*aBaseImpl.GetItemSet().GetPool(),
RES_FRMATR_BEGIN,RES_FRMATR_END - 1, // [82
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index 6c28f83..62473ba 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -394,7 +394,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
if (!m_pImpl->m_pTextNode)
return;
- // check for equal length of all sequnces
+ // check for equal length of all sequences
sal_Int32 nLen = rMarkups.getLength();
// for grammar checking there should be exactly one sentence markup
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 5ed77ce..918051d 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -226,7 +226,7 @@ static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode )
/*
* Create the table for the ASCII function pointers to the output
- * functon.
+ * function.
* There are local structures that only need to be known to the ASCII DLL.
*/
More information about the Libreoffice-commits
mailing list