[Libreoffice-commits] core.git: extensions/source filter/source include/svx m4/libgcrypt.m4 qadevOOo/tests sal/osl sal/textenc sc/source svtools/source sw/source sw/uiconfig xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Fri Aug 18 05:46:32 UTC 2017
extensions/source/ole/unoconversionutilities.hxx | 2 +-
filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl | 4 ++--
include/svx/msdffdef.hxx | 2 +-
m4/libgcrypt.m4 | 4 ++--
qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java | 2 +-
sal/osl/unx/file_path_helper.hxx | 2 +-
sal/textenc/tcvtlat1.tab | 4 ++--
sc/source/core/data/column4.cxx | 2 +-
svtools/source/config/colorcfg.cxx | 2 +-
sw/source/uibase/docvw/PostItMgr.cxx | 2 +-
sw/uiconfig/swriter/ui/inputwinmenu.ui | 2 +-
xmloff/source/chart/SchXMLExport.cxx | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 0501869949b65b27303a41fd235a6ec32a4c90a7
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Wed Aug 16 22:21:16 2017 +0200
Fix typos
Change-Id: I795059109e23800987cda6f04c58ab18c488ad07
Reviewed-on: https://gerrit.libreoffice.org/41242
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 58a2d9dcfb27..194bdf6942ff 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1952,7 +1952,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
OLECHAR const * sLength= L"length";
- // Get the length of the array. Can also be obtained throu GetNextDispID. The
+ // Get the length of the array. Can also be obtained through GetNextDispID. The
// method only returns DISPIDs of the array data. Their names are like "0", "1" etc.
if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, const_cast<OLECHAR **>(&sLength), 1, LOCALE_USER_DEFAULT, &dispid)))
throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
index 4397bdc610d1..2fa20efbf7cf 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl
@@ -130,7 +130,7 @@
<xsl:template match="/">
<!-- debug output of parameter value set -->
<xsl:if test="$debugEnabled">
- <xsl:call-template name="debug-check-paramter" />
+ <xsl:call-template name="debug-check-parameter" />
</xsl:if>
<!-- gathers style properties and
returns them as globalData parameter to the 'start-main' template -->
@@ -159,7 +159,7 @@
<!-- debug purpose only:
verbose checking of the parameters of this template-->
- <xsl:template name="debug-check-paramter">
+ <xsl:template name="debug-check-parameter">
<xsl:message>Parameter dpi: <xsl:value-of select="$dpi" /></xsl:message>
<xsl:message>Parameter metaFileURL: <xsl:value-of select="$metaFileURL" /></xsl:message>
<xsl:message>Parameter stylesFileURL: <xsl:value-of select="$stylesFileURL" /></xsl:message>
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index afabc5ca7c31..0c62f5e6d0d2 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -613,7 +613,7 @@ enum MSO_BlipFlags {
/* Or the following flags with any of the above. */
mso_blipflagDontSave = 4, // A "dont" is the depression in the metal
// body work of an automobile caused when a
- // cyclist violently thrusts his or her nose
+ // cyclist violently trusts his or her nose
// at it, thus a DontSave is another name for
// a cycle lane.
mso_blipflagDoNotSave = 4, // For those who prefer English
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 831dc0c6f439..2c79027c7894 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -13,9 +13,9 @@ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUM-VERSION is a string with the version number optionalliy prefixed
dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl a MINIMUM-VERSION of 1:1.2.5 won't pass the test unless the installed
dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
dnl this features allows to prevent build against newer versions of libgcrypt
dnl with a changed API.
diff --git a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
index 8767e15f07d1..27daceaa80ce 100644
--- a/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
+++ b/qadevOOo/tests/java/ifc/xml/sax/_XDocumentHandler.java
@@ -150,7 +150,7 @@ public class _XDocumentHandler extends MultiMethodTest {
if (targetDocSet == null){
log.println("object relation 'XDocumentHandler.TargetDocumentSetter' not used.");
- log.println("be sure that the test have a target to write throu");
+ log.println("be sure that the test have a target to write through");
}
}
diff --git a/sal/osl/unx/file_path_helper.hxx b/sal/osl/unx/file_path_helper.hxx
index d325e3b3baea..5639ce72563e 100644
--- a/sal/osl/unx/file_path_helper.hxx
+++ b/sal/osl/unx/file_path_helper.hxx
@@ -58,7 +58,7 @@ void SAL_CALL osl_systemPathEnsureSeparator(rtl_uString** ppustrPath);
@param pustrPath [in] a system path - must not be NULL
@retval sal_True the given path doesn't start with a separator
- @retval sal_False the given path starts with a seperator
+ @retval sal_False the given path starts with a separator
*/
bool SAL_CALL osl_systemPathIsRelativePath(
diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab
index d97a040268ed..4fa56e56ab00 100644
--- a/sal/textenc/tcvtlat1.tab
+++ b/sal/textenc/tcvtlat1.tab
@@ -1038,7 +1038,7 @@ static ImplTextEncodingData const aImplIBM865TextEncodingData
/* ISO-8859-14 */
/* approximately like Latin1 */
-/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control character like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-14.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -1166,7 +1166,7 @@ static ImplTextEncodingData const aImplISO885914TextEncodingData
/* ISO-8859-15 */
/* approximately like Latin1, but with Euro (former CURRENCY symbol to A4) */
-/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control character like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-15.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 3b4caab6e6c1..1d4d8293d856 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1695,7 +1695,7 @@ public:
sc::formula_block::const_iterator itEnd = it;
std::advance(itEnd, nDataSize);
- for (; it != itEnd; /* incrementing throug std::advance*/)
+ for (; it != itEnd; /* incrementing through std::advance*/)
{
const ScFormulaCell* pCell = *it;
OUString aFormula;
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 69040da4428b..78f25796f202 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -442,7 +442,7 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry eEntry)
0xCE7B00, // SQLSTRING
COL_BLACK, // SQLOPERATOR
0x0000E6, // SQLKEYWORD
- 0x259D9D, // SQLPARAMTER
+ 0x259D9D, // SQLPARAMETER
COL_GRAY, // SQLCOMMENT
};
Color aRet;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index de56b38bcc28..5e58e5155071 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -1061,7 +1061,7 @@ void SwPostItMgr::AutoScroll(const SwAnnotationWin* pPostIt,const unsigned long
const long aDiff = bBottom ? mpEditWin->LogicToPixel(Point(0,mPages[aPage-1]->mPageRect.Top() + aSidebarheight)).Y() - pPostIt->GetPosPixel().Y() :
mpEditWin->LogicToPixel(Point(0,mPages[aPage-1]->mPageRect.Bottom() - aSidebarheight)).Y() - (pPostIt->GetPosPixel().Y()+pPostIt->GetSizePixel().Height());
// this just adds the missing value to get the next a* GetScrollSize() after aDiff
- // e.g aDiff= 61 POSTIT_SCOLL=50 --> lScroll = 100
+ // e.g aDiff= 61 POSTIT_SCROLL=50 --> lScroll = 100
const long lScroll = bBottom ? (aDiff + ( GetScrollSize() - (aDiff % GetScrollSize()))) : (aDiff - (GetScrollSize() + (aDiff % GetScrollSize())));
Scroll(lScroll, aPage);
}
diff --git a/sw/uiconfig/swriter/ui/inputwinmenu.ui b/sw/uiconfig/swriter/ui/inputwinmenu.ui
index 0dc3c8d8b42f..d02d197825e2 100644
--- a/sw/uiconfig/swriter/ui/inputwinmenu.ui
+++ b/sw/uiconfig/swriter/ui/inputwinmenu.ui
@@ -112,7 +112,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="seperator1">
+ <object class="GtkSeparatorMenuItem" id="separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 26f46f8d24b9..8fdb75e86f8a 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3655,7 +3655,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
}
// #i79009# For Writer we have to export a broken version of the
- // range, where every row number is noe too large, so that older
+ // range, where every row number is not too large, so that older
// version can correctly read those files.
msChartAddress = (bBrokenRangeAvailable ? sBrokenRange : sCellRange);
if( !msChartAddress.isEmpty() )
More information about the Libreoffice-commits
mailing list