core.git: Branch 'libreoffice-7-6' - config_host/config_crypto.h.in configure.ac include/curlinit.hxx include/opensslinit.hxx vcl/source
config_host/config_crypto.h.in |2 ++
configure.ac |3 +++
include/curlinit.hxx | 23 +--
include/opensslinit.hxx| 41 +
vcl/source/app/svmain.cxx | 25 +
5 files changed, 72 insertions(+), 22 deletions(-)
New commits:
commit d8fa11184fae396e4bca3c2201380613c6031ac8
Author: Michael Stahl
AuthorDate: Wed Nov 8 14:50:26 2023 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Apr 10 08:07:46 2024 +0200
Related: tdf#157480 vcl,openssl: set SSL_CERT_FILE for bundled OpenSSL
OpenSSL may read a CA certificate file from $SSL_CERT_FILE, if the
client library calls SSL_CTX_set_default_verify_paths(); python's ssl
module does it but apparently libcurl does not.
So split the code from commit 3fc632c0261c75fb4079a5305e814698e791f75c
and set the environment variable in ImplSVMain(), hopefully before
any threads are spawned; seems to work for PyMailSMTPService.
This needs to have SYSTEM_OPENSSL available in a config header.
Change-Id: I63b747cb61bb236cf4f605bb9858e5b0083388fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159149
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 1472e2d68b9cff43b99069d3ba9439fff0a5684c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159283
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165597
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/config_host/config_crypto.h.in b/config_host/config_crypto.h.in
index 106485d55213..33877f99af36 100644
--- a/config_host/config_crypto.h.in
+++ b/config_host/config_crypto.h.in
@@ -33,4 +33,6 @@
#endif
+#undef SYSTEM_OPENSSL
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/configure.ac b/configure.ac
index ecc8cf29733a..fb6103eb6181 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11051,6 +11051,9 @@ if test "$enable_openssl" = "yes"; then
OPENSSL_LIBS="-lssl -lcrypto"
else
libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl])
+if test -n "${SYSTEM_OPENSSL}"; then
+AC_DEFINE([SYSTEM_OPENSSL])
+fi
fi
if test "$with_system_openssl" = "yes"; then
AC_MSG_CHECKING([whether openssl supports SHA512])
diff --git a/include/curlinit.hxx b/include/curlinit.hxx
index 8b3a9968419d..1cf766f9 100644
--- a/include/curlinit.hxx
+++ b/include/curlinit.hxx
@@ -14,28 +14,7 @@
#if defined(LINUX) && !defined(SYSTEM_CURL)
#include
-#include
-
-static char const* GetCABundleFile()
-{
-// try system ones first; inspired by:
-//
https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-auto const candidates = {
-"/etc/pki/tls/certs/ca-bundle.crt",
-"/etc/pki/tls/certs/ca-bundle.trust.crt",
-"/etc/ssl/certs/ca-certificates.crt",
-"/var/lib/ca-certificates/ca-bundle.pem",
-};
-for (char const* const candidate : candidates)
-{
-if (access(candidate, R_OK) == 0)
-{
-return candidate;
-}
-}
-
-throw css::uno::RuntimeException("no OpenSSL CA certificate bundle found");
-}
+#include "opensslinit.hxx"
static void InitCurl_easy(CURL* const pCURL)
{
diff --git a/include/opensslinit.hxx b/include/opensslinit.hxx
new file mode 100644
index ..9c3f4c860895
--- /dev/null
+++ b/include/opensslinit.hxx
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+
+#if defined(LINUX) && !defined(SYSTEM_OPENSSL)
+#include
+
+#include
+
+static char const* GetCABundleFile()
+{
+// try system ones first; inspired by:
+//
https://www.happyassassin.net/posts/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
+auto const candidates = {
+"/etc/pki/tls/certs/ca-bundle.crt",
+"/etc/pki/tls/certs/ca-bundle.trust.crt",
+"/etc/ssl/certs/ca-certificates.crt",
+"/var/lib/ca-certificates/ca-bundle.pem",
+};
+for (char const* const candidate : candidates)
+{
+if (access(candidate, R_OK) == 0)
+{
+return candidate;
+}
+}
+
+throw css::uno::RuntimeException("no OpenSSL CA certificate bundle found");
+}
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b574873744ee
core.git: Branch 'libreoffice-7-6' - vcl/unx
vcl/unx/gtk3/gtkframe.cxx | 22 +-
1 file changed, 17 insertions(+), 5 deletions(-)
New commits:
commit 508a755a465c322af3c08f871299ce57193ca523
Author: Caolán McNamara
AuthorDate: Sun Mar 31 18:11:42 2024 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Apr 10 08:06:40 2024 +0200
Resolves: tdf#154072 no effect when clicking some dropdown buttons
when toolbar overflows.
A problem since:
commit b534ee2e972711af2dbaadf2190813054adda902
Date: Tue Nov 22 11:33:23 2022 +
Resolves: tdf#152155 use gtk's knowledge of relative widget positions
rather than effectively emulate it poorly
Change-Id: I18c08e43e9c0b642f2a30b5114d6f0a53f18a331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165610
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165634
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 6152d64bd86e..7c9290cfed68 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -3926,12 +3926,24 @@ void GtkSalFrame::signalRealize(GtkWidget*, gpointer
frame)
}
tools::Rectangle aFloatRect =
FloatingWindow::ImplConvertToAbsPos(pVclParent, pThis->m_aFloatRect);
-if
(gdk_window_get_window_type(widget_get_surface(pThis->m_pParent->m_pWindow)) !=
GDK_WINDOW_TOPLEVEL)
+switch
(gdk_window_get_window_type(widget_get_surface(pThis->m_pParent->m_pWindow)))
{
-// See tdf#152155 for an example
-gtk_coord nX(0), nY(0.0);
-gtk_widget_translate_coordinates(pThis->m_pParent->m_pWindow,
widget_get_toplevel(pThis->m_pParent->m_pWindow), 0, 0, &nX, &nY);
-aFloatRect.Move(nX, nY);
+case GDK_WINDOW_TOPLEVEL:
+break;
+case GDK_WINDOW_CHILD:
+{
+// See tdf#152155 for an example
+gtk_coord nX(0), nY(0.0);
+gtk_widget_translate_coordinates(pThis->m_pParent->m_pWindow,
widget_get_toplevel(pThis->m_pParent->m_pWindow), 0, 0, &nX, &nY);
+aFloatRect.Move(nX, nY);
+break;
+}
+default:
+{
+// See tdf#154072 for an example
+aFloatRect.Move(-pThis->m_pParent->maGeometry.x(),
-pThis->m_pParent->maGeometry.y());
+break;
+}
}
GdkRectangle rect {static_cast(aFloatRect.Left()),
static_cast(aFloatRect.Top()),
core.git: configure.ac
configure.ac |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit 42f6e89d5e6458966de452af2978f206115394af Author: Stephan Bergmann AuthorDate: Tue Apr 9 10:37:09 2024 +0200 Commit: Stephan Bergmann CommitDate: Tue Apr 9 23:40:49 2024 +0200 Avoid -O2 in AC_PROG_CC/CXX, work around occasional Clang 12.0.1 SEGVs At least with one ASan/UBSan setup of mine using LODE's Clang 12.0.1, ./autogen.sh would occasionally detect -std=gnu11 as the required CC "option to enable C11 features" (which would in turn cause building external/firebird to fail oddly; an issue worth investigations of its own), because Clang would occasionally crash with a SEGV on the corresponding configure test program's first invocation (without -std=gnu11) when invoked with -O2 (and happen to succeed on second invocation with -std=gnu11, so configure thinks that's needed), see below for a relevant config.log excerpt. When CC/CXX are already set (as is the case in this scenario), we could arguably skip the AC_PROG_CC/CXX checks entirely (and thus avoid configure potentially adding -std=gnu11 to CC), but at least AC_PROG_CC also internally sets the GCC shell var, which we use in configure.ac. So better be conservative and just avoid -O2 during AC_PROG_CC/CXX (whatever the autoconf motivation to include it in the first place). > configure:8165: checking for /home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=local-bounds -fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist option to enable C11 features > configure:8180: /home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=local-bounds -fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist -c -g -O2 conftest.c >&5 > PLEASE submit a bug report to https://bugs.llvm.org/ and include the crash backtrace, preprocessed source, and associated run script. > Stack dump: > 0.Program arguments: /home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang -fsanitize=address -fsanitize=undefined -fsanitize=float-divide-by-zero -fsanitize=local-bounds -fsanitize-blacklist=/home/sberg/lo0/core/sanitize-ubsan-excludelist -c -g -O2 conftest.c > 1. parser at end of file > 2.Code generation > #0 0x55f3a890caf2 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3eaf2) > #1 0x55f3a890a734 llvm::sys::RunSignalHandlers() (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1c3c734) > #2 0x55f3a887b998 CrashRecoverySignalHandler(int) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1bad998) > #3 0x7f750d24e520 (/lib/x86_64-linux-gnu/libc.so.6+0x42520) > #4 0x55f3a93f9cd4 llvm::DIE::getUnitDie() const (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x272bcd4) > #5 0x55f3a9404574 llvm::DwarfDebug::finishEntityDefinitions() (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2736574) > #6 0x55f3a941df99 llvm::DwarfDebug::finalizeModuleInfo() (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x274ff99) > #7 0x55f3a9421128 llvm::DwarfDebug::endModule() (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2753128) > #8 0x55f3a93f1219 llvm::AsmPrinter::doFinalization(llvm::Module&) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2723219) > #9 0x55f3a82478f5 llvm::FPPassManager::doFinalization(llvm::Module&) (.localalias) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x15798f5) > #10 0x55f3a8253900 llvm::legacy::PassManagerImpl::run(llvm::Module&) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1585900) > #11 0x55f3a8bb57d3 (anonymous namespace)::EmitAssemblyHelper::EmitAssembly(clang::BackendAction, std::unique_ptr >) (.constprop.0) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee77d3) > #12 0x55f3a8bb76ea clang::EmitBackendOutput(clang::DiagnosticsEngine&, clang::HeaderSearchOptions const&, clang::CodeGenOptions const&, clang::TargetOptions const&, clang::LangOptions const&, llvm::DataLayout const&, llvm::Module*, clang::BackendAction, std::unique_ptr >) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x1ee96ea) > #13 0x55f3a9825876 clang::BackendConsumer::HandleTranslationUnit(clang::ASTContext&) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x2b57876) > #14 0x55f3aa35c549 clang::ParseAST(clang::Sema&, bool, bool) (/home/builder/lode/opt_private/clang-llvmorg-12.0.1/bin/clang+0x368e549) > #15 0x55f3a91ef2d9 clang::FrontendActio
core.git: odk/examples
odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/cxx/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e64a1dfc36a18de40af6563f9720a9fb1e42cb1b Author: RMZeroFour AuthorDate: Wed Apr 10 00:20:12 2024 +0530 Commit: Hossein CommitDate: Tue Apr 9 22:21:44 2024 +0200 Fix typo in HelloTextTableShape makefile The HelloTextTableShape example, which was recently ported to C++, has a small typo in line #64 of the Makefile. It gives the user the command to run the example, but it was missing an 'e' at the end. Change-Id: I29af45f21ff78dbda42e5bd9e25e44f06536f7c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165915 Tested-by: Jenkins Reviewed-by: Hossein diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/cxx/Makefile b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/cxx/Makefile index 1ecaaac747d5..121feca07d61 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/cxx/Makefile +++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape/cxx/Makefile @@ -61,7 +61,7 @@ HelloTextTableShape: $(OUT_BIN)/$(APP_NAME)$(EXE_EXT) @echo @echo Please use the following command to execute the example! @echo - - @echo $(MAKE) HelloTextTableShap.run + @echo $(MAKE) HelloTextTableShape.run @echo %.run: $(OUT_BIN)/HelloTextTableShape$(EXE_EXT)
core.git: filter/source
filter/source/svg/svgfontexport.cxx |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 2dbd0acb88be751c05648167518dbc60ba75bceb
Author: Mike Kaganski
AuthorDate: Tue Apr 9 19:08:07 2024 +0100
Commit: Mike Kaganski
CommitDate: Tue Apr 9 21:50:37 2024 +0200
Simplify a bit
Change-Id: I92def0e5731d231583b9b03e351bc46949045b4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165846
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/filter/source/svg/svgfontexport.cxx
b/filter/source/svg/svgfontexport.cxx
index 7e75d65e6bc2..014975b8d229 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -252,7 +252,6 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont )
void SVGFontExport::implEmbedGlyph( OutputDevice const & rOut, const OUString&
rCellStr )
{
tools::PolyPolygon aPolyPoly;
-const sal_Unicode nSpace = ' ';
if( !rOut.GetTextOutline( aPolyPoly, rCellStr ) )
return;
@@ -261,14 +260,10 @@ void SVGFontExport::implEmbedGlyph( OutputDevice const &
rOut, const OUString& r
aPolyPoly.Scale( 1.0, -1.0 );
-if( !rOut.GetTextBoundRect( aBoundRect, rCellStr ) )
+if (rCellStr == " " || !rOut.GetTextBoundRect(aBoundRect, rCellStr))
aBoundRect = tools::Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth(
rCellStr ), 0 ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, "unicode", rCellStr );
-
-if( rCellStr[ 0 ] == nSpace && rCellStr.getLength() == 1 )
-aBoundRect = tools::Rectangle( Point( 0, 0 ), Size( rOut.GetTextWidth(
OUString(' ') ), 0 ) );
-
mrExport.AddAttribute( XML_NAMESPACE_NONE, "horiz-adv-x",
OUString::number( aBoundRect.GetWidth() ) );
const OUString aPathString( SVGActionWriter::GetPathString( aPolyPoly,
false ) );
core.git: Branch 'distro/collabora/co-23.05' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8df77099766c2fb56b0c9be9eef34c54f5011b6a Author: László Németh AuthorDate: Tue Apr 9 17:53:42 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Apr 9 18:53:42 2024 +0200 Update git submodules * Update dictionaries from branch 'distro/collabora/co-23.05' to 3564cb05559c1ea6c34ee89bfb02caee2637028a - Hungarian dictionary v1.8.1 Added new words, fixes, and decomposition data of ~6500 compound words for better hyphenation. See tdf#158885 for COMPOUNDLEFTHYPHENMIN implementation in LibreOffice, where Hunspell filters out compound word boundaries from libhyphen-based hyphenation breaks, restricting hyphenation near the compound boundary according to spelling and typography rules. Change-Id: I22a7b70513d0a59d7a31462fcb46efd53cfe8ad7 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/165439 Tested-by: László Németh Reviewed-by: László Németh - Updated Hungarian hyphenation dictionary to version v20240321 source: https://sourceforge.net/projects/magyarispell/files/OOo%20Huhyphn/v20240321-0.1/ Change-Id: If470f5854511cac6f0a355e4d006abf9e3976f90 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/165166 Tested-by: László Németh Reviewed-by: László Németh - use general label for Turkish dictionary to be consistent with labels for other dictionaries Change-Id: If01f9a9292fc15f3ff06f608b87273bc4e300e2f Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/162946 Reviewed-by: Kevin Suo Tested-by: Kevin Suo - update hunspell dictionaries for Turkish language This dictionary is more accurate and efficient than the current dictionary. It was benchmarked and compared to existing hunspell Turkish dictionaries. Please see: https://github.com/tdd-ai/hunspell-tr Edit: Updated the dictionary to include proper names. Change-Id: Ie23273274bc60ce6ac53a12ff92ad529bd0339a7 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118649 Reviewed-by: Muhammet Kara Tested-by: Muhammet Kara - Updated Afrikaans dictionary Change-Id: Ief9cb53fdcbf794d1c54f4f5008f80b9975453d8 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/163265 Tested-by: Andras Timar Reviewed-by: Andras Timar (cherry picked from commit 55f4731d574aeec252379ac66326bcea6df2f823) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/163280 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Adolfo Jayme Barrientos - tdf#159164 Update the English dictionaries: GB+ZA+AU+CA+US Change-Id: I1ad3cb7a283f85cd8260d2d12f3abd78dfcf6206 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/162881 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas (cherry picked from commit 208a9fd80b2a182fe20f224cd615119c6323ae2e) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/162899 - tdf#156723 False positives in pt-BR lightproof Salário mínimo Change-Id: I5d060d90b7915b91d44b8dd2cb9bd4cf79115012 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/161572 Tested-by: Olivier Hallot Reviewed-by: Olivier Hallot (cherry picked from commit fda9b47d9ce58f16441d6e0ec23f8aac655c1428) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/161559 - Updated Slovenian thesaurus Change-Id: Ib3c9a0b4a36398b25def93bbbc62a9bcc8e3fa2c Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/161569 Tested-by: Andras Timar Reviewed-by: Andras Timar - Belarusian hunspell dictionary update Change-Id: I3d2a0f62fe59f46f201a4c7d596a22fd04efe017 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/159516 Tested-by: Vasily Melenchuk Reviewed-by: Vasily Melenchuk Reviewed-by: Thorsten Behrens (cherry picked from commit 15c78fe07964b0457639ff02cd8c15d0d2d844b6) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/161108 - Update the Korean Dictionaries: ko-KR Update Korean dictionary file (ko_KR.dic) by DaeHyun Sung (2023.05.14) Also, update readme description Change-Id: Iebaad8c33d8a94bfa4e7427c0a3d218ea4d7c109 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/151732 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos - Updated the English dictionaries: GB Change-Id: I9950273688ccb0d9743d168b1a928e91942c38a3 Reviewed-on: https:/
core.git: scripting/source
scripting/source/basprov/baslibnode.cxx |1 -
scripting/source/dlgprov/DialogModelProvider.cxx |2 --
2 files changed, 3 deletions(-)
New commits:
commit 098f366895d2b224ddcd791d10a2e61fbc5fae94
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 20:48:52 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:50 2024 +0200
tdf#146619 Drop unused 'using namespace' in: scripting/
Change-Id: I84194df451ea990c515ae914741078c80e53e45b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165694
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/scripting/source/basprov/baslibnode.cxx
b/scripting/source/basprov/baslibnode.cxx
index 566883757b48..72d464f5caf0 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::script;
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx
b/scripting/source/dlgprov/DialogModelProvider.cxx
index e49ed058d475..ceb46f53c103 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -28,10 +28,8 @@
namespace dlgprov {
using namespace ::com::sun::star;
-using namespace awt;
using namespace lang;
using namespace uno;
-using namespace script;
using namespace beans;
dictionaries.git: Branch 'distro/collabora/co-23.05' - 25 commits - af_ZA/af_ZA.aff af_ZA/af_ZA.dic af_ZA/description.xml be_BY/be-official.aff be_BY/be-official.dic be_BY/description.xml ca/descripti
.gitreview|7 Dictionary_es.mk |4 Dictionary_id.mk |3 af_ZA/af_ZA.aff | 175 af_ZA/af_ZA.dic |30255 -- af_ZA/description.xml |2 be_BY/be-official.aff |19696 - be_BY/be-official.dic |273559 +++--- be_BY/description.xml |2 ca/LICENSES-en.txt|2 ca/LLICENCIES-ca.txt |2 ca/README_ca.txt | 24 ca/README_hyph_ca.txt | 32 ca/README_thes_ca.txt | 18 ca/description.xml|2 ca/dictionaries/ca-valencia.aff | 5075 ca/dictionaries/ca-valencia.dic |412234 ++- ca/dictionaries/ca.aff| 5057 ca/dictionaries/ca.dic|411426 ++- ca/dictionaries/hyph_ca.dic | 5542 ca/dictionaries/th_ca_ES_v3.dat |132242 +++- ca/package-description.txt|2 da_DK/README_da_DK.txt|2 da_DK/da_DK.aff | 708 da_DK/da_DK.dic |24605 + da_DK/description.xml |2 da_DK/th_da_DK.dat| 3888 en/Linguistic.xcu |2 en/README_en_GB.txt | 241 en/changelog.txt | 156 en/description.xml|2 en/dialog/en_en_US.properties |2 en/dictionaries.xcu |6 en/en_AU.aff |6 en/en_CA.aff |6 en/en_GB.aff | 1643 en/en_GB.dic |10520 en/en_US.aff |6 en/en_ZA.aff | 1341 en/en_ZA.dic | 113 en/package-description.txt| 10 en/pythonpath/lightproof_impl_en.py |2 es/description.xml|2 es/dictionaries.xcu | 15 es/es.aff | 6907 es/es.dic |70159 es/es_AR.dic | 106 es/es_BO.dic | 106 es/es_CL.dic | 107 es/es_CO.dic | 107 es/es_CR.dic | 110 es/es_CU.dic | 106 es/es_DO.dic | 106 es/es_EC.dic | 109 es/es_ES.dic | 106 es/es_GQ.dic | 119 es/es_GT.dic | 112 es/es_HN.dic | 114 es/es_MX.dic | 115 es/es_NI.dic | 113 es/es_PA.dic | 108 es/es_PE.dic | 106 es/es_PH.dic | 109 es/es_PR.dic | 106 es/es_PY.dic | 106 es/es_SV.dic | 109 es/es_US.dic | 106 es/es_UY.dic | 106 es/es_VE.dic | 106 es/package-description.txt|2 hu_HU/README_hu_HU.txt|8 hu_HU/README_hyph_hu_HU.txt |2 hu_HU/description.xml |2 hu_HU/hu_HU.aff |79685 ++--- hu_HU/hu_HU.dic |157990 +- hu_HU/hyph_hu_HU.dic | 4614 id/README-dict.adoc | 137 id/README-dict.md | 55 id/description.xml|2 id/id_ID.aff | 107 id/id_ID.dic |19909 + ko_KR/README_ko_KR.txt|3 ko_KR/ko_KR.dic | 144 oc_FR/LICENCES-fr.txt | 50 oc_FR/LICENSES-en.txt | 26 oc_FR/README_oc_FR.txt| 109 oc_FR/description.xml |8 oc_FR/oc_FR.aff | 172 oc_FR/oc_FR.dic | 4708 pt_BR/dialog/pt_BR_en_US.properties |2 pt_BR/pythonpath/lightproof_impl_pt_BR.py |2 pt_BR/pythonpath/lightproof_pt_BR.py |6 sk_SK/README_en.txt |5 sk_SK/README_sk.txt |5 sk_SK/description.xml |2 sk_SK/release_en.txt |
core.git: 2 commits - bin/find-unneeded-includes starmath/qa starmath/source
bin/find-unneeded-includes |2 +-
starmath/qa/cppunit/test_cursor.cxx |2 --
starmath/qa/cppunit/test_nodetotextvisitors.cxx |2 --
starmath/qa/cppunit/test_parse.cxx |2 --
starmath/source/edit.cxx|1 -
starmath/source/mathml/import.cxx |1 -
starmath/source/mathml/mathmlimport.cxx |1 -
7 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit ff9373bd7271f37fd4cc8c35987a2477c5913b22
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 20:47:39 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:23 2024 +0200
tdf#146619 Drop unused 'using namespace' in: starmath/
Change-Id: I382ca117484b0928580f4bed765799e915e7b8a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165693
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/starmath/qa/cppunit/test_cursor.cxx
b/starmath/qa/cppunit/test_cursor.cxx
index 002a445745c9..89d4e6fe9a8e 100644
--- a/starmath/qa/cppunit/test_cursor.cxx
+++ b/starmath/qa/cppunit/test_cursor.cxx
@@ -23,8 +23,6 @@
typedef rtl::Reference SmDocShellRef;
-using namespace ::com::sun::star;
-
namespace
{
class Test : public test::BootstrapFixture
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index d4981445d8bb..0fbcfa1a81a1 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -25,8 +25,6 @@
typedef rtl::Reference SmDocShellRef;
-using namespace ::com::sun::star;
-
namespace
{
class Test : public test::BootstrapFixture
diff --git a/starmath/qa/cppunit/test_parse.cxx
b/starmath/qa/cppunit/test_parse.cxx
index cb158a15491d..2e240c04a2ac 100644
--- a/starmath/qa/cppunit/test_parse.cxx
+++ b/starmath/qa/cppunit/test_parse.cxx
@@ -21,8 +21,6 @@
namespace {
-using namespace ::com::sun::star;
-
typedef rtl::Reference SmDocShellRef;
class ParseTest : public test::BootstrapFixture
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f36634a16b14..464498262b2f 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -42,7 +42,6 @@
#include
#include
-using namespace com::sun::star::accessibility;
using namespace com::sun::star;
diff --git a/starmath/source/mathml/import.cxx
b/starmath/source/mathml/import.cxx
index d857e56930d6..31d92a355cc7 100644
--- a/starmath/source/mathml/import.cxx
+++ b/starmath/source/mathml/import.cxx
@@ -58,7 +58,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
diff --git a/starmath/source/mathml/mathmlimport.cxx
b/starmath/source/mathml/mathmlimport.cxx
index 7bc3e5b913e3..d6a9b8d10ad8 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -74,7 +74,6 @@ one go*/
#include
using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
commit 6f10dc11015ed1640b847e7f0c0be5498b777c5b
Author: Gabor Kelemen
AuthorDate: Mon Apr 1 10:41:39 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:53:11 2024 +0200
find-unneeded-includes: improve grepping for namespaces
for example this was not found:
extensions/source/update/check/updatecheck.cxx:58:namespace frame =
com::sun::star::frame ;
due to the missing using and the space before the semicolon
but IWYU correctly detected it as unused
Change-Id: I404c93d41aec1a571c9ac49db7b7c7e8da824bf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165698
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 99c77b654d3e..718ee67a2561 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -392,7 +392,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName,
noexclude, checknamespa
print("WARNING:", fileName, "This 'using namespace' is
likely unnecessary:", nameSpace)
# Get the row number, normal IWYU output does not contain
this info
-subprocess.run(["git", "grep", "-n", "using
namespace.*"+nameSpace+";", fileName])
+subprocess.run(["git", "grep", "-n",
"namespace.*[^a-zA-Z]"+nameSpace+" *;", fileName])
for remove in sorted(toRemove):
print("ERROR: %s: remove not needed include" % remove)
core.git: reportdesign/source
reportdesign/source/core/api/services.cxx |1 -
reportdesign/source/core/sdr/UndoActions.cxx |2 --
reportdesign/source/core/sdr/UndoEnv.cxx |2 --
reportdesign/source/filter/xml/xmlAutoStyle.cxx |1 -
reportdesign/source/filter/xml/xmlCell.cxx|1 +
reportdesign/source/filter/xml/xmlComponent.cxx |1 -
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx |1 -
reportdesign/source/filter/xml/xmlExport.cxx |1 -
reportdesign/source/filter/xml/xmlExport.hxx |4
reportdesign/source/filter/xml/xmlFixedContent.cxx|2 ++
reportdesign/source/filter/xml/xmlFormatCondition.cxx |1 -
reportdesign/source/filter/xml/xmlHelper.cxx |1 -
reportdesign/source/filter/xml/xmlPropertyHandler.cxx |4
reportdesign/source/filter/xml/xmlfilter.cxx |1 -
reportdesign/source/filter/xml/xmlfilter.hxx |5 -
reportdesign/source/ui/dlg/AddField.cxx |1 -
reportdesign/source/ui/dlg/DateTime.cxx |1 -
reportdesign/source/ui/dlg/Navigator.cxx |1 -
reportdesign/source/ui/misc/RptUndo.cxx |2 --
reportdesign/source/ui/misc/UITools.cxx |1 -
reportdesign/source/ui/report/DesignView.cxx |3 ---
reportdesign/source/ui/report/ReportController.cxx|1 -
reportdesign/source/ui/report/ViewsWindow.cxx |1 -
23 files changed, 3 insertions(+), 36 deletions(-)
New commits:
commit a919a0aa4c434c906aa0301d842b1234bf287a9d
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 14:00:06 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 18:52:56 2024 +0200
tdf#146619 Drop unused 'using namespace' in: reportdesign/
Change-Id: Iaf246112014d5b5da751570ca55a179232a1e9d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165692
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/reportdesign/source/core/api/services.cxx
b/reportdesign/source/core/api/services.cxx
index de07c51e8c22..1f0a0a6f2fe8 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -32,7 +32,6 @@
//
using namespace ::reportdesign;
-using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx
b/reportdesign/source/core/sdr/UndoActions.cxx
index a63161a1b977..5aaa412cf1ff 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -36,10 +36,8 @@ namespace rptui
using namespace ::com::sun::star;
using namespace uno;
using namespace lang;
-using namespace script;
using namespace beans;
using namespace awt;
-using namespace util;
using namespace container;
using namespace report;
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index bba8d5ae91f1..a2cdddafbdae 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -45,9 +45,7 @@ namespace rptui
using namespace ::com::sun::star;
using namespace uno;
using namespace lang;
-using namespace script;
using namespace beans;
-using namespace awt;
using namespace util;
using namespace container;
using namespace report;
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index d292b84bd4be..cceb85a45b5f 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -24,7 +24,6 @@
namespace rptxml
{
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
void OXMLAutoStylePoolP::exportStyleAttributes(
comphelper::AttributeList& rAttrList,
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx
b/reportdesign/source/filter/xml/xmlCell.cxx
index c504204db7f8..3d34a8c241a6 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -44,6 +44,7 @@ namespace rptxml
using namespace ::com::sun::star;
using namespace uno;
using namespace beans;
+using namespace lang;
using namespace xml::sax;
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx
b/reportdesign/source/filter/xml/xmlComponent.cxx
index 896d8b2ab324..0e17dff666d4 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -27,7 +27,6 @@ namespace rptxml
{
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::report;
using namespace ::
core.git: Branch 'distro/collabora/co-24.04' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 64f98c67ad5b4e6a7c57c028a204ccc5c43de03c Author: László Németh AuthorDate: Tue Apr 9 17:24:11 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Apr 9 18:24:11 2024 +0200 Update git submodules * Update dictionaries from branch 'distro/collabora/co-24.04' to 12518d479bc574492d6da740e9176649725c - Hungarian dictionary v1.8.1 Added new words, fixes, and decomposition data of ~6500 compound words for better hyphenation. See tdf#158885 for COMPOUNDLEFTHYPHENMIN implementation in LibreOffice, where Hunspell filters out compound word boundaries from libhyphen-based hyphenation breaks, restricting hyphenation near the compound boundary according to spelling and typography rules. Change-Id: I22a7b70513d0a59d7a31462fcb46efd53cfe8ad7 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/165439 Tested-by: László Németh Reviewed-by: László Németh - Updated Hungarian hyphenation dictionary to version v20240321 source: https://sourceforge.net/projects/magyarispell/files/OOo%20Huhyphn/v20240321-0.1/ Change-Id: If470f5854511cac6f0a355e4d006abf9e3976f90 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/165166 Tested-by: László Németh Reviewed-by: László Németh - use general label for Turkish dictionary to be consistent with labels for other dictionaries Change-Id: If01f9a9292fc15f3ff06f608b87273bc4e300e2f Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/162946 Reviewed-by: Kevin Suo Tested-by: Kevin Suo - update hunspell dictionaries for Turkish language This dictionary is more accurate and efficient than the current dictionary. It was benchmarked and compared to existing hunspell Turkish dictionaries. Please see: https://github.com/tdd-ai/hunspell-tr Edit: Updated the dictionary to include proper names. Change-Id: Ie23273274bc60ce6ac53a12ff92ad529bd0339a7 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/118649 Reviewed-by: Muhammet Kara Tested-by: Muhammet Kara diff --git a/dictionaries b/dictionaries index a62f9b3e6b2d..12518d47 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a62f9b3e6b2de1366d826a5bacf19ae63e527ead +Subproject commit 12518d479bc574492d6da740e9176649725c
dictionaries.git: Branch 'distro/collabora/co-24.04' - 4 commits - hu_HU/hu_HU.aff hu_HU/hu_HU.dic hu_HU/hyph_hu_HU.dic hu_HU/README_hu_HU.txt hu_HU/README_hyph_hu_HU.txt tr_TR/COPYING.MPL tr_TR/descr
hu_HU/README_hu_HU.txt |8 hu_HU/README_hyph_hu_HU.txt |2 hu_HU/hu_HU.aff |58746 ++--- hu_HU/hu_HU.dic |126894 ++-- hu_HU/hyph_hu_HU.dic| 4614 tr_TR/COPYING.MPL | 373 tr_TR/LICENSE |2 tr_TR/README.txt| 16 tr_TR/description.xml |4 tr_TR/tr_TR.aff |171333 tr_TR/tr_TR.dic |447000 +++- 11 files changed, 338854 insertions(+), 470138 deletions(-) New commits: commit 12518d479bc574492d6da740e9176649725c Author: László Németh AuthorDate: Thu Mar 28 00:19:22 2024 +0100 Commit: Andras Timar CommitDate: Tue Apr 9 18:23:25 2024 +0200 Hungarian dictionary v1.8.1 Added new words, fixes, and decomposition data of ~6500 compound words for better hyphenation. See tdf#158885 for COMPOUNDLEFTHYPHENMIN implementation in LibreOffice, where Hunspell filters out compound word boundaries from libhyphen-based hyphenation breaks, restricting hyphenation near the compound boundary according to spelling and typography rules. Change-Id: I22a7b70513d0a59d7a31462fcb46efd53cfe8ad7 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/165439 Tested-by: László Németh Reviewed-by: László Németh diff --git a/hu_HU/README_hu_HU.txt b/hu_HU/README_hu_HU.txt index 8593ed0..468cdee 100644 --- a/hu_HU/README_hu_HU.txt +++ b/hu_HU/README_hu_HU.txt @@ -1,17 +1,17 @@ -Magyar Ispell helyesírási szótár – 1.8 szótárállományok morfológiai adatokkal +Magyar Ispell helyesírási szótár – 1.8.1 szótárállományok morfológiai adatokkal A szótárállományok a LibreOffice projekt részeként a következő nyílt forráskódú licencek bármelyike alapján szabadon felhasználhatóak, de mindenféle garancia nélkül: MPLv2 vagy LesserGPLv3+ -(c) Németh László és Godó Ferenc, 2023 +(c) Németh László és Godó Ferenc, 2024 Honlap: http://magyarispell.sf.net -- -Hungarian Hunspell dictionaries version 1.8 with morphological data +Hungarian Hunspell dictionaries version 1.8.1 with morphological data These files are part of the LibreOffice project. @@ -26,6 +26,6 @@ Software distributed under these licenses is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the licences for the specific language governing rights and limitations under the licenses. -2023 (c) László Németh & Ferenc Godó +2024 (c) László Németh & Ferenc Godó Home: http://magyarispell.sf.net diff --git a/hu_HU/hu_HU.aff b/hu_HU/hu_HU.aff index 4bddd3e..1812c72 100644 --- a/hu_HU/hu_HU.aff +++ b/hu_HU/hu_HU.aff @@ -6,11 +6,11 @@ # GPL/LGPL/MPL license as published by the FSF and Mozilla Foundation. # # -# Version: May 2023, 1.8 +# Version: March 2024, 1.8.1 # # Home page: http://magyarispell.sourceforge.net # -# 2002-2023 (c) L�szl� N�meth and Ferenc God� +# 2002-2024 (c) L�szl� N�meth and Ferenc God� # # Thanks to # Tam�s Sz�nt� , @@ -30,7 +30,7 @@ # amelyet N�meth L�szl� �s God� Ferenc k�sz�tett, �s a GPL/LGPL/MPL licenc # alatt k�zz�tett a http://magyarispell.sourceforge.net oldalon. # -# Magyar Ispell 1.8, 2023-05 +# Magyar Ispell 1.8.1, 2024-03 # # K�sz�net illeti a k�vetkez�ket: # @@ -52,7 +52,7 @@ NAME Magyar Ispell helyes�r�si sz�t�r LANG hu_HU HOME http://magyarispell.sourceforge.net -VERSION Magyar 1.8 +VERSION Magyar 1.8.1 SET UTF-8 KEY öüó|qwertzuiopőú|asdfghjkléáű|íyxcvbnm TRY íóútaeslzánorhgkiédmyőpvöbucfjüűxwq-.à @@ -157,7 +157,7 @@ ICONV fl fl # - multicharacter suggestions # - well-sorted suggestions -REP 170 +REP 171 REP í i REP i í REP ó o @@ -328,8 +328,9 @@ REP ssal$ sszal REP ssé$ sszé REP ssá$ sszá REP ^megfed megfedd +REP lengépszer legnépszer REP # lengépszerűbb->legnépszerűbb -AF 1548 +AF 1559 AF V˯j�L�n�TtYc��l # 1 AF Um��yiYc� # 2 AF �CWR̯j���y���Yc� # 3 @@ -369,7 +370,7 @@ AF uQ # 36 AF �AUʮi���yǿ�Yc� # 37 AF W̯j�M���RTtvc�� # 38 AF Uʮi�K�m�QYc��k # 39 -AF tV˯j�L�n�RYc��l # 40 +AF tV˯j�L�n��y���RTYc� # 40 AF wYUm���ic�k # 41 AF wYUʮi�K�m�Ssc��k # 42 AF VN˯j�L���TtYc�� # 43 @@ -546,1339 +547,1350 @@ AF KU AF A���UQ # 214 AF W�yjYc� # 215 AF Uʮi$s�m�QYc��k # 216 -AF Um�yiYc���K��ǿ�Ss� # 217 -AF UVʮ˯ij��KL��n�m�TtYcklSs # 218 -AF UVʮ˯ij��KL��n�m�QRYckl # 219 -AF Uʮi�K�m�q�Q,�k # 220 -AF W̯j�M���q�Tt,�l # 221 -AF �BVR˯j��q���,� # 222 -AF W̯j�B��q���R,�l # 223 -AF �CWR̯j��q�,� # 224 -AF V˯j�L�n�q�Tt,�l # 225 -AF ��mAFUKQ # 226 -AF �BVR˯j��q�,� # 227 -AF �AUQʮi��q�,� # 228 -AF Uʮi�K�m�q�Ss,� # 229 -AF Uʮi�A��qǿ�Q,�k # 230 -AF Uʮi�K�m�q�Ss,�k # 231 -AF V˯j�L�n�q�R,�l # 232 -AF V˯j�L�n�q���Tt,�l # 233 -AF V˯j�L�n�q���R,�l� # 234 -AF ��nBGVLR # 235 -AF ���BGVLTt # 236 -AF W̯j�M���q���R,�l # 237 -AF �BVR˯j��q���,�� # 238 -AF W̯j�M���q���Tt,�� # 239 -AF V˯j�B��q���R,�l # 240 -AF W̯j�M
core.git: sd/source
sd/source/ui/view/ViewShellBase.cxx | 26 +++---
1 file changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 32d3826a36099cbdb8675fe957348d80760f8cba
Author: Armin Le Grand (allotropia)
AuthorDate: Tue Apr 9 15:01:30 2024 +0200
Commit: Armin Le Grand
CommitDate: Tue Apr 9 17:37:00 2024 +0200
IASS: Missing updates in OutlinerView mode
It looked like in OutlinerMode in IASS when doing
changes updating the other views were missing. After
debugging and finding no error I found out that the
text as COL_AUTO is painted white on white - all
updates happen but are invisible - argh.
After some more debugging I found that in
ViewShellBase::GetColorConfigColor only the
DrawViewShell case was handled, so I added the
OutlineViewShell now. Since that ViewShell has
no SdViewOptions I hard-coded the DOCCOLOR
to COL_WHITE.
That method returns {} aka COL_BLACK as default
which is a bad default for an office package
with paper as target, so I also changed that
to COL_WHITE - which is the default for unknown
ViewShells now that way. Also adapted the warning
to mention an 'unknown ViewShell' now.
Change-Id: I580a151b4c0a9eb46d190ba84b0c6d0798dc21d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165907
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index fd319fee5200..115beb928a19 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1095,12 +1096,31 @@ void ViewShellBase::NotifyCursor(SfxViewShell*
pOtherShell) const
}
}
}
-else
+// IASS: also need to handle OutlineViewShell
+else if (nullptr !=
dynamic_cast(GetMainViewShell().get()))
{
-SAL_WARN("sd", "dynamic_cast to DrawViewShell failed");
+switch (nColorType)
+{
+case svtools::ColorConfigEntry::DOCCOLOR:
+{
+// IASS: OutlineViewShell does not have any SdViewOptions and
no access
+// to the (currently not shown) DrawViewShell. If that should
be
+// needed it may be added. For now, assume that DOCCOLOR is
COL_WHITE
+return COL_WHITE;
+}
+// Should never be called for an unimplemented color type
+default:
+{
+O3TL_UNREACHABLE;
+}
+}
}
-return {};
+SAL_WARN("sd", "Unknown ViewShell used: Consider adding a case for this to
get correct colors, COL_WHITE is used as fallback.");
+// NOTE: This returned COL_BLACK. For unknown ViewShells I would assume
that
+// returning COL_WHITE would be safer - a better default for an
office
+// application dealing with Paper as target
+return COL_WHITE;
}
//= ViewShellBase::Implementation =
core.git: Branch 'feature/cib_contract49' - 2 commits - sw/inc sw/qa sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1
sw/qa/core/text/data/A011-charheight.rtf | 27 ++
sw/qa/core/text/itrform2.cxx | 18 +
sw/source/core/doc/DocumentSettingManager.cxx | 11 ++
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/layout/layact.cxx |6 +
sw/source/core/text/itrform2.cxx | 13 +---
sw/source/filter/ww8/ww8par.cxx |1
sw/source/filter/xml/xmlimp.cxx | 10 +
sw/source/uibase/uno/SwXDocumentSettings.cxx | 18 +
writerfilter/source/filter/WriterFilter.cxx |1
11 files changed, 104 insertions(+), 3 deletions(-)
New commits:
commit 283c16f56500ee517c10cf86182954ef12340bde
Author: Michael Stahl
AuthorDate: Thu Apr 4 19:26:31 2024 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 9 14:37:27 2024 +0200
sw: layout: remove superfluous pages again in InternalAction()
The bugdoc has a very large header containing hidden text changes height
when toggling Formatting Marks. When toggling on, it crashes, because
UnHide() iterates the text frames in all headers, but after the first
one empty pages at the end of the document are removed, so UAF.
Remove the pages without content earlier; SwLayAction::InternalAction()
already does it after the "normal" page loop, but the 2nd page loop
following that may also move content off pages, so do it again.
Change-Id: Iaae6a16842b3494f25cba8fc036d15049b71961f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165801
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 759d822dac5edc6104ce61b70c578425d9f2470d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165728
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index a705ef251176..f4a578fe99eb 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -809,6 +809,12 @@ void SwLayAction::InternalAction(OutputDevice*
pRenderContext)
unlockPositionOfObjects( pPg );
pPg = static_cast(pPg->GetNext());
}
+if (m_pRoot->IsSuperfluous()) // could be newly set now!
+{
+bool bOld = IsAgain();
+m_pRoot->RemoveSuperfluous();
+SetAgain(bOld);
+}
// reset flag for special interrupt content formatting.
mbFormatContentOnInterrupt = false;
}
commit acc47a4392777b4ad59633c31db71e96a4340cf5
Author: Michael Stahl
AuthorDate: Mon Apr 8 15:26:00 2024 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 9 14:34:04 2024 +0200
tdf#88214 sw: text formatting: adapt empty line at end of para to Word
For an empty line at the end of an empty paragraph, Writer already uses
any existing text attribute in the paragraph, see for example
testEmptyTrailingSpans.
For an empty line at the end of a non-empty paragraph, Writer text
formatting uses only paragraph attributes, ignoring any text attributes,
whereas the UI will display the attributes from the text attributes
(such as font height) if you move the cursor there.
Word uses text attributes also in this case, so adapt the inconsistent
Writer behaviour: text formatting now uses text attributes too.
Apparently this can be achieved by calling SeekAndChgBefore() instead of
SeekAndChg().
Add another compat flag "ApplyTextAttrToEmptyLineAtEndOfParagraph" to
preserve the formatting of existing ODF documents.
Adapt test document fdo74110.docx, it has a line break with "Angsana
New" font.
Change-Id: I0863d3077e419404194b47110e4ad2bdda3d11c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165887
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 2b47fae7e3e23ee7c733708500cb0482ad7f8af1)
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index ad1d95c10b0d..ac319e3fb2a2 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -94,6 +94,7 @@ enum class DocumentSettingId
HYPHENATE_URLS, ///< tdf#152952
DO_NOT_BREAK_WRAPPED_TABLES,
ALLOW_TEXT_AFTER_FLOATING_TABLE_BREAK,
+APPLY_TEXT_ATTR_TO_EMPTY_LINE_AT_END_OF_PARAGRAPH,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
HTML_MODE,
diff --git a/sw/qa/core/text/data/A011-charheight.rtf
b/sw/qa/core/text/data/A011-charheight.rtf
new file mode 100644
index ..4b56ecdd6a15
--- /dev/null
+++ b/sw/qa/core/text/data/A011-charheight.rtf
@@ -0,0 +1,27 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang3079\deflangfe3079
hemelang3079hemelangfe0 hemelangcs0
+{ onttbl{ 0 bidi roman charset0 prq2Times New Roman{\
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6cd0ef58cddf40a0eb2d8cbb017136552f47704e Author: Olivier Hallot AuthorDate: Tue Apr 9 13:27:02 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Apr 9 14:27:02 2024 +0200 Update git submodules * Update helpcontent2 from branch 'master' to af2fc2b7c1d2226ce628f60415fd384ffc75a342 - Fixes in Gallery help page Change-Id: I319b4a6c3b028bf36c86752a73855e947826b271 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165845 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8db831e3f0dc..af2fc2b7c1d2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8db831e3f0dce474924168d18e4f8d23fc29f731 +Subproject commit af2fc2b7c1d2226ce628f60415fd384ffc75a342
help.git: source/text
source/text/shared/01/gallery.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit af2fc2b7c1d2226ce628f60415fd384ffc75a342 Author: Olivier Hallot AuthorDate: Tue Apr 9 13:03:56 2024 +0100 Commit: Olivier Hallot CommitDate: Tue Apr 9 14:27:02 2024 +0200 Fixes in Gallery help page Change-Id: I319b4a6c3b028bf36c86752a73855e947826b271 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/165845 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/gallery.xhp b/source/text/shared/01/gallery.xhp index 06d7099db3..7ab9e9b443 100644 --- a/source/text/shared/01/gallery.xhp +++ b/source/text/shared/01/gallery.xhp @@ -54,7 +54,7 @@ Choose Insert - Gallery. - Alt+3 + OptionAlt + 3
core.git: sw/inc sw/qa sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1
sw/qa/core/text/data/A011-charheight.rtf | 27 ++
sw/qa/core/text/itrform2.cxx | 18 +
sw/qa/extras/ooxmlexport/data/fdo74110.docx |binary
sw/source/core/doc/DocumentSettingManager.cxx | 11 ++
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/text/itrform2.cxx | 13 +---
sw/source/filter/ww8/ww8par.cxx |1
sw/source/filter/xml/xmlimp.cxx | 10 +
sw/source/uibase/uno/SwXDocumentSettings.cxx | 18 +
writerfilter/source/filter/WriterFilter.cxx |1
11 files changed, 98 insertions(+), 3 deletions(-)
New commits:
commit 2b47fae7e3e23ee7c733708500cb0482ad7f8af1
Author: Michael Stahl
AuthorDate: Mon Apr 8 15:26:00 2024 +0200
Commit: Michael Stahl
CommitDate: Tue Apr 9 14:10:19 2024 +0200
tdf#88214 sw: text formatting: adapt empty line at end of para to Word
For an empty line at the end of an empty paragraph, Writer already uses
any existing text attribute in the paragraph, see for example
testEmptyTrailingSpans.
For an empty line at the end of a non-empty paragraph, Writer text
formatting uses only paragraph attributes, ignoring any text attributes,
whereas the UI will display the attributes from the text attributes
(such as font height) if you move the cursor there.
Word uses text attributes also in this case, so adapt the inconsistent
Writer behaviour: text formatting now uses text attributes too.
Apparently this can be achieved by calling SeekAndChgBefore() instead of
SeekAndChg().
Add another compat flag "ApplyTextAttrToEmptyLineAtEndOfParagraph" to
preserve the formatting of existing ODF documents.
Adapt test document fdo74110.docx, it has a line break with "Angsana
New" font.
Change-Id: I0863d3077e419404194b47110e4ad2bdda3d11c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165887
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index 74b123dc462e..0dd9467bdf13 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -98,6 +98,7 @@ enum class DocumentSettingId
ALLOW_TEXT_AFTER_FLOATING_TABLE_BREAK,
// tdf#119908 new paragraph justification
JUSTIFY_LINES_WITH_SHRINKING,
+APPLY_TEXT_ATTR_TO_EMPTY_LINE_AT_END_OF_PARAGRAPH,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
HTML_MODE,
diff --git a/sw/qa/core/text/data/A011-charheight.rtf
b/sw/qa/core/text/data/A011-charheight.rtf
new file mode 100644
index ..4b56ecdd6a15
--- /dev/null
+++ b/sw/qa/core/text/data/A011-charheight.rtf
@@ -0,0 +1,27 @@
+{
tf1deflang1025nsinsicpg1252\uc1deff0\deff0\stshfdbch0\stshfloch31506\stshfhich31506\stshfbi31506\deflang3079\deflangfe3079
hemelang3079hemelangfe0 hemelangcs0
+{ onttbl{ 0 bidi roman charset0 prq2Times New Roman{\* alt Arial};}
+}
+{\*\defchp 0 s22\lang3079\langfe1033\langfenp1033 }
+{\*\defpap \ql \li0 i0\sa200\sl276\slmult1
+\widctlpar\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 }
+
oqfpromote
+{\stylesheet
+{\ql \li0 i0\sa200\sl276\slmult1\widctlpar\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0
+ 0 s23\lang3079\langfe1033+{\s15\ql \li0 i0\widctlpar qc x4536 qr
x9072\wrapdefaultspalphaspnum aautodjustright in0\lin0\itap0 tlch cs1
f0fs22lang1025 \ltrch cs0 0 s23\lang3079\langfe1033+\sbasedon0 \snext15
\slink16 \sunhideused header;}
+{\*+}
+\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1134\gutter0\ltrsect
+\deftab708\widowctrl tnbjenddoc\hyphhotz425 rackmoves0
rackformatting1\donotembedsysfont1 elyonvml0\donotembedlingdata0\grfdocevents0
alidatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
+\showxmlerrors1
oxlattoyenxpshrtn
oultrlspc\dntblnsbdb
ospaceforul
ormshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1
+\jexpand iewkind1 iewscale100\pgbrdrhead\pgbrdrfoot\splytwnine
tnlytwnine\htmautsp
olnhtadjtbl\useltbalnlntblind\lytcalctblwd\lyttblrtgr\lnbrkrule
obrkwrptbl\snaptogridincellllowfieldendsel\wrppunct
+sianbrkrule
ewtblstyruls
ogrowautofit\usenormstyforlist
oindnmbrts elnbrelev
ocxsptable\indrlsweleven
oafcnsttblfelev\utinl\hwelev\spltpgpar
otcvasp
otbrkcnstfrctbl
otvatxbx\krnprsnet+{\*\wgrffmtfilter 2450}
ofeaturethrottle1\ilfomacatclnup0
+
+\ltrpar \pard\plain \ltrpar\s15\qc \li0 i0\widctlpar
+ qc x4536 qr x9072\wrapdefaultspalphaspnum
aautodjustright in0\lin0\itap0 tlch cs1 f0fs22lang1025 \ltrch cs0 0
s23\lang3079\langfe1033+ s16 \line \line \line
+\par \line
+\par }
+}
diff --git a/sw/qa/core/text/itrform2.cxx b/sw/qa/core/text/itrform2.cxx
index 6d59140f97f0..86
core.git: Branch 'libreoffice-24-2' - vcl/qa vcl/source
vcl/qa/cppunit/logicalfontinstance.cxx | 25 +
vcl/source/font/LogicalFontInstance.cxx | 11 +++
2 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 61e94a59a947c372a5802134d94f0908327a2366
Author: Mike Kaganski
AuthorDate: Sun Mar 31 00:45:25 2024 +0500
Commit: Xisco Fauli
CommitDate: Tue Apr 9 13:56:23 2024 +0200
tdf#160436: fix glyph bounds calculation for vertical glyphs
It is unclear if LogicalFontInstance::GetGlyphBoundRect can be called
for both normal and rotated variants of the same glyph in the same font.
If yes, then the normal and vertical variants must be cached separately,
or possibly vertical variant can be not cached, but always calculated.
This problem already existed before, so this change doesn't introduce
a new issue.
Change-Id: I9b50ef340c9e38db7bef890165519aadc96d3ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165581
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit dff57d2b4f5abd1b51ebfb0015339471f61e72f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165843
Reviewed-by: Xisco Fauli
diff --git a/vcl/qa/cppunit/logicalfontinstance.cxx
b/vcl/qa/cppunit/logicalfontinstance.cxx
index 2a0e30d50c34..eb803ed40363 100644
--- a/vcl/qa/cppunit/logicalfontinstance.cxx
+++ b/vcl/qa/cppunit/logicalfontinstance.cxx
@@ -46,6 +46,7 @@ void VclLogicalFontInstanceTest::testglyphboundrect()
basegfx::B2DRectangle aBoundRect;
const auto LATIN_SMALL_LETTER_B = 0x0062;
+const auto SECTION_SIGN = 0x00A7; // UTR#50: Vertical_Orientation (vo)
property value U
pFontInstance->GetGlyphBoundRect(pFontInstance->GetGlyphIndex(LATIN_SMALL_LETTER_B),
aBoundRect,
false);
@@ -54,6 +55,14 @@ void VclLogicalFontInstanceTest::testglyphboundrect()
CPPUNIT_ASSERT_DOUBLES_EQUAL(49.5, aBoundRect.getWidth(), 0.05);
CPPUNIT_ASSERT_DOUBLES_EQUAL(80.8, aBoundRect.getHeight(), 0.05);
+// tdf#160436: test vertically oriented glyphs
+
pFontInstance->GetGlyphBoundRect(pFontInstance->GetGlyphIndex(SECTION_SIGN),
aBoundRect, true);
+
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-79.7, aBoundRect.getMinX(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-55.0, aBoundRect.getMinY(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(88.9, aBoundRect.getWidth(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(48.8, aBoundRect.getHeight(), 0.05);
+
font.SetOrientation(900_deg10);
device->SetFont(font);
@@ -67,6 +76,14 @@ void VclLogicalFontInstanceTest::testglyphboundrect()
CPPUNIT_ASSERT_DOUBLES_EQUAL(80.8, aBoundRect.getWidth(), 0.05);
CPPUNIT_ASSERT_DOUBLES_EQUAL(49.5, aBoundRect.getHeight(), 0.05);
+// tdf#160436: test vertically oriented glyphs
+
pFontInstance->GetGlyphBoundRect(pFontInstance->GetGlyphIndex(SECTION_SIGN),
aBoundRect, true);
+
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-55.0, aBoundRect.getMinX(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-9.2, aBoundRect.getMinY(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(48.8, aBoundRect.getWidth(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(88.9, aBoundRect.getHeight(), 0.05);
+
font.SetOrientation(450_deg10);
device->SetFont(font);
@@ -79,6 +96,14 @@ void VclLogicalFontInstanceTest::testglyphboundrect()
CPPUNIT_ASSERT_DOUBLES_EQUAL(-96.4, aBoundRect.getMinY(), 0.05);
CPPUNIT_ASSERT_DOUBLES_EQUAL(92.1, aBoundRect.getWidth(), 0.05);
CPPUNIT_ASSERT_DOUBLES_EQUAL(92.1, aBoundRect.getHeight(), 0.05);
+
+// tdf#160436: test vertically oriented glyphs
+
pFontInstance->GetGlyphBoundRect(pFontInstance->GetGlyphIndex(SECTION_SIGN),
aBoundRect, true);
+
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-95.3, aBoundRect.getMinX(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(-45.4, aBoundRect.getMinY(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(97.4, aBoundRect.getWidth(), 0.05);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(97.4, aBoundRect.getHeight(), 0.05);
}
CPPUNIT_TEST_SUITE_REGISTRATION(VclLogicalFontInstanceTest);
diff --git a/vcl/source/font/LogicalFontInstance.cxx
b/vcl/source/font/LogicalFontInstance.cxx
index fbb115825828..3cf95cab8d65 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -171,8 +171,8 @@ void LogicalFontInstance::IgnoreFallbackForUnicode(sal_UCS4
cChar, FontWeight eW
bool LogicalFontInstance::GetGlyphBoundRect(sal_GlyphId nID,
basegfx::B2DRectangle& rRect,
bool bVertical) const
{
-// TODO/FIXME: bVertical handling here is highly suspicious. When it's
true, it may
-// return different rectangle, depending on if this glyph was cached
already or not.
+// TODO: find out if it's possible for the same glyph in the same font to
be used both
+// normally and vertically; if yes, then these two variants must be cached
separately
if (mpFontCache && mpFontCache->GetCachedGlyphBoundRect(this, nID, rR
core.git: Branch 'libreoffice-24-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0f25bb5747eeefcc0668c726e613394dc35cb4de Author: Christian Lohmaier AuthorDate: Tue Apr 9 13:53:45 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 9 13:53:45 2024 +0200 Update git submodules * Update translations from branch 'libreoffice-24-2' to 28615b892ac03b0c5c1b74f60f4008a36da518dd - update translations for 24.2.3 rc1 and force-fix errors using pocheck Change-Id: Iaaf78b114dce75267640c50c3512e42ed334d9ab diff --git a/translations b/translations index d3abafd51ff4..28615b892ac0 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d3abafd51ff477a324a0c0342fb1e02c78c93f6c +Subproject commit 28615b892ac03b0c5c1b74f60f4008a36da518dd
translations.git: Branch 'libreoffice-24-2' - source/ab source/af source/am source/an source/ar source/as source/ast source/az source/be source/bg source/bn source/bn-IN source/bo source/br source/brx
source/ab/cui/messages.po |4 source/ab/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po| 16 source/ab/officecfg/registry/data/org/openoffice/Office.po |4 source/ab/readlicense_oo/docs.po | 14 source/ab/setup_native/source/mac.po |6 source/ab/sfx2/messages.po |4 source/ab/swext/mediawiki/help.po | 16 source/af/cui/messages.po |4 source/af/sfx2/messages.po |4 source/am/cui/messages.po |4 source/am/helpcontent2/source/text/shared/04.po|8 source/am/sfx2/messages.po |4 source/an/cui/messages.po |8 source/an/officecfg/registry/data/org/openoffice/Office/UI.po |5 source/an/sfx2/messages.po |4 source/ar/cui/messages.po |4 source/ar/helpcontent2/source/text/shared/04.po|6 source/ar/sfx2/messages.po |4 source/as/cui/messages.po |4 source/as/sfx2/messages.po |4 source/ast/chart2/messages.po | 22 source/ast/cui/messages.po | 20 source/ast/extras/source/autocorr/emoji.po | 11 source/ast/helpcontent2/source/text/sbasic/shared.po |8 source/ast/helpcontent2/source/text/sbasic/shared/03.po|4 source/ast/helpcontent2/source/text/scalc.po |4 source/ast/helpcontent2/source/text/scalc/00.po|6 source/ast/helpcontent2/source/text/scalc/01.po| 12 source/ast/helpcontent2/source/text/scalc/05.po| 12 source/ast/helpcontent2/source/text/scalc/guide.po | 12 source/ast/helpcontent2/source/text/schart/01.po |6 source/ast/helpcontent2/source/text/sdraw/01.po|8 source/ast/helpcontent2/source/text/shared.po |4 source/ast/helpcontent2/source/text/shared/00.po | 10 source/ast/helpcontent2/source/text/shared/01.po | 32 source/ast/helpcontent2/source/text/shared/02.po |6 source/ast/helpcontent2/source/text/shared/04.po | 10 source/ast/helpcontent2/source/text/shared/guide.po| 22 source/ast/helpcontent2/source/text/shared/help.po |6 source/ast/helpcontent2/source/text/shared/optionen.po | 10 source/ast/helpcontent2/source/text/simpress/00.po |4 source/ast/helpcontent2/source/text/simpress/01.po |8 source/ast/helpcontent2/source/text/simpress/02.po |4 source/ast/helpcontent2/source/text/simpress/guide.po |4 source/ast/helpcontent2/source/text/smath/02.po|4 source/ast/helpcontent2/source/text/swriter.po |4 source/ast/helpcontent2/source/text/swriter/01.po | 18 source/ast/helpcontent2/source/text/swriter/guide.po |8 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |4 source/ast/sc/messages.po | 12 source/ast/sd/messages.po | 11 source/ast/sfx2/messages.po| 40 source/ast/svx/messages.po | 12 source/ast/sw/messages.po | 20 source/ast/xmlsecurity/messages.po |8 source/az/cui/messages.po |4 source/az/sfx2/messages.po |4 source/be/cui/messages.po |4 source/be/sfx2/messages.po |4 source/bg/cui/messages.po |4 source/bg/helpcontent2/source/text/shared/00.po| 368 - source/bg/helpcontent2/source/text/shared/01.po| 844 +-- source/bg/helpcontent2/source/text/shared/02.po|4 source/bg/helpcontent2/source/text/shared/04.po| 10 source/bg/helpcontent2/source/text/shared/guide.po | 14 source/bg/helpcontent2/source/text/shared/optionen.po
core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b523a72fd0469e47456c9b571ba6ff9da2666fc8 Author: Christian Lohmaier AuthorDate: Tue Apr 9 12:38:12 2024 +0200 Commit: Gerrit Code Review CommitDate: Tue Apr 9 12:38:12 2024 +0200 Update git submodules * Update translations from branch 'master' to 162f2568c09f9391b8ceb5a123757a9ed75e7898 - update translations for master and force-fix errors using pocheck Change-Id: I90a33a0294035c5efd3e6b130d340924d4bc9d4f diff --git a/translations b/translations index e36ba06ea7b7..162f2568c09f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e36ba06ea7b75b61d93b7b9b9f50d90301010738 +Subproject commit 162f2568c09f9391b8ceb5a123757a9ed75e7898
core.git: basic/source
basic/source/runtime/methods.cxx | 178 +--
1 file changed, 81 insertions(+), 97 deletions(-)
New commits:
commit f3d0a184c4da57907a1fcf1ed784340be7d974d6
Author: Tuukka Orava
AuthorDate: Tue Apr 9 09:28:27 2024 +0300
Commit: Mike Kaganski
CommitDate: Tue Apr 9 10:51:14 2024 +0200
tdf#147132 Flatten Basic function implementations
Change-Id: I077e042c82cbefd1d46db5ca8d5983a0870a296c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165903
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index a97e66dc6c41..4dfcdc210ea3 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -429,18 +429,14 @@ void SbRtl_CurDir(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_ChDir(StarBASIC * pBasic, SbxArray & rPar, bool)
{
rPar.Get(0)->PutEmpty();
-if (rPar.Count() == 2)
-{
-// VBA: track current directory per document type (separately for
Writer, Calc, Impress, etc.)
-if( SbiRuntime::isVBAEnabled() )
-{
-::basic::vba::registerCurrentDirectory(getDocumentModel(pBasic),
- rPar.Get(1)->GetOUString());
-}
-}
-else
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+// VBA: track current directory per document type (separately for Writer,
Calc, Impress, etc.)
+if( SbiRuntime::isVBAEnabled() )
{
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+::basic::vba::registerCurrentDirectory(getDocumentModel(pBasic),
+rPar.Get(1)->GetOUString());
}
}
@@ -448,9 +444,7 @@ void SbRtl_ChDrive(StarBASIC *, SbxArray & rPar, bool)
{
rPar.Get(0)->PutEmpty();
if (rPar.Count() != 2)
-{
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-}
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
}
@@ -499,129 +493,119 @@ void implStepRenameOSL( const OUString& aSource, const
OUString& aDest )
void SbRtl_FileCopy(StarBASIC *, SbxArray & rPar, bool)
{
rPar.Get(0)->PutEmpty();
-if (rPar.Count() == 3)
+if (rPar.Count() != 3)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+
+OUString aSource = rPar.Get(1)->GetOUString();
+OUString aDest = rPar.Get(2)->GetOUString();
+if( hasUno() )
{
-OUString aSource = rPar.Get(1)->GetOUString();
-OUString aDest = rPar.Get(2)->GetOUString();
-if( hasUno() )
+const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI =
getFileAccess();
+if( xSFI.is() )
{
-const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI =
getFileAccess();
-if( xSFI.is() )
+try
{
-try
-{
-xSFI->copy( getFullPath( aSource ), getFullPath( aDest ) );
-}
-catch(const Exception & )
-{
-StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND );
-}
+xSFI->copy( getFullPath( aSource ), getFullPath( aDest ) );
}
-}
-else
-{
-FileBase::RC nRet = File::copy( getFullPath( aSource ),
getFullPath( aDest ) );
-if( nRet != FileBase::E_None )
+catch(const Exception & )
{
StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND );
}
}
}
else
-StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
+{
+FileBase::RC nRet = File::copy( getFullPath( aSource ), getFullPath(
aDest ) );
+if( nRet != FileBase::E_None )
+{
+StarBASIC::Error( ERRCODE_BASIC_PATH_NOT_FOUND );
+}
+}
}
void SbRtl_Kill(StarBASIC *, SbxArray & rPar, bool)
{
rPar.Get(0)->PutEmpty();
-if (rPar.Count() == 2)
-{
-OUString aFileSpec = rPar.Get(1)->GetOUString();
+if (rPar.Count() != 2)
+return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
-if( hasUno() )
+OUString aFileSpec = rPar.Get(1)->GetOUString();
+
+if( hasUno() )
+{
+const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI =
getFileAccess();
+if( xSFI.is() )
{
-const uno::Reference< ucb::XSimpleFileAccess3 >& xSFI =
getFileAccess();
-if( xSFI.is() )
+OUString aFullPath = getFullPath( aFileSpec );
+if( !xSFI->exists( aFullPath ) || xSFI->isFolder( aFullPath ) )
{
-OUString aFullPath = getFullPath( aFileSpec );
-if( !xSFI->exists( aFullPath ) || xSFI->isFolder( aFullPath ) )
-{
-StarBASIC::Error( ERRCODE_BASIC_FILE_NOT_FOUND );
-return;
-}
-try
-{
core.git: bin/find-unneeded-includes
bin/find-unneeded-includes |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 83f1a6f8172ab5688bb3e3883e33ed8295d3f5b7 Author: Gabor Kelemen AuthorDate: Mon Apr 1 10:37:45 2024 +0200 Commit: Gabor Kelemen CommitDate: Tue Apr 9 10:43:59 2024 +0200 find-unneeded-includes: improve list of namespaces Add 'star' for com::sun::star instances Add some vcl-specific ones 'PackageKit' gave always a false warning due to the similarity in org/freedesktop/PackageKit/*hpp and officecfg::Office::Common::PackageKit::* Change-Id: I109e7a2e8d7588d62b2a6bec2e55ec32e993e49e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165697 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 509331cd5ff3..99c77b654d3e 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -342,7 +342,6 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'oox|core|drawingml|ole|vml|' 'OpenStormBento|' 'osl|' -'PackageKit|' 'pdfi|pdfparse|' 'ppt|' 'pyuno|' @@ -359,6 +358,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'sfx2|DocTempl|' 'sidebar|' # for sfx2::sidebar 'skeletonmaker|' +'star|' # for com::sun::star 'std|chrono_literals|literals|' 'stoc_sec|' 'store|' @@ -374,7 +374,7 @@ def processIWYUOutput(iwyuOutput, moduleRules, fileName, noexclude, checknamespa 'unopkg|' 'util|db|qe|' # for xmlsearch:: 'utl|' -'vcl|' +'vcl|psp|x11|' 'writerfilter|' 'xforms|' 'xmloff|token|EnhancedCustomShapeToken' # for xmloff::
core.git: xmlsecurity/source
xmlsecurity/source/gpg/CipherContext.cxx |1 -
xmlsecurity/source/gpg/DigestContext.cxx |1 -
xmlsecurity/source/gpg/XMLEncryption.cxx |1 -
3 files changed, 3 deletions(-)
New commits:
commit 4aa43e62e45d418540e352370215c199d97cdfe7
Author: Gabor Kelemen
AuthorDate: Sun Mar 31 09:40:03 2024 +0200
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 10:43:32 2024 +0200
tdf#146619 Drop unused 'using namespace' in: xmlsecurity/
Change-Id: I95b84eff5d8bb288aa704620db328d89062efdf4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165689
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/xmlsecurity/source/gpg/CipherContext.cxx
b/xmlsecurity/source/gpg/CipherContext.cxx
index 291db0ba66c8..b7f81bc9ee3e 100644
--- a/xmlsecurity/source/gpg/CipherContext.cxx
+++ b/xmlsecurity/source/gpg/CipherContext.cxx
@@ -11,7 +11,6 @@
using namespace css;
using namespace css::uno;
-using namespace css::lang;
Sequence
SAL_CALL CipherContext::convertWithCipherContext(const Sequence&
/*aData*/)
diff --git a/xmlsecurity/source/gpg/DigestContext.cxx
b/xmlsecurity/source/gpg/DigestContext.cxx
index 4864191bb85e..79ff98710691 100644
--- a/xmlsecurity/source/gpg/DigestContext.cxx
+++ b/xmlsecurity/source/gpg/DigestContext.cxx
@@ -11,7 +11,6 @@
using namespace css;
using namespace css::uno;
-using namespace css::lang;
void SAL_CALL DigestContext::updateDigest(const Sequence& /*aData*/)
{}
diff --git a/xmlsecurity/source/gpg/XMLEncryption.cxx
b/xmlsecurity/source/gpg/XMLEncryption.cxx
index 65083ff68bac..98f7aa6dc46d 100644
--- a/xmlsecurity/source/gpg/XMLEncryption.cxx
+++ b/xmlsecurity/source/gpg/XMLEncryption.cxx
@@ -11,7 +11,6 @@
using namespace css::uno;
using namespace css::lang;
-using namespace css::xml::wrapper;
using namespace css::xml::crypto;
XMLEncryptionGpg::XMLEncryptionGpg() {
core.git: chart2/source
chart2/source/controller/chartapiwrapper/GridWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |1 -
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx |1 -
chart2/source/controller/dialogs/TitleDialogData.cxx |1 -
chart2/source/controller/dialogs/dlg_ChartType.cxx |1 -
chart2/source/controller/dialogs/dlg_DataSource.cxx|1 -
chart2/source/controller/dialogs/dlg_View3D.cxx|1 -
chart2/source/controller/main/ChartController_Position.cxx |1 -
chart2/source/inc/ChartResourceGroups.hxx |1 -
chart2/source/model/main/ChartModel.cxx|1 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |1 -
chart2/source/model/template/FilledNetChartType.cxx|1 -
chart2/source/model/template/StockChartTypeTemplate.cxx|1 -
chart2/source/tools/ColorPerPointHelper.cxx|1 -
chart2/source/view/axes/VPolarAngleAxis.cxx|1 -
chart2/source/view/axes/VPolarAxis.cxx |1 -
chart2/source/view/axes/VPolarCoordinateSystem.cxx |1 -
chart2/source/view/charttypes/BarPositionHelper.cxx|1 -
chart2/source/view/charttypes/BubbleChart.cxx |1 -
chart2/source/view/charttypes/CandleStickChart.cxx |1 -
chart2/source/view/main/LabelPositionHelper.cxx|1 -
chart2/source/view/main/PlotterBase.cxx|1 -
chart2/source/view/main/PolarLabelPositionHelper.cxx |1 -
24 files changed, 24 deletions(-)
New commits:
commit 6e1647699fb7de69b7b14498dbc9b133c24508d4
Author: Gabor Kelemen
AuthorDate: Sat Mar 30 21:25:06 2024 +0100
Commit: Gabor Kelemen
CommitDate: Tue Apr 9 10:43:12 2024 +0200
tdf#146619 Drop unused 'using namespace' in: chart2/
Change-Id: I632d0dda0e62e5b1bf0956e731ab5ed6417db1ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165688
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 8a9f4267e785..5f75aa686a69 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -34,7 +34,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 4f98fa5923f2..d0cb5eab6552 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -32,7 +32,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 9fa2e5132168..c63090d81ac8 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -32,7 +32,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index dc5742aef63b..9c8a6f61afb0 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -31,7 +31,6 @@
#include
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx
b/chart2/source/controller/dialogs/TitleDialogData.cxx
index b8f3ed6d9429..75d59bbb43b4 100644
--- a/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -28,7 +28,6 @@
namespace chart
{
using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
TitleDialogData::TitleDialogData( std::optional
pRefSizeProvider )
: aPossibilityList{ true, true, true, true, true, true, true }
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index e6e88dae42b8..a1f52f5169a5 100644
--- a/chart2/source/controller/dialogs/dlg_ChartTy
core.git: Branch 'libreoffice-24-2' - sw/source
sw/source/core/fields/expfld.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 07a566f87213bd4c9c28b454ab4c4d30146fdaa4
Author: Mike Kaganski
AuthorDate: Thu Apr 4 15:11:24 2024 +0500
Commit: Michael Stahl
CommitDate: Tue Apr 9 10:34:14 2024 +0200
tdf#81012: avoid content frames in footnotes / endnotes
This makes the behavior of the endnotes in the end of sections consistent
with the behavior of dedicated endnote pages, where heading fields ignore
headings in endnote content.
Change-Id: Iad0218b75a678808b1266024fe4c81f040a631c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165789
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 746b21760b911860c7ac497f10ab07d60111e867)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165842
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 6ed4cdb7c125..47c675cc42bf 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -233,7 +233,7 @@ const SwTextNode* GetBodyTextNode( const SwDoc& rDoc,
SwPosition& rPos,
else
pContentFrame = pPgFrame->FindLastBodyContent();
-if( pContentFrame )
+if( pContentFrame && !pContentFrame->IsInFootnote() )
{
assert(pContentFrame->IsTextFrame());
SwTextFrame const*const pFrame(static_cast(pContentFrame));
core.git: sw/inc
sw/inc/docary.hxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit e2b968e6821fe9617a795d95b7e4f53029a33018
Author: Miklos Vajna
AuthorDate: Tue Apr 9 07:27:10 2024 +0100
Commit: Miklos Vajna
CommitDate: Tue Apr 9 10:25:17 2024 +0200
sw: document SwTextFormatColls
Text is never clear, it means paragraph in this case, since we have
SwCharFormats for character styles.
Change-Id: Iba21df71053f0b4fbcc0616c024e5cd2972ad44a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165902
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 5cd132f0ef44..abe0adeecf8e 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -144,6 +144,7 @@ public:
static void dumpAsXml(xmlTextWriterPtr /*pWriter*/) {};
};
+/// Provides a generic container for Writer styles: paragraph, graphic,
section, etc styles.
template
class SwFormatsModifyBase : public SwVectorModifyBase, public
SwFormatsBase
{
@@ -178,6 +179,7 @@ public:
SwFrameFormatsV() : SwFormatsModifyBase( DestructorPolicy::KeepElements )
{}
};
+/// Container of paragraph styles.
class SwTextFormatColls final : public SwFormatsModifyBase
{
public:
core.git: Branch 'libreoffice-24-2' - vcl/source
vcl/source/gdi/sallayout.cxx | 22 +- 1 file changed, 17 insertions(+), 5 deletions(-) New commits: commit 70c19e55662e8a42876bc6aebdc7cfe1ede14ee1 Author: Mike Kaganski AuthorDate: Tue Apr 2 08:55:51 2024 +0500 Commit: Xisco Fauli CommitDate: Tue Apr 9 10:24:53 2024 +0200 Fix UB after 8962141a12c966b2d891829925e6203bf8d51852 (tdf#160430: Fix glyph bounds calculation, and use basegfx::B2DRectangle, 2024-04-01). As reported by Stephan in https://gerrit.libreoffice.org/c/core/+/165553/6#message-fec1e45288c0e87d43c58f777ebe51b03c534d82: `CppunitTest_sw_rtfexport CPPUNIT_TEST_NAME=testMathEqarray::TestBody` now fails with vcl/source/gdi/sallayout.cxx:245:30: runtime error: inf is outside the range of representable values of type 'long' #0 in SalLayout::GetBoundRect(tools::Rectangle&) const at vcl/source/gdi/sallayout.cxx:245:30 #1 in OutputDevice::GetTextBoundRect(tools::Rectangle&, rtl::OUString const&, int, int, int, unsigned long, KernArraySpan, std::span, SalLayoutGlyphs const*) const at vcl/source/outdev/text.cxx:1932:28 #2 in (anonymous namespace)::SmGetGlyphBoundRect(OutputDevice const&, rtl::OUString const&, tools::Rectangle&) at starmath/source/rect.cxx:80:32 #3 in SmRect::SmRect(OutputDevice const&, SmFormat const*, rtl::OUString const&, unsigned short) at starmath/source/rect.cxx:224:21 #4 in SmMathSymbolNode::AdaptToY(OutputDevice&, unsigned long) at starmath/source/node.cxx:2122:18 #5 in SmBraceNode::Arrange(OutputDevice&, SmFormat const&) at starmath/source/node.cxx:1340:17 #6 in SmBinHorNode::Arrange(OutputDevice&, SmFormat const&) at starmath/source/node.cxx:816:13 #7 in SmLineNode::Arrange(OutputDevice&, SmFormat const&) at starmath/source/node.cxx:610:20 #8 in SmTableNode::Arrange(OutputDevice&, SmFormat const&) at starmath/source/node.cxx:534:20 #9 in SmDocShell::ArrangeFormula() at starmath/source/document.cxx:280:13 #10 in SmDocShell::GetSize() at starmath/source/document.cxx:405:9 #11 in SmDocShell::Repaint() at starmath/source/document.cxx:566:21 #12 in SmDocShell::OnDocumentPrinterChanged(Printer*) at starmath/source/document.cxx:552:5 #13 in SmDocShell::SetText(rtl::OUString const&) at starmath/source/document.cxx:188:9 #14 in SmDocShell::readFormulaOoxml(oox::formulaimport::XmlStream&) at starmath/source/document.cxx:848:5 #15 in SmModel::readFormulaOoxml(oox::formulaimport::XmlStream&) at starmath/source/unomodel.cxx:1105:22 #16 in writerfilter::rtftok::RTFDocumentImpl::beforePopState(writerfilter::rtftok::RTFParserState&) at writerfilter/source/rtftok/rtfdocumentimpl.cxx:3010:30 #17 in writerfilter::rtftok::RTFDocumentImpl::popState() at writerfilter/source/rtftok/rtfdocumentimpl.cxx:3666:23 #18 in writerfilter::rtftok::RTFTokenizer::resolveParse() at writerfilter/source/rtftok/rtftokenizer.cxx:114:37 #19 in writerfilter::rtftok::RTFDocumentImpl::resolve(writerfilter::Stream&) at writerfilter/source/rtftok/rtfdocumentimpl.cxx:856:27 #20 in (anonymous namespace)::RtfFilter::filter(com::sun::star::uno::Sequence const&) at writerfilter/source/filter/RtfFilter.cxx:163:20 #21 in SfxObjectShell::ImportFrom(SfxMedium&, com::sun::star::uno::Reference const&) at sfx2/source/doc/objstor.cxx:2392:34 #22 in SfxObjectShell::DoLoad(SfxMedium*) at sfx2/source/doc/objstor.cxx:760:23 #23 in SfxBaseModel::load(com::sun::star::uno::Sequence const&) at sfx2/source/doc/sfxbasemodel.cxx:1980:36 #24 in (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&) at sfx2/source/view/frmload.cxx:720:28 #25 in framework::LoadEnv::impl_loadContent() at framework/source/loadenv/loadenv.cxx:1176:37 #26 in framework::LoadEnv::start() at framework/source/loadenv/loadenv.cxx:412:20 #27 in framework::LoadEnv::startLoading(rtl::OUString const&, com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&, rtl::OUString const&, int, LoadEnvFeatures) at framework/source/loadenv/loadenv.cxx:308:5 #28 in framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) at framework/source/loadenv/loadenv.cxx:168:14 #29 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) at framework/source/services/desktop.cxx:591:16 #30 in non-virtual thunk to framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) at framework/source/services/desktop.cxx #31 in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUS
core.git: editeng/source
editeng/source/uno/unotext.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e211607dffe2986601359dcb1ef757fda3805fb3
Author: Mohit Marathe
AuthorDate: Sun Mar 24 22:06:46 2024 +0530
Commit: Hossein
CommitDate: Tue Apr 9 09:06:27 2024 +0200
tdf#42982: Improve UNO API error reporting
Change-Id: If075965f2b020767b35692ea110ca768daf342c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165228
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 09a117d82123..b5f329e62050 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -314,7 +314,7 @@ uno::Reference< text::XTextRange > SAL_CALL
SvxUnoTextRangeBase::getStart()
SvxUnoTextBase* pText = comphelper::getFromUnoTunnel(
getText() );
if(pText == nullptr)
-throw uno::RuntimeException();
+throw uno::RuntimeException("Failed to retrieve a valid text base
object from the Uno Tunnel");
rtl::Reference pRange = new SvxUnoTextRange( *pText );
xRange = pRange;
@@ -342,7 +342,7 @@ uno::Reference< text::XTextRange > SAL_CALL
SvxUnoTextRangeBase::getEnd()
SvxUnoTextBase* pText = comphelper::getFromUnoTunnel(
getText() );
if(pText == nullptr)
-throw uno::RuntimeException();
+throw uno::RuntimeException("Failed to retrieve a valid text base
object from the Uno Tunnel");
rtl::Reference pNew = new SvxUnoTextRange( *pText );
xRet = pNew;
@@ -704,12 +704,12 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper(
SfxItemSet const & rSet, cons
{
SfxItemState eState = rSet.GetItemState( EE_PARA_NUMBULLET );
if( eState != SfxItemState::SET && eState != SfxItemState::DEFAULT)
-throw uno::RuntimeException();
+throw uno::RuntimeException("Invalid item state for paragraph
numbering/bullet. Expected SET or DEFAULT.");
const SvxNumBulletItem* pBulletItem = rSet.GetItem(
EE_PARA_NUMBULLET );
if( pBulletItem == nullptr )
-throw uno::RuntimeException();
+throw uno::RuntimeException("Unable to retrieve paragraph
numbering/bullet item.");
aAny <<= SvxCreateNumRule( pBulletItem->GetNumRule() );
}
