[Libreoffice-commits] core.git: solenv/bin svtools/source svx/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 5 08:45:21 UTC 2019
solenv/bin/mkdocs.sh | 2 +-
solenv/bin/modules/installer/parameter.pm | 2 +-
solenv/bin/modules/installer/scriptitems.pm | 2 +-
solenv/bin/modules/installer/windows/file.pm | 4 ++--
solenv/bin/modules/installer/windows/media.pm | 2 +-
solenv/bin/modules/par2script/systemactions.pm | 2 +-
solenv/bin/modules/pre2par/systemactions.pm | 2 +-
solenv/bin/ooinstall | 2 +-
solenv/bin/polib.py | 4 ++--
svtools/source/control/tabbar.cxx | 2 +-
svtools/source/control/valueacc.cxx | 4 ++--
svtools/source/misc/ehdl.cxx | 2 +-
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2 +-
svx/source/sdr/contact/viewobjectcontact.cxx | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 9d787ac8ee3b336d620fbec2cd3cba16a1f2f30a
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sun Aug 4 20:20:54 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 5 10:44:41 2019 +0200
Fix typos
Change-Id: I66d48c809b263835016571772ce2ee529c16b8f4
Reviewed-on: https://gerrit.libreoffice.org/76960
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index e83e749bde27..0f92ff87e532 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -150,7 +150,7 @@ if test ! -f "$DOXYGEN_CFG"; then
exit 1
fi
-# strip -I. and bin -I prefix; exlude system headers
+# strip -I. and bin -I prefix; exclude system headers
DOXYGEN_INCLUDE_PATH=`echo $SOLARINC | sed -e 's/-I\.//g' -e 's/ -I/ /'g -e 's/ -isystem/ /g' -e 's|/usr/[^ ]*| |g'`
# setup version string
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 352b6f94c19b..9d8efbb558a6 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -233,7 +233,7 @@ sub setglobalvariables
{
# Setting the installertype directory corresponding to the environment variable PKGFORMAT
# The global variable $installer::globals::packageformat can only contain one package format.
- # If PKGFORMAT contains more than one format (for example "rpm deb") this is splitted in the
+ # If PKGFORMAT contains more than one format (for example "rpm deb") this is split in the
# makefile calling the perl program.
$installer::globals::installertypedir = $installer::globals::packageformat;
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 01f29f067198..da0768daa9ba 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -819,7 +819,7 @@ sub get_Directoryname_From_Directorygid
}
##################################################################
-# Getting destination direcotory for links, files and profiles
+# Getting destination directory for links, files and profiles
##################################################################
sub get_Destination_Directory_For_Item_From_Directorylist # this is used for Files, Profiles and Links
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index d3771fae0b94..61116e923b6d 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -248,8 +248,8 @@ sub get_file_component_name
$componentname =~ s/\./\_/g; # converting "-" to "_"
# Attention: Maximum length for the componentname is 72
- # %installer::globals::allcomponents_in_this_database : resetted for each database
- # %installer::globals::allcomponents : not resetted for each database
+ # %installer::globals::allcomponents_in_this_database : reset for each database
+ # %installer::globals::allcomponents : not reset for each database
# Component strings must be unique for the complete product, because they are used for
# the creation of the globally unique identifier.
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index 3e6f429ba8e1..e73013ee055d 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -98,7 +98,7 @@ sub get_maximum_filenumber
$maxfile = $allfiles / $maxcabfilenumber;
- $maxfile++; # for securitry
+ $maxfile++; # for security
return $maxfile;
}
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index 7c9ecbe90fbb..b6e6b546b8c5 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -24,7 +24,7 @@ use par2script::exiter;
use par2script::globals;
######################################################
-# Creating a new direcotory
+# Creating a new directory
######################################################
sub create_directory
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index 11d5c259c607..c5f5e44f5f41 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -24,7 +24,7 @@ use pre2par::exiter;
use pre2par::globals;
######################################################
-# Creating a new direcotory
+# Creating a new directory
######################################################
sub create_directory
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index aca6b01ae11d..efb1f28de824 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -78,7 +78,7 @@ if ($is_windows) {
}
# FIXME: a better solution would be to fix installer to deal with broken symlinks
-# make distro-pack-install shufle with the SDK installation to make it LSB compliant
+# make distro-pack-install shuffle with the SDK installation to make it LSB compliant
# it creates symlinks from the original path to /usr/share; they are not valid with $DESTDIR
# and potential second ooinstall call fails with strange error messages if the old tree is still there
if ($destdir && "$ENV{DESTDIR}" ne "/" && -d "$ENV{DESTDIR}") {
diff --git a/solenv/bin/polib.py b/solenv/bin/polib.py
index ef873541bb7e..5ab421365376 100644
--- a/solenv/bin/polib.py
+++ b/solenv/bin/polib.py
@@ -604,7 +604,7 @@ class _BaseFile(list):
def _encode(self, mixed):
"""
Encodes the given ``mixed`` argument with the file encoding if and
- only if it's an unicode string and returns the encoded string.
+ only if it's a unicode string and returns the encoded string.
"""
if isinstance(mixed, text_type):
mixed = mixed.encode(self.encoding)
@@ -1334,7 +1334,7 @@ class _POFileParser(object):
if tokens[0] == '#:':
if nb_tokens <= 1:
continue
- # we are on a occurrences line
+ # we are on an occurrences line
self.process('oc')
elif line[:1] == '"':
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2562903c6244..469c626d31a2 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2130,7 +2130,7 @@ void TabBar::EndEditMode(bool bCancel)
mbEditCanceled = true;
}
- // renaming not allowed, than reset edit data
+ // renaming not allowed, then reset edit data
if (!bEnd)
{
mpImpl->mpEdit->ResetPostEvent();
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 12a965280ece..45428bf26dd5 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -803,7 +803,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
for (sal_uInt16 i=0; i<nCount && !bDone; i++)
{
// Guard the retrieval of the i-th child with a try/catch block
- // just in case the number of children changes in the mean time.
+ // just in case the number of children changes in the meantime.
try
{
pItem = mpParent->mrParent.ImplGetItem(i);
@@ -1152,7 +1152,7 @@ sal_Int32 SAL_CALL SvtValueItemAcc::getAccessibleIndexInParent()
for (sal_uInt16 i=0; i<nCount && !bDone; i++)
{
// Guard the retrieval of the i-th child with a try/catch block
- // just in case the number of children changes in the mean time.
+ // just in case the number of children changes in the meantime.
try
{
pItem = mpParent->mrParent.ImplGetItem(i);
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index c9914a693ac1..c4b444f69a57 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -265,7 +265,7 @@ bool SfxErrorContext::GetString(ErrCode nErrId, OUString &rStr)
/* [Description]
- Constructs the description of a error context
+ Constructs the description of an error context
*/
{
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 497a4c5a4a89..a679d26474fc 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -37,7 +37,7 @@
namespace sdr { namespace contact {
-// Create a Object-Specific ViewObjectContact, set ViewContact and
+// Create an Object-Specific ViewObjectContact, set ViewContact and
// ObjectContact. Always needs to return something.
ViewObjectContact& ViewContactOfSdrObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
{
diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx
index 197113cda630..d15ba27dd9f9 100644
--- a/svx/source/sdr/contact/viewobjectcontact.cxx
+++ b/svx/source/sdr/contact/viewobjectcontact.cxx
@@ -389,7 +389,7 @@ drawinglayer::primitive2d::Primitive2DContainer const & ViewObjectContact::getPr
// started doing so, but it just makes the code more complicated. For now,
// just allow re-creation of the PrimitiveSequence (and removing buffered
// decomposed content of it). May be optimized, though. OTOH it only happens
- // in calc which traditionally does not have a huge amout of DrawObjects anyways.
+ // in calc which traditionally does not have a huge amount of DrawObjects anyways.
const_cast< ViewObjectContact* >(this)->mxPrimitive2DSequence = drawinglayer::primitive2d::Primitive2DContainer { aEmbed };
const_cast< ViewObjectContact* >(this)->maObjectRange.transform(aTranslateGridOffset);
}
More information about the Libreoffice-commits
mailing list