core.git: Branch 'libreoffice-24-2' - svl/source

[Caolán McNamara (via logerrit)]

 svl/source/items/itemset.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 46bd13a55492adef4bf95133d7123494a62f549a
Author: Caolán McNamara 
AuthorDate: Sat Apr 13 20:42:16 2024 +0100
Commit: Eike Rathke 
CommitDate: Mon May 6 15:11:12 2024 +0200

Related: tdf#160056 1 entry is more common than no entries

Change-Id: I78fe8969120f894cf5c0a71fb61611af2d203d18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166065
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 7f2283c2986ff94766cc1d2c076fb34a2c88a31a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166302
Reviewed-by: Eike Rathke 

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 66780cb581cb..fd9cbb1dddee 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1891,11 +1891,8 @@ static void isMiss()
 
 sal_uInt16 WhichRangesContainer::getOffsetFromWhich(sal_uInt16 nWhich) const
 {
-if (empty())
-return INVALID_WHICHPAIR_OFFSET;
-
 // special case for single entry - happens often e.g. UI stuff
-if (1 == m_size)
+if (m_size == 1)
 {
 if( m_pairs->first <= nWhich && nWhich <= m_pairs->second )
 return nWhich - m_pairs->first;
@@ -1904,6 +1901,9 @@ sal_uInt16 
WhichRangesContainer::getOffsetFromWhich(sal_uInt16 nWhich) const
 return INVALID_WHICHPAIR_OFFSET;
 }
 
+if (m_size == 0)
+return INVALID_WHICHPAIR_OFFSET;
+
 // check if nWhich is inside last successfully used WhichPair
 if (INVALID_WHICHPAIR_OFFSET != m_aLastWhichPairOffset
 && m_aLastWhichPairFirst <= nWhich
@@ -1949,12 +1949,8 @@ sal_uInt16 
WhichRangesContainer::getOffsetFromWhich(sal_uInt16 nWhich) const
 
 sal_uInt16 WhichRangesContainer::getWhichFromOffset(sal_uInt16 nOffset) const
 {
-// check for empty, if yes, return null which is an invalid WhichID
-if (empty())
-return 0;
-
 // special case for single entry - happens often e.g. UI stuff
-if (1 == m_size)
+if (m_size == 1)
 {
 if (nOffset <= m_pairs->second - m_pairs->first)
 return m_pairs->first + nOffset;
@@ -1963,6 +1959,10 @@ sal_uInt16 
WhichRangesContainer::getWhichFromOffset(sal_uInt16 nOffset) const
 return 0;
 }
 
+// check for empty, if yes, return null which is an invalid WhichID
+if (m_size == 0)
+return 0;
+
 // check if nWhich is inside last successfully used WhichPair
 if (INVALID_WHICHPAIR_OFFSET != m_aLastWhichPairOffset)
 {

core.git: Branch 'libreoffice-24-2' - svl/source

[Caolán McNamara (via logerrit)]

 svl/source/numbers/zforlist.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 3a3ab826e73cc98988f2044e497ca55461b40c4e
Author: Caolán McNamara 
AuthorDate: Thu Feb 29 12:52:22 2024 +
Commit: Michael Stahl 
CommitDate: Wed Apr 17 11:10:05 2024 +0200

Related: tdf#160056 use member init list

Change-Id: I09dea90e3e3f3fd0a4047b989329a027f788f695
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164148
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166123
Reviewed-by: Michael Stahl 

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 1597f8b244e0..ddefc17699b3 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -278,10 +278,11 @@ SvNumberFormatter::SvNumberFormatter( const Reference< 
XComponentContext >& rxCo
 , IniLnge(eLang != LANGUAGE_DONTKNOW ? eLang : UNKNOWN_SUBSTITUTE)
 , ActLnge(IniLnge)
 , maLanguageTag(IniLnge)
+, MaxCLOffset(0)
+, nDefaultSystemCurrencyFormat(NUMBERFORMAT_ENTRY_NOT_FOUND)
+, eEvalDateFormat(NF_EVALDATEFORMAT_INTL)
+, bNoZero(false)
 {
-eEvalDateFormat = NF_EVALDATEFORMAT_INTL;
-nDefaultSystemCurrencyFormat = NUMBERFORMAT_ENTRY_NOT_FOUND;
-
 xCharClass.changeLocale( m_xContext, maLanguageTag );
 xLocaleData.init( m_xContext, maLanguageTag );
 xCalendar.init( m_xContext, maLanguageTag.getLocale() );
@@ -297,11 +298,7 @@ SvNumberFormatter::SvNumberFormatter( const Reference< 
XComponentContext >& rxCo
 
 pStringScanner.reset( new ImpSvNumberInputScan( this ) );
 pFormatScanner.reset( new ImpSvNumberformatScan( this ) );
-pFormatTable = nullptr;
-MaxCLOffset = 0;
 ImpGenerateFormats( 0, false ); // 0 .. 999 for initialized language 
formats
-pMergeTable = nullptr;
-bNoZero = false;
 
 ::osl::MutexGuard aGuard( GetGlobalMutex() );
 GetFormatterRegistry().Insert( this );

core.git: Branch 'libreoffice-24-2' - svl/source

[Julien Nabet (via logerrit)]

 svl/source/items/srchitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0e803a23b8a1c4c66cdd3cef00252867ba9a1193
Author: Julien Nabet 
AuthorDate: Sat Feb 24 09:40:14 2024 +0100
Commit: Eike Rathke 
CommitDate: Mon Feb 26 17:56:04 2024 +0100

tdf#159862: set SearchWildcard to false changes SearchRegularExpression 
value

Like this since 2016 with 3a0abd3019ec3ca29b8f1378cdb32ebf741e6306
add SvxSearchItem::GetWildcard() SetWildcard()

Change-Id: Id988a6e58488af6b1f274a318e9d1f52c7a8b169
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163876
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit d05e863c69b5611964a4a2eb242ee9566cfb659e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163836
Reviewed-by: Eike Rathke 

diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 1300bf744afa..6aa7c36ddca2 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -364,7 +364,7 @@ void SvxSearchItem::SetWildcard( bool bVal )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::WILDCARD;
 }
-else if ( SearchAlgorithms2::REGEXP == m_aSearchOpt.AlgorithmType2 )
+else if ( SearchAlgorithms2::WILDCARD == m_aSearchOpt.AlgorithmType2 )
 {
 m_aSearchOpt.AlgorithmType2 = SearchAlgorithms2::ABSOLUTE;
 }

core.git: Branch 'libreoffice-24-2' - svl/source

[Noel Grandin (via logerrit)]

 svl/source/crypto/cryptosign.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 42e06fb686d4c02fc6efaf0a792319147e3d62bf
Author: Noel Grandin 
AuthorDate: Fri Jan 26 12:22:36 2024 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jan 27 22:47:20 2024 +0100

tdf#159381 TimeStamp(RFC3161) create problem by asn1 format error.

DER rules say that BOOLEAN values are either FALSE (0x00)
or TRUE (0xff)

Change-Id: I59f57557fbc4d6447e0d8e994b04adda1ee8c1a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162597
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 
(cherry picked from commit d2d8f8bf82558d9aa548fb9f13bed410e0baf79b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162614
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index a234afccbc27..3fe6ae90ab34 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -1037,6 +1037,7 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
 ts_digest.len = aTsHashResult.size();
 
 unsigned char cOne = 1;
+unsigned char cTRUE = 0xff; // under DER rules true is 0xff, false is 
0x00
 src.version.type = siUnsignedInteger;
 src.version.data = 
 src.version.len = sizeof(cOne);
@@ -1056,8 +1057,8 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
 src.nonce.len = sizeof(nNonce);
 
 src.certReq.type = siUnsignedInteger;
-src.certReq.data = 
-src.certReq.len = sizeof(cOne);
+src.certReq.data = 
+src.certReq.len = sizeof(cTRUE);
 
 src.extensions = nullptr;
 

core.git: Branch 'libreoffice-24-2' - svl/source

[Eike Rathke (via logerrit)]

 svl/source/numbers/zforfind.cxx |   21 +++--
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 9d5b078120f1151e9afaf30ca8e088a871c5d443
Author: Eike Rathke 
AuthorDate: Fri Jan 12 17:03:35 2024 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 15 10:48:09 2024 +0100

Resolves: tdf#159148 Accept int32 hours:minutes:seconds input

... and detect overflow to result in text instead of 00:00 input loss.

Change-Id: Ib2b9f16ab6c3c2963c5a2058c27366219f090096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161977
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit e69192b51fc00cbc38006230364af07983a9a827)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161993
Reviewed-by: Michael Stahl 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d29a6a025cd8..c1898104a905 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -983,9 +983,9 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber,
  ) const
 {
 bool bRet = true;
-sal_uInt16 nHour;
-sal_uInt16 nMinute = 0;
-sal_uInt16 nSecond = 0;
+sal_Int32 nHour;
+sal_Int32 nMinute = 0;
+sal_Int32 nSecond = 0;
 double fSecond100 = 0.0;
 sal_uInt16 nStartIndex = nIndex;
 
@@ -1000,7 +1000,10 @@ bool ImpSvNumberInputScan::GetTimeRef( double& 
fOutNumber,
 }
 else if (nIndex - nStartIndex < nCnt)
 {
-nHour   = 
static_cast(sStrArray[nNums[nIndex++]].toInt32());
+const OUString& rValStr = sStrArray[nNums[nIndex++]];
+nHour = rValStr.toInt32();
+if (nHour == 0 && rValStr != "0" && rValStr != "00")
+bRet = false;   // overflow -> Text
 }
 else
 {
@@ -1031,7 +1034,10 @@ bool ImpSvNumberInputScan::GetTimeRef( double& 
fOutNumber,
 }
 else if (nIndex - nStartIndex < nCnt)
 {
-nMinute = 
static_cast(sStrArray[nNums[nIndex++]].toInt32());
+const OUString& rValStr = sStrArray[nNums[nIndex++]];
+nMinute = rValStr.toInt32();
+if (nMinute == 0 && rValStr != "0" && rValStr != "00")
+bRet = false;   // overflow -> Text
 if (!(eInputOptions & SvNumInputOptions::LAX_TIME) && !bAllowDuration
 && nIndex > 1 && nMinute > 59)
 bRet = false;   // 1:60 or 1:123 is invalid, 123:1 or 0:123 is 
valid
@@ -1040,7 +1046,10 @@ bool ImpSvNumberInputScan::GetTimeRef( double& 
fOutNumber,
 }
 if (nIndex - nStartIndex < nCnt)
 {
-nSecond = 
static_cast(sStrArray[nNums[nIndex++]].toInt32());
+const OUString& rValStr = sStrArray[nNums[nIndex++]];
+nSecond = rValStr.toInt32();
+if (nSecond == 0 && rValStr != "0" && rValStr != "00")
+bRet = false;   // overflow -> Text
 if (!(eInputOptions & SvNumInputOptions::LAX_TIME) && !bAllowDuration
 && nIndex > 1 && nSecond > 59 && !(nHour == 23 && nMinute == 
59 && nSecond == 60))
 bRet = false;   // 1:60 or 1:123 or 1:1:123 is invalid, 123:1 or 
123:1:1 or 0:0:123 is valid, or leap second

core.git: Branch 'libreoffice-24-2' - svl/source

[Caolán McNamara (via logerrit)]

 svl/source/items/itemset.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 37f4fc947f81294eebffab5adc1a437bcfc09632
Author: Caolán McNamara 
AuthorDate: Mon Dec 25 22:18:24 2023 +
Commit: Xisco Fauli 
CommitDate: Tue Dec 26 13:31:28 2023 +0100

cid#1559882 Uninitialized scalar field

and

cid#1559872 Uninitialized scalar field

Change-Id: Iaea583d63cd1f0a1b68c60adb57c8c1db9a26a9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161292
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f8163aba61c6c2037deb32c61e52a8c4bd38d07f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161314
Reviewed-by: Xisco Fauli 

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index b14cfa20383e..66780cb581cb 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -74,7 +74,7 @@ SfxPoolItemHolder::SfxPoolItemHolder()
 SfxPoolItemHolder::SfxPoolItemHolder(SfxItemPool& rPool, const SfxPoolItem* 
pItem, bool bPassingOwnership)
 : m_pPool()
 , m_pItem(pItem)
-#ifdef DBG_UTIL
+#ifndef NDEBUG
 , m_bDeleted(false)
 #endif
 {
@@ -89,7 +89,7 @@ SfxPoolItemHolder::SfxPoolItemHolder(SfxItemPool& rPool, 
const SfxPoolItem* pIte
 SfxPoolItemHolder::SfxPoolItemHolder(const SfxPoolItemHolder& rHolder)
 : m_pPool(rHolder.m_pPool)
 , m_pItem(rHolder.m_pItem)
-#ifdef DBG_UTIL
+#ifndef NDEBUG
 , m_bDeleted(false)
 #endif
 {