[Libreoffice-commits] core.git: android/README basic/source chart2/opengl dbaccess/source extensions/source filter/source lingucomponent/source package/source qadevOOo/tests ridljar/com sc/inc sw/source unotest/source vcl/opengl winaccessibility/source xmloff/source
Andrea Gelmini
andrea.gelmini at gelma.net
Mon May 16 06:19:11 UTC 2016
android/README | 2 +-
basic/source/classes/sbunoobj.cxx | 2 +-
chart2/opengl/symbolFragmentShader.glsl | 2 +-
dbaccess/source/core/dataaccess/connection.hxx | 2 +-
extensions/source/ole/oleobjw.hxx | 2 +-
filter/source/config/cache/typedetection.cxx | 2 +-
lingucomponent/source/languageguessing/simpleguesser.hxx | 2 +-
lingucomponent/source/lingutil/lingutil.cxx | 2 +-
package/source/zippackage/ZipPackage.cxx | 2 +-
qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java | 2 +-
ridljar/com/sun/star/lib/util/WeakMap.java | 2 +-
sc/inc/validat.hxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 2 +-
unotest/source/java/org/openoffice/test/FileHelper.java | 2 +-
vcl/opengl/x11/X11DeviceInfo.cxx | 2 +-
winaccessibility/source/UAccCOM/MAccessible.cxx | 2 +-
xmloff/source/chart/SchXMLChartContext.hxx | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit a9ff36a1e9080b7789d2150dd5a0fdcb1cc7a968
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Mon May 16 07:19:43 2016 +0200
Fix typos
Change-Id: If7262e114b5b4cd40e9c0a8929940199ea747595
Reviewed-on: https://gerrit.libreoffice.org/25025
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: jan iversen <jani at documentfoundation.org>
diff --git a/android/README b/android/README
index bd119ee..118e5ff 100644
--- a/android/README
+++ b/android/README
@@ -252,7 +252,7 @@ useful info, try with the ndk-gdb method and the other way round.
Then you can select your new configuration and use Run | Debug to launch it.
Note that lldb doesn't initially stop execution, so if you want to add
breakpoints using lldb prompt, you manually have to pause execution, then you
-can witch to the lldb tab and add your breakpoints. However making use of the
+can switch to the lldb tab and add your breakpoints. However making use of the
editor just using File|Open .. to open the desired file in Android Studio and
then toggling the breakpoint by clicking on the margin is more comfortable.
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 05f9aba..41290cf 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -2678,7 +2678,7 @@ SbxVariable* SbUnoObject::Find( const OUString& rName, SbxClassType t )
// won't be stored anywhere.
// If this leads to problems, it has to be created
// synthetically or a class SbUnoNameAccessProperty,
- // witch checks the existence on access and which
+ // which checks the existence on access and which
// is disposed if the name is not found anymore.
pRes = new SbxVariable( SbxVARIANT );
unoToSbxValue( pRes, aAny );
diff --git a/chart2/opengl/symbolFragmentShader.glsl b/chart2/opengl/symbolFragmentShader.glsl
index 35cc910..f9b6dfa 100644
--- a/chart2/opengl/symbolFragmentShader.glsl
+++ b/chart2/opengl/symbolFragmentShader.glsl
@@ -18,7 +18,7 @@ void main()
if(shape == 0)
{
}
- else if(shape == 1) //diamon
+ else if(shape == 1) //diamond
{
if (abs(p.x) + abs(p.y) > 1)
discard;
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 91a9755..6b6508e 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -220,7 +220,7 @@ private:
*/
void impl_loadConnectionTools_throw();
- /** reads the table filter and table type filter from the datasourfce
+ /** reads the table filter and table type filter from the datasource
*/
void impl_fillTableFilter();
};
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 9d9753d..0879df3 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/bridge/oleautomation/XAutomationObject.hpp>
-#include <com/sun/star/script//XAutomationInvocation.hpp>
+#include <com/sun/star/script/XAutomationInvocation.hpp>
#include <rtl/ustring.hxx>
#include <com/sun/star/script/XDefaultProperty.hpp>
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 5c8466f..278115c 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -632,7 +632,7 @@ bool TypeDetection::impl_getPreselectionForType(
// Can be used to suppress execution of some parts of this method
// if its already clear that detected type is valid or not.
// Its necessary to use shared code at the end, which update
- // all return parameters constistency!
+ // all return parameters consistency!
bool bBreakDetection = false;
// Further we must know if it matches by pattern
diff --git a/lingucomponent/source/languageguessing/simpleguesser.hxx b/lingucomponent/source/languageguessing/simpleguesser.hxx
index db6cc6a..769a22f 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.hxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.hxx
@@ -94,7 +94,7 @@ public:
/**
* Load a new DB of fingerprints
* @param const char* thePathOfConfFile self explaining
- * @param const char* prefix is the path where the directory witch contains fingerprint files is stored
+ * @param const char* prefix is the path where the directory which contains fingerprint files is stored
*/
void SetDBPath(const char* thePathOfConfFile, const char* prefix);
diff --git a/lingucomponent/source/lingutil/lingutil.cxx b/lingucomponent/source/lingutil/lingutil.cxx
index 32d4a5e..707f0a9 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -53,7 +53,7 @@ OString Win_AddLongPathPrefix( const OString &rPathName )
}
#endif //defined(WNT)
-// build list of old style diuctionaries (not as extensions) to use.
+// build list of old style dictionaries (not as extensions) to use.
// User installed dictionaries (the ones residing in the user paths)
// will get precedence over system installed ones for the same language.
std::vector< SvtLinguConfigDictionaryEntry > GetOldStyleDics( const char *pDicType )
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 0f58bc4..26f6dd2 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -166,7 +166,7 @@ ZipPackage::~ZipPackage()
{
delete m_pZipFile;
- // All folders and streams contain pointers to their parents, when a parent diappeares
+ // All folders and streams contain pointers to their parents, when a parent disappeares
// it should disconnect all the children from itself during destruction automatically.
// So there is no need in explicit m_pRootFolder->releaseUpwardRef() call here any more
// since m_pRootFolder has no parent and cleaning of its children will be done automatically
diff --git a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
index 7a8193b..767125c 100644
--- a/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
+++ b/qadevOOo/tests/java/ifc/document/_XDocumentInsertable.java
@@ -80,7 +80,7 @@ public class _XDocumentInsertable extends MultiMethodTest {
/**
* Can be overridden to specify different than default
* document name. This document must be situated in
- * the test document disrectory, and its name must
+ * the test document directory, and its name must
* be specified relational to this directory. By
* default 'XDocumentInsertable.swx' file name returned.
* @return File name of the document to be inserted.
diff --git a/ridljar/com/sun/star/lib/util/WeakMap.java b/ridljar/com/sun/star/lib/util/WeakMap.java
index 75b89b1..f3b3b55 100644
--- a/ridljar/com/sun/star/lib/util/WeakMap.java
+++ b/ridljar/com/sun/star/lib/util/WeakMap.java
@@ -158,7 +158,7 @@ public final class WeakMap<K,V> implements Map {
*
* <p>This is a modifying operation.</p>
*
- * @param key the key with witch the specified value is to be associated
+ * @param key the key with which the specified value is to be associated
* @param value the value to be associated with the specified key. This
* must be a plain object, which is then wrapped in a
* <code>WeakReference</code>.
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 34f42bc..e266553 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -165,7 +165,7 @@ private:
bool IsListValid( ScRefCellValue& rCell, const ScAddress& rPos ) const;
};
-// list of contitions:
+// list of conditions:
struct CompareScValidationDataPtr
{
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 6b20a4f..06d3ebc 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4082,7 +4082,7 @@ void SwWW8ImplReader::Read_LR( sal_uInt16 nId, const sal_uInt8* pData, short nLe
// Sprm 20
void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short nLen )
{
-// commment see Read_UL()
+// comment see Read_UL()
if (m_bStyNormal && m_bWWBugNormal)
return;
diff --git a/unotest/source/java/org/openoffice/test/FileHelper.java b/unotest/source/java/org/openoffice/test/FileHelper.java
index 0b5c102..93907ed 100644
--- a/unotest/source/java/org/openoffice/test/FileHelper.java
+++ b/unotest/source/java/org/openoffice/test/FileHelper.java
@@ -26,7 +26,7 @@ public class FileHelper
/*
* Concat a _sRelativePathToAdd to a _sPath and append a '/' to the _sPath only if need.
*
- * @return a right concatened path
+ * @return a right concatenated path
*/
public static String appendPath(String _sPath, String _sRelativePathToAdd)
{
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx
index 4be9619..8b8b88e 100644
--- a/vcl/opengl/x11/X11DeviceInfo.cxx
+++ b/vcl/opengl/x11/X11DeviceInfo.cxx
@@ -8,7 +8,7 @@
*/
#include "opengl/x11/X11DeviceInfo.hxx"
-#include "opengl/x11//glxtest.hxx"
+#include "opengl/x11/glxtest.hxx"
#include <config_features.h>
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 3bd658d..c3e1a0c 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -674,7 +674,7 @@ STDMETHODIMP CMAccessible::get_accKeyboardShortcut(VARIANT varChild, BSTR *pszKe
m_pIParent->get_accRole(varChild, &varParentRole);
- if( m_pIParent && varParentRole.lVal == ROLE_SYSTEM_COMBOBOX ) // edit in comoboBox
+ if( m_pIParent && varParentRole.lVal == ROLE_SYSTEM_COMBOBOX ) // edit in comboBox
{
m_pIParent->get_accKeyboardShortcut(varChild, pszKeyboardShortcut);
return S_OK;
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index f0f457d..8102148 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -117,7 +117,7 @@ private:
/** @descr This method bundles some settings to the chart model and executes them with
a locked controller. This includes setting the chart type.
@param aServiceName The name of the service the diagram is initialized with.
- @param bSetWitchData Indicates whether the data set takes it's data series from
+ @param bSetSwitchData Indicates whether the data set takes it's data series from
rows or from columns.
*/
void InitChart (const OUString & rChartTypeServiceName,
More information about the Libreoffice-commits
mailing list