[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Mon Oct 3 13:50:16 UTC 2016
sw/inc/ndtxt.hxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 2 +-
sw/qa/python/check_table.py | 2 +-
sw/source/core/access/acccontext.cxx | 2 +-
sw/source/core/access/accmap.cxx | 2 +-
sw/source/core/doc/SwStyleNameMapper.cxx | 4 ++--
sw/source/core/doc/tblafmt.cxx | 2 +-
sw/source/core/inc/layact.hxx | 2 +-
sw/source/core/layout/dbg_lay.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/ssfrm.cxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 6 +++---
sw/source/core/text/itrform2.cxx | 2 +-
sw/source/core/tox/tox.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 4 ++--
sw/source/filter/ww8/ww8par2.cxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 4 ++--
sw/source/filter/ww8/ww8scan.cxx | 2 +-
sw/source/filter/xml/xmlexpit.cxx | 4 ++--
sw/source/filter/xml/xmlfmte.cxx | 2 +-
20 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 874035190625de4d82d357e61cc5bcf785c7b9fe
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sat Oct 1 15:46:15 2016 +0200
Fix typos
Change-Id: Ia59d287a015482e9e97b701a6695463a7d235203
Reviewed-on: https://gerrit.libreoffice.org/29439
Reviewed-by: jan iversen <jani at documentfoundation.org>
Tested-by: jan iversen <jani at documentfoundation.org>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 15f6341..a1807a1 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -801,7 +801,7 @@ public:
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const override;
- /// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
+ /// In MS Word, the font underline setting of the paragraph end position won't affect the formatting of numbering, so we ignore it
static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
};
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index df6f945..80f28f0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -923,7 +923,7 @@ DECLARE_OOXMLEXPORT_TEST(testSyncedRelativePercent, "tdf93676-1.odt")
return;
// check no explicit pctHeight has been exported, all we care
- // about at this point is that its not 255000
+ // about at this point is that it's not 255000
assertXPath(pXmlDoc, "//wp14:pctHeight", 0);
}
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 61b9358..6ea619a 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -282,7 +282,7 @@ class CheckTable(unittest.TestCase):
xTable.getCellByPosition(1, 0).String = 'Cell 1 0'
xTable.getCellByPosition(2, 0).String = 'Cell 2 0'
self._check_table(xTable) # ... to ensure the rest was untouched
- # check disconnected table excepts, but doesnt crash
+ # check disconnected table excepts, but doesn't crash
xTable2 = xDoc.createInstance("com.sun.star.text.TextTable")
xTable2.initialize(3, 3)
with self.assertRaises(Exception):
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index f3d3285..e006999 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1058,7 +1058,7 @@ void SwAccessibleContext::Dispose(bool bRecursive, bool bCanSkipInvisible)
pAcc->FireAccessibleEvent( aEvent );
}
- // set defunc state (its not required to broadcast a state changed
+ // set defunc state (it's not required to broadcast a state changed
// event if the object is disposed afterwards)
{
osl::MutexGuard aDefuncStateGuard( m_Mutex );
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 54c5531..54fec42 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2647,7 +2647,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
// Moreover, we have to make sure to invalidate the
// cursor even if the current cell has no accessible object.
// If the old cursor objects exists and is in the same
- // table, its the best choice, because using it avoids
+ // table, it's the best choice, because using it avoids
// an unnecessary cursor invalidation cycle when creating
// a new object for the current cell.
if( aFrameOrObj.GetSwFrame()->IsCellFrame() )
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 5a4044b..2850fec 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -865,7 +865,7 @@ const std::vector<OUString>& SwStyleNameMapper::GetTableStyleUINameArray()
return *m_pTableStyleUINameArray;
}
-/// retuns an empty array because Cell Names aren't translated
+/// returns an empty array because Cell Names aren't translated
const std::vector<OUString>& SwStyleNameMapper::GetCellStyleUINameArray()
{
if (!m_pCellStyleUINameArray)
@@ -969,7 +969,7 @@ const std::vector<OUString>& SwStyleNameMapper::GetTableStyleProgNameArray()
return *m_pTableStyleProgNameArray;
}
-/// retuns an empty array because Cell Names aren't translated
+/// returns an empty array because Cell Names aren't translated
const std::vector<OUString>& SwStyleNameMapper::GetCellStyleProgNameArray()
{
if (!m_pCellStyleProgNameArray)
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 38824b2..4ca88ca 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1500,7 +1500,7 @@ void SwCellStyleTable::ChangeBoxFormatName(const OUString& sFromName, const OUSt
if (m_aCellStyles[i].first == sFromName)
{
m_aCellStyles[i].first = sToName;
- // changed succesfully
+ // changed successfully
return;
}
}
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 1afe9eb..247260d7 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -171,7 +171,7 @@ public:
void CheckWaitCursor();
// #i28701# - method is now public;
- // delete 2nd parameter, because its not used;
+ // delete 2nd parameter, because it's not used;
bool FormatLayoutFly( SwFlyFrame * );
// #i28701# - method is now public
bool FormatFlyContent( const SwFlyFrame * );
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 6125553..8c61c12 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -294,7 +294,7 @@ void SwImplProtocol::CheckLine( OString& rLine )
rLine = rLine.replace( '\t', ' ' );
if( '#' == rLine[0] ) // comments start with '#'
return;
- if( '[' == rLine[0] ) // section: FrameIds, type or funciton
+ if( '[' == rLine[0] ) // section: FrameIds, type or function
{
OString aTmp = rLine.getToken(0, ']');
if (aTmp == "[frmid") // section FrameIds
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 986f7bb..874c77c 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -387,7 +387,7 @@ SwFrameNotify::~SwFrameNotify()
// This could be optimized. Basically the fly frame only has to
// be invalidated, if the first line of pFrame (if pFrame is a content
- // frame, for other frame types its the print area) has changed its
+ // frame, for other frame types it's the print area) has changed its
// size and pFrame was responsible for the current width of pFly. On
// the other hand, this is only rarely used and re-calculation of
// the fly frame does not cause too much trouble. So we keep it this
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 0465936..ecab038 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -374,7 +374,7 @@ void SwFrame::DestroyImpl()
SwFrame::~SwFrame()
{
assert(m_isInDestroy); // check that only DestroySwFrame does "delete"
- assert(!IsDeleteForbidden()); // check that its not deleted while deletes are forbidden
+ assert(!IsDeleteForbidden()); // check that it's not deleted while deletes are forbidden
#if OSL_DEBUG_LEVEL > 0
// JP 15.10.2001: for detection of access to deleted frames
mpDrawObjs = reinterpret_cast<SwSortedObjs*>(0x33333333);
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index d7788ff..93d01cf 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -267,7 +267,7 @@ static void lcl_InvalidateLowerObjs( SwLayoutFrame& _rLayoutFrame,
if ( _bMoveObjsOutOfRange )
{
// indicate, that positioning is progress to avoid
- // modification of the anchored object resp. its attributes
+ // modification of the anchored object resp. it's attributes
// due to the movement
SwObjPositioningInProgress aObjPosInProgress( *pAnchoredObj );
pAnchoredObj->SetObjLeft( _pPageFrame->Frame().Right() );
@@ -2428,7 +2428,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
if ( pNxt )
{
// #i18103# - no formatting of found next
- // frame, if its a follow section of the
+ // frame, if it's a follow section of the
// 'ColLocked' section, the follow table is
// in.
bool bCalcNxt = true;
@@ -2587,7 +2587,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
// #i26945# - correction of conditions,
// if Writer fly frame has to be considered:
// - no need to check, if top of Writer fly frame differs
- // from FAR_AWAY, because its also check, if the Writer
+ // from FAR_AWAY, because it's also checked, if the Writer
// fly frame rectangle overlaps with <aRect>
// - no check, if bottom of anchor frame is prior the top of
// the table, because Writer fly frames can be negative positioned.
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index ead82d7..73de089 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -301,7 +301,7 @@ void SwTextFormatter::InsertPortion( SwTextFormatInfo &rInf,
}
// i#112181 - Prevent footnote anchor being wrapped to next line
- // without preceeding word
+ // without preceding word
rInf.SetOtherThanFootnoteInside( rInf.IsOtherThanFootnoteInside() || !pPor->IsFootnotePortion() );
}
else
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f05f5d2..a0fd746 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -498,7 +498,7 @@ void SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
m_aStyleNames[i] = rSource.m_aStyleNames[i];
- // its the same data type!
+ // it's the same data type!
m_aData.nOptions = rSource.m_aData.nOptions;
if( !pDoc || pDoc->IsCopyIsMove() )
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 1a83620..d76722d 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4812,7 +4812,7 @@ css::uno::Reference<css::style::XStyle> SwXTextCellStyle::CreateXTextCellStyle(S
sal_Bool SAL_CALL SwXTextCellStyle::isUserDefined() throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- // if this cell belong to first table style then its defaut style
+ // if this cell belong to first table style then its default style
if (&m_pDocShell->GetDoc()->GetTableStyles()[0] == m_pDocShell->GetDoc()->GetTableStyles().FindAutoFormat(m_sParentStyle))
return false;
@@ -4940,7 +4940,7 @@ void SAL_CALL SwXTextCellStyle::setPropertyValue(const OUString& rPropertyName,
sal_uInt32 nKey;
if (aValue >>= nKey)
{
- // FIXME: Its not working for old "automatic" currency formats, which are still in use by autotbl.fmt.
+ // FIXME: It's not working for old "automatic" currency formats, which are still in use by autotbl.fmt.
// Scenario:
// 1) Mark all styles present by default in autotbl.fmt as default.
// 2) convert all currencies present in autotbl.fmt before calling this code
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a658485..34fb283 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -560,7 +560,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
aRet.mbStartApo = bNowApo && !InAnyApo(); // APO-start
aRet.mbStopApo = InEqualOrHigherApo(nCellLevel) && !bNowApo; // APO-end
- //If it happens that we are in a table, then if its not the first cell
+ //If it happens that we are in a table, then if it's not the first cell
//then any attributes that might otherwise cause the contents to jump
//into another frame don't matter, a table row sticks together as one
//unit no matter what else happens. So if we are not in a table at
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 92dc55b..b09fc68 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1021,7 +1021,7 @@ void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
// 2pages in 1sheet hackery ?
// #i31806# but only swap if 2page in 1sheet is enabled.
- // its not clear if dmOrientPage is the correct member to
+ // it's not clear if dmOrientPage is the correct member to
// decide on this.
if(mrReader.m_pWDop->doptypography.f2on1 &&
aNewSection.maSep.dmOrientPage == 2)
@@ -2557,7 +2557,7 @@ void SwWW8ImplReader::StopApo()
SwFormatFrameSize( m_pSFlyPara->eHeightFix, nW, m_pSFlyPara->nHeight ) );
}
/*
- Word set *no* width meaning its an automatic width. The
+ Word set *no* width meaning it's an automatic width. The
SwFlyPara reader will have already set a fallback width of the
printable regions width, so we should reuse it. Despite the related
problems with layout addressed with a hack in WW8FlyPara's constructor
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index eb7cff6..0a82a6f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -1394,7 +1394,7 @@ WW8_CP WW8ScannerBase::WW8Fc2Cp( WW8_FC nFcPos ) const
sal_Int32 nLen = (nCpEnd - nCpStart) * (bIsUnicode ? 2 : 1);
/*
- If this cp is inside this piece, or its the last piece and we are
+ If this cp is inside this piece, or it's the last piece and we are
on the very last cp of that piece
*/
if (nFcPos >= nFcStart)
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 2738bee..cad9ce1 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -248,7 +248,7 @@ void SvXMLExportItemMapper::exportElementItems(
}
/** returns the item with the given WhichId from the given ItemSet if its
- set or its default item if its not set and the SvXmlExportFlags::DEEP
+ set or its default item if it's not set and the SvXmlExportFlags::DEEP
is set in the flags
*/
const SfxPoolItem* SvXMLExportItemMapper::GetItem( const SfxItemSet& rSet,
@@ -269,7 +269,7 @@ const SfxPoolItem* SvXMLExportItemMapper::GetItem( const SfxItemSet& rSet,
else if( (nFlags & SvXmlExportFlags::DEFAULTS) &&
SfxItemPool::IsWhich(nWhichId))
{
- // if its not set, try the pool if we export defaults
+ // if it's not set, try the pool if we export defaults
return &rSet.GetPool()->GetDefaultItem(nWhichId);
}
else
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 7e53273..33a6e0a 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -67,7 +67,7 @@ void SwXMLExport::ExportFormat( const SwFormat& rFormat, enum XMLTokenEnum eFami
AddAttribute( XML_NAMESPACE_STYLE, XML_FAMILY, eFamily );
#if OSL_DEBUG_LEVEL > 0
- // style:parent-style-name="..." (if its not the default only)
+ // style:parent-style-name="..." (if it's not the default only)
const SwFormat* pParent = rFormat.DerivedFrom();
// Only adopt parent name, if it's not the default
OSL_ENSURE( !pParent || pParent->IsDefault(), "unexpected parent" );
More information about the Libreoffice-commits
mailing list