[Libreoffice-commits] core.git: cppuhelper/source i18npool/source lotuswordpro/source sc/qa sc/source sdext/source slideshow/source starmath/source svtools/source svx/source sw/source vcl/opengl
Andrea Gelmini
andrea.gelmini at gelma.net
Wed Jan 17 20:04:10 UTC 2018
cppuhelper/source/servicemanager.cxx | 6 +++---
i18npool/source/breakiterator/data/README | 2 +-
lotuswordpro/source/filter/bencont.cxx | 2 +-
lotuswordpro/source/filter/explode.cxx | 2 +-
lotuswordpro/source/filter/lwpfribptr.cxx | 2 +-
sc/qa/unit/subsequent_filters-test.cxx | 2 +-
sc/source/core/data/table3.cxx | 2 +-
sc/source/filter/excel/xichart.cxx | 2 +-
sc/source/ui/app/inputwin.cxx | 2 +-
sc/source/ui/undo/undocell.cxx | 2 +-
sdext/source/minimizer/impoptimizer.cxx | 2 +-
slideshow/source/engine/slideshowimpl.cxx | 4 ++--
starmath/source/visitors.cxx | 2 +-
svtools/source/control/calendar.cxx | 2 +-
svx/source/svdraw/svdsnpv.cxx | 4 ++--
svx/source/unodraw/unoshap3.cxx | 4 ++--
sw/source/core/layout/fly.cxx | 2 +-
sw/source/core/text/itrform2.cxx | 6 +++---
sw/source/core/text/txtfld.cxx | 4 ++--
vcl/opengl/gdiimpl.cxx | 2 +-
20 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 970b76816a03be0f57f35a790bea57bf299e344b
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Jan 17 19:39:12 2018 +0100
Fix typos
Change-Id: Id1c7ddf6c49ec709e38947a82731fe31a64aad04
Reviewed-on: https://gerrit.libreoffice.org/48076
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 556440dc8733..d51ce6bd6292 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -738,7 +738,7 @@ void cppuhelper::ServiceManager::addSingletonContextEntries(
assert(i->second[0].get() != nullptr);
SAL_INFO_IF(
i->second.size() > 1, "cppuhelper",
- "Arbitrarily chosing " << i->second[0]->info->name
+ "Arbitrarily choosing " << i->second[0]->info->name
<< " among multiple implementations for " << i->first);
entries->push_back(
cppu::ContextEntry_Init(
@@ -1641,7 +1641,7 @@ bool cppuhelper::ServiceManager::insertExtraData(Data const & extra) {
assert(i->second[0].get() != nullptr);
SAL_INFO_IF(
i->second.size() > 1, "cppuhelper",
- "Arbitrarily chosing " << i->second[0]->info->name
+ "Arbitrarily choosing " << i->second[0]->info->name
<< " among multiple implementations for singleton "
<< i->first);
try {
@@ -1792,7 +1792,7 @@ cppuhelper::ServiceManager::findServiceImplementation(
assert(!i->second.empty());
SAL_INFO_IF(
i->second.size() > 1, "cppuhelper",
- "Arbitrarily chosing " << i->second[0]->info->name
+ "Arbitrarily choosing " << i->second[0]->info->name
<< " among multiple implementations for " << i->first);
impl = i->second[0];
}
diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
index a95306608887..63f25a1ccd07 100644
--- a/i18npool/source/breakiterator/data/README
+++ b/i18npool/source/breakiterator/data/README
@@ -117,7 +117,7 @@ Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Sep 5 16:37:28 2007 +0000
INTEGRATION: CWS i18n37 (1.22.6); FILE MERGED
- 2007/09/03 18:27:39 khong 1.22.6.2: i8132 fixed a problem in skiping space for word breakiterator
+ 2007/09/03 18:27:39 khong 1.22.6.2: i8132 fixed a problem in skipping space for word breakiterator
2007/08/31 21:30:30 khong 1.22.6.1: i81158 fix skipping space problem
commit d2c2baf1a31d281d20e8b4d4c806dda027b2d5a3
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 52c82292c8ea..7340f046fa53 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -164,7 +164,7 @@ LtcBenContainer::LtcBenContainer(LwpSvStream * pStream)
}
/**
-* Read buffer fro bento file with specified buffer
+* Read buffer for bento file with specified buffer
* @param buffer pointer
* @param buffer size
* @param number of bytes read
diff --git a/lotuswordpro/source/filter/explode.cxx b/lotuswordpro/source/filter/explode.cxx
index 5d821698745c..7f60a9dfa737 100644
--- a/lotuswordpro/source/filter/explode.cxx
+++ b/lotuswordpro/source/filter/explode.cxx
@@ -317,7 +317,7 @@ sal_Int32 Decompression::explode()
m_pOutStream->ReadBytes(sTemp, nRead);
if (nRead != Length)
{
- // fill the buffer with read content repeatly until full
+ // fill the buffer with read content repeatedly until full
for (sal_uInt32 i=nRead; i<Length; i++)
{
sTemp[i] = sTemp[i-nRead];
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx
index 0cad23dfbe2f..406a42189075 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -127,7 +127,7 @@ void LwpFribPtr::ReadPara(LwpObjectStream* pObjStrm)
{
pCurFrib->SetNext(pFrib);
}
- else//frist frib in the para
+ else//first frib in the para
{
if (pFrib->GetType() == FRIB_TAG_TEXT)
{
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index daf934187252..f23786355671 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2612,7 +2612,7 @@ void ScFiltersTest::testFormulaDependency()
nVal = rDoc.GetValue(0,0,0);
CPPUNIT_ASSERT_DOUBLES_EQUAL(nVal, 2.0, 1e-10);
- // check that the number format is implicity inherited
+ // check that the number format is implicitly inherited
// CPPUNIT_ASSERT_EQUAL(rDoc.GetString(0,4,0), rDoc.GetString(0,5,0));
xDocSh->DoClose();
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 3396c50effc7..2bb00607eb68 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -147,7 +147,7 @@ bool SplitString( const OUString &sWhole,
@param pCW
Pointer to collator wrapper for normal string comparison
- @return Returnes 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if
+ @return Returns 1 if sInput1 is greater, 0 if sInput1 == sInput2, and -1 if
sInput2 is greater.
*/
short Compare( const OUString &sInput1, const OUString &sInput2,
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 87f824262b87..28aece1b72b3 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -1730,7 +1730,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer
case EXC_CHSERERR_CUSTOM:
{
aBarProp.SetProperty( EXC_CHPROP_ERRORBARSTYLE, cssc::ErrorBarStyle::FROM_DATA );
- // attach data sequences to erorr bar
+ // attach data sequences to error bar
Reference< XDataSink > xDataSink( xErrorBar, UNO_QUERY );
if( xDataSink.is() )
{
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 28ff4acbdd1a..815b83692952 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -719,7 +719,7 @@ void ScInputWindow::MouseButtonDown( const MouseEvent& rMEvt )
CaptureMouse();
bInResize = true;
- // find the height of the gridwin, we don't wan't to be
+ // find the height of the gridwin, we don't want to be
// able to expand the toolbar too far so we need to
// calculate an upper limit
// I'd prefer to leave at least a single column header and a
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 159eb1df675f..7734e2ae7492 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -742,7 +742,7 @@ ScUndoReplaceNote::ScUndoReplaceNote( ScDocShell& rDocShell, const ScAddress& rP
mpDrawUndo( pDrawUndo )
{
OSL_ENSURE( maOldData.mxCaption || maNewData.mxCaption, "ScUndoReplaceNote::ScUndoReplaceNote - missing note captions" );
- OSL_ENSURE( !maOldData.mxInitData.get() && !maNewData.mxInitData.get(), "ScUndoReplaceNote::ScUndoReplaceNote - unexpected unitialized note" );
+ OSL_ENSURE( !maOldData.mxInitData.get() && !maNewData.mxInitData.get(), "ScUndoReplaceNote::ScUndoReplaceNote - unexpected uninitialized note" );
maOldData.mxCaption.setNotOwner();
maNewData.mxCaption.setNotOwner();
}
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index 45321fcef7fe..ccbd4cc1f056 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -422,7 +422,7 @@ void CompressGraphics( ImpOptimizer& rOptimizer, const Reference< XComponentCont
if ( aGraphicUserIter->maGraphicCropLogic.Left || aGraphicUserIter->maGraphicCropLogic.Top
|| aGraphicUserIter->maGraphicCropLogic.Right || aGraphicUserIter->maGraphicCropLogic.Bottom )
- { // removing crop area was not possible or should't been applied
+ { // removing crop area was not possible or shouldn't been applied
text::GraphicCrop aGraphicCropLogic( 0, 0, 0, 0 );
if ( !aGraphicSettings.mbRemoveCropArea )
{
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index b90ccc19c485..5138517cc755 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -267,7 +267,7 @@ public:
*/
bool notifyHyperLinkClicked( OUString const& hyperLink );
- /** Notification from eventmultiplexer that an animation event has occoured.
+ /** Notification from eventmultiplexer that an animation event has occurred.
This will be forewarded to all registered XSlideShowListener
*/
bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode );
@@ -2313,7 +2313,7 @@ bool SlideShowImpl::notifyHyperLinkClicked( OUString const& hyperLink )
return true;
}
-/** Notification from eventmultiplexer that an animation event has occoured.
+/** Notification from eventmultiplexer that an animation event has occurred.
This will be forewarded to all registered XSlideShoeListener
*/
bool SlideShowImpl::handleAnimationEvent( const AnimationNodeSharedPtr& rNode )
diff --git a/starmath/source/visitors.cxx b/starmath/source/visitors.cxx
index 004c153bfdc4..6bbc5d989013 100644
--- a/starmath/source/visitors.cxx
+++ b/starmath/source/visitors.cxx
@@ -1269,7 +1269,7 @@ void SmCaretPosGraphBuildingVisitor::Visit( SmBinDiagonalNode* pNode )
mpRightMost = right;
}
-//Straigt forward ( I think )
+//Straight forward ( I think )
void SmCaretPosGraphBuildingVisitor::Visit( SmBinHorNode* pNode )
{
for( auto pChild : *pNode )
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 8daacf652f71..12a9fb1c3dab 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -902,7 +902,7 @@ void Calendar::ImplUpdate( bool bCalcNew )
void Calendar::ImplInvertDropPos()
{
- tools::Rectangle aRect = GetDateRect( maDropDate );//this is one Pixel to width and one to heigh
+ tools::Rectangle aRect = GetDateRect( maDropDate );//this is one Pixel to width and one to height
aRect.Bottom() = aRect.Top()+mnDayHeight-1;
aRect.Right() = aRect.Left()+mnDayWidth-1;
Invert( aRect );
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 6a442f4cd538..6b6e0968de92 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -39,7 +39,7 @@ class ImplPageOriginOverlay
// The OverlayObjects
sdr::overlay::OverlayObjectList maObjects;
- // The current position in logical coodinates
+ // The current position in logical coordinates
basegfx::B2DPoint maPosition;
public:
@@ -97,7 +97,7 @@ class ImplHelpLineOverlay
// The OverlayObjects
sdr::overlay::OverlayObjectList maObjects;
- // The current position in logical coodinates
+ // The current position in logical coordinates
basegfx::B2DPoint maPosition;
// HelpLine specific stuff
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 4f6bae7a7e8f..66ac52b876db 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -289,7 +289,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // pach transformation matrix to the object
+ // patch transformation matrix to the object
if( ConvertHomogenMatrixToObject( static_cast< E3dObject* >( mpObj.get() ), rValue ) )
return true;
break;
@@ -401,7 +401,7 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem
{
case OWN_ATTR_3D_VALUE_TRANSFORM_MATRIX:
{
- // pach object to a homogeneous 4x4 matrix
+ // patch object to a homogeneous 4x4 matrix
ConvertObjectToHomogenMatric( static_cast< E3dObject* >( mpObj.get() ), rValue );
break;
}
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index b7d7da4f4230..da57f1212b79 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -381,7 +381,7 @@ void SwFlyFrame::FinitDrawObj()
void SwFlyFrame::ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
{
- OSL_ENSURE( pMaster && pFollow, "uncomplete chain" );
+ OSL_ENSURE( pMaster && pFollow, "incomplete chain" );
OSL_ENSURE( !pMaster->GetNextLink(), "link can not be changed" );
OSL_ENSURE( !pFollow->GetPrevLink(), "link can not be changed" );
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index c4df1a42e81e..1346390589cc 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -956,9 +956,9 @@ SwTextPortion *SwTextFormatter::NewTextPortion( SwTextFormatInfo &rInf )
nNextChg = std::min( nNextChg, nNextDir );
// Turbo boost:
- // We assume that a font's characters are not larger than twice
- // as wide as heigh.
- // Very crazy: We need to take the ascent into account.
+ // We assume that font characters are not larger than twice
+ // as wide as height.
+ // Very crazy: we need to take the ascent into account.
// Mind the trap! GetSize() contains the wished-for height, the real height
// is only known in CalcAscent!
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 3dde379f61a2..7e958cd7be8c 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -531,7 +531,7 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con
}
// Apply the explicit attributes from the character style
- // associated with the numering to the new bullet font.
+ // associated with the numbering to the new bullet font.
if( pFormat )
pNumFnt->SetDiffFnt( pFormat, pIDSA );
@@ -587,7 +587,7 @@ SwNumberPortion *SwTextFormatter::NewNumberPortion( SwTextFormatInfo &rInf ) con
}
// Apply the explicit attributes from the character style
- // associated with the numering to the new bullet font.
+ // associated with the numbering to the new bullet font.
if( pFormat )
pNumFnt->SetDiffFnt( pFormat, pIDSA );
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index afe0157c520a..db8117193e38 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -902,7 +902,7 @@ void OpenGLSalGraphicsImpl::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rPol
const basegfx::B2DPolyPolygon& aSimplePolyPolygon = ::basegfx::utils::solveCrossovers( rPolyPolygon );
basegfx::B2DTrapezoidVector aB2DTrapVector;
basegfx::utils::trapezoidSubdivide( aB2DTrapVector, aSimplePolyPolygon );
- // draw tesselation result
+ // draw tessellation result
if( aB2DTrapVector.size())
{
for(basegfx::B2DTrapezoid & i : aB2DTrapVector)
More information about the Libreoffice-commits
mailing list