[Libreoffice-commits] core.git: testtools/qa toolkit/qa toolkit/README toolkit/source toolkit/test tools/source ucb/qa ucb/source udkapi/com unotools/qa unotools/source unoxml/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Mar 25 12:57:43 UTC 2017
testtools/qa/cli/readme.txt | 2 +-
toolkit/README | 2 +-
toolkit/qa/complex/toolkit/Assert.java | 2 +-
toolkit/qa/complex/toolkit/GridControl.java | 2 +-
toolkit/source/awt/animatedimagespeer.cxx | 2 +-
toolkit/test/accessibility/NodeMap.java | 2 +-
tools/source/fsys/urlobj.cxx | 2 +-
tools/source/generic/poly.cxx | 6 +++---
ucb/qa/complex/tdoc/_XTypeProvider.java | 2 +-
ucb/source/core/ucbcmds.cxx | 2 +-
ucb/source/ucp/file/filtask.cxx | 2 +-
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2 +-
ucb/source/ucp/webdav-neon/ContentProperties.cxx | 2 +-
ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 ++--
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 6 +++---
ucb/source/ucp/webdav/ContentProperties.cxx | 2 +-
ucb/source/ucp/webdav/webdavcontent.cxx | 2 +-
udkapi/com/sun/star/reflection/TypeDescriptionManager.idl | 2 +-
unotools/qa/unit/testGetEnglishSearchName.cxx | 2 +-
unotools/source/config/configitem.cxx | 2 +-
unotools/source/ucbhelper/ucblockbytes.cxx | 4 ++--
unoxml/source/dom/attr.cxx | 2 +-
22 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit f7eb8ae9d9cce3e493105da98cc4ace9c56a3062
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Mar 24 15:28:34 2017 +0100
Fix typos
Change-Id: Ieea40e1b7282267157810f9f58ca083e68ae6715
Reviewed-on: https://gerrit.libreoffice.org/35659
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/testtools/qa/cli/readme.txt b/testtools/qa/cli/readme.txt
index 88ad4bd30b12..34531936ab99 100644
--- a/testtools/qa/cli/readme.txt
+++ b/testtools/qa/cli/readme.txt
@@ -21,6 +21,6 @@ However, if for some reason an assembly remains in the GAC than it is used no ma
what.
-The qa test simply executes the cli_bridgetest_inprocess.exe. All console output is descarded.
+The qa test simply executes the cli_bridgetest_inprocess.exe. All console output is discarded.
When the test fails one should directly run that executable. Then one may see the cause
of the failure in the console.
diff --git a/toolkit/README b/toolkit/README
index e320108de058..ea40b4d26590 100644
--- a/toolkit/README
+++ b/toolkit/README
@@ -4,7 +4,7 @@ or Java.
Note that the "awt" here has no relation to the Java awt, as far as I know. It
might be inspired by it API-wise, perhaps. (If you know differently, feel free
-to improve this REDAME file.)
+to improve this README file.)
Note that toolkit/ is itself not really a toolkit, it is at root a
reasonably simple wrapper of vcl/ - if you came here looking for a
diff --git a/toolkit/qa/complex/toolkit/Assert.java b/toolkit/qa/complex/toolkit/Assert.java
index eb6ec44dce1e..f7988270a8e3 100644
--- a/toolkit/qa/complex/toolkit/Assert.java
+++ b/toolkit/qa/complex/toolkit/Assert.java
@@ -87,7 +87,7 @@ public class Assert
* retrieves a method, given by name and parameter signature, from the given class
*
* The method does somewhat more than simply calling {@link Class#getMethod}. In particular, it recognizes
- * primitiive parameter types, and attempts to find a method taking the given primitive type, instead of the
+ * primitive parameter types, and attempts to find a method taking the given primitive type, instead of the
* type represented by the parameter class.
*
* For instance, if you have a method <code>foo( int )</code>, {@link Class#getMethod} would not return this
diff --git a/toolkit/qa/complex/toolkit/GridControl.java b/toolkit/qa/complex/toolkit/GridControl.java
index ab836cc4a057..e76fe9fab55a 100644
--- a/toolkit/qa/complex/toolkit/GridControl.java
+++ b/toolkit/qa/complex/toolkit/GridControl.java
@@ -232,7 +232,7 @@ public class GridControl
impl_assertColumnModelConsistency();
List< ContainerEvent > events = listener.assertExclusiveInsertionEvents();
listener.reset();
- assertEquals( "wrong number of events fired by setDefaulColumns", defaultColumnsCount, events.size() );
+ assertEquals( "wrong number of events fired by setDefaultColumns", defaultColumnsCount, events.size() );
for ( int i=0; i<defaultColumnsCount; ++i )
{
final ContainerEvent event = events.get(i);
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 8ddbda4108ad..e33b9ac1ada0 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -114,7 +114,7 @@ namespace toolkit
// the private: scheme is not considered to be hierarchical by INetURLObject, so manually insert the
// segment
const sal_Int32 separatorPos = i_imageURL.indexOf( '/' );
- ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL: unsipported URL scheme - cannot automatically determine HC version!", i_imageURL );
+ ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL: unsupported URL scheme - cannot automatically determine HC version!", i_imageURL );
OUStringBuffer composer;
composer.append( i_imageURL.copy( 0, separatorPos ) );
diff --git a/toolkit/test/accessibility/NodeMap.java b/toolkit/test/accessibility/NodeMap.java
index b8e8b3bf3300..045c933713d5 100644
--- a/toolkit/test/accessibility/NodeMap.java
+++ b/toolkit/test/accessibility/NodeMap.java
@@ -44,7 +44,7 @@ class NodeMap
/** @return
whether the new node was different from a previous one
- repspectively was the first one set.
+ respectively was the first one set.
*/
public boolean InsertNode (XAccessibleContext xContext, AccessibleTreeNode aNode)
{
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 45af3393afe3..a052506196f1 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -1060,7 +1060,7 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef,
// becomes
// "file:///" ALPHA ":" ["/" *path] ["#" *UCS4]
// replacing "\" by "/" within <*path>
- // 4th Production (misscounted slashes):
+ // 4th Production (miscounted slashes):
// "//" *path ["#" *UCS4]
// becomes
// "file:///" *path ["#" *UCS4]
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 9d546499f3ee..eba86e6f40b6 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -1109,7 +1109,7 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
if (aPoints.size() >= SAL_MAX_UINT16)
{
OSL_ENSURE(aPoints.size() < SAL_MAX_UINT16,
- "Polygon::AdapativeSubdivision created polygon too many points;"
+ "Polygon::AdaptiveSubdivision created polygon too many points;"
" using original polygon instead");
// The resulting polygon can not hold all the points
@@ -1690,7 +1690,7 @@ void impCorrectContinuity(basegfx::B2DPolygon& roPolygon, sal_uInt32 nIndex, Pol
{
if(roPolygon.isPrevControlPointUsed(nIndex) && roPolygon.isNextControlPointUsed(nIndex))
{
- // #i115917# Patch from osnola (modified, thanks for showing the porblem)
+ // #i115917# Patch from osnola (modified, thanks for showing the problem)
// The correction is needed because an integer polygon with control points
// is converted to double precision. When C1 or C2 is used the involved vectors
@@ -1700,7 +1700,7 @@ void impCorrectContinuity(basegfx::B2DPolygon& roPolygon, sal_uInt32 nIndex, Pol
// it needs to be corrected to be able to detect the continuity in this points
// correctly.
- // We only have the integer data here (already in double precision form, but no mantisses
+ // We only have the integer data here (already in double precision form, but no mantisse
// used), so the best correction is to use:
// for C1: The longest vector since it potentially has best preserved the original vector.
diff --git a/ucb/qa/complex/tdoc/_XTypeProvider.java b/ucb/qa/complex/tdoc/_XTypeProvider.java
index 506566dc4244..3d45ae798d5d 100644
--- a/ucb/qa/complex/tdoc/_XTypeProvider.java
+++ b/ucb/qa/complex/tdoc/_XTypeProvider.java
@@ -55,7 +55,7 @@ public class _XTypeProvider {
/**
- * ?alls the method and checks the return value.<p>
+ * Calls the method and checks the return value.<p>
* Has <b>OK</b> status if one of the return value equals to the
* type <code>com.sun.star.lang.XTypeProvider</code>.
*/
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index f288a60aec18..4f829ddf860f 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1602,7 +1602,7 @@ void globalTransfer_(
}
}
-} /* namescpace */
+} /* namespace */
// UniversalContentBroker implementation ( XCommandProcessor commands ).
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index b64df364a9b6..fbe93ed955f8 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2373,7 +2373,7 @@ TaskManager::commit( const TaskManager::ContentMap::iterator& it,
{
// extremely ugly, but otherwise default construction
// of aDirItem and aFileStatus2
- // before the preciding if
+ // before the preceding if
isVolume = osl::FileStatus::Volume == aFileStatus.getFileType();
isDirectory =
osl::FileStatus::Volume == aFileStatus.getFileType() ||
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 190a499992d9..dd44ccee7b70 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -583,7 +583,7 @@ ContentProvider::queryStorageTitle( const OUString & rUri ) const
else if ( aUri.isDocument() )
{
// for documents, title shall not be derived from URL. It shall
- // be somethimg more 'speaking' than just the document UID.
+ // be something more 'speaking' than just the document UID.
if ( m_xDocsMgr.is() )
aTitle = m_xDocsMgr->queryStorageTitle( aUri.getDocumentId() );
}
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
index a3bf1ec2fb76..f9cd24fd0e50 100644
--- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx
@@ -488,7 +488,7 @@ void ContentProperties::addProperty( const OUString & rName,
OUString aValue;
rValue >>= aValue;
- // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
+ // Map DAV:resourcetype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" );
(*m_xProps)[ OUString("IsFolder") ]
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 7ba44b141657..7e21205e6b59 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -511,7 +511,7 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req,
// If there is a proxy server in between, it shall never use
// cached data. We always want 'up-to-date' data.
ne_buffer_concat( headers, "Pragma: no-cache", EOL, nullptr );
- // alternative, but understoud by HTTP 1.1 servers only:
+ // alternative, but understood by HTTP 1.1 servers only:
// ne_buffer_concat( headers, "Cache-Control: max-age=0", EOL, NULL );
const RequestDataMap * pRequestData
@@ -892,7 +892,7 @@ void NeonSession::OPTIONS( const OUString & inPath,
// we detect the class (1, 2 and 3), other elements (token, URL)
// are not used for now
// silly parser written using OUString, not very efficient
- // but quick and esy to write...
+ // but quick and easy to write...
sal_Int32 nFromIndex = 0;
sal_Int32 nNextIndex = 0;
while( ( nNextIndex = aHeaderValue.indexOf( ",", nFromIndex ) ) != -1 )
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 34276231a975..929ae8627ef4 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -2293,7 +2293,7 @@ uno::Any Content::open(
}
xResAccess->setFlags( rArg.OpeningFlags );
- // fill inputsream sync; return if all data present
+ // fill inputstream sync; return if all data present
DAVResource aResource;
std::vector< OUString > aHeaders;
@@ -3872,7 +3872,7 @@ Content::ResourceType Content::getResourceType(
}
if ( e.getStatus() == SC_NOT_FOUND )
{
- // arrives here if OPTIONS is still cached for a resource prevously available
+ // arrives here if OPTIONS is still cached for a resource previously available
// operate on the OPTIONS cache:
// if OPTIONS was not found, do nothing
// else OPTIONS returned on a resource not existent (example a server that allows lock on null resource) set
@@ -4046,7 +4046,7 @@ void Content::getResourceOptions(
case DAVException::DAV_HTTP_CONNECT:
{
// something bad happened to the connection
- // not same as not found, this instead happens when the server does'n exist or does'n aswer at all
+ // not same as not found, this instead happens when the server doesn't exist or doesn't answer at all
// probably a new bit stating 'timed out' should be added to opts var?
// in any case abort the command
SAL_WARN( "ucb.ucp.webdav", "OPTIONS - DAVException: DAV_HTTP_TIMEOUT or DAV_HTTP_CONNECT for URL <" << m_xIdentifier->getContentIdentifier() << ">" );
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index 3f6b66ca5ebc..b43f58543782 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -509,7 +509,7 @@ void ContentProperties::addProperty( const OUString & rName,
OUString aValue;
rValue >>= aValue;
- // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
+ // Map DAV:resourcetype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType
bool bFolder =
aValue.equalsIgnoreAsciiCase( "collection" );
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 6c72c3661655..125a099496ec 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -2147,7 +2147,7 @@ uno::Any Content::open(
new DAVResourceAccess( *m_xResAccess.get() ) );
}
- // fill inputsream sync; return if all data present
+ // fill inputstream sync; return if all data present
DAVResource aResource;
std::vector< OUString > aHeaders;
diff --git a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
index 7b15fd0bc102..90fc63bf2b59 100644
--- a/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
+++ b/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
@@ -73,7 +73,7 @@ published service TypeDescriptionManager
</ul>
<p>Even though the name of this interface suggests that the used type
- names are hierarchic, this need not be the case. (For example, consider
+ names are hierarchical, this doesn't need to be the case. (For example, consider
the names of instantiated polymorphic struct types, like
<code>"Struct<long>"</code>.)</p>
*/
diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx b/unotools/qa/unit/testGetEnglishSearchName.cxx
index 41dffa2548bc..6dd97f7c2b1f 100644
--- a/unotools/qa/unit/testGetEnglishSearchName.cxx
+++ b/unotools/qa/unit/testGetEnglishSearchName.cxx
@@ -31,7 +31,7 @@ void Test::testSingleElement()
{ // lowercase
OUString test1 = GetEnglishSearchFontName( "SYMBOL" );
CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1);
- //trailingWhitespaces
+ //trailing whitespaces
test1 = GetEnglishSearchFontName( "Symbol " );
CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1);
//no longer remove script suffixes
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 1de221b4fa19..37da09c8e1de 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -353,7 +353,7 @@ Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const css::uno::Sequence< OUS
(void)::utl::splitLastFromConfigurationPath(sName,sPath,sProperty);
if (sPath.isEmpty() && sProperty.isEmpty())
{
- OSL_FAIL("ConfigItem::IsReadonly()\nsplitt failed\n");
+ OSL_FAIL("ConfigItem::IsReadonly()\nsplit failed\n");
continue;
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index cc387a9d79b4..d6374482e625 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -561,7 +561,7 @@ void Moderator::handle( const Reference<XInteractionRequest >& Request )
}
}
- // resignal the exitcondition
+ // resignal the exit condition
setReply(EXIT);
break;
}
@@ -1239,7 +1239,7 @@ ErrCode UcbLockBytes::SetSize (sal_uInt64 const nNewSize)
nSize = 0;
}
else {
- SAL_INFO("unotools.ucbhelper", "Not truncatable!");
+ SAL_INFO("unotools.ucbhelper", "Not truncable!");
}
}
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 9f0f7c8c5b67..39cb53230c9a 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -64,7 +64,7 @@ namespace DOM
pNs = xmlSearchNsByHref(pNode->doc, pNode, pUri);
// if (!pNs) hmm... now what? throw?
if (!pNs) {
- SAL_WARN("unoxml", "CAtttr: cannot create namespace");
+ SAL_WARN("unoxml", "CAttr: cannot create namespace");
}
return pNs;
}
More information about the Libreoffice-commits
mailing list