[Libreoffice-commits] core.git: filter/source include/cppuhelper stoc/test
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Fri Aug 9 08:50:43 UTC 2019
filter/source/xslt/export/spreadsheetml/styles.xsl | 2 +-
filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl | 2 +-
include/cppuhelper/implbase.hxx | 2 +-
include/cppuhelper/implbase1.hxx | 4 ++--
include/cppuhelper/implbase10.hxx | 4 ++--
include/cppuhelper/implbase11.hxx | 4 ++--
include/cppuhelper/implbase12.hxx | 4 ++--
include/cppuhelper/implbase13.hxx | 4 ++--
include/cppuhelper/implbase2.hxx | 4 ++--
include/cppuhelper/implbase3.hxx | 4 ++--
include/cppuhelper/implbase4.hxx | 4 ++--
include/cppuhelper/implbase5.hxx | 4 ++--
include/cppuhelper/implbase6.hxx | 4 ++--
include/cppuhelper/implbase7.hxx | 4 ++--
include/cppuhelper/implbase8.hxx | 4 ++--
include/cppuhelper/implbase9.hxx | 4 ++--
stoc/test/language_binding.idl | 2 +-
17 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 7f8dbdc18cec9ddb45e0ecd543b35b738e0ad13c
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Aug 7 17:27:33 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Aug 9 10:49:46 2019 +0200
Fix typo
"Inherting"
Change-Id: Ib9b1fcfd9ef585149de5018ce650707c71d412c8
Reviewed-on: https://gerrit.libreoffice.org/77127
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/filter/source/xslt/export/spreadsheetml/styles.xsl b/filter/source/xslt/export/spreadsheetml/styles.xsl
index 8c9c042dda8d..a3c4b8bae159 100644
--- a/filter/source/xslt/export/spreadsheetml/styles.xsl
+++ b/filter/source/xslt/export/spreadsheetml/styles.xsl
@@ -120,7 +120,7 @@
</xsl:choose>
</xsl:when>
<xsl:otherwise>
- <!-- automatic styles are implicit inherting from a style called 'Default',
+ <!-- automatic styles are implicit inheriting from a style called 'Default',
furthermore nor in spreadsheetml nor in OpenDocument automatic styles are able to inherit from each other -->
<xsl:choose>
<xsl:when test="@style:parent-style-name and not(@style:parent-style-name = 'Default')">
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 d3c6d37f8fa4..f9b5aff1b363 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -381,7 +381,7 @@
<xsl:param name="inheritedStyleProperties" />
<xsl:param name="searchOnlyInAutomaticStyles" />
- <!--** create an absolute style by inherting properties from the given parent properties **-->
+ <!--** create an absolute style by inheriting properties from the given parent properties **-->
<xsl:variable name="newStyleProperties-RTF">
<xsl:call-template name="create-inherited-style-properties">
<xsl:with-param name="inheritedStyleProperties" select="$inheritedStyleProperties" />
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index b5d67edac990..02bfb4ce7eef 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -123,7 +123,7 @@ public:
/** Implementation helper implementing interfaces
css::uno::XInterface and css::lang::XTypeProvider
- inherting from a BaseClass.
+ inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon
queryInterface(), if a demanded interface is not supported by this class
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 61f7c0780df8..9850f4b832af 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -164,7 +164,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -231,7 +231,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index ea978e115162..0fe7b37c018b 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -170,7 +170,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -237,7 +237,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index 2ce61f8f8a4b..66b7dd27813e 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -171,7 +171,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -238,7 +238,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index afc5b4e34f0e..a4ed0241867a 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -172,7 +172,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -239,7 +239,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index 7ebb695d2ce6..68401e482122 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -173,7 +173,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -240,7 +240,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index bdf8568db51a..c142cd3fd9d1 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -161,7 +161,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -228,7 +228,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index 590471118f8b..9babfe04072a 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -162,7 +162,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -230,7 +230,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 36279a0f74b5..2b5f55e8f20a 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -164,7 +164,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -231,7 +231,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 1b300dcf6c04..c8bbd9a406b5 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -165,7 +165,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -232,7 +232,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 62652c9819e2..724005f0a88a 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -166,7 +166,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -233,7 +233,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index 0d1e12a91117..5358b8ca5b90 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -167,7 +167,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -234,7 +234,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 08dec44e4215..1c9cbbccc77d 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -168,7 +168,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -235,7 +235,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 2c3fe2bd1a74..5914b42202f9 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -169,7 +169,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire() and release() calls are delegated to the BaseClass. Upon queryInterface(),
if a demanded interface is not supported by this class directly, the request is
delegated to the BaseClass.
@@ -236,7 +236,7 @@ namespace cppu
{ return ImplHelper_getImplementationId( cd::get() ); }
};
/** Implementation helper implementing interfaces css::lang::XTypeProvider and
- css::uno::XInterface inherting from a BaseClass.
+ css::uno::XInterface inheriting from a BaseClass.
All acquire(), release() and queryInterface() calls are delegated to the BaseClass.
Upon queryAggregation(), if a demanded interface is not supported by this class directly,
the request is delegated to the BaseClass.
diff --git a/stoc/test/language_binding.idl b/stoc/test/language_binding.idl
index 38ddce1c7650..e4d240b4fb9c 100644
--- a/stoc/test/language_binding.idl
+++ b/stoc/test/language_binding.idl
@@ -132,7 +132,7 @@ interface XLBTestBase : com::sun::star::uno::XInterface
};
-/** Inherting from monster; adds raiseException(). */
+/** Inheriting from monster; adds raiseException(). */
interface XLanguageBindingTest : test::XLBTestBase
{
/**
More information about the Libreoffice-commits
mailing list