[Libreoffice-commits] core.git: connectivity/inc connectivity/source dbaccess/source desktop/source editeng/source filter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 16 21:51:21 UTC 2018
connectivity/inc/strings.hrc | 2 +-
connectivity/source/drivers/mork/MCatalog.hxx | 2 +-
connectivity/source/inc/hsqldb/HCatalog.hxx | 2 +-
connectivity/source/inc/mysql/YCatalog.hxx | 2 +-
dbaccess/source/core/dataaccess/databasedocument.hxx | 2 +-
desktop/source/lib/init.cxx | 2 +-
editeng/source/editeng/impedit.cxx | 4 ++--
editeng/source/editeng/impedit.hxx | 2 +-
editeng/source/editeng/impedit2.cxx | 2 +-
filter/source/svg/presentation_engine.js | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 57abecebc1b6c114b93fea34f133ac4eeb157dc3
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Aug 16 13:55:31 2018 +0200
Commit: Jens Carl <j.carl43 at gmx.de>
CommitDate: Thu Aug 16 23:50:54 2018 +0200
Fix typo: s/an other/another/g
Change-Id: I203c546cfca841e7853282267190e20b60919add
Reviewed-on: https://gerrit.libreoffice.org/59098
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/connectivity/inc/strings.hrc b/connectivity/inc/strings.hrc
index d2380e45b92f..129a41826b02 100644
--- a/connectivity/inc/strings.hrc
+++ b/connectivity/inc/strings.hrc
@@ -77,7 +77,7 @@
#define STR_ONL_ONE_COLUMN_PER_INDEX NC_("STR_ONL_ONE_COLUMN_PER_INDEX", "The index could not be created. Only one column per index is allowed.")
#define STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE NC_("STR_COULD_NOT_CREATE_INDEX_NOT_UNIQUE", "The index could not be created. The values are not unique.")
#define STR_COULD_NOT_CREATE_INDEX NC_("STR_COULD_NOT_CREATE_INDEX", "The index could not be created. An unknown error appeared.")
-#define STR_COULD_NOT_CREATE_INDEX_NAME NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The file '$filename$' is used by an other index.")
+#define STR_COULD_NOT_CREATE_INDEX_NAME NC_("STR_COULD_NOT_CREATE_INDEX_NAME", "The index could not be created. The file '$filename$' is used by another index.")
#define STR_COULD_NOT_CREATE_INDEX_KEYSIZE NC_("STR_COULD_NOT_CREATE_INDEX_KEYSIZE", "The index could not be created. The size of the chosen column is too big.")
#define STR_SQL_NAME_ERROR NC_("STR_SQL_NAME_ERROR", "The name '$name$' doesn't match SQL naming constraints.")
#define STR_COULD_NOT_DELETE_FILE NC_("STR_COULD_NOT_DELETE_FILE", "The file $filename$ could not be deleted.")
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx
index 5f5f817e78c8..1c6f7904f4ef 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -25,7 +25,7 @@ namespace connectivity
{
namespace mork
{
- // please don't name the class the same name as in an other namespaces
+ // please don't name the class the same name as in another namespaces
// some compilers have problems with this task as I noticed on windows
class OConnection;
class OCatalog : public connectivity::sdbcx::OCatalog
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index f953c9f30ae1..b2aa95c11a2b 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -25,7 +25,7 @@ namespace connectivity
{
namespace hsqldb
{
- // please don't name the class the same name as in an other namespaces
+ // please don't name the class the same name as in another namespaces
// some compilers have problems with this task as I noticed on windows
class OHCatalog : public connectivity::sdbcx::OCatalog
{
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index d6b465ff8c84..8af6b82c2aa0 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -25,7 +25,7 @@ namespace connectivity
{
namespace mysql
{
- // please don't name the class the same name as in an other namespaces
+ // please don't name the class the same name as in another namespaces
// some compilers have problems with this task as I noticed on windows
class OMySQLCatalog : public connectivity::sdbcx::OCatalog
{
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index e910bff75d3e..df5765855df7 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -196,7 +196,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
bool m_bClosing;
bool m_bAllowDocumentScripting;
bool m_bHasBeenRecovered;
- /// If XModel::attachResource() was called to inform us that the document is embedded into an other one.
+ /// If XModel::attachResource() was called to inform us that the document is embedded into another one.
bool m_bEmbedded;
enum StoreType { SAVE, SAVE_AS };
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3af3b54d015f..ddbdeaa4e5ba 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2157,7 +2157,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* pThis,
int nViewId = nOrigViewId;
if (!isText)
{
- // Check if just switching to an other view is enough, that has
+ // Check if just switching to another view is enough, that has
// less side-effects.
if (nPart != doc_getPart(pThis))
{
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 4580a573ed19..7b8f9fbd112e 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -451,7 +451,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel, vcl::Region* pRegion,
if (mpOtherShell)
{
- // An other shell wants to know about our existing selection.
+ // Another shell wants to know about our existing selection.
if (mpViewShell != mpOtherShell)
mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", sRectangle);
}
@@ -1108,7 +1108,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
OString sRect = aRect.toString();
if (mpOtherShell)
{
- // An other shell wants to know about our existing cursor.
+ // Another shell wants to know about our existing cursor.
if (mpViewShell != mpOtherShell)
mpViewShell->NotifyOtherView(mpOtherShell, LOK_CALLBACK_INVALIDATE_VIEW_CURSOR, "rectangle", sRect);
}
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 737b347a4192..c8199bd72045 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -230,7 +230,7 @@ private:
std::unique_ptr<Color> pBackgroundColor;
/// Containing view shell, if any.
OutlinerViewShell* mpViewShell;
- /// An other shell, just listening to our state, if any.
+ /// Another shell, just listening to our state, if any.
OutlinerViewShell* mpOtherShell;
EditEngine* pEditEngine;
VclPtr<vcl::Window> pOutWin;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 8a38a97661db..a3a3c374d3a9 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1663,7 +1663,7 @@ void ImpEditEngine::InitScriptTypes( sal_Int32 nPara )
}
// ... but if the first one is LATIN, and there are CJK or CTL chars too,
- // we prefer that ScripType because we need an other font.
+ // we prefer that ScriptType because we need another font.
if ( ( nTmpType == i18n::ScriptType::ASIAN ) || ( nTmpType == i18n::ScriptType::COMPLEX ) )
{
aText = aText.replaceAt( pField->GetStart(), 1, aFldText.copy(nCharInField,1) );
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js
index 7fd8eaa3d8fa..61e0d5fd7277 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -2432,7 +2432,7 @@ initMasterPage : function()
var sMasterPageId = this.element.getAttributeNS( NSS['ooo'], aOOOAttrMaster );
// Check that the master page handler object has not already been
- // created by an other slide that target the same master page.
+ // created by another slide that target the same master page.
if( !this.theMetaDoc.aMasterPageSet.hasOwnProperty( sMasterPageId ) )
{
this.theMetaDoc.aMasterPageSet[ sMasterPageId ] = new MasterPage( sMasterPageId, this );
More information about the Libreoffice-commits
mailing list