[Libreoffice-commits] core.git: cli_ure/source desktop/source extensions/source javaunohelper/com reportbuilder/java sd/source sfx2/source ucb/source xmloff/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jul 23 09:45:20 UTC 2018
cli_ure/source/climaker/climaker_emit.cxx | 4 ++--
desktop/source/deployment/registry/executable/dp_executable.cxx | 2 +-
extensions/source/ole/oleobjw.hxx | 2 +-
extensions/source/ole/unoobjw.cxx | 2 +-
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 2 +-
reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java | 4 ++--
sd/source/ui/animations/CustomAnimationDialog.cxx | 4 ++--
sd/source/ui/inc/ViewShell.hxx | 2 +-
sfx2/source/dialog/filtergrouping.cxx | 2 +-
ucb/source/sorter/sortresult.cxx | 2 +-
xmloff/source/text/txtimp.cxx | 2 +-
xmlsecurity/source/helper/xsecctl.cxx | 2 +-
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 4 ++--
13 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 7d071f35bee7bed82ac47429a594e76617518d20
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Jul 22 23:27:34 2018 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Jul 23 11:44:59 2018 +0200
Fix typos
Change-Id: Iebc31a53404da41f35eed7338662365d7efbd7a2
Reviewed-on: https://gerrit.libreoffice.org/57810
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 162963b6f15d..bfd0b88a05f7 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -660,7 +660,7 @@ Assembly ^ TypeEmitter::type_resolve(
}
//In case of an instantiated polymorphic struct we want to return a
- //uno.PolymorphicType (inherits Type) rather then Type. This is neaded for constructing
+ //uno.PolymorphicType (inherits Type) rather than Type. This is needed for constructing
//the service code. We can only do that if the struct is completed.
if (m_generated_structs[cts_name])
{
@@ -823,7 +823,7 @@ Assembly ^ TypeEmitter::type_resolve(
{
for (int i = 0; i < seqBaseTypes.getLength(); i++)
{
- //make sure we get the interface rather then a typedef
+ //make sure we get the interface rather than a typedef
Reference<reflection::XInterfaceTypeDescription2> aBaseType =
resolveInterfaceTypedef( seqBaseTypes[i]);
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 5f7eb30519d3..64be7a09992e 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -244,7 +244,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_(
//installed. That is an executable must have the right flags
OSL_ASSERT(false);
- //This won't have affect on Windows
+ //This won't have effect on Windows
osl::File::setAttributes(
dp_misc::expandUnoRcUrl(m_url), attributes);
}
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 793e00a12a18..1ba5b8a5ebbf 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -220,7 +220,7 @@ protected:
CComPtr<IDispatch> m_spDispatch;
OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type
/** This value is set during XInitialization::initialize. It indicates that the COM interface
- was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN
+ was transported as VT_DISPATCH in a VARIANT rather than a VT_UNKNOWN
*/
bool m_bOriginalDispatch;
DispIdMap m_dispIdMap;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 0c0347320096..4165fbfbac83 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1650,7 +1650,7 @@ static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
// if caller accept VARIANT as out parameter, any value must be converted
if (V_VT(pDest) == (VT_VARIANT | VT_BYREF))
{
- // When the user provides a VARIANT rather then a concrete type
+ // When the user provides a VARIANT rather than a concrete type
// we just copy the source to the out, in/out parameter
// VT_DISPATCH, VT_UNKNOWN, VT_ARRAY, VT_BSTR in the VARIANT that
// is contained in pDest are released by VariantCopy
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 75eb4f5d4763..8838ccee5334 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -592,7 +592,7 @@ XMultiPropertySet
* Then, no conversion is necessary, since they can hold all possible values. However, if
* the member is an Object and <em>setVal</em> is an Any then the object contained in the any is assigned to
* the member. The extra type information which exists as Type object in the Any will get lost. If this is not
- * intended then use an Any variable rather then an Object.
+ * intended then use an Any variable rather than an Object.
*
* If a member is an Object or Any and the argument <em>setVal</em> is an Object, other than String or array,
* then it is presumed to be an UNO object and queried for XInterface. If successful, the out-param <em>newVal</em>
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
index 8c06ac021606..e285d8b18caf 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java
@@ -116,9 +116,9 @@ public class ImageReadHandler extends ElementReadHandler
@Override
protected void doneParsing() throws SAXException
{
- // if we have static content (as well or only), that one goes into the
+ // if we have static content (as well as or only), that one goes into the
// alternate-content attribute right now. It is part of the output target
- // and style rules to deal with them properly ..
+ // and style rules to deal with them properly.
if (xLinkReadHandler != null)
{
contentElement.setAttribute(OfficeNamespaces.OOREPORT_NS,
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index fbcdad9097c9..fe4218cb0ba6 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1335,7 +1335,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
if( mpCBSmoothStart->IsVisible() )
{
- // set selected value for accelerate if different then in original set
+ // set selected value for accelerate if different than in original set
double fTemp = mpCBSmoothStart->IsChecked() ? 0.5 : 0.0;
@@ -1348,7 +1348,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
if( fOldTemp != fTemp )
pSet->setPropertyValue( nHandleAccelerate, makeAny( fTemp ) );
- // set selected value for decelerate if different then in original set
+ // set selected value for decelerate if different than in original set
fTemp = mpCBSmoothEnd->IsChecked() ? 0.5 : 0.0;
if(mpSet->getPropertyState( nHandleDecelerate ) != STLPropertyState::Ambiguous)
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7498ff14ce2e..a6d81ac3e910 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -83,7 +83,7 @@ static const DrawModeFlags OUTPUT_DRAWMODE_CONTRAST
<p>Despite its name this class is not a descendant of SfxViewShell
but of SfxShell. Its name expresses the fact that it acts like a
- view shell. Being a stacked shell rather then being an actual view shell
+ view shell. Being a stacked shell rather than being an actual view shell
there can be several instances of this class that
<ul>
<li>all are based on the same view shell and thus show the same
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 2cd55e1d3c21..471bf35ee942 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -103,7 +103,7 @@ namespace sfx2
into the file picker filter list, instead of the single filters which form the class.</p>
<p>This is an interesting difference between local and global classes: Filters which are part of a global class
- are listed in there own group, too. Filters in local classes aren't listed a second time - neither directly (as
+ are listed in their own group, too. Filters in local classes aren't listed a second time - neither directly (as
the filter itself) nor indirectly (as part of another local group).</p>
<p>The only exception are filters which are part of a global class <em>and</em> a local class. This is allowed.
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index f8b4b05b4bd5..906e368a0523 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1500,7 +1500,7 @@ void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffs
}
}
- // finally put the remembered entries at there new location
+ // finally put the remembered entries at their new location
nTo = nPos + nOffset;
for ( i=0; i<nCount; i++ )
{
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 85f3a895952f..3f5ac56b279a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1615,7 +1615,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
bool bSameNumRules = xNewNumRules == xNumRules;
if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
{
- // If the interface pointers are different then this does
+ // If the interface pointers are different, then this does
// not mean that the num rules are different. Further tests
// are required then. However, if only one num rule is
// set, no tests are required of course.
diff --git a/xmlsecurity/source/helper/xsecctl.cxx b/xmlsecurity/source/helper/xsecctl.cxx
index e7731672a331..7a8422bc39e2 100644
--- a/xmlsecurity/source/helper/xsecctl.cxx
+++ b/xmlsecurity/source/helper/xsecctl.cxx
@@ -837,7 +837,7 @@ void XSecController::exportSignature(
OUStringBuffer buffer;
//If the xml signature was already contained in the document,
- //then we use the original date and time string, rather then the
+ //then we use the original date and time string, rather than the
//converted one. This avoids writing a different string due to
//e.g. rounding issues and thus breaking the signature.
if (!signatureInfo.ouDateTime.isEmpty())
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index c402e2833604..dd035c6f657a 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -213,9 +213,9 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen
//used on a different platform.
//
//Then one needs to add the roots module oneself. This should be done with
-//SECMOD_LoadUserModule rather then SECMOD_AddNewModule. The latter would write
+//SECMOD_LoadUserModule rather than SECMOD_AddNewModule. The latter would write
//the location of the roots module to the profile, which makes FF2 and TB2 use
-//it instead of there own module.
+//it instead of their own module.
//
//When using SYSTEM_NSS then the libnss3.so lib is typically found in /usr/lib.
//This folder may, however, NOT contain the roots certificate module. That is,
More information about the Libreoffice-commits
mailing list