[Libreoffice-commits] core.git: sax/source vcl/README.lifecycle vcl/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 24 11:47:46 UTC 2021
sax/source/fastparser/fastparser.cxx | 2 +-
vcl/README.lifecycle | 2 +-
vcl/source/filter/jpeg/transupp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b6632bd41b56a2485dc6dd67a19d930c9654f835
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Mar 23 20:23:59 2021 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Mar 24 12:47:08 2021 +0100
Revert "Fix typo"
This reverts commit 4550b35781c6d9407da29f64f9b02b9201bf953b.
Change-Id: I279bb86bb876179d470a736f638446ffeaac9508
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112959
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 8cec8284abce..f35e56e8ab7f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -467,7 +467,7 @@ void Entity::startElement( Event const *pEvent )
if( xContext.is() )
xContext->startFastElement( nElementToken, xAttr );
}
- // swap the reference we own in to avoid referencing trash.
+ // swap the reference we own in to avoid referencing thrash.
maContextStack.top().mxContext = std::move( xContext );
}
catch (...)
diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle
index 0c44fb6a14d8..a309b65ef9ea 100644
--- a/vcl/README.lifecycle
+++ b/vcl/README.lifecycle
@@ -42,7 +42,7 @@ to lingering pointers to freed objects.
To fix this situation we now have a VclPtr - which is a smart
reference-counting pointer (include/vcl/vclptr.hxx) which is
designed to look and behave -very- much like a normal pointer
- to reduce code-trash. VclPtr is used to wrap all OutputDevice
+ to reduce code-thrash. VclPtr is used to wrap all OutputDevice
derived classes thus:
VclPtr<Dialog> pDialog( new Dialog( ... ), SAL_NO_ACQUIRE );
diff --git a/vcl/source/filter/jpeg/transupp.c b/vcl/source/filter/jpeg/transupp.c
index 318b28d790c1..d26cb9510009 100644
--- a/vcl/source/filter/jpeg/transupp.c
+++ b/vcl/source/filter/jpeg/transupp.c
@@ -60,7 +60,7 @@ jdiv_round_up (long a, long b)
* arrays are always written in normal scan order (top to bottom) because
* the virtual array manager expects this. The source arrays will be scanned
* in the corresponding order, which means multiple passes through the source
- * arrays for most of the transforms. That could result in much trashing
+ * arrays for most of the transforms. That could result in much thrashing
* if the image is larger than main memory.
*
* If cropping or trimming is involved, the destination arrays may be smaller
More information about the Libreoffice-commits
mailing list