[Libreoffice-commits] core.git: jvmfwk/plugins librelogo/source lingucomponent/source linguistic/source lotuswordpro/source mysqlc/source odk/examples offapi/com offapi/org offapi/type_reference oox/source
Andrea Gelmini
andrea.gelmini at gelma.net
Thu Mar 2 12:40:05 UTC 2017
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 2 +-
librelogo/source/LibreLogo/LibreLogo.py | 2 +-
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2 +-
linguistic/source/gciterator.hxx | 2 +-
lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2 +-
lotuswordpro/source/filter/lwppara.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfofficemeta.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfutil.hxx | 2 +-
mysqlc/source/mysqlc_connection.cxx | 2 +-
mysqlc/source/mysqlc_driver.cxx | 2 +-
odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java | 2 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx | 2 +-
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx | 2 +-
odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java | 10 +++++-----
odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java | 2 +-
odk/examples/java/MinimalComponent/MinimalComponent.java | 2 +-
offapi/com/sun/star/ui/XSidebar.idl | 2 +-
offapi/org/freedesktop/PackageKit/XQuery.idl | 2 +-
offapi/type_reference/typelibrary_history.txt | 2 +-
oox/source/drawingml/customshapepresetdata.cxx | 10 +++++-----
20 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 5bea199bae9986d7276a9b2379a577c6cea552ed
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Thu Mar 2 12:24:24 2017 +0100
Fix typos
Change-Id: Ic6c41fbcc36c11a7528cde0986593a39c2d6738b
Reviewed-on: https://gerrit.libreoffice.org/34803
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 01169a7..0f5e126 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -1297,7 +1297,7 @@ void addJavaInfosDirScan(
{
//usr/java
//When we look directly into a dir like /usr, /usr/lib, etc. then we only
- //look for certain java directories, such as jre, jdk, etc. Whe do not want
+ //look for certain java directories, such as jre, jdk, etc. We do not want
//to examine the whole directory because of performance reasons.
DirectoryItem item2;
if(DirectoryItem::get(usDir2, item2) == File::E_None)
diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index f51202c..287404d 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1728,7 +1728,7 @@ def __compil__(s):
if len(subnames) > 0:
globs = "global %s" % ", ".join(subnames)
- # search user functions (function calls with two or more arguments need explicite Python parentheses)
+ # search user functions (function calls with two or more arguments need explicit Python parentheses)
ends = __l12n__(_.lng)["END"] # support multiple names of "END"
firstend = ends.split("|")[0]
s = re.sub(r"(?<!:)\b(?:%s)\b" % ends, firstend, s)
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index ea6aca5..579c452 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -316,7 +316,7 @@ Sequence < Reference < css::linguistic2::XMeaning > > SAL_CALL Thesaurus::queryM
{
if (rLocale == aTLocs[i])
{
- // open up and intialize this thesaurus if need be
+ // open up and initialize this thesaurus if need be
if (!aThes[i])
{
OUString datpath = aTNames[i] + ".dat";
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index a4d6fc1..0d7a185 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -109,7 +109,7 @@ class GrammarCheckingIterator:
osl::Condition m_aWakeUpThread;
oslThread m_thread;
- //! beware of initilization order !
+ //! beware of initialization order!
struct MyMutex : public rtl::Static< osl::Mutex, MyMutex > {};
comphelper::OInterfaceContainerHelper2 m_aEventListeners;
comphelper::OInterfaceContainerHelper2 m_aNotifyListeners;
diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
index 6193168..bd2500f 100644
--- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx
@@ -56,7 +56,7 @@
/**
* @file
* For LWP filter architecture prototype
- * Implemention of class LwpBackgroundStuff.
+ * Implementation of class LwpBackgroundStuff.
*/
#include "lwpbackgroundstuff.hxx"
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index 17f0c04..10acd0a 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -742,7 +742,7 @@ void LwpPara::RegisterStyle()
//register master page;
RegisterMasterPage(GetXFParaStyle());
- // reg auto style,lay here for pagebreak need overrided para style
+ // reg auto style,lay here for pagebreak need overridden para style
m_Fribs.SetPara(this);
m_Fribs.RegisterStyle();
diff --git a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
index fbeb52e..d200802 100644
--- a/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfofficemeta.cxx
@@ -55,7 +55,7 @@
************************************************************************/
/*************************************************************************
* @file
- * Implemention file for Meta data,pls reference to the header file.
+ * Implementation file for Meta data,pls reference to the header file.
************************************************************************/
#include "xfofficemeta.hxx"
#include "ixfstream.hxx"
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx
index 8d72ab7..c9eddad 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx
@@ -55,7 +55,7 @@
************************************************************************/
/*************************************************************************
* @file
- * Tool funtions for xml filter.
+ * Tool functions for xml filter.
* Don't use any template for the ***TOOUString function list for easy.
************************************************************************/
#ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_XFILTER_XFUTIL_HXX
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 8732d9d..5f08231 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -495,7 +495,7 @@ void SAL_CALL OConnection::clearWarnings()
void OConnection::disposing()
{
- // we noticed that we should be destroied in near future so we have to dispose our statements
+ // we noticed that we should be destroyed in near future so we have to dispose our statements
MutexGuard aGuard(m_aMutex);
for (OWeakRefArray::iterator i = m_aStatements.begin(); i != m_aStatements.end() ; ++i) {
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 02d0184..319fc96 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -56,7 +56,7 @@ void MysqlCDriver::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
- // when driver will be destroied so all our connections have to be destroied as well
+ // when driver will be destroyed so all our connections have to be destroyed as well
for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i)
{
Reference< XComponent > xComp(i->get(), UNO_QUERY);
diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
index cc7e6c0..372f6c2 100644
--- a/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
+++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java
@@ -119,7 +119,7 @@ public class LicenseTest {
public void initialize( Object[] object )
throws com.sun.star.uno.Exception {
/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can intialize
+ * order!At this point you can read the objects and can initialize
* your component using these objects.
*/
}
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 860a907..4db2f20 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -379,7 +379,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
void OConnection::disposing()
{
- // we noticed that we should be destroied in near future so we have to dispose our statements
+ // we noticed that we should be destroyed in near future so we have to dispose our statements
::osl::MutexGuard aGuard(m_aMutex);
for (OWeakRefArray::iterator i = m_aStatements.begin(); m_aStatements.end() != i; ++i)
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
index 1c25940..1c3abba 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
@@ -63,7 +63,7 @@ void SkeletonDriver::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
- // when driver will be destroied so all our connections have to be destroied as well
+ // when driver will be destroyed so all our connections have to be destroyed as well
for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i)
{
Reference< XComponent > xComp(i->get(), UNO_QUERY);
diff --git a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
index 642c978..47bfe15 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
@@ -64,7 +64,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
xCompLoader.loadComponentFromURL("private:factory/swriter",
"_blank", 0, new com.sun.star.beans.PropertyValue[0]);
- // intialize the test document
+ // initialize the test document
com.sun.star.frame.XFrame xFrame = null;
{
com.sun.star.text.XTextDocument xDoc =UnoRuntime.queryInterface(com.sun.star.text.XTextDocument.class,
@@ -176,7 +176,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
xMenuElementFactory.createInstance(
"com.sun.star.ui.ActionTriggerContainer" ));
- // intialize root menu entry
+ // initialize root menu entry
xRootMenuEntry.setPropertyValue( "Text", "Help");
xRootMenuEntry.setPropertyValue( "CommandURL", "slot:5410");
xRootMenuEntry.setPropertyValue( "HelpURL", "5410");
@@ -184,7 +184,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
// create menu entries for the new sub menu
- // intialize help/content menu entry
+ // initialize help/content menu entry
XPropertySet xMenuEntry = UnoRuntime.queryInterface(
XPropertySet.class, xMenuElementFactory.createInstance(
"com.sun.star.ui.ActionTrigger" ));
@@ -196,7 +196,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
// insert menu entry to sub menu
xSubMenuContainer.insertByIndex( 0, xMenuEntry );
- // intialize help/help on help
+ // initialize help/help on help
xMenuEntry = UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class,
xMenuElementFactory.createInstance(
@@ -208,7 +208,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor {
// insert menu entry to sub menu
xSubMenuContainer.insertByIndex( 1, xMenuEntry );
- // intialize help/tips
+ // initialize help/tips
xMenuEntry = UnoRuntime.queryInterface(
com.sun.star.beans.XPropertySet.class,
xMenuElementFactory.createInstance(
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
index a294923..8d2886b 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
@@ -323,7 +323,7 @@ public class LinguisticExamples
}
}
- //! remove listener before programm termination.
+ //! remove listener before program termination.
//! should not be omitted.
mxLinguSvcMgr.removeLinguServiceManagerListener(aClient);
diff --git a/odk/examples/java/MinimalComponent/MinimalComponent.java b/odk/examples/java/MinimalComponent/MinimalComponent.java
index 828cf0c..b18a777 100644
--- a/odk/examples/java/MinimalComponent/MinimalComponent.java
+++ b/odk/examples/java/MinimalComponent/MinimalComponent.java
@@ -92,7 +92,7 @@ public class MinimalComponent {
public void initialize( Object[] object )
throws com.sun.star.uno.Exception {
/* The component describes what arguments its expected and in which
- * order!At this point you can read the objects and can intialize
+ * order!At this point you can read the objects and can initialize
* your component using these objects.
*/
}
diff --git a/offapi/com/sun/star/ui/XSidebar.idl b/offapi/com/sun/star/ui/XSidebar.idl
index d5c495e..1881804 100644
--- a/offapi/com/sun/star/ui/XSidebar.idl
+++ b/offapi/com/sun/star/ui/XSidebar.idl
@@ -29,7 +29,7 @@ interface XSidebar
{
/** Request layout of the sidebar.
Call this method when one of the panels wants to change its size due to
- late initilization or different content after a context change.
+ late initialization or different content after a context change.
*/
void requestLayout ();
} ;
diff --git a/offapi/org/freedesktop/PackageKit/XQuery.idl b/offapi/org/freedesktop/PackageKit/XQuery.idl
index ecfe1aa..d55ffcf 100644
--- a/offapi/org/freedesktop/PackageKit/XQuery.idl
+++ b/offapi/org/freedesktop/PackageKit/XQuery.idl
@@ -18,7 +18,7 @@ module freedesktop
module PackageKit
{
/**
- * The interface used for quering the package database.
+ * The interface used for querying the package database.
*
* @sa
* https://git.gnome.org/browse/gnome-software/tree/src/org.freedesktop.PackageKit.xml
diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt
index 02b7fee..7f375fa 100644
--- a/offapi/type_reference/typelibrary_history.txt
+++ b/offapi/type_reference/typelibrary_history.txt
@@ -105,7 +105,7 @@
05/15/06 (JSC, TL): TaskID=i54823,i62825
adapt the documentation because of specification errors which have never matched
- the existing implmentation.
+ the existing implementation.
Style -> FollowStyle property is now of type string instead of boolean
TextTableRow -> TableColumnSeparators is now a sequence instead of the single return
diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx
index 8916ae2..4773eef 100644
--- a/oox/source/drawingml/customshapepresetdata.cxx
+++ b/oox/source/drawingml/customshapepresetdata.cxx
@@ -77,7 +77,7 @@ drawing::EnhancedCustomShapeParameterPair lcl_parseEnhancedCustomShapeParameterP
{
drawing::EnhancedCustomShapeParameterPair aPair;
OString aToken = rValue;
- // We expect the followings here: First.Value, First.Type, Second.Value, Second.Type
+ // We expect the following here: First.Value, First.Type, Second.Value, Second.Type
static const char aExpectedFVPrefix[] = "First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) ";
assert(aToken.startsWith(aExpectedFVPrefix));
sal_Int32 nIndex = strlen(aExpectedFVPrefix);
@@ -107,7 +107,7 @@ drawing::EnhancedCustomShapeSegment lcl_parseEnhancedCustomShapeSegment(const OS
{
drawing::EnhancedCustomShapeSegment aSegment;
OString aToken = rValue;
- // We expect the followings here: Command, Count
+ // We expect the following here: Command, Count
static const char aExpectedCommandPrefix[] = "Command = (short) ";
assert(aToken.startsWith(aExpectedCommandPrefix));
sal_Int32 nIndex = strlen(aExpectedCommandPrefix);
@@ -125,7 +125,7 @@ awt::Rectangle lcl_parseRectangle(const OString& rValue)
{
awt::Rectangle aRectangle;
OString aToken = rValue;
- // We expect the followings here: X, Y, Width, Height
+ // We expect the following here: X, Y, Width, Height
static const char aExpectedXPrefix[] = "X = (long) ";
assert(aToken.startsWith(aExpectedXPrefix));
sal_Int32 nIndex = strlen(aExpectedXPrefix);
@@ -156,7 +156,7 @@ awt::Size lcl_parseSize(const OString& rValue)
{
awt::Size aSize;
OString aToken = rValue;
- // We expect the followings here: Width, Height
+ // We expect the following here: Width, Height
static const char aExpectedWidthPrefix[] = "Width = (long) ";
assert(aToken.startsWith(aExpectedWidthPrefix));
sal_Int32 nIndex = strlen(aExpectedWidthPrefix);
@@ -289,7 +289,7 @@ void lcl_parseHandleRange(std::vector<beans::PropertyValue>& rHandle, const OStr
{
drawing::EnhancedCustomShapeParameter aParameter;
aToken = aToken.copy(strlen(aExpectedPrefix), aToken.getLength() - strlen(aExpectedPrefix) - strlen(" } }"));
- // We expect the followings here: Value and Type
+ // We expect the following here: Value and Type
static const char aExpectedVPrefix[] = "Value = (any) { (long) ";
assert(aToken.startsWith(aExpectedVPrefix));
sal_Int32 nIndex = strlen(aExpectedVPrefix);
More information about the Libreoffice-commits
mailing list