editeng/source/misc/unolingu.cxx | 6 +++++-
linguistic/source/dlistimp.cxx | 6 +++++-
linguistic/source/gciterator.cxx | 2 +-
linguistic/source/misc.cxx | 6 +++++-
sc/source/ui/app/inputhdl.cxx | 11 +++++++----
5 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 49a0983b55590331d722ebcf9b15a45d5f3dcfa1
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 11 08:46:07 2024 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 17 11:49:46 2024 +0100
cid#1583748 Dereference after null check
Change-Id: I147e0454e215b3a26e97c0a6d727db25fd2549a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161918
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f414aabbe277..e2c6b4b27949 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3862,8 +3862,10 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt,
bool bStartEdit /* = false
ScModule* pScMod = SC_MOD();
const ScInputOptions& rOpt = pScMod->GetInputOptions();
- if ( (rOpt.GetMoveKeepEdit() &&
!comphelper::LibreOfficeKit::isActive())
- || (pActiveViewSh->GetMoveKeepEdit() &&
comphelper::LibreOfficeKit::isActive()) )
+ const bool bKit = comphelper::LibreOfficeKit::isActive();
+
+ if ( (rOpt.GetMoveKeepEdit() && !bKit)
+ || (pActiveViewSh && pActiveViewSh->GetMoveKeepEdit() &&
bKit) )
pScMod->SetInputMode( SC_INPUT_TABLE );
bUsed = true;
commit 58f721fba4bc09f85595f9d08dd25d973b70c4ea
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Jan 10 08:45:18 2024 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 17 11:48:56 2024 +0100
cid#1583748 Dereference after null check
since:
commit 20502992b862e5a83140b6d2b19722cdc652eeab
Date: Mon Dec 4 14:08:09 2023 +0000
calc: Add option to keep edit mode on enter/tab
Change-Id: Ic338602945fb77cebf771fe3d0ad2e4e94fc0318
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161874
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e7e7f6041c8a..f414aabbe277 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -3814,9 +3814,10 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt,
bool bStartEdit /* = false
ScModule* pScMod = SC_MOD();
const ScInputOptions& rOpt = pScMod->GetInputOptions();
+ const bool bKit = comphelper::LibreOfficeKit::isActive();
- if ( (rOpt.GetMoveKeepEdit() &&
!comphelper::LibreOfficeKit::isActive())
- || (pActiveViewSh->GetMoveKeepEdit() &&
comphelper::LibreOfficeKit::isActive()) )
+ if ( (rOpt.GetMoveKeepEdit() && !bKit)
+ || (pActiveViewSh && pActiveViewSh->GetMoveKeepEdit() && bKit) )
pScMod->SetInputMode( SC_INPUT_TABLE );
return true;
commit 0c5924adc8353df9bf4e5ff7b2cc06ec22675419
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 8 19:48:47 2024 +0000
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 17 11:48:32 2024 +0100
avoid null deref of xIgnoreAll
Change-Id: Ib8e3309c046a74ca13f88fd0a668f3e1d6b909b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161802
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161815
Tested-by: Jenkins
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 2f1232289c10..b35882785995 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -417,7 +417,7 @@ void GrammarCheckingIterator::ProcessResult(
for (const linguistic2::SingleProofreadingError &rError :
rRes.aErrors)
{
OUString word(rRes.aText.subView(rError.nErrorStart,
rError.nErrorLength));
- bool ignored = xIgnoreAll->getEntry(word).is();
+ bool ignored = xIgnoreAll.is() &&
xIgnoreAll->getEntry(word).is();
if (!ignored)
{
commit d0393bc3d8e1d5d7dc2d3305473a8c6c7ef219bb
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Dec 22 13:29:01 2023 +0300
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Jan 17 11:48:12 2024 +0100
Lok: make Ignore All list name independent on UI language
Fixes not working "Ignore All" context menu entry in e.g. German UI
in Online.
Change-Id: I761c9f65c89fb5c7e929ea20f2db4eff20f7d53d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161170
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 1e7b69a25f27..bd1fae50654e 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/linguistic2/LinguProperties.hpp>
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -595,7 +596,10 @@ uno::Reference< XDictionary > LinguMgr::GetIgnoreAll()
uno::Reference< XSearchableDictionaryList > xTmpDicList(
GetDictionaryList() );
if (xTmpDicList.is())
{
- std::locale loc(Translate::Create("svt"));
+ const LanguageTag tag = comphelper::LibreOfficeKit::isActive()
+ ? LanguageTag("en-US")
+ : SvtSysLocale().GetUILanguageTag();
+ std::locale loc(Translate::Create("svt", tag));
xIgnoreAll = xTmpDicList->getDictionaryByName(
Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) );
}
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 281abce9e11a..ba39271eee0c 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -27,6 +27,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <unotools/localfilehelper.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -586,7 +587,10 @@ void DicList::CreateDicList()
// create IgnoreAllList dictionary with empty URL (non persistent)
// and add it to list
- std::locale loc(Translate::Create("svt"));
+ const LanguageTag tag = comphelper::LibreOfficeKit::isActive()
+ ? LanguageTag("en-US")
+ : SvtSysLocale().GetUILanguageTag();
+ std::locale loc(Translate::Create("svt", tag));
uno::Reference< XDictionary > xIgnAll(
createDictionary( Translate::get(STR_DESCRIPTION_IGNOREALLLIST,
loc), LinguLanguageToLocale( LANGUAGE_NONE ),
DictionaryType_POSITIVE, OUString() ) );
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index c315ad1270ee..5c50af6f1946 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.h>
+#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <unotools/charclass.hxx>
@@ -690,7 +691,10 @@ uno::Reference< XDictionary > GetIgnoreAllList()
uno::Reference< XSearchableDictionaryList > xDL( GetDictionaryList() );
if (xDL.is())
{
- std::locale loc(Translate::Create("svt"));
+ const LanguageTag tag = comphelper::LibreOfficeKit::isActive()
+ ? LanguageTag("en-US")
+ : SvtSysLocale().GetUILanguageTag();
+ std::locale loc(Translate::Create("svt", tag));
xRes = xDL->getDictionaryByName(
Translate::get(STR_DESCRIPTION_IGNOREALLLIST, loc) );
}
return xRes;
