sc/source/core/tool/compiler.cxx | 10 ++-------- vcl/source/fontsubset/sft.cxx | 1 + 2 files changed, 3 insertions(+), 8 deletions(-)
New commits: commit 7a207d9974846b894eac2380042013f771abc8ba Author: Karthik Godha <[email protected]> AuthorDate: Thu Jan 8 15:27:39 2026 +0530 Commit: Michael Stahl <[email protected]> CommitDate: Mon Jan 12 13:43:54 2026 +0100 XLS->XLSX: Quote sheet names starting with numbers In 'definedNames' element enclose sheet names starting with numbers in quotes, this is what Microsoft Excel expects. bug document: fdo54055-1.xlsx Change-Id: I5e729defa4c75aba71b629fffbef05d0b710b76a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196832 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 978acf71136df9e491c0de78423f55da49bae4fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197080 diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 76516b8b9555..d0a1ee5dc361 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -1968,8 +1968,8 @@ ScCompiler::~ScCompiler() void ScCompiler::CheckTabQuotes( OUString& rString, const FormulaGrammar::AddressConvention eConv ) { - sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_UNDERSCORE; - sal_Int32 nContFlags = nStartFlags; + sal_Int32 nStartFlags = KParseTokens::ANY_LETTER | KParseTokens::ASC_UNDERSCORE; + sal_Int32 nContFlags = nStartFlags | KParseTokens::ANY_NUMBER; ParseResult aRes = ScGlobal::getCharClass().parsePredefinedToken( KParseType::IDENTNAME, rString, 0, nStartFlags, OUString(), nContFlags, OUString()); bool bNeedsQuote = !((aRes.TokenType & KParseType::IDENTNAME) && aRes.EndPos == rString.getLength()); @@ -1992,12 +1992,6 @@ void ScCompiler::CheckTabQuotes( OUString& rString, break; } - if ( !bNeedsQuote && CharClass::isAsciiNumeric( rString ) ) - { - // Prevent any possible confusion resulting from pure numeric sheet names. - bNeedsQuote = true; - } - if( bNeedsQuote ) { rString = "'" + rString + "'"; commit 4ca3a1e240d947b4b0f47a29f689d70d04b17089 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Jan 12 08:40:55 2026 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Jan 12 13:43:39 2026 +0100 cid#1680327 Uninitialized scalar field Change-Id: Ia823d38011e45dedcf16a06869b6d9b0460ebcd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197073 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx index 0c04719adc75..5deacf74a0f1 100644 --- a/vcl/source/fontsubset/sft.cxx +++ b/vcl/source/fontsubset/sft.cxx @@ -995,6 +995,7 @@ AbstractTrueTypeFont::~AbstractTrueTypeFont() TrueTypeFont::TrueTypeFont(const char* pFileName, const FontCharMapRef xCharMap) : AbstractTrueTypeFont(pFileName, xCharMap) , fsize(-1) + , mmhandle(0) , ptr(nullptr) , ntables(0) {
