[Libreoffice-commits] core.git: svx/source swext/mediawiki sw/inc
Andrea Gelmini
andrea.gelmini at gelma.net
Tue Sep 29 23:16:00 PDT 2015
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 2 +-
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 2 +-
svx/source/svdraw/svddrgmt.cxx | 2 +-
svx/source/svdraw/svdmrkv.cxx | 2 +-
svx/source/svdraw/svdotextdecomposition.cxx | 2 +-
svx/source/svdraw/textchainflow.cxx | 2 +-
svx/source/table/tablecontroller.cxx | 4 ++--
svx/source/table/tablelayouter.cxx | 2 +-
svx/source/table/tablemodel.cxx | 2 +-
svx/source/table/viewcontactoftableobj.cxx | 2 +-
svx/source/unodraw/unoshtxt.cxx | 2 +-
sw/inc/cmdid.h | 2 +-
sw/inc/crsrsh.hxx | 2 +-
sw/inc/editsh.hxx | 2 +-
swext/mediawiki/src/filter/odt2mediawiki.xsl | 6 +++---
15 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 2de378ecacd95d7ac52275b34f3fda281d477dbe
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Tue Sep 29 18:10:33 2015 +0200
Fix typos
Change-Id: I92f9eda138c387dde3095e1a6281bdcec3a2adde
Reviewed-on: https://gerrit.libreoffice.org/18982
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index f1c7e35..761a9c8 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -211,7 +211,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfPageObj::creat
// #i102637# add gray frame also when printing and page exists (handout pages)
const bool bCreateGrayFrame(!GetObjectContact().isOutputToPrinter() || pPage);
- // get displayed page's content. This is the uscaled page content
+ // get displayed page's content. This is the unscaled page content
if(mpExtractor && pPage)
{
// get displayed page's geometry
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 9f00a32..1147704 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -692,7 +692,7 @@ namespace sdr { namespace contact {
/** adjusts the control visibility so it respects its layer's visibility
- The control must never be visibile if it's in design mode.
+ The control must never be visible if it's in design mode.
In alive mode, it must be visibility if and only it's on a visible layer.
@param _rxControl
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 77dd081..9274c3e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -4022,7 +4022,7 @@ bool SdrDragCrop::EndSdrDrag(bool /*bCopy*/)
double fScaleY = ( aGraphicSize.Height() - rOldCrop.GetTop() - rOldCrop.GetBottom() ) / (double)aOldRect.GetHeight();
// not needed since the modification is done in unit coordinates, free from shear/rotate and mirror
- // // TTTT may be removed or exhanged by other stuff in aw080
+ // // TTTT may be removed or exchanged by other stuff in aw080
// // to correct the never working combination of cropped images and mirroring
// // I have to correct the rectangles the calculation is based on here. In the current
// // core geometry stuff a vertical mirror is expressed as 180 degree rotation. All
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index dbb3582..112fcea 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -679,7 +679,7 @@ void SdrMarkView::SetMarkHandles()
{
// formally #i33755#: If TextEdit is active the EditEngine will directly paint
// to the window, so suppress Overlay and handles completely; a text frame for
- // the active text edit will be painted by the repaitnt mechanism in
+ // the active text edit will be painted by the repaint mechanism in
// SdrObjEditView::ImpPaintOutlinerView in this case. This needs to be reworked
// in the future
// Also formally #122142#: Pretty much the same for SdrCaptionObj's in calc.
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index e946be3..9533e9e 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -1438,7 +1438,7 @@ void SdrTextObj::impHandleChainingEventsDuringDecomposition(SdrOutliner &rOutlin
aTxtChainFlow.ExecuteUnderflow(&rOutliner);
bIsOverflow = aTxtChainFlow.IsOverflow();
} else {
- // standard overflow (no underlow before)
+ // standard overflow (no underflow before)
bIsOverflow = aTxtChainFlow.IsOverflow();
}
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index a433fcd..2ce012c 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -157,7 +157,7 @@ bool TextChainFlow::IsUnderflow() const
// XXX: In editing mode you need to get "underflowing" text from editing outliner, so it's kinda separate from the drawing one!
-// XXX:Would it be possible to unify undeflow and its possibly following overrflow?
+// XXX:Would it be possible to unify underflow and its possibly following overflow?
void TextChainFlow::ExecuteUnderflow(SdrOutliner *pOutl)
{
//GetTextChain()->SetNilChainingEvent(mpTargetLink, true);
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 149d0db..c88867b 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -636,7 +636,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
nRowSpan = 0;
}
- // The target colomns are outside the span; Start a new span.
+ // The target columns are outside the span; Start a new span.
if( nRowSpan > 0 && ( nNewStartColumn < nSpanInfoCol || nSpanInfoCol + nColSpan <= nNewStartColumn ) )
bNewSpan = true;
}
@@ -1875,7 +1875,7 @@ void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, co
if(nParaAnz==1 && p1stPara)
{
- // Bei nur einem Pararaph
+ // Bei nur einem Paragraph
if (pOutl->GetText(p1stPara).isEmpty())
{
bEmptyOutliner = true;
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 0793e77..7443cb8 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -483,7 +483,7 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu
{
sal_Int32 n;
if( nIndex == (nCount-1) )
- n = nDistributed; // for last entitie, use up rest
+ n = nDistributed; // for last entity use up rest
else
n = (nDistribute * rLayout.mnSize) / nCurrentWidth;
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index bd50f69..e14100f 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1119,7 +1119,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_
if( (nLastRow > getRowCount()) || (nLastCol > getColumnCount() ) )
{
- OSL_FAIL("TableModel::merge(), merge beyound the table!");
+ OSL_FAIL("TableModel::merge(), merge beyond the table!");
}
// merge first cell
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 63d206b..87f0f93 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -716,7 +716,7 @@ namespace sdr
aObjectRange.getWidth(), aObjectRange.getHeight(), fShearX, fRotate,
aObjectRange.getMinX(), aObjectRange.getMinY()));
- // credate an invisible outline for the cases where no visible content exists
+ // created an invisible outline for the cases where no visible content exists
const drawinglayer::primitive2d::Primitive2DReference xReference(
drawinglayer::primitive2d::createHiddenGeometryPrimitives2D(
false,
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 3e9c39d..6e99378 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -670,7 +670,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
mpOutliner->SetVertical( true );
}
- // evtually we have to set the border attributes
+ // maybe we have to set the border attributes
if (mpOutliner->GetParagraphCount()==1)
{
// if we only have one paragraph we check if it is empty
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 30cf71b..e4f4d8d 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -254,7 +254,7 @@
#define FN_DRAWTEXT_ATTR_DLG (FN_INSERT + 76) /* position DrawText */
-#define FN_TOOL_ANCHOR_CHAR (FN_INSERT + 84) /* anchor Draw object to charater */
+#define FN_TOOL_ANCHOR_CHAR (FN_INSERT + 84) /* anchor Draw object to character */
#define FN_QRY_INSERT (FN_INSERT + 86) /* insert record selection in to text */
#define FN_QRY_MERGE_FIELD (FN_INSERT + 87) /* insert record selection into fields */
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 0629a04..9c44b6a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -537,7 +537,7 @@ public:
// (used in PhyPage).
sal_uInt16 GetNextPrevPageNum( bool bNext = true );
- // Move cursor at the bginning of page "nPage".
+ // Move cursor at the beginning of page "nPage".
bool GotoPage( sal_uInt16 nPage );
sal_uInt16 GetPageCnt();
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index bdab357..1a1536b 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -195,7 +195,7 @@ public:
/// Set all numbering start points to a fixed value - mailmerge support.
void SetNumberingRestart();
- /// Embedds all local links (ranges/graphics).
+ /// Embeds all local links (ranges/graphics).
sal_uInt16 GetLinkUpdMode(bool bDocSettings = false) const;
void SetLinkUpdMode( sal_uInt16 nMode );
diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 705c482..f3da065 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -328,12 +328,12 @@
</choose>
</template>
- <!--
- Funktion generating a token consisting of the given character
+ <!--
+ Funktion generating a token consisting of the given character
repeated 'level' times.
@param level
- The lengh of the result.
+ The length of the result.
@param char
The character that should be repeated 'level' times.
-->
More information about the Libreoffice-commits
mailing list