[Libreoffice-commits] core.git: filter/source oox/source sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 5 16:44:19 UTC 2019
filter/source/msfilter/escherex.cxx | 2 +-
filter/source/msfilter/msdffimp.cxx | 4 ++--
oox/source/drawingml/lineproperties.cxx | 4 ++--
oox/source/export/drawingml.cxx | 2 +-
sw/source/filter/ww8/attributeoutputbase.hxx | 2 +-
sw/source/filter/ww8/docxattributeoutput.hxx | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 71740e630321f1cf12363995cdfc0a53fa2cd8cb
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Sep 5 17:55:37 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Sep 5 18:43:22 2019 +0200
Fix typos
Change-Id: Ibfff5af316a2c18b5735245caf5a27a562bc0f52
Reviewed-on: https://gerrit.libreoffice.org/78664
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 69bb2b92f257..a5caf5328a40 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1059,7 +1059,7 @@ void EscherPropertyContainer::CreateLineProperties(
default : break;
}
// Try to detect exact prstDash styles. Use a similar method as in oox export.
- // Map it to a roughly fitting prstDash in outher cases.
+ // Map it to a roughly fitting prstDash in other cases.
bool bIsConverted = false;
bool bIsRelative = pLineDash->Style == drawing::DashStyle_RECTRELATIVE
|| pLineDash->Style == drawing::DashStyle_ROUNDRELATIVE;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 3dc792e7674f..9e303d876cf8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -966,13 +966,13 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
// "dash" is always the second dash. MS Office always starts with the longer dash, so
// set it here accordingly.
// The preset from binary is essentially the same as from OOXML. So here the same
- // setting is used as in oox import. The comment corrensponds to
+ // setting is used as in oox import. The comment corresponds to
// "dots, dotLen, dashes, dashLen, distance" there.
// MS Office uses always relative length, so no need to consider nLineWidth
// here. Values are of kind 300 for 300% in css::drawing::DashStyle, for example.
sal_uInt16 nDots = 1; // in all cases, "solid" is treated above
- // initalize, will be changened if necessary
+ // initialize, will be changed if necessary
sal_uInt32 nDotLen = 300;
sal_uInt16 nDashes = 0;
sal_uInt32 nDashLen = 0;
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index d9a441d8f52d..adaafcf91f0c 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -84,7 +84,7 @@ void lclConvertPresetDash(LineDash& orLineDash, sal_Int32 nPresetDash)
}
/** Converts the passed custom dash to API dash. rCustomDash should not be empty.
- * We assume, that there exist only two lenght values and the distance is the same
+ * We assume, that there exist only two length values and the distance is the same
* for all dashes. Other kind of dash stop sequences cannot be represented, neither
* in model nor in ODF.
*/
@@ -443,7 +443,7 @@ void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap,
drawing::LineStyle eLineStyle = (maLineFill.moFillType.get() == XML_noFill) ? drawing::LineStyle_NONE : drawing::LineStyle_SOLID;
// line width in 1/100mm
- sal_Int32 nLineWidth = getLineWidth(); // includes convertion from EMUs to 1/100mm
+ sal_Int32 nLineWidth = getLineWidth(); // includes conversion from EMUs to 1/100mm
rPropMap.setProperty( ShapeProperty::LineWidth, nLineWidth );
// create line dash from preset dash token or dash stop vector (not for invisible line)
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2eafc6f32e24..0e49cfca4291 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -946,7 +946,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
if ( aLineDash.Dashes > 0 )
{
double fD = bIsRelative ? aLineDash.DashLen : aLineDash.DashLen * 100.0 / fLineWidth;
- // LO sets length to 0, if attribute is missing in ODF. Then a relataive length of 100% is intended.
+ // LO sets length to 0, if attribute is missing in ODF. Then a relative length of 100% is intended.
if (aLineDash.DashLen == 0)
fD = 100.0;
for( i = 0; i < aLineDash.Dashes; i ++ )
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 7774cc01f17b..43ab2a6ecd1b 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -346,7 +346,7 @@ public:
/// Definition of a numbering instance.
virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) = 0;
- /// Numbering defintion that overrides abstract numbering definition
+ /// Numbering definition that overrides abstract numbering definition
virtual void OverrideNumberingDefinition(SwNumRule const&, sal_uInt16 /*nNum*/, sal_uInt16 /*nAbstractNum*/)
{ assert(false); } // TODO implement for WW8/RTF
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 478f4b39f2fd..92fdd032737f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -323,7 +323,7 @@ public:
/// Definition of a numbering instance.
virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) override;
- /// Numbering defintion that overrides abstract numbering definition
+ /// Numbering definition that overrides abstract numbering definition
virtual void OverrideNumberingDefinition(SwNumRule const& rRule,
sal_uInt16 nNum, sal_uInt16 nAbstractNum) override;
More information about the Libreoffice-commits
mailing list