This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 49fb1b3762 Uodated two strings "temporally" to "temporarily" (#219)
49fb1b3762 is described below
commit 49fb1b3762d35bf25917c0d7355208d2a43f319f
Author: DiGro <dik...@yahoo.co.uk>
AuthorDate: Tue Jun 25 17:50:41 2024 +0200
Uodated two strings "temporally" to "temporarily" (#219)
* Create .gitattributes
* Delete .gitattributes
* Create .gitattributes
* Delete .gitattributes
* Updated download link for zlib, updated LICENSE
* Fixed typo (minmal -> minimal)
* Changed icon for OLE objects in Navigation (Writer) - This fixes issue
128315
* Fixed typos
* Latest Finnish translation, contributed by: Mechtilde
* Changed icon for OLE objects in Navigation (Writer) - Forgot icons in
Classic
* Create .gitattributes
* Delete .gitattributes
* Create .gitattributes
* Delete .gitattributes
* Added new file
* Fixed typos
* Changed helptext after resolved problem.
[:space:] should represent any whitespace character in regular expressions.
However, in the older, before OOo 3.4, it did not find the tab \t.
Used to be Issue 41706
Now it does due to changing the regexp engine since 3.4
* Updated variable static Era gengou_eraArrya with new era Reiwa, as of
May, 1 2019
Added the start date for the era Reiwa to the variable "static Era
gengou_eraArray[ ]"
Updated after post on the forum
https://forum.openoffice.org/en/forum/viewtopic.php?f=9&t=104665
* Occurence "OpenOffice.org" in dialog Writing Aids for new thesaurus
Just noticed the occurrence of the string "OpenOffice.org New Thesaurus" in
the
dialog Writing Aids (Tools > Options > Language Settings > Writing Aids) in
the
Developer Build 4.2.0
This should probably be changed to "New Thesaurus" only.
OpenGrok found the string just once, in:
/trunk/main/lingucomponent/source/thesaurus/libnth/nthesimp.cxx (revision
c4c42a0e)
Line:
576 {
577 MutexGuard aGuard( GetLinguMutex() );
578 return A2OU( "OpenOffice.org New Thesaurus" );
579 }
Since I'm no developer at all I won't touch the code.
Hope someone will pick this up.
Should probably also need to be changed in branches AOO41 and AOO42 too
Earlier reported in BugZilla Issue ID: 128483
https://bz.apache.org/ooo/show_bug.cgi?id=128483
* Update libs2test.txt = temporally > temporarily
Replaced temporally by temporarily.
The latter seems to be the most appropriate word to use.
As to me, it seems that the definitions below that sentence are disabled
for now
* Update osl_File.cxx temporally > temporarily
Replaced temporally by temporarily, as that seems to be the most suitable
word to use.
I read it as:
"If the condition no longer fails on RH9, it will probably be reinstated."
---------
Co-authored-by: mseidel <msei...@apache.org>
(cherry picked from commit 0a01f5af3675670deff925c8a584e3b4d1d36780)
---
main/sal/qa/libs2test.txt | 2 +-
main/sal/qa/osl/file/osl_File.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/sal/qa/libs2test.txt b/main/sal/qa/libs2test.txt
index ffaeb0f267..05a894f2dd 100644
--- a/main/sal/qa/libs2test.txt
+++ b/main/sal/qa/libs2test.txt
@@ -47,7 +47,7 @@ rtl/oustring ; rtl_OUString2
rtl/ostring ; rtl_OString2
osl/file ; osl_File
-# LLA: temporally removed, there are lot of problems with our environment
+# LLA: temporarily removed, there are lot of problems with our environment
osl/socket ; osl_StreamSocket
osl/socket ; osl_DatagramSocket
osl/socket ; osl_SocketAddr
diff --git a/main/sal/qa/osl/file/osl_File.cxx
b/main/sal/qa/osl/file/osl_File.cxx
index deb563f861..8c2947c905 100644
--- a/main/sal/qa/osl/file/osl_File.cxx
+++ b/main/sal/qa/osl/file/osl_File.cxx
@@ -2762,7 +2762,7 @@ namespace osl_FileStatus
nError1 = pDir->getNextItem( m_aItem_2 );
ASSERT_TRUE(::osl::FileBase::E_None == nError1) << "get
second item failed!";
pDir->close();
- //mindy: failed on my RH9,so removed temporally
+ //mindy: failed on my RH9,so removed temporarily
//nError1 = ::osl::DirectoryItem::get( aVolURL2,
m_aVolumeItem );
//ASSERT_TRUE(::osl::FileBase::E_None == nError1) <<
"get volume item failed!";
