[Libreoffice-commits] core.git: idl/source sfx2/classification solenv/clang-format sw/source

[Andrea Gelmini]

 idl/source/prj/command.cxx            |    2 +-
 sfx2/classification/xAL.xsd           |    2 +-
 solenv/clang-format/check-last-commit |    2 +-
 sw/source/filter/ww8/ww8par2.cxx      |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0d4cc84ccaedebdcb3303e6c8cdd209d8390c64d
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Mon Nov 20 21:39:14 2017 +0100

    Fix typos
    
    Change-Id: Ifd95ada4477d7d21ffbadd355226f91f2a2371e1
    Reviewed-on: https://gerrit.libreoffice.org/45004
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 8f35643db707..50d410819c28 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -54,7 +54,7 @@ char const * const SyntaxStrings[] = {
 "\ttype definition:",
 "\tstruct identifier",
 "\t'{'",
-"\t\t{ type idetifier }",
+"\t\t{ type identifier }",
 "\t'}'",
 "\t|",
 "\tenum identifier",
diff --git a/sfx2/classification/xAL.xsd b/sfx2/classification/xAL.xsd
index c568c5001890..982a48b8fa66 100644
--- a/sfx2/classification/xAL.xsd
+++ b/sfx2/classification/xAL.xsd
@@ -497,7 +497,7 @@
 		</xs:attribute>
 		<xs:attribute name="AddressID" type="ct:String">
 			<xs:annotation>
-				<xs:documentation>A unique address identifier such as postal delivery idetifier assigned to the address by local postal authority, e.g. DPID in Australia.</xs:documentation>
+				<xs:documentation>A unique address identifier such as postal delivery identifier assigned to the address by local postal authority, e.g. DPID in Australia.</xs:documentation>
 			</xs:annotation>
 		</xs:attribute>
 		<xs:attribute name="AddressIDType" type="AddressIDTypeList">
diff --git a/solenv/clang-format/check-last-commit b/solenv/clang-format/check-last-commit
index 9a9458e1af95..8c3628af76d1 100755
--- a/solenv/clang-format/check-last-commit
+++ b/solenv/clang-format/check-last-commit
@@ -27,7 +27,7 @@ sub check_style()
     my $clang_format = ClangFormat::find();
 
     # Get a list of non-deleted changed files.
-    # Explicitly use the low-level 'git diff-tree' (rathern that plain 'git
+    # Explicitly use the low-level 'git diff-tree' (rather than plain 'git
     # diff') so we get the new, but not the old files for renames and/or
     # copies.
     open (FILES, "git diff-tree -r --diff-filter=AM --name-only HEAD^ HEAD |") ||  die "Cannot run git diff.";
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 5a7c740e8c3b..fc9ca941a39d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4601,7 +4601,7 @@ void WW8RStyle::Import()
                  && pi->m_pFormat                        // Format ok ?
                  && pj->m_pFormat                        // Derived-Format ok ?
                  && pi->m_bColl                       // only possible for paragraph templates (WW)
-                 && pj->m_bColl ){                    // identical Typ ?
+                 && pj->m_bColl ){                    // identical Type ?
                     static_cast<SwTextFormatColl*>(pi->m_pFormat)->SetNextTextFormatColl(
                      *static_cast<SwTextFormatColl*>(pj->m_pFormat) );    // ok, register
             }