[Libreoffice-commits] core.git: filter/source sc/source sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Jan 25 07:37:21 UTC 2018
filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl | 2 +-
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 2 +-
sc/source/ui/unoobj/chart2uno.cxx | 2 +-
sw/source/core/inc/anchoredobjectposition.hxx | 2 +-
sw/source/core/inc/flowfrm.hxx | 4 ++--
sw/source/core/layout/flowfrm.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 2 +-
sw/source/core/layout/trvlfrm.cxx | 4 ++--
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit f08828f26b19c486f074182833e2e674b681745c
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Jan 24 18:31:43 2018 +0100
Fix typos
Change-Id: I18d224557173b9ae5f20399b05132f45f08022a4
Reviewed-on: https://gerrit.libreoffice.org/48544
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index 87c8744d2a0e..be331280ed72 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -807,7 +807,7 @@
<xsl:text>padding</xsl:text>
<xsl:value-of select="substring-after(name(), 'fo:margin')"/>
<xsl:text>:</xsl:text>
- <!-- Map once erroneusly used inch shortage 'inch' to CSS shortage 'in' -->
+ <!-- Map once erroneously used inch shortage 'inch' to CSS shortage 'in' -->
<xsl:choose>
<xsl:when test="contains(., 'inch')">
<xsl:value-of select="substring-before(.,'ch')"/>
diff --git a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index 791a2bcd391b..da123b1e5146 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -94,7 +94,7 @@
<xsl:template match="@fo:letter-spacing | @fo:line-height | @fo:width |@fo:margin | @fo:margin-top | @fo:margin-bottom | @fo:margin-left | @fo:margin-right | @fo:padding | @fo:padding-top | @fo:padding-bottom | @fo:padding-left | @fo:padding-right">
<xsl:value-of select="local-name(.)"/>
<xsl:text>:</xsl:text>
- <!-- Map once erroneusly used inch shortage 'inch' to CSS shortage 'in' -->
+ <!-- Map once erroneously used inch shortage 'inch' to CSS shortage 'in' -->
<xsl:choose>
<xsl:when test="contains(., 'inch')">
<xsl:value-of select="substring-before(.,'ch')"/>
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index d5dce02cd4f7..96f527efca71 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3113,7 +3113,7 @@ uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::d
SCCOL nCols = func.getCols();
SCROW nRows = func.getRows();
- // Detemine whether this is column-major or row-major.
+ // Determine whether this is column-major or row-major.
bool bColumn = true;
if ((eOrigin == chart2::data::LabelOrigin_SHORT_SIDE) ||
(eOrigin == chart2::data::LabelOrigin_LONG_SIDE))
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 382cb5a57591..74705465d54a 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -374,7 +374,7 @@ namespace objectpositioning
const bool _bEvenPage
) const;
- /** detemine, if object has to draw aside given fly frame
+ /** determine, if object has to draw aside given fly frame
method used by <AdjustHoriRelPosForDrawAside(..)>
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index e2963d859336..818f0fb4f597 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -96,14 +96,14 @@ class SwFlowFrame
*/
const SwFrame* GetPrevFrameForUpperSpaceCalc_( const SwFrame* _pProposedPrevFrame = nullptr ) const;
- /** method to detemine the upper space amount, which is considered for
+ /** method to determine the upper space amount, which is considered for
the previous frame
#i11860#
*/
SwTwips GetUpperSpaceAmountConsideredForPrevFrame() const;
- /** method to detemine the upper space amount, which is considered for
+ /** method to determine the upper space amount, which is considered for
the page grid
#i11860#
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 30d92bb3fae4..75a064fa6e55 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1529,7 +1529,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs,
return nUpper;
}
-/** method to detemine the upper space amount, which is considered for
+/** method to determine the upper space amount, which is considered for
the page grid
OD 2004-03-12 #i11860#
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index e7ee8d1f21a0..ec13fdc99ea9 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -504,7 +504,7 @@ bool sanityCheckLayoutCache(SwLayCacheImpl const& rCache,
/** helper class, which utilizes the layout cache information
* to distribute the document content to the right pages.
* It's used by the InsertCnt_(..)-function.
- * If there's no layout cache, the distibution to the pages is more
+ * If there's no layout cache, the distribution to the pages is more
* a guess, but a guess with statistical background.
*/
SwLayHelper::SwLayHelper( SwDoc *pD, SwFrame* &rpF, SwFrame* &rpP, SwPageFrame* &rpPg,
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index 04277f51db34..4b0df5c5709e 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -794,7 +794,7 @@ static bool lcl_UpDown( SwPaM *pPam, const SwContentFrame *pStart,
do
{
- //If I'm in the DocumentBody, I wan't to stay there.
+ //If I'm in the DocumentBody, I want to stay there.
if ( pStart->IsInDocBody() )
{
while ( pCnt && (!pCnt->IsInDocBody() ||
@@ -1570,7 +1570,7 @@ Point SwRootFrame::GetPagePos( sal_uInt16 nPageNum ) const
return pPage->getFrameArea().Pos();
}
-/** get page frame by phyiscal page number
+/** get page frame by physical page number
*
* @return pointer to the page frame with the given physical page number
*/
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index bd11bac3523d..45f8292b279a 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -1035,7 +1035,7 @@ SwTwips SwAnchoredObjectPosition::AdjustHoriRelPosForDrawAside(
return nAdjustedRelPosX;
}
-/** detemine, if object has to draw aside given fly frame
+/** determine, if object has to draw aside given fly frame
method used by <AdjustHoriRelPosForDrawAside(..)>
*/
More information about the Libreoffice-commits
mailing list