[Libreoffice-commits] core.git: connectivity/source dbaccess/source desktop/source desktop/test dtrans/source dtrans/test extensions/source extensions/test include/osl udkapi/com
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 20 07:51:48 UTC 2019
connectivity/source/drivers/mork/MResultSet.cxx | 2 +-
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 6 +++---
desktop/source/app/app.cxx | 2 +-
desktop/test/deployment/update/publisher/readme.txt | 4 ++--
dtrans/source/win32/clipb/MtaOleClipb.cxx | 2 +-
dtrans/source/win32/dnd/source.cxx | 2 +-
dtrans/source/win32/dtobj/APNDataObject.cxx | 2 +-
dtrans/test/win32/dnd/atlwindow.cxx | 2 +-
extensions/source/config/ldap/ldapuserprofilebe.hxx | 2 +-
extensions/source/ole/unoconversionutilities.hxx | 8 ++++----
extensions/test/ole/callUnoToJava.htm | 2 +-
include/osl/file.h | 2 +-
udkapi/com/sun/star/uno/Uik.idl | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 1618a3cee763fe9c3393e0511244547674bdd264
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 19 20:34:57 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Aug 20 09:50:59 2019 +0200
Fix typos
Change-Id: Iac38284daf0196d6a7f29aaa6e2103c1d76d7cc4
Reviewed-on: https://gerrit.libreoffice.org/77755
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 1ff055143f09..2275472c5a4a 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -884,7 +884,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
}
else
{
- // Most Complex, need to use an RE
+ // Most Complex, need to use a RE
sal_Int32 pos;
while ( (pos = matchString.indexOf ( WILDCARD )) != -1 )
{
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 2d12a18ad546..63588ed93c2a 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -183,15 +183,15 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer
m_aIndirectPropTranslator.emplace( DSID_RESPECTRESULTSETTYPE, OUString("RespectDriverResultSetType") );
m_aIndirectPropTranslator.emplace( DSID_MAX_ROW_SCAN, OUString("MaxRowScan") );
- // extra settings for odbc
+ // extra settings for ODBC
m_aIndirectPropTranslator.emplace( DSID_USECATALOG, INFO_USECATALOG );
- // extra settings for a ldap address book
+ // extra settings for an LDAP address book
m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_BASEDN, INFO_CONN_LDAP_BASEDN );
m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_ROWCOUNT, INFO_CONN_LDAP_ROWCOUNT );
m_aIndirectPropTranslator.emplace( DSID_CONN_LDAP_USESSL, OUString("UseSSL") );
m_aIndirectPropTranslator.emplace( DSID_DOCUMENT_URL, PROPERTY_URL );
- // oracle
+ // Oracle
m_aIndirectPropTranslator.emplace( DSID_IGNORECURRENCY, OUString("IgnoreCurrency") );
try
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bd203f943739..13f66a9697b9 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -812,7 +812,7 @@ void Desktop::HandleBootstrapErrors(
}
else if ( aBootstrapError == BE_UNO_SERVICEMANAGER || aBootstrapError == BE_UNO_SERVICE_CONFIG_MISSING )
{
- // Uno service manager is not available. VCL needs a uno service manager to display a message box!!!
+ // UNO service manager is not available. VCL needs a UNO service manager to display a message box!!!
// Currently we are not able to display a message box with a service manager due to this limitations inside VCL.
// When UNO is not properly initialized, all kinds of things can fail
diff --git a/desktop/test/deployment/update/publisher/readme.txt b/desktop/test/deployment/update/publisher/readme.txt
index 17d51dce307f..148dab776ce6 100644
--- a/desktop/test/deployment/update/publisher/readme.txt
+++ b/desktop/test/deployment/update/publisher/readme.txt
@@ -147,7 +147,7 @@ Test
Repository:
-Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be in the update
+-Provide a company name and a URL to the company website. They should then be in the update
feed.
-Create a new release for the extension. Upload the version 2.0 (update/pub10.oxt).
@@ -190,7 +190,7 @@ Test
Repository:
-Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be in the update
+-Provide a company name and a URL to the company website. They should then be in the update
feed.
-Create a new release for the extension. Upload the version 2.0 (update/pub11.oxt).
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index ae831cc76bb2..a3e28806deed 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -150,7 +150,7 @@ static HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM*
*ppStream = nullptr;
return CoMarshalInterThreadInterfaceInStream(
- __uuidof(IDataObject), //The IID of interface to be marshaled
+ __uuidof(IDataObject), //The IID of interface to be marshalled
pIDataObject, //The interface pointer
ppStream //IStream pointer
);
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 7851296c7fd7..f02bd9b784e8 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.cxx
@@ -68,7 +68,7 @@ DragSource::~DragSource()
????
Do we really need a separate thread for
every Dnd operation or only if the source
- thread is a MTA thread
+ thread is an MTA thread
????
*/
void DragSource::StartDragImpl(
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 9759e78ee8bf..53342f21f379 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -36,7 +36,7 @@ CAPNDataObject::CAPNDataObject( IDataObjectPtr rIDataObject ) :
OSL_ENSURE( m_rIDataObjectOrg.get( ), "constructing CAPNDataObject with empty data object" );
// we marshal the IDataObject interface pointer here so
- // that it can be unmarshaled multiple times when this
+ // that it can be unmarshalled multiple times when this
// class will be used from another apartment
IStreamPtr pStm;
HRESULT hr = CreateStreamOnHGlobal( nullptr, KEEP_HGLOB_ON_RELEASE, &pStm );
diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx
index 95aca10e75fc..0d8d5d77646a 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.cxx
@@ -45,7 +45,7 @@ DWORD WINAPI MTAFunc(LPVOID pParams);
char* szSTAWin= "XDragSource::executeDrag is called from the same "
"OLE STA thread that created the window.";
-char* szMTAWin= "XDragSource::executeDrag is called from a MTA thread "
+char* szMTAWin= "XDragSource::executeDrag is called from an MTA thread "
"that did not create the window.";
WNDPROC wpOrigEditProc;
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 235511cd2986..100a6061d615 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -48,7 +48,7 @@ struct LdapProfileMutexHolder { osl::Mutex mMutex; };
/**
Implements the PlatformBackend service, a specialization of the
XPropertySet service for retrieving LDAP user profile
- configuration settings from a LDAP repository.
+ configuration settings from an LDAP repository.
*/
class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase
{
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index a9f5a5ae323e..9f3f307bd235 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1111,7 +1111,7 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
for( sal_Int32 i= 0; i < pCurrentSeq->nElements; i++)
{
Any unoElement( pCurrentSeq->elements + i * elementSize, rawTypeDesc );
- // The any is being converted into an VARIANT which value is then copied
+ // The any is being converted into a VARIANT which value is then copied
// to the SAFEARRAY's data block. When copying one has to follow the rules for
// copying certain types, as are VT_DISPATCH, VT_UNKNOWN, VT_VARIANT, VT_BSTR.
// To increase performance, we just do a memcpy of VARIANT::byref. This is possible
@@ -1248,7 +1248,7 @@ void UnoConversionUtilities<T>::getElementCountAndTypeOfSequence( const Any& rS
rSeq.getValueTypeDescription( &pSeqDesc);
typelib_TypeDescriptionReference* pElementDescRef= reinterpret_cast<typelib_IndirectTypeDescription*>(pSeqDesc)->pType;
- // if the elements are Sequences than do recursion
+ // if the elements are Sequences then do recursion
if( dim < seqElementCounts.getLength() )
{
uno_Sequence* pSeq = *static_cast<uno_Sequence* const*>(rSeq.getValue());
@@ -2201,7 +2201,7 @@ Sequence<Any> UnoConversionUtilities<T>::createOleArrayWrapper(SAFEARRAY* pArray
return ret;
}
-// If an VARIANT has the type VT_DISPATCH it can either be an JScript Array
+// If a VARIANT has the type VT_DISPATCH it can either be an JScript Array
// or some other object. This function finds out if it is such an array or
// not. Currently there's no way to make sure it's an array
// so we assume that when the object has a property "0" then it is an Array.
@@ -2285,7 +2285,7 @@ Sequence<Type> UnoConversionUtilities<T>::getImplementedInterfaces(IUnknown* pUn
}
if (SUCCEEDED( hr))
{
- // we exspect an array( SafeArray or IDispatch) of Strings.
+ // we expect an array( SafeArray or IDispatch) of Strings.
Any anyNames;
variantToAny( &var, anyNames, cppu::UnoType<Sequence<Any>>::get());
Sequence<Any> seqAny;
diff --git a/extensions/test/ole/callUnoToJava.htm b/extensions/test/ole/callUnoToJava.htm
index b309ee740a49..5374adbfa53d 100644
--- a/extensions/test/ole/callUnoToJava.htm
+++ b/extensions/test/ole/callUnoToJava.htm
@@ -515,7 +515,7 @@ as out parameter.<br>
<button onclick='callOleTest( 14)'>short</Button>
<button onclick='callOleTest( 15)'>long</Button>
<br>
-Other test with out parameters <br>
+Other test without parameters <br>
<button onclick='callOleTest( 30)'>outValuesMixed</Button>
<button onclick='callOleTest( 31)'>outValuesAll</Button>
<h1> in out parameter </h1>
diff --git a/include/osl/file.h b/include/osl/file.h
index ebba23af47c4..309d6089cfb3 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -34,7 +34,7 @@ extern "C" {
Main goals and usage hints
-The main intention of this interface is to provide an universal portable and
+The main intention of this interface is to provide a universal portable and
high performance access to file system functionality on any operating
system.
diff --git a/udkapi/com/sun/star/uno/Uik.idl b/udkapi/com/sun/star/uno/Uik.idl
index 82f6a7aa4c66..1aa266cc8d3e 100644
--- a/udkapi/com/sun/star/uno/Uik.idl
+++ b/udkapi/com/sun/star/uno/Uik.idl
@@ -23,7 +23,7 @@
module com { module sun { module star { module uno {
-/** Specifies an universal interface key (globally unique).
+/** Specifies a universal interface key (globally unique).
This struct is deprecated. Uiks are not used anymore.
@deprecated
More information about the Libreoffice-commits
mailing list