[Libreoffice-commits] core.git: svx/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 12 08:55:58 UTC 2019
svx/source/svdraw/svdoole2.cxx | 4 ++--
svx/source/svdraw/svdopage.cxx | 4 ++--
svx/source/svdraw/svdorect.cxx | 2 +-
svx/source/svdraw/svdotext.cxx | 2 +-
svx/source/svdraw/svdotextdecomposition.cxx | 2 +-
svx/source/svdraw/svdpage.cxx | 2 +-
svx/source/svdraw/svdpagv.cxx | 2 +-
svx/source/svdraw/svdsnpv.cxx | 6 +++---
svx/source/table/cell.cxx | 6 +++---
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit d4718543f48733b4167bd9b9e6339915f6fd1f19
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Aug 11 18:26:48 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 12 10:54:57 2019 +0200
Fix typos
Change-Id: Ied6e07ef44e67394338e552566aa58a274204440
Reviewed-on: https://gerrit.libreoffice.org/77281
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 9a2aff11b913..431e9b701434 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -509,7 +509,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
Size aNewObjSize( long( aNewLogicRect.GetWidth() / m_aScaleWidth ),
long( aNewLogicRect.GetHeight() / m_aScaleHeight ) );
- // now remove scaling from new placement and keep this a the new object area
+ // now remove scaling from new placement and keep this at the new object area
aNewLogicRect.SetSize( aNewObjSize );
// react to the change if the difference is bigger than one pixel
Size aPixelDiff =
@@ -1782,7 +1782,7 @@ void SdrOle2Obj::GetObjRef_Impl()
mpImpl->mbTypeAsked = false;
CheckFileLink_Impl();
- // If loading of OLE object failed, remember that to not invoke a endless
+ // If loading of OLE object failed, remember that to not invoke an endless
// loop trying to load it again and again.
if( mpImpl->mxObjRef.is() )
{
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 6dc8dbe1b5ae..a38768c01088 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -49,9 +49,9 @@ std::unique_ptr<sdr::contact::ViewContact> SdrPageObj::CreateObjectSpecificViewC
}
-// this method is called form the destructor of the referenced page.
+// this method is called from the destructor of the referenced page.
// do all necessary action to forget the page. It is not necessary to call
-// RemovePageUser(), that is done form the destructor.
+// RemovePageUser(), that is done from the destructor.
void SdrPageObj::PageInDestruction(const SdrPage& rPage)
{
if(mpShownPage && mpShownPage == &rPage)
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index eeebb3d7c8d3..3a3d87308f70 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -314,7 +314,7 @@ void SdrRectObj::AddToHdlList(SdrHdlList& rHdlList) const
// A text box has an additional (pseudo-)handle for the blinking frame.
if(IsTextFrame())
{
- OSL_ENSURE(!IsTextEditActive(), "Do not use a ImpTextframeHdl for highlighting text in active text edit, this will collide with EditEngine paints (!)");
+ OSL_ENSURE(!IsTextEditActive(), "Do not use an ImpTextframeHdl for highlighting text in active text edit, this will collide with EditEngine paints (!)");
std::unique_ptr<SdrHdl> pH(new ImpTextframeHdl(maRect));
pH->SetObj(const_cast<SdrRectObj*>(this));
pH->SetRotationAngle(aGeo.nRotationAngle);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index c604e0b0d513..47e46b738345 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1516,7 +1516,7 @@ void SdrTextObj::SetVerticalWriting(bool bVertical)
if( !pOutlinerParaObject && bVertical )
{
- // we only need to force a outliner para object if the default of
+ // we only need to force an outliner para object if the default of
// horizontal text is changed
ForceOutlinerParaObject();
pOutlinerParaObject = GetOutlinerParaObject();
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 0406341d5456..1cc2b8a1df37 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -923,7 +923,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
if(bIsCell)
{
- // cell text is formatted neither like a text object nor like a object
+ // cell text is formatted neither like a text object nor like an object
// text, so use a special setup here
rOutliner.SetMaxAutoPaperSize(aAnchorTextSize);
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index e015a4783c50..77941e810db9 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -491,7 +491,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
// tdf#121022 InsertedStateChange uses the parent
// to detect if pObj is inserted or not, so have to call
- // it *after* changing these settings, else a obviously wrong
+ // it *after* changing these settings, else an obviously wrong
// 'SdrUserCallType::Inserted' would be sent
pObj->InsertedStateChange();
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 426f883447f0..950660669bad 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -280,7 +280,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget,
}
else
{
- // #i72752# DrawLayer() uses a OutputDevice different from BeginDrawLayer. This happens
+ // #i72752# DrawLayer() uses an OutputDevice different from BeginDrawLayer. This happens
// e.g. when SW paints a single text line in text edit mode. Try to use it
SdrPageWindow* pPreparedTarget = mpPreparedPageWindow;
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index a3991d9f42e3..3994a06ad11c 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -443,7 +443,7 @@ void SdrSnapView::BegSetPageOrg(const Point& rPnt)
{
BrkAction();
- DBG_ASSERT(nullptr == mpPageOriginOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)");
+ DBG_ASSERT(nullptr == mpPageOriginOverlay, "SdrSnapView::BegSetPageOrg: There exists an ImplPageOriginOverlay (!)");
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpPageOriginOverlay = new ImplPageOriginOverlay(*this, aStartPos);
maDragStat.Reset(GetSnapPos(rPnt,nullptr));
@@ -521,7 +521,7 @@ bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
Point aHelpLinePos = rHelpLine.GetPos();
basegfx::B2DPoint aStartPos(aHelpLinePos.X(), aHelpLinePos.Y());
- DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)");
+ DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists an ImplHelpLineOverlay (!)");
mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, pPV, nHelpLineNum, rHelpLine.GetKind());
maDragStat.Reset(GetSnapPos(aHelpLinePos, pPV));
@@ -540,7 +540,7 @@ void SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind)
if(GetSdrPageView())
{
- DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists a ImplHelpLineOverlay (!)");
+ DBG_ASSERT(nullptr == mpHelpLineOverlay, "SdrSnapView::BegDragHelpLine: There exists an ImplHelpLineOverlay (!)");
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, nullptr, 0, eNewKind);
maDragStat.Reset(GetSnapPos(rPnt, nullptr));
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c81b56818989..81d78bec4ff5 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -533,7 +533,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell )
if(&rSourceTableObj.getSdrModelFromSdrObject() != &rTableObj.getSdrModelFromSdrObject())
{
// TTTT should not happen - if, then a clone may be needed
- // Maybe add a assertion here later
+ // Maybe add an assertion here later
SetStyleSheet( nullptr, true );
}
}
@@ -561,7 +561,7 @@ void Cell::copyFormatFrom( const CellRef& xSourceCell )
if(&rSourceTableObj.getSdrModelFromSdrObject() != &rTableObj.getSdrModelFromSdrObject())
{
// TTTT should not happen - if, then a clone may be needed
- // Maybe add a assertion here later
+ // Maybe add an assertion here later
SetStyleSheet( nullptr, true );
}
@@ -1427,7 +1427,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName )
break;
}
- // if a item is set, this doesn't mean we want it :)
+ // if an item is set, this doesn't mean we want it :)
if( PropertyState_DIRECT_VALUE == eState )
{
switch( pMap->nWID )
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fcae1fb8342b..7028a3afc53c 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1206,7 +1206,7 @@ IMPL_LINK(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, v
// return is always the Font-Color
// when both light or dark, change the Contrast
// in other case do not change the origin color
-// when the color is R=G=B=128 the DecreaseContrast make 128 the need a exception
+// when the color is R=G=B=128 the DecreaseContrast make 128 the need an exception
Color SvxStyleBox_Impl::TestColorsVisible(const Color &FontCol, const Color &BackCol)
{
const sal_uInt8 ChgVal = 60; // increase/decrease the Contrast
More information about the Libreoffice-commits
mailing list