[Libreoffice-commits] core.git: include/LibreOfficeKit include/sfx2 include/svx include/vcl instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo jurt/com offapi/com
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 29 15:13:01 UTC 2018
include/LibreOfficeKit/LibreOfficeKitEnums.h | 2 +-
include/sfx2/shell.hxx | 2 +-
include/svx/svdedtv.hxx | 2 +-
include/vcl/task.hxx | 2 +-
instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt | 2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt | 2 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt | 2 +-
jurt/com/sun/star/comp/connections/PipedConnection.java | 2 +-
offapi/com/sun/star/chart2/XTransformation.idl | 2 +-
offapi/com/sun/star/form/FormComponentType.idl | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit dd6c80e4336d4c30e733f126f968b8fb7152851c
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Wed Aug 15 14:18:38 2018 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 29 17:12:35 2018 +0200
Fix typo: s/an other/another/g
Change-Id: Ifd83affcb16209f4134c725640fbd95077c8ab0f
Reviewed-on: https://gerrit.libreoffice.org/59099
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 74d49fa15824..c3ccc6aa0e10 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -349,7 +349,7 @@ typedef enum
/**
* The size and/or the position of the view cursor changed. A view cursor
- * is a cursor of an other view, the current view can't change it.
+ * is a cursor of another view, the current view can't change it.
*
* The payload format:
*
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index d2d72093338a..0887c4f3dfe9 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -97,7 +97,7 @@ enum class SfxShellFeature
FormTBMoreControls = 0x0800,
FormTBDesign = 0x1000,
FormShowDataNavigator = 0x2000,
- // masks to make sure modules don't use flags from an other
+ // masks to make sure modules don't use flags from another
SwMask = 0x0001,
BasicMask = 0x0004,
FormMask = 0x3ff8
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 27eb85e8c607..4e7f7e63eb56 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -194,7 +194,7 @@ public:
void DeleteLayer(const OUString& rName);
// Marked objects which are outside a page
- // are assigned to an other page; at the moment without undo!!!
+ // are assigned to another page; at the moment without undo!!!
void ForceMarkedObjToAnotherPage();
void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); }
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 2711d4343932..7c450099c830 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -61,7 +61,7 @@ protected:
*
* Simply return Scheduler::ImmediateTimeoutMs if you're ready, like an
* Idle. If you have to return Scheduler::InfiniteTimeoutMs, you probably
- * need an other mechanism to wake up the Scheduler or rely on other
+ * need another mechanism to wake up the Scheduler or rely on other
* Tasks to be scheduled, or simply use a polling Timer.
*
* @param nMinPeriod the currently expected sleep time
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
index 789a6d5d979b..499c013e343d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt
@@ -88,7 +88,7 @@ Condition Feature_ N Feature 1 Identifier Reference to a Feature entry in Fea
Condition Level N 0 32767 New selection Level to set in Feature table if Condition evaluates to TRUE.
Control Attributes Y 0 2147483647 A 32-bit word that specifies the attribute flags to be applied to this control.
Control Control N Identifier Name of the control. This name must be unique within a dialog, but can repeat on different dialogs.
-Control Control_Next Y Control 2 Identifier The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
+Control Control_Next Y Control 2 Identifier The name of another control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
Control Dialog_ N Dialog 1 Identifier External key to the Dialog table, name of the dialog.
Control Height N 0 32767 Height of the bounding rectangle of the control.
Control Help Y Text The help strings used with the button. The text is optional.
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index e1b061440d55..cfb8c4c7a219 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -87,7 +87,7 @@ Condition Feature_ N Feature 1 Identifier Reference to a Feature entry in Fea
Condition Level N 0 32767 New selection Level to set in Feature table if Condition evaluates to TRUE.
Control Attributes Y 0 2147483647 A 32-bit word that specifies the attribute flags to be applied to this control.
Control Control N Identifier Name of the control. This name must be unique within a dialog, but can repeat on different dialogs.
-Control Control_Next Y Control 2 Identifier The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
+Control Control_Next Y Control 2 Identifier The name of another control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
Control Dialog_ N Dialog 1 Identifier External key to the Dialog table, name of the dialog.
Control Height N 0 32767 Height of the bounding rectangle of the control.
Control Help Y Text The help strings used with the button. The text is optional.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
index 789a6d5d979b..499c013e343d 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/_Validat.idt
@@ -88,7 +88,7 @@ Condition Feature_ N Feature 1 Identifier Reference to a Feature entry in Fea
Condition Level N 0 32767 New selection Level to set in Feature table if Condition evaluates to TRUE.
Control Attributes Y 0 2147483647 A 32-bit word that specifies the attribute flags to be applied to this control.
Control Control N Identifier Name of the control. This name must be unique within a dialog, but can repeat on different dialogs.
-Control Control_Next Y Control 2 Identifier The name of an other control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
+Control Control_Next Y Control 2 Identifier The name of another control on the same dialog. This link defines the tab order of the controls. The links have to form one or more cycles!
Control Dialog_ N Dialog 1 Identifier External key to the Dialog table, name of the dialog.
Control Height N 0 32767 Height of the bounding rectangle of the control.
Control Help Y Text The help strings used with the button. The text is optional.
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index eceea9aa51e8..631cfae40ee0 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -85,7 +85,7 @@ public class PipedConnection implements XConnection {
protected PipedConnection _otherSide;
/**
- * Constructs a new <code>PipedConnection</code>, sees if there is an other
+ * Constructs a new <code>PipedConnection</code>, sees if there is another
* side, which it should be connected to.
*
* @param args Another side could be in index 0.
diff --git a/offapi/com/sun/star/chart2/XTransformation.idl b/offapi/com/sun/star/chart2/XTransformation.idl
index 80b655660935..a19ce8839116 100644
--- a/offapi/com/sun/star/chart2/XTransformation.idl
+++ b/offapi/com/sun/star/chart2/XTransformation.idl
@@ -37,7 +37,7 @@ module chart2
// ... access to source and destination coordinate system ?
/** allows the transformation of numeric values from one
- coordinate-system into an other. Values may be transformed using
+ coordinate-system into another. Values may be transformed using
any mapping.
*/
interface XTransformation : ::com::sun::star::uno::XInterface
diff --git a/offapi/com/sun/star/form/FormComponentType.idl b/offapi/com/sun/star/form/FormComponentType.idl
index a35286b7dee2..3da73576b949 100644
--- a/offapi/com/sun/star/form/FormComponentType.idl
+++ b/offapi/com/sun/star/form/FormComponentType.idl
@@ -30,7 +30,7 @@ published constants FormComponentType
{
/** This generic identifier is for controls which cannot be identified by
- an other specific identifier.
+ another specific identifier.
*/
const short CONTROL = 1;
More information about the Libreoffice-commits
mailing list