[Bug 159410] problem with import part of html page into writer
https://bugs.documentfoundation.org/show_bug.cgi?id=159410 --- Comment #2 from hos...@volny.cz --- OK -- You are receiving this mail because: You are the assignee for the bug.
core.git: Branch 'distro/collabora/co-23.05' - sc/source
sc/source/ui/docshell/docfunc.cxx | 24 +++-
sc/source/ui/inc/docsh.hxx|2 +-
sc/source/ui/inc/viewdata.hxx |3 +++
sc/source/ui/view/tabview3.cxx|6 --
sc/source/ui/view/viewfun3.cxx|4 ++--
sc/source/ui/view/viewfunc.cxx| 32 +---
6 files changed, 42 insertions(+), 29 deletions(-)
New commits:
commit 85db2b8338392525bb138f41a3175203c703bf73
Author: Caolán McNamara
AuthorDate: Mon Feb 12 15:55:22 2024 +
Commit: Miklos Vajna
CommitDate: Tue Feb 13 08:16:08 2024 +0100
pass width hint around as twips and convert to pixel at the end
reuse the device setup and twip calculation that GetOptimalColWidth uses
and convert to pixel at the end with ViewData::toPixel
Change-Id: Ie24a66dda2e642c23ae63ff915829dd910ee44dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163259
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 750fa3e01b18..71bb31545df4 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -671,24 +671,22 @@ bool ScDocFunc::DeleteContents(
return true;
}
-tools::Long ScDocShell::GetPixelWidthHint(const ScAddress& rPos)
+tools::Long ScDocShell::GetTwipWidthHint(const ScAddress& rPos)
{
ScViewData* pViewData = GetViewData();
if (!pViewData)
return -1;
ScSizeDeviceProvider aProv(this);
-OutputDevice* pDev = aProv.GetDevice(); // has pixel MapMode
-double nPPTX = aProv.GetPPTX();
-double nPPTY = aProv.GetPPTY();
+Fraction aZoomX, aZoomY;
+double nPPTX, nPPTY;
+pViewData->setupSizeDeviceProviderForColWidth(aProv, aZoomX, aZoomY,
nPPTX, nPPTY);
ScDocument& rDoc = GetDocument();
-Fraction aInvX(pViewData->GetZoomX().GetDenominator(),
- pViewData->GetZoomX().GetNumerator());
-Fraction aInvY(pViewData->GetZoomY().GetDenominator(),
- pViewData->GetZoomY().GetNumerator());
-return rDoc.GetNeededSize(rPos.Col(), rPos.Row(), rPos.Tab(), pDev,
- nPPTX, nPPTY, aInvX, aInvY, true /*bWidth*/);
+tools::Long nWidth = rDoc.GetNeededSize(rPos.Col(), rPos.Row(),
rPos.Tab(), aProv.GetDevice(),
+nPPTX, nPPTY, aZoomX, aZoomY, true
/*bWidth*/);
+
+return (nWidth + 2) / nPPTX; // same as ScColumn::GetOptimalColWidth
}
bool ScDocFunc::DeleteCell(
@@ -739,7 +737,7 @@ bool ScDocFunc::DeleteCell(
pDataSpans = sc::DocFuncUtil::getNonEmptyCellSpans(rDoc, rMark, rPos);
}
-tools::Long nBefore(rDocShell.GetPixelWidthHint(rPos));
+tools::Long nBefore(rDocShell.GetTwipWidthHint(rPos));
rDoc.DeleteArea(rPos.Col(), rPos.Row(), rPos.Col(), rPos.Row(), rMark,
nFlags);
if (bRecord)
@@ -854,9 +852,9 @@ bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const
ScAddress& rPos, con
aOldValues.push_back(aOldValue);
}
-tools::Long nBefore(rDocShell.GetPixelWidthHint(rPos));
+tools::Long nBefore(rDocShell.GetTwipWidthHint(rPos));
o_rbNumFmtSet = rDoc.SetString( rPos.Col(), rPos.Row(), rPos.Tab(), rText
);
-tools::Long nAfter(rDocShell.GetPixelWidthHint(rPos));
+tools::Long nAfter(rDocShell.GetTwipWidthHint(rPos));
if (bUndo)
{
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index b4a016d8fd68..be8f551fcab0 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -315,7 +315,7 @@ public:
voidPostEditView( ScEditEngineDefaulter* pEditEngine, const
ScAddress& rCursorPos );
-tools::Long GetPixelWidthHint(const ScAddress& rPos);
+tools::Long GetTwipWidthHint(const ScAddress& rPos);
voidPostPaint( SCCOL nStartCol, SCROW nStartRow, SCTAB
nStartTab,
SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab,
PaintPartFlags nPart,
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index abe93954f774..b5265299462a 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -115,6 +115,7 @@ class ScExtDocOptions;
class ScViewData;
class ScMarkData;
class ScGridWindow;
+class ScSizeDeviceProvider;
class ScPositionHelper
{
@@ -696,6 +697,8 @@ public:
static void AddPixelsWhileBackward( tools::Long & rScrY, tools::Long
nEndPixels,
SCROW & rPosY, SCROW nStartRow, double
nPPTY,
const ScDocument * pDoc, SCTAB nTabNo );
+
+void setupSizeDeviceProviderForColWidth(ScSizeDeviceProvider& rProv,
Fraction& rZoomX, Fraction& rZoomY, double& rPPTX, double );
};
inline tools::Long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor )
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index
core.git: vcl/inc
vcl/inc/jsdialog/jsdialogbuilder.hxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 199b8ef1dffd3ef46b2319d9992c83ab47ccea05
Author: Szymon Kłos
AuthorDate: Mon Feb 12 22:11:25 2024 +0100
Commit: Szymon Kłos
CommitDate: Tue Feb 13 08:14:52 2024 +0100
jsdialog: use action for set_sensitive
This will reduce protocol volume as we will send short
message instead of JSON for the complete widget.
Signed-off-by: Szymon Kłos
Change-Id: I5e7541915f7e2da4bf822b99a05cc3066073334e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163279
Tested-by: Jenkins
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index e4fdd266851a..e24ff1589655 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -422,7 +422,12 @@ public:
bool bIsSensitive = BaseInstanceClass::get_sensitive();
BaseInstanceClass::set_sensitive(sensitive);
if (bIsSensitive != sensitive)
-sendUpdate();
+{
+std::unique_ptr pMap
+= std::make_unique();
+(*pMap)[ACTION_TYPE ""_ostr] = (sensitive ? u"enable" :
u"disable");
+sendAction(std::move(pMap));
+}
}
virtual css::uno::Reference
get_drop_target() override
core.git: desktop/win32 vcl/win
desktop/win32/source/loader.cxx | 33 +
vcl/win/window/salframe.cxx | 39 ++-
2 files changed, 71 insertions(+), 1 deletion(-)
New commits:
commit ebd3f0971b843527ed493a35b2303c8c15b94109
Author: Stephan Bergmann
AuthorDate: Fri Jan 26 13:45:01 2024 +0100
Commit: Stephan Bergmann
CommitDate: Tue Feb 13 08:11:57 2024 +0100
Fall back to old bootstrap.ini [Win32] section, for backwards compatibility
Change-Id: I629b2a16bc889f16595cd1718d2ee4535f31aed7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162602
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
(cherry picked from commit fe459b9595c851d00a861d595c8dd50b35c90be3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163255
Tested-by: Jenkins
diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index 998eb189effc..bbc97a462724 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -218,6 +218,8 @@ int officeloader_impl(bool bAllowConsole)
// read limit values from fundamental.override.ini
unsigned int nMaxMemoryInMB = 0;
bool bExcludeChildProcesses = true;
+bool fallbackForMaxMemoryInMB = true;
+bool fallbackForExcludeChildProcesses = true;
const WCHAR* szIniFile = L"\fundamental.override.ini";
const size_t nDirLen = wcslen(szIniDirectory);
@@ -233,13 +235,44 @@ int officeloader_impl(bool bAllowConsole)
std::ifstream aFile(szBootstrapIni);
boost::property_tree::ini_parser::read_ini(aFile, pt);
nMaxMemoryInMB = pt.get("Bootstrap.LimitMaximumMemoryInMB",
nMaxMemoryInMB);
+fallbackForMaxMemoryInMB =
!pt.get_child_optional("Bootstrap.LimitMaximumMemoryInMB");
bExcludeChildProcesses =
pt.get("Bootstrap.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
+fallbackForExcludeChildProcesses
+=
!pt.get_child_optional("Bootstrap.ExcludeChildProcessesFromLimit");
}
catch (...)
{
nMaxMemoryInMB = 0;
}
}
+// For backwards compatibility, for now also try to read the values from
bootstrap.ini if
+// fundamental.override.ini does not provide them:
+if (fallbackForMaxMemoryInMB || fallbackForExcludeChildProcesses) {
+const WCHAR* szFallbackIniFile = L"\bootstrap.ini";
+const size_t nFallbackDirLen = wcslen(szIniDirectory);
+if (wcslen(szFallbackIniFile) + nFallbackDirLen < MAX_PATH)
+{
+WCHAR szBootstrapIni[MAX_PATH];
+wcscpy(szBootstrapIni, szIniDirectory);
+wcscpy([nFallbackDirLen], szFallbackIniFile);
+
+try
+{
+boost::property_tree::ptree pt;
+std::ifstream aFile(szBootstrapIni);
+boost::property_tree::ini_parser::read_ini(aFile, pt);
+if (fallbackForMaxMemoryInMB) {
+nMaxMemoryInMB = pt.get("Win32.LimitMaximumMemoryInMB",
nMaxMemoryInMB);
+}
+if (fallbackForExcludeChildProcesses) {
+bExcludeChildProcesses =
pt.get("Win32.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
+}
+}
+catch (...)
+{
+}
+}
+}
// create a Windows JobObject with a memory limit
HANDLE hJobObject = nullptr;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 121596eb5b8c..797b5a80fc14 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -32,6 +32,12 @@
#include
+#include
+#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -1948,7 +1954,38 @@ static bool EnableAttachThreadInputHack()
{
OUString s("$EnableAttachThreadInputHack");
rtl::Bootstrap::expandMacros(s);
-const bool bEnabled = s == "true";
+bool bEnabled;
+if (!s.isEmpty()) {
+bEnabled = s == "true";
+} else {
+// For backwards compatibility, for now also try to read the value
from a [Win32] section of
+// bootstrap.ini if it is not set as a boostrap variable:
+bEnabled = false;
+OUString aBootstrapUri;
+if (osl_getProcessWorkingDir() ==
osl_Process_E_None) {
+aBootstrapUri += "/bootstrap.ini";
+
+OUString aSystemFileName;
+if (osl::FileBase::getSystemPathFromFileURL(aBootstrapUri,
aSystemFileName)
+== osl::FileBase::E_None
+&& aSystemFileName.getLength() <= MAX_PATH)
+{
+// this uses the Boost ini parser, instead of tools::Config,
as we already use it to
+// read other values from bootstrap.ini in
desktop/win32/source/loader.cxx, because
+// that watchdog process can't access LO libs. This way the
handling is consistent.
+
[Bug 159697] BASE, EXTENSIONS, BaseDocumenter error Basic script crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=159697 --- Comment #1 from Jean-Pierre Ledure --- Hi, - line 130 or 230 ? - can you, please, attach the database that causes the error ? Eventually, reduce it to what is strictly necessary to reproduce the error and remove private or sensible data. JPL -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159403] Saving .odt files as .docx make tables losing some settings/properties values
https://bugs.documentfoundation.org/show_bug.cgi?id=159403 Dieter changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Bug 154285] IsNumeric(1,2) returns True, must produce an error
https://bugs.documentfoundation.org/show_bug.cgi?id=154285 --- Comment #5 from Commit Notification --- Adam Seskunas committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/95dace2eb1ae7ce2fc000cc67e134b7bfadf2c35 tdf#154285 Check upper bound of arguments in SbRtl_CurDir It will be available in 24.8.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.
core.git: basic/source
basic/source/runtime/methods.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 95dace2eb1ae7ce2fc000cc67e134b7bfadf2c35 Author: Adam Seskunas AuthorDate: Thu Feb 8 21:41:13 2024 -0800 Commit: Mike Kaganski CommitDate: Tue Feb 13 05:51:04 2024 +0100 tdf#154285 Check upper bound of arguments in SbRtl_CurDir The LibreOffice Basic specification says CurDir should accept one argument and in the case of a non-Windows system, ignore that argument and simply return the current directory. So check that SbRtl_CurDir accepts a maximum of two arguments. Change-Id: Ia60114fac31aa4261c8251e26ef172a0370e6abc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163150 Reviewed-by: Mike Kaganski Tested-by: Jenkins diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index d58a2cef9ee0..34d959669747 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -371,6 +371,9 @@ void SbRtl_CurDir(StarBASIC *, SbxArray & rPar, bool) // there's no possibility to detect the current one in a way that a virtual URL // could be delivered. +if (rPar.Count() > 2) + return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT ); + #if defined(_WIN32) int nCurDir = 0; // Current dir // JSM if (rPar.Count() == 2)
core.git: vcl/source
vcl/source/gdi/pdfwriter_impl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5121c1f8a3dc1e326a4195393f463f5c0383859b Author: Mike Kaganski AuthorDate: Mon Feb 12 12:50:05 2024 +0100 Commit: Mike Kaganski CommitDate: Tue Feb 13 05:09:43 2024 +0100 tdf#159689: trailing newline before "endstream" must not count in Length Change-Id: Ic1e636c9d4e5a531113f26e147427fb75ce3591c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163185 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 11a62a156bb0..321f628cbf7a 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2775,7 +2775,7 @@ bool PDFWriterImpl::emitType3Font(const vcl::font::PhysicalFontFace* pFace, aLine.setLength(0); aLine.append(OString::number(nStream) + " 0 obj <> stream "); if (!writeBuffer(aLine)) return false;
Steven Casey license statement
All of my past and future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
[Bug 159403] Saving .odt files as .docx make tables losing some settings/properties values
https://bugs.documentfoundation.org/show_bug.cgi?id=159403 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159390] when a comment box is made very wide, then it does not print properly,
https://bugs.documentfoundation.org/show_bug.cgi?id=159390 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159410] problem with import part of html page into writer
https://bugs.documentfoundation.org/show_bug.cgi?id=159410 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159399] Replacing a word at the beginning of a marked sequence loses marker color
https://bugs.documentfoundation.org/show_bug.cgi?id=159399 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 156242] Writer - Page Style dialog - Footnote - missing preview of separator lines in drop-down list
https://bugs.documentfoundation.org/show_bug.cgi?id=156242 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159398] FIND & REPLACE DIALOG: In "Replace with formatting" dialog the effect setting (Without) doesn't persist
https://bugs.documentfoundation.org/show_bug.cgi?id=159398 QA Administrators changed: What|Removed |Added Whiteboard| QA:needsComment| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 156242] Writer - Page Style dialog - Footnote - missing preview of separator lines in drop-down list
https://bugs.documentfoundation.org/show_bug.cgi?id=156242 --- Comment #6 from QA Administrators --- Dear AB, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Bug 158995] SDK setup fails on linux, if `hostname` not installed
https://bugs.documentfoundation.org/show_bug.cgi?id=158995 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Bug 156788] Flatpak Wayland: "restore document" uses generic Wayland icon
https://bugs.documentfoundation.org/show_bug.cgi?id=156788 --- Comment #2 from QA Administrators --- Dear amanita+LIBREOFFICE, This bug has been in NEEDINFO status with no change for at least 6 months. Please provide the requested information as soon as possible and mark the bug as UNCONFIRMED. Due to regular bug tracker maintenance, if the bug is still in NEEDINFO status with no change in 30 days the QA team will close the bug as INSUFFICIENTDATA due to lack of needed information. For more information about our NEEDINFO policy please read the wiki located here: https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO If you have already provided the requested information, please mark the bug as UNCONFIRMED so that the QA team knows that the bug is ready to be confirmed. Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-NeedInfo-Ping -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159426] Add custom functions and dynamic data source
https://bugs.documentfoundation.org/show_bug.cgi?id=159426 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Bug 97318] Mailmerge wizard & Header > Every record from DB in styles.xml
https://bugs.documentfoundation.org/show_bug.cgi?id=97318 --- Comment #8 from QA Administrators --- Dear spamici, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Bug 126533] FILEOPEN/FILESAVE DOCX: bitmap background image (from a non-Default Page Style) not saved with document
https://bugs.documentfoundation.org/show_bug.cgi?id=126533 --- Comment #19 from Justin L --- Created attachment 192532 --> https://bugs.documentfoundation.org/attachment.cgi?id=192532=edit pageStyleNoBitmap.docx: here is one to throw you for a loop - shouldn't show bitmap -- You are receiving this mail because: You are the assignee for the bug.
core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffccbf4762a9ae810bcdd21c41fccdd436e7bfc9 Author: Kris van der Merwe AuthorDate: Tue Feb 13 00:32:39 2024 +0100 Commit: Gerrit Code Review CommitDate: Tue Feb 13 00:32:39 2024 +0100 Update git submodules * Update dictionaries from branch 'master' to 892f0f402cf8347aa3273f774365c094c310cf1b - Updated Afrikaans dictionary Change-Id: Ief9cb53fdcbf794d1c54f4f5008f80b9975453d8 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/163265 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/dictionaries b/dictionaries index 208a9fd80b2a..892f0f402cf8 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 208a9fd80b2a182fe20f224cd615119c6323ae2e +Subproject commit 892f0f402cf8347aa3273f774365c094c310cf1b
dictionaries.git: af_ZA/af_ZA.aff af_ZA/af_ZA.dic af_ZA/description.xml
af_ZA/af_ZA.aff | 175
af_ZA/af_ZA.dic |30255 --
af_ZA/description.xml |2
3 files changed, 12710 insertions(+), 17722 deletions(-)
New commits:
commit 892f0f402cf8347aa3273f774365c094c310cf1b
Author: Kris van der Merwe
AuthorDate: Tue Feb 13 00:31:19 2024 +0100
Commit: Andras Timar
CommitDate: Tue Feb 13 00:32:39 2024 +0100
Updated Afrikaans dictionary
Change-Id: Ief9cb53fdcbf794d1c54f4f5008f80b9975453d8
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/163265
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/af_ZA/af_ZA.aff b/af_ZA/af_ZA.aff
index e8bb7de..33348f4 100644
--- a/af_ZA/af_ZA.aff
+++ b/af_ZA/af_ZA.aff
@@ -1,8 +1,7 @@
# af_ZA.aff - Afrikaans (af) affix file for use in hunspell
#
-# Copyright (C) 2020 Kris van der Merwe
-# ... created from the Afrikaans ispell affix file by Dwayne Bailey
-# ... created from the Afrikaans ispell affix file by Reinier de Vos
+# Copyright (C) 2024 Kris van der Merwe
+# ... created from the original Afrikaans ispell affix file by Dwayne Bailey
and by Reinier de Vos
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -40,8 +39,8 @@ NOSPLITSUGS
COMPOUNDMIN 1
ONLYINCOMPOUND c
# nommer verbuiging reëls:
-# ([23456789]|1?[0-9])de
-# ([018]?|[2-9][0-9]+|[1-9]{3,})ste
+# ([23456789]|1?[0-9])de
+# ([018]?|[2-9][0-9]+|[1-9]{3,})ste
#
# COMPOUNDRULE het foute, eenvoudige reëls word dus gebruik
@@ -73,12 +72,12 @@ MAP yÿý
# kennis van wat maklik verwar word.
#
# Byvoorbeeld:
-# g<->ch, vir foute soos gemikus of nongalant
-# y<->ui<->ei, uu<->ie, vir oorronding en ontronding, en y/ei-verwarring
-# ij -> y, lijk -> lik, vir foutiewe Nederlandse spellings
-# kuste -> ci, kuste -> kusse, vir politikuste -> politici/politikusse
-# ui oeï, vir foute soos Hinduisme -> Hindoeïsme
-# ch->tj, sh -> sj, vir foute soos chips (tjips) en shoe (sjoe)
+# g<->ch, vir foute soos gemikus of nongalant
+# y<->ui<->ei, uu<->ie, vir oorronding en ontronding, en y/ei-verwarring
+# ij -> y, lijk -> lik, vir foutiewe Nederlandse spellings
+# kuste -> ci, kuste -> kusse, vir politikuste -> politici/politikusse
+# ui oeï, vir foute soos Hinduisme -> Hindoeïsme
+# ch->tj, sh -> sj, vir foute soos chips (tjips) en shoe (sjoe)
#
REP 27
REP g ch
@@ -107,7 +106,7 @@ REP sh sj
REP kie djie
REP kie tjie
REP ntjie nkie
-REP aaitjie aadjie
+REP aitjie adjie
BREAK 2
BREAK -
@@ -124,98 +123,113 @@ PFX A Y 1
PFX A 0 aan .
PFX B Y 1
-PFX B 0 be .
+PFX B 0 be ..
PFX C Y 1
-PFX C 0 in .
+PFX C 0 in ..
SFX E N 2
-SFX E 0 e [^aeiou]
+SFX E 0 e [^aeou]
SFX E 0 'e [ghc]e
PFX F Y 1
-PFX F 0 af .
+PFX F 0 af ..
PFX G Y 1
-PFX G 0 ge .
+PFX G 0 ge ..
SFX H N 2
SFX H 0 heid [^ëe]
SFX H 0 nheid [ëe]
SFX J N 16
-SFX J 0 tjie .[aeiouy]
-SFX J 0 tjies .[aeiouy]
-SFX J 0 tjie .[aeiouyëê][lnr]
-SFX J 0 tjies .[aeiouyëê][lnr]
-SFX J 0 etjie ^.{1,3}[aeiouyëê]ng
-SFX J 0 etjies ^.{1,3}[aeiouyëê]ng
-SFX J 0 pie .[aeiou]m
-SFX J 0 pies .[aeiou]m
-SFX J 0 jie .[aeioun][dt]
-SFX J 0 jies .[aeioun][dt]
-SFX J 0 'tjies .+[^aeiouyëêlngrmdtp]
-SFX J 0 'tjie .+[^aeiouyëêlngrmdtp]
-SFX J 0 'etjies ^[flmnrsx]
-SFX J 0 'etjie ^[flmnrsx]
-SFX J 0 'tjies ^[^flmnrsx]
-SFX J 0 'tjie ^[^flmnrsx]
+SFX J 0 tjie .[aeiouy]
+SFX J 0 tjies .[aeiouy]
+SFX J 0 tjie .[aeiouyëê][lnr]
+SFX J 0 tjies .[aeiouyëê][lnr]
+SFX J 0 etjie [aeiouyëê]ng
+SFX J 0 etjies [aeiouyëê]ng
+SFX J 0 pie .[aeiou]m
+SFX J 0 pies .[aeiou]m
+SFX J 0 jie .[aeioun][dt]
+SFX J 0 jies .[aeioun][dt]
+SFX J 0 'tjies .+[^aeiouyëêlngrmdtp]
+SFX J 0 'tjie .+[^aeiouyëêlngrmdtp]
+SFX J 0 'etjies ^[flmnrsx]
+SFX J 0 'etjie ^[flmnrsx]
+SFX J 0 'tjies ^[^flmnrsx]
+SFX J 0 'tjie ^[^flmnrsx]
PFX K Y 1
PFX K 0 op .
SFX L N 1
-SFX L 0 te .
+SFX L 0 te .
PFX M Y 1
PFX M 0 oor .
SFX N N 1
-SFX N 0 de .
+SFX N 0 de .
PFX O Y 1
PFX O 0 on .
SFX P N 32
-SFX P ad de aad
-SFX P ag e aag
-SFX P ak ke aak
-SFX P al le aal
-SFX P am me aam
-SFX P an ne aan
-SFX P ap pe aap
-SFX P ar re aar
-SFX P as se aas
-SFX P at te aat
-SFX P ed de eed
-SFX P eg ge eeg
-SFX P ek ke eek
-SFX P el le eel
-SFX P em me eem
-SFX P id de heid
-SFX P en ne [eï]en
-SFX P ep pe eep
-SFX P er re eer
-SFX P es se ees
-SFX P et te eet
-SFX P od de ood
-SFX P og ë oog
-SFX P ok ke ook
-SFX P ol le ool
-SFX P om me oom
-SFX P on ne oon
-SFX P op pe oop
-SFX P or re oor
-SFX P ot te oot
-SFX P un ne uun
-SFX P ur re uur
+SFX P ad de aad
+SFX P ag e aag
+SFX P ak ke aak
+SFX P al le aal
+SFX P am me aam
+SFX P an ne aan
+SFX P ap pe aap
+SFX P ar re aar
+SFX P as se aas
+SFX P at te aat
+SFX P ed de eed
+SFX P eg ge eeg
+SFX P ek ke eek
+SFX P el le eel
+SFX P em me eem
+SFX P en ne [eï]en
+SFX P ep pe eep
+SFX P er re eer
+SFX P es se ees
+SFX P et te eet
+SFX P od
[Bug 159700] [META] KF6 VCL plugin bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=159700 Michael Weghorn changed: What|Removed |Added Summary|(KF6) - [META] KF6 VCL |[META] KF6 VCL plugin bugs |plugin bugs and |and enhancements |enhancements| -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159690] “Wrap text automatically” badly handled in Calc 24.2
https://bugs.documentfoundation.org/show_bug.cgi?id=159690 Telesto changed: What|Removed |Added Ever confirmed|0 |1 Keywords||bibisectRequest, regression Status|UNCONFIRMED |NEW --- Comment #9 from Telesto --- Confirm comment 3 (didn't test comment 4) Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 4d381b54d1c598c181b4a21a8bf0db86eb4668d1 CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL threaded as reported not in Version: 7.6.3.0.0+ (X86_64) / LibreOffice Community Build ID: 35f19e5cb93ce218787904e99c2bedfd40e725cc CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Bug 102495] [META] KDE (kf5) VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Michael Weghorn changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||9700 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 125943] [META] Qt5 VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=125943 Michael Weghorn changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||9700 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159700] (KF6) - [META] KF6 VCL plugin bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=159700 Michael Weghorn changed: What|Removed |Added Status|UNCONFIRMED |NEW Alias||KF6 Ever confirmed|0 |1 See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||5734, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||5943, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||2495 CC||m.wegh...@posteo.de --- Comment #1 from Michael Weghorn --- Issues also reproducible with the qt6 VCL plugin should rather be set as blocking for the qt6 VCL plugin meta bug (tdf#145734), not this one. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 145734] [META] Qt6 VCL plugin bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=145734 Michael Weghorn changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||9700 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 125943] [META] Qt5 VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=125943 --- Comment #4 from Michael Weghorn --- (In reply to Michael Weghorn from comment #3) > Issues also reproducible with the qt6 VCL plugin should rather be set as > blocking for the qt6 VCL plugin meta bug (tdf#145734), not this one. Sorry, please ignore that comment, it was meant for tdf#159700, not this one... -- You are receiving this mail because: You are the assignee for the bug.
[Bug 125943] [META] Qt5 VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=125943 --- Comment #3 from Michael Weghorn --- Issues also reproducible with the qt6 VCL plugin should rather be set as blocking for the qt6 VCL plugin meta bug (tdf#145734), not this one. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159700] New: (KF6) - [META] KF6 VCL plugin bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=159700 Bug ID: 159700 Summary: (KF6) - [META] KF6 VCL plugin bugs and enhancements Product: LibreOffice Version: 24.8.0.0 alpha0+ Master Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: m.wegh...@posteo.de This meta bug is used to track aspects specific to the kf6 VCL plugin. See also meta bugs for qt6 (tdf#145734), qt5 (tdf#125943) and kf5 (tdf#102495). -- You are receiving this mail because: You are the assignee for the bug.
[Bug 115930] [META] Adding and deleting cells / rows / columns
https://bugs.documentfoundation.org/show_bug.cgi?id=115930 Bug 115930 depends on bug 140712, which changed state. Bug 140712 Summary: Deleting a column in very large table slow 3x slower compared to 5.0 branch https://bugs.documentfoundation.org/show_bug.cgi?id=140712 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Bug 140712] Deleting a column in very large table slow 3x slower compared to 5.0 branch
https://bugs.documentfoundation.org/show_bug.cgi?id=140712 Telesto changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159690] “Wrap text automatically” badly handled in Calc 24.2
https://bugs.documentfoundation.org/show_bug.cgi?id=159690 --- Comment #8 from maison --- (revert to 7.6.4 rather, but that’s irrelevant) -- You are receiving this mail because: You are the assignee for the bug.
core.git: vcl/jsdialog
vcl/jsdialog/enabled.cxx |4 1 file changed, 4 insertions(+) New commits: commit b34c69dd09069c4bb34fe4fe3225d304317999f1 Author: Szymon Kłos AuthorDate: Sun Jan 28 22:28:40 2024 +0100 Commit: Szymon Kłos CommitDate: Mon Feb 12 22:48:02 2024 +0100 jsdialog: enable animation properties in impress to test: 1. click on any shape in Impress 2. go to Animation tab in sidebar 3. "add" animation 4. double-click on added animation on the list Signed-off-by: Szymon Kłos Change-Id: I009cbdd295fac4f4533101c89d5c0268fbbe633a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162725 Tested-by: Jenkins diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index beb12b5dd081..6d5acc3dc538 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -167,6 +167,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/sdraw/ui/drawpagedialog.ui" || rUIFile == u"modules/sdraw/ui/drawparadialog.ui" // simpress +|| rUIFile == u"modules/simpress/ui/customanimationeffecttab.ui" +|| rUIFile == u"modules/simpress/ui/customanimationproperties.ui" +|| rUIFile == u"modules/simpress/ui/customanimationtexttab.ui" +|| rUIFile == u"modules/simpress/ui/customanimationtimingtab.ui" || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui" || rUIFile == u"modules/simpress/ui/headerfootertab.ui" // swriter
[Bug 159690] “Wrap text automatically” badly handled in Calc 24.2
https://bugs.documentfoundation.org/show_bug.cgi?id=159690 --- Comment #7 from maison --- So, I managed to construct two test files with a slight variation. First, I have to retract the fact that the problem is visible on new and empty files (I was testing several things that made me confused). But the good news is that it’s tested and reproducible on 24.2. Contrary to the other referenced bug, it has nothing to do with xls files (I used native ods) and it is not dependable on formulas. The trigger is when you leave a cell that contains a line break, then Calc goes crazy. 1ˢᵗ file: Just move through the three cells. See line 3 expanding out of nowhere if you leave it first. Watch the undo list stack up with useless “attributes”. See Calc asking you to save the file when you close it. (Although not exactly the same thing, will bug 156431 ever be solved?) 2ⁿᵈ file: It has the same content, but I happened to define a cell height — just the default height. Browse through the cells. See how NOT ONLY word wrapping is affected, but the CELL ALIGNMENT as well: the last cells change their visible content. This bug is so workflow‐breaking for me that unfortunately I have to revert to 7.2 and not upgrade until it is resolved. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159690] “Wrap text automatically” badly handled in Calc 24.2
https://bugs.documentfoundation.org/show_bug.cgi?id=159690 --- Comment #6 from maison --- Created attachment 192531 --> https://bugs.documentfoundation.org/attachment.cgi?id=192531=edit Second test file. Not only that, but the cell alignment goes awry as well. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159690] “Wrap text automatically” badly handled in Calc 24.2
https://bugs.documentfoundation.org/show_bug.cgi?id=159690 --- Comment #5 from maison --- Created attachment 192530 --> https://bugs.documentfoundation.org/attachment.cgi?id=192530=edit First test file. As you start moving through the 3 cells, the “Wrap text automatically” option is set its way for each cell again. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 140712] Deleting a column in very large table slow 3x slower compared to 5.0 branch
https://bugs.documentfoundation.org/show_bug.cgi?id=140712 --- Comment #3 from Tex2002ans --- Yes, I would say close this. Following comment 0, and deleting the column, it only took me: - ~3 seconds - - - Tested in: Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: da48488a73ddd66ea24cf16bbc4f7b9c08e9bea1 CPU threads: 8; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159390] when a comment box is made very wide, then it does not print properly,
https://bugs.documentfoundation.org/show_bug.cgi?id=159390 --- Comment #5 from Dieter --- (In reply to vena.c...@virgin.net from comment #4) > I just wanted to clarify what was confirmed above. The bug that I reported, > is not that the comment box is printed in the margin. The problem is the > the comment box is printed right across the margin and goes off the page, so > that that the right side of the text box is not printed on the page nor the > margin. Yes, sure. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159666] Crash when table and line object are selected at the same time
https://bugs.documentfoundation.org/show_bug.cgi?id=159666 Commit Notification changed: What|Removed |Added Whiteboard|target:24.8.0 target:24.2.2 |target:24.8.0 target:24.2.2 ||target:7.6.6 -- You are receiving this mail because: You are the assignee for the bug.
core.git: Branch 'libreoffice-7-6' - svx/source
svx/source/svdraw/svdhdl.cxx | 101 +--
1 file changed, 51 insertions(+), 50 deletions(-)
New commits:
commit da4ed866e4434f4c0c3487a983bd97879d197076
Author: Noel Grandin
AuthorDate: Mon Feb 12 12:54:06 2024 +0200
Commit: Xisco Fauli
CommitDate: Mon Feb 12 22:27:49 2024 +0100
tdf#159666 Crash when table and line object are selected at the same time
before
commit e3077168072452fb8f1c0a8afb2992877cb96d1c
Author: Noel Grandin
Date: Thu Jun 17 09:49:37 2021 +0200
loplugin:finalclasses
the cast in
const SdrEdgeObj* pEdge = static_cast(m_pObj);
would incorrectly cast a SdrTableObj, but it happened to do nothing
problematic.
After the above commit, the vtable layout changed and it started
crashing.
Work around it by use dynamic_cast and ignoring objects that are not
SdrEdgeObj.
Change-Id: Ibe03d4935b8eeb182e037b1648d841e26fa23ed4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163242
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit bac09f76fd903c109b591a7bc15883e5653715ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163187
Reviewed-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163256
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 64f29976f5ca..62851f9b6331 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1604,66 +1604,67 @@ ImpEdgeHdl::~ImpEdgeHdl()
void ImpEdgeHdl::CreateB2dIAObject()
{
-if(nObjHdlNum <= 1 && pObj)
+if(nObjHdlNum > 1 || !pObj)
{
-// first throw away old one
-GetRidOfIAObject();
+// call parent
+SdrHdl::CreateB2dIAObject();
+return;
+}
-BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan;
-BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7;
+// first throw away old one
+GetRidOfIAObject();
-if(pHdlList)
-{
-SdrMarkView* pView = pHdlList->GetView();
+BitmapColorIndex eColIndex = BitmapColorIndex::LightCyan;
+BitmapMarkerKind eKindOfMarker = BitmapMarkerKind::Rect_7x7;
-if(pView && !pView->areMarkHandlesHidden())
-{
-const SdrEdgeObj* pEdge = static_cast(pObj);
+if(!pHdlList)
+return;
-if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr)
-eColIndex = BitmapColorIndex::LightRed;
+SdrMarkView* pView = pHdlList->GetView();
-if(nPPntNum < 2)
-{
-// Handle with plus sign inside
-eKindOfMarker = BitmapMarkerKind::Circ_7x7;
-}
+if(!pView || pView->areMarkHandlesHidden())
+return;
-SdrPageView* pPageView = pView->GetSdrPageView();
+// tdf#159666 Crash when table and line object are selected at the same
time
+auto pEdge = dynamic_cast(pObj);
+if (!pEdge)
+return;
-if(pPageView)
-{
-for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
-{
-const SdrPageWindow& rPageWindow =
*pPageView->GetPageWindow(b);
-
-if(rPageWindow.GetPaintWindow().OutputToWindow())
-{
-const rtl::Reference< sdr::overlay::OverlayManager
>& xManager = rPageWindow.GetOverlayManager();
-if (xManager.is())
-{
-basegfx::B2DPoint aPosition(aPos.X(),
aPos.Y());
-std::unique_ptr
pNewOverlayObject(CreateOverlayObject(
-aPosition,
-eColIndex,
-eKindOfMarker));
-
-// OVERLAYMANAGER
-insertNewlyCreatedOverlayObjectForSdrHdl(
-std::move(pNewOverlayObject),
-rPageWindow.GetObjectContact(),
-*xManager);
-}
-}
-}
-}
-}
-}
+if(pEdge->GetConnectedNode(nObjHdlNum == 0) != nullptr)
+eColIndex = BitmapColorIndex::LightRed;
+
+if(nPPntNum < 2)
+{
+// Handle with plus sign inside
+eKindOfMarker = BitmapMarkerKind::Circ_7x7;
}
-else
+
+SdrPageView* pPageView = pView->GetSdrPageView();
+if(!pPageView)
+return;
+
+for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
{
-// call parent
-SdrHdl::CreateB2dIAObject();
+const SdrPageWindow& rPageWindow =
[Bug 159675] FORMATTING - Text in column disappears when modified
https://bugs.documentfoundation.org/show_bug.cgi?id=159675 ludovic.cre...@gmail.com changed: What|Removed |Added Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED --- Comment #5 from ludovic.cre...@gmail.com --- I am not sure about the older version it appeared in, I believe I always had it. Updating to 24.2 did not change anything. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159675] FORMATTING - Text in column disappears when modified
https://bugs.documentfoundation.org/show_bug.cgi?id=159675 Telesto changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||9698 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159698] Undo change doesn't restore previous layout
https://bugs.documentfoundation.org/show_bug.cgi?id=159698 Telesto changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||9675 -- You are receiving this mail because: You are the assignee for the bug.
[Bug 146725] Calc is taking much time to process paste command of unformatted text
https://bugs.documentfoundation.org/show_bug.cgi?id=146725 --- Comment #3 from Tex2002ans --- Much better than it was in 7.2.5. It finally pasted after: - ~2 minutes but still VERY slow compared to what you'd expect. Using: Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: da48488a73ddd66ea24cf16bbc4f7b9c08e9bea1 CPU threads: 8; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Bug 133092] [META] Crash bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=133092 Bug 133092 depends on bug 153538, which changed state. Bug 153538 Summary: Writer freezes and crashes without any error message https://bugs.documentfoundation.org/show_bug.cgi?id=153538 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 153538] Writer freezes and crashes without any error message
https://bugs.documentfoundation.org/show_bug.cgi?id=153538 BogdanB changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159467] XLOOKUP does not work if embedded in another XLOOKUP
https://bugs.documentfoundation.org/show_bug.cgi?id=159467 ady changed: What|Removed |Added Blocks||108827 --- Comment #7 from ady --- (In reply to Balázs Varga (allotropia) from comment #6) > In Calc if an inner, embedded function gives back an error (like #N/A) the > evaluation of the full formula will stop after the inner function. This is > the basic work of the functions in Calc and also in Excel. But the XLOOKUP > is an exception in excel. :) Thank you for the explanation. Then this is not just the case of (a second) chained XLOOKUP, but any such inner error case would trigger the unexpected result (in comparison to what other tools do). Considering that compatibility in Calc in general, and for this function in particular, is very important, then Calc should have the same way of dealing with XLOOKUP() as Excel regarding errors. @X1sc0, this should also be important for regression tests (at the appropriate time, whenever they will be introduced). FWIW, as I mentioned in comment 4, I have tested 2 other spreadsheet tools that provide the same result as Excel. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108827 [Bug 108827] [META] Calc functions bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Bug 108827] [META] Calc functions bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108827 ady changed: What|Removed |Added Depends on||159467 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=159467 [Bug 159467] XLOOKUP does not work if embedded in another XLOOKUP -- You are receiving this mail because: You are the assignee for the bug.
[Bug 108843] [META] Clipboard bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108843 BogdanB changed: What|Removed |Added Depends on||159683 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=159683 [Bug 159683] Crash on closing LibreOffice with certain content on the clipboard -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159683] Crash on closing LibreOffice with certain content on the clipboard
https://bugs.documentfoundation.org/show_bug.cgi?id=159683 BogdanB changed: What|Removed |Added Blocks||108843 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108843 [Bug 108843] [META] Clipboard bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Bug 105948] [META] Undo/Redo bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=105948 BogdanB changed: What|Removed |Added Depends on||159698 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=159698 [Bug 159698] Undo change doesn't restore previous layout -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159698] Undo change doesn't restore previous layout
https://bugs.documentfoundation.org/show_bug.cgi?id=159698 BogdanB changed: What|Removed |Added Blocks||105948 Status|UNCONFIRMED |NEW Ever confirmed|0 |1 CC||buzea.bog...@libreoffice.or ||g --- Comment #1 from BogdanB --- Confirm with Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: da48488a73ddd66ea24cf16bbc4f7b9c08e9bea1 CPU threads: 16; OS: Linux 6.5; UI render: default; VCL: gtk3 Locale: ro-RO (ro_RO.UTF-8); UI: en-US Calc: threaded Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105948 [Bug 105948] [META] Undo/Redo bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Bug 153538] Writer freezes and crashes without any error message
https://bugs.documentfoundation.org/show_bug.cgi?id=153538 --- Comment #19 from Marcin Segit --- I think this one can be closed. No major crashes so far. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 152110] LanguageTool extension (version <6.0) prevents adding words to dictionaries via context menu with 2+ dictionaries present
https://bugs.documentfoundation.org/show_bug.cgi?id=152110 --- Comment #11 from Marcin Segit --- I believe this one can be closed. The workaround works. It's not very elegant as the other dictionaries are still visible but at least it works fine. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 90486] [META] Chart bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=90486 Bug 90486 depends on bug 124227, which changed state. Bug 124227 Summary: Calc chart - incomplete copy paste https://bugs.documentfoundation.org/show_bug.cgi?id=124227 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Bug 124227] Calc chart - incomplete copy paste
https://bugs.documentfoundation.org/show_bug.cgi?id=124227 Buovjaga changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #10 from Buovjaga --- Yes, let's close. Arch Linux 64-bit, X11 Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: 420(Build:3) CPU threads: 8; OS: Linux 6.7; UI render: default; VCL: kf5 (cairo+xcb) Locale: fi-FI (fi_FI.UTF-8); UI: en-US 24.2.0-1 Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Bug 102593] [META] Paste bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102593 Bug 102593 depends on bug 124227, which changed state. Bug 124227 Summary: Calc chart - incomplete copy paste https://bugs.documentfoundation.org/show_bug.cgi?id=124227 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
Re: Live streaming LibreOffice bug triaging (week 7)
On 12.2.2024 22.38, Ilmari Lauhakangas wrote: I will be live streaming a 1 hour LibreOffice bug triaging session in the Jitsi room https://jitsi.documentfoundation.org/ilmaritriages on Wed, 14 February 2024 at 14:00 UTC Thu, 15 February 2024 at 13:00 UTC Fri, 16 February 2024 at 14:00 UTC Times are in 24-hour notation. Anyone is welcome to interrupt me during the session and ask questions about the process or request me to test something specific. Note: if you want to record the session for your own use, ask me to make you a moderator and then you can click the "meatball menu" in Jitsi's bottom bar and select "Start recording". TDF members can become moderators simply by authenticating (Settings - Profile). Recording only works in Chrome and derivative browsers at the moment. Should have titled it week 7... Ilmari
Live streaming LibreOffice bug triaging (week 6)
I will be live streaming a 1 hour LibreOffice bug triaging session in the Jitsi room https://jitsi.documentfoundation.org/ilmaritriages on Wed, 14 February 2024 at 14:00 UTC Thu, 15 February 2024 at 13:00 UTC Fri, 16 February 2024 at 14:00 UTC Times are in 24-hour notation. Anyone is welcome to interrupt me during the session and ask questions about the process or request me to test something specific. Note: if you want to record the session for your own use, ask me to make you a moderator and then you can click the "meatball menu" in Jitsi's bottom bar and select "Start recording". TDF members can become moderators simply by authenticating (Settings - Profile). Recording only works in Chrome and derivative browsers at the moment. Ilmari
core.git: Branch 'distro/collabora/co-23.05' - sc/qa sc/source
sc/qa/unit/tiledrendering/tiledrendering.cxx | 26 +++---
sc/source/ui/inc/tabview.hxx |2 ++
sc/source/ui/view/tabview3.cxx | 14 +-
sc/source/ui/view/tabview5.cxx | 22 --
4 files changed, 38 insertions(+), 26 deletions(-)
New commits:
commit 9f3ee2b27ceeab175fb865a55cfeabd66fbb128d
Author: Caolán McNamara
AuthorDate: Sun Jan 14 16:29:56 2024 +
Commit: Michael Meeks
CommitDate: Mon Feb 12 21:36:55 2024 +0100
don't invalidate when switching tabs
Change-Id: If013bb2a2d4de32da21ef6a86cc2237c6e75c0e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162049
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 7ec0d730180d..7dc38facfa8e 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -141,7 +141,7 @@ public:
void testVbaRangeCopyPaste();
void testInvalidationLoop();
void testPageDownInvalidation();
-void testSheetChangeInvalidation();
+void testSheetChangeNoInvalidation();
void testInsertDeletePageInvalidation();
void testGetRowColumnHeadersInvalidation();
void testJumpHorizontallyInvalidation();
@@ -213,7 +213,7 @@ public:
CPPUNIT_TEST(testVbaRangeCopyPaste);
CPPUNIT_TEST(testInvalidationLoop);
CPPUNIT_TEST(testPageDownInvalidation);
-CPPUNIT_TEST(testSheetChangeInvalidation);
+CPPUNIT_TEST(testSheetChangeNoInvalidation);
CPPUNIT_TEST(testInsertDeletePageInvalidation);
CPPUNIT_TEST(testGetRowColumnHeadersInvalidation);
CPPUNIT_TEST(testJumpHorizontallyInvalidation);
@@ -2011,13 +2011,12 @@ void ScTiledRenderingTest::testPageDownInvalidation()
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(15, 15, 1230, 225),
aView1.m_aInvalidations[0]);
}
-void ScTiledRenderingTest::testSheetChangeInvalidation()
+void ScTiledRenderingTest::testSheetChangeNoInvalidation()
{
const bool oldPartInInvalidation =
comphelper::LibreOfficeKit::isPartInInvalidation();
comphelper::LibreOfficeKit::setPartInInvalidation(true);
ScModelObj* pModelObj = createDoc("two_sheets.ods");
-ScDocument* pDoc = pModelObj->GetDocument();
ScViewData* pViewData = ScDocShell::GetViewData();
CPPUNIT_ASSERT(pViewData);
@@ -2033,19 +2032,8 @@ void ScTiledRenderingTest::testSheetChangeInvalidation()
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, awt::Key::PAGEDOWN |
KEY_MOD1);
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, awt::Key::PAGEDOWN |
KEY_MOD1);
Scheduler::ProcessEventsToIdle();
-CPPUNIT_ASSERT(aView1.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(2), aView1.m_aInvalidations.size());
-const ScSheetLimits& rLimits = pDoc->GetSheetLimits();
-CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 1280 *
rLimits.GetMaxColCount(),
- 256 * rLimits.GetMaxRowCount()),
- aView1.m_aInvalidations[0]);
-CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 10, 10),
aView1.m_aInvalidations[1]);
-CPPUNIT_ASSERT_EQUAL(size_t(2), aView1.m_aInvalidationsParts.size());
-CPPUNIT_ASSERT_EQUAL(pModelObj->getPart(),
aView1.m_aInvalidationsParts[0]);
-CPPUNIT_ASSERT_EQUAL(pModelObj->getPart(),
aView1.m_aInvalidationsParts[1]);
-CPPUNIT_ASSERT_EQUAL(size_t(2), aView1.m_aInvalidationsMode.size());
-CPPUNIT_ASSERT_EQUAL(pModelObj->getEditMode(),
aView1.m_aInvalidationsMode[0]);
-CPPUNIT_ASSERT_EQUAL(pModelObj->getEditMode(),
aView1.m_aInvalidationsMode[1]);
+// switching sheets should trigger no invalidations
+CPPUNIT_ASSERT(!aView1.m_bInvalidateTiles);
comphelper::LibreOfficeKit::setPartInInvalidation(oldPartInInvalidation);
}
@@ -2072,7 +2060,7 @@ void
ScTiledRenderingTest::testInsertDeletePageInvalidation()
dispatchCommand(mxComponent, ".uno:Insert", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(6), aView1.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(2), aView1.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 10, 10),
aView1.m_aInvalidations[0]);
CPPUNIT_ASSERT_EQUAL(2, pModelObj->getParts());
@@ -2085,7 +2073,7 @@ void
ScTiledRenderingTest::testInsertDeletePageInvalidation()
dispatchCommand(mxComponent, ".uno:Remove", aArgs2);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView1.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(5), aView1.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(1), aView1.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(0, 0, 10, 10),
aView1.m_aInvalidations[0]);
CPPUNIT_ASSERT_EQUAL(1, pModelObj->getParts());
}
diff --git
[Bug 159467] XLOOKUP does not work if embedded in another XLOOKUP
https://bugs.documentfoundation.org/show_bug.cgi?id=159467 --- Comment #6 from Balázs Varga (allotropia) --- Thanks for the explanation and investigation Ady. :) =XLOOKUP(A12;A2:A8;B2:B8;XLOOKUP(A12;F2:F8;G2:G8;0)) The reason why it is work and the original ones not, because in the above function the inner function give back not an error msg (like #N/A) but a 0 value if the searched value not found. In that case the evaluation of the full formula will not stop after the evaluation of the inner function. --> After evaluation of the embedded XLOOKUP this is the result: =XLOOKUP(A12;A2:A8;B2:B8;0) In case of the original case the result was: =XLOOKUP(A12;A2:A8;B2:B8;#N/A) -> #N/A which is an error type. In Calc if an inner, embedded function gives back an error (like #N/A) the evaluation of the full formula will stop after the inner function. This is the basic work of the functions in Calc and also in Excel. But the XLOOKUP is an exception in excel. :) -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159467] XLOOKUP does not work if embedded in another XLOOKUP
https://bugs.documentfoundation.org/show_bug.cgi?id=159467 --- Comment #5 from ady --- (In reply to ady from comment #4) > Translated to the array formula: > =XLOOKUP(A12;A2:A8;B2:B8;XLOOKUP(A12;F2:F8;G2:G8)) > > ... it is only executing the search of the criterion on the second > XLOOKUP(), which is the "Result_if_not_found" of the first XLOOKUP(), but it > can retrieve the result from the first XLOOKUP() (too). Additional info that might point to the cause of this failure... A. Change the above _array_ formula (worksheet "Ex5", cell B12) from: =XLOOKUP(A12;A2:A8;B2:B8;XLOOKUP(A12;F2:F8;G2:G8)) to: =XLOOKUP(A12;A2:A8;B2:B8;XLOOKUP(A12;F2:F8;G2:G8;0)) (note the additional zero; i.e. since the first XLOOKUP() has a "Result_if_not_found", I am adding the equivalent argument to the second XLOOKUP()) * The result when cell A12 is "Ned" (without quotation marks) is now correct (67). B. Same as "A.", but instead of using the fixed numeric value of zero as the second "Result_if_not_found", I used a "SUM(0)" function. * The result when cell A12 is "Ned" (without quotation marks) is still correct, same as in case "A.". C. Same as "A.", but instead of using the fixed numeric value of zero as the second "Result_if_not_found", I used a "NA()" function. * The result when cell A12 is "Ned" (without quotation marks) is back to generate an incorrect result, #N/A. Conclusion: The presence of a second "Result_if_not_found" _might_ trigger the correct result, depending on the specific type of value and/or function used for it. The result should not change, whether using (or not) the second "Result_if_not_found", and whichever value or function is used on that argument. Perhaps errors are being carried over in the chain of functions in a different manner than it was supposed to happen? -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159666] Crash when table and line object are selected at the same time
https://bugs.documentfoundation.org/show_bug.cgi?id=159666 --- Comment #8 from Commit Notification --- Xisco Fauli committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/0ac4f5130e823bb64c0519838ebe3aab1da97aaf tdf#159666: sd_uiimpress: Add unittest It will be available in 24.8.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159666] Crash when table and line object are selected at the same time
https://bugs.documentfoundation.org/show_bug.cgi?id=159666 --- Comment #7 from Commit Notification --- Xisco Fauli committed a patch related to this issue. It has been pushed to "libreoffice-24-2": https://git.libreoffice.org/core/commit/98af2dc233f6ac154afe4a8e53ff97062577c21c tdf#159666: sd_uiimpress: Add unittest It will be available in 24.2.2. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.
core.git: sd/qa
sd/qa/unit/data/tdf159666.odg |binary
sd/qa/unit/uiimpress.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit 0ac4f5130e823bb64c0519838ebe3aab1da97aaf
Author: Xisco Fauli
AuthorDate: Mon Feb 12 16:35:49 2024 +0100
Commit: Xisco Fauli
CommitDate: Mon Feb 12 21:00:39 2024 +0100
tdf#159666: sd_uiimpress: Add unittest
Change-Id: Id5e35e1514695bffeced718d48dcfeffc4a4d4d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163250
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/unit/data/tdf159666.odg b/sd/qa/unit/data/tdf159666.odg
new file mode 100644
index ..6b407597f7ca
Binary files /dev/null and b/sd/qa/unit/data/tdf159666.odg differ
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 41c685feef36..d03e85dab6c8 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -288,6 +288,27 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf124708)
CPPUNIT_ASSERT_EQUAL(static_cast(16), pActualPage->GetObjCount());
}
+CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf159666)
+{
+createSdDrawDoc("tdf159666.odg");
+
+auto pXImpressDocument =
dynamic_cast(mxComponent.get());
+sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pActualPage->GetObjCount());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:Delete", {});
+
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pActualPage->GetObjCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pActualPage->GetObjCount());
+}
+
CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf143412)
{
createSdImpressDoc();
core.git: Branch 'libreoffice-24-2' - sd/qa
sd/qa/unit/data/tdf159666.odg |binary
sd/qa/unit/uiimpress.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit 98af2dc233f6ac154afe4a8e53ff97062577c21c
Author: Xisco Fauli
AuthorDate: Mon Feb 12 16:35:49 2024 +0100
Commit: Xisco Fauli
CommitDate: Mon Feb 12 21:00:45 2024 +0100
tdf#159666: sd_uiimpress: Add unittest
Change-Id: Id5e35e1514695bffeced718d48dcfeffc4a4d4d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163271
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sd/qa/unit/data/tdf159666.odg b/sd/qa/unit/data/tdf159666.odg
new file mode 100644
index ..6b407597f7ca
Binary files /dev/null and b/sd/qa/unit/data/tdf159666.odg differ
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 41c685feef36..d03e85dab6c8 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -288,6 +288,27 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf124708)
CPPUNIT_ASSERT_EQUAL(static_cast(16), pActualPage->GetObjCount());
}
+CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf159666)
+{
+createSdDrawDoc("tdf159666.odg");
+
+auto pXImpressDocument =
dynamic_cast(mxComponent.get());
+sd::ViewShell* pViewShell =
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pActualPage->GetObjCount());
+
+// Without the fix in place, this test would have crashed here
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+dispatchCommand(mxComponent, ".uno:Delete", {});
+
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pActualPage->GetObjCount());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pActualPage->GetObjCount());
+}
+
CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf143412)
{
createSdImpressDoc();
[Bug 159699] New: FILEOPEN: DOCX layout mangled
https://bugs.documentfoundation.org/show_bug.cgi?id=159699 Bug ID: 159699 Summary: FILEOPEN: DOCX layout mangled Product: LibreOffice Version: 6.1.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tele...@surfxs.nl Description: FILEOPEN: DOCX shows up mangled Steps to Reproduce: 1. Open attachment 192528 (bug 159675) 2. Save as DOCX (or DOC) 3. File -> Reload (Jumbled layout) It's a fileopen issue. The DOCX file opens fine with older versions Actual Results: Jumbled layout Expected Results: Same or nearly identical layout as ODT Reproducible: Always User Profile Reset: No Additional Info: Found in Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 4d381b54d1c598c181b4a21a8bf0db86eb4668d1 CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL threaded Version: 7.1.8.0.0+ (x64) / LibreOffice Community Build ID: a94b58277c7aeaa83ce14347cd0b8f7137969d03 CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: default; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL and in Version: 6.1.6.3 Build ID: 5896ab1714085361c45cf540f76f60673dd96a72 CPU threads: 4; OS: Windows 6.3; UI render: default; Locale: nl-NL (nl_NL); Calc: CL open fine with Versie: 5.3.5.2 Build ID: 50d9bf2b0a79cdb85a3814b592608037a682059d CPU-threads: 4; Besturingssysteem:Windows 6.2; UI-render: GL; Layout Engine: old; Locale: nl-NL (nl_NL); Calc: CL -- You are receiving this mail because: You are the assignee for the bug.
[Bug 124227] Calc chart - incomplete copy paste
https://bugs.documentfoundation.org/show_bug.cgi?id=124227 --- Comment #9 from Tex2002ans --- Following comment 6, I CANNOT reproduce. Copying/pasting the chart from Calc->Impress looks exactly the same to me. (Seems like it's been fixed since 2019.) - - - I retested in: Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: da48488a73ddd66ea24cf16bbc4f7b9c08e9bea1 CPU threads: 8; OS: Windows 10.0 Build 22631; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
core.git: desktop/win32
desktop/win32/source/loader.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c84e8a14e476a70989e66df142e7b2426df02617
Author: Stephan Bergmann
AuthorDate: Tue Jan 16 14:55:03 2024 +0100
Commit: Stephan Bergmann
CommitDate: Mon Feb 12 20:37:52 2024 +0100
Search for load-time variables in fundamental.override.ini
...instead of arbitrarily cramming them into bootstrap.ini. (And don't
force
those ini-files to have an additional [Win32] section, when
include/rtl/bootstrap.h demands that "An ini-file is only allowed to have
one
section, which must be named `[Bootstrap]` with the square brackets.")
Change-Id: I732bf9d771ea309eccd35b6db0f565a0c56a3c3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162188
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
(cherry picked from commit 50b14f26de63d22b9ad05ca51d9edc53e024e75e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163252
Tested-by: Jenkins
diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index b730d4119695..998eb189effc 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -215,11 +215,11 @@ int officeloader_impl(bool bAllowConsole)
bool fSuccess = false;
bool bFirst = true;
-// read limit values from bootstrap.ini
+// read limit values from fundamental.override.ini
unsigned int nMaxMemoryInMB = 0;
bool bExcludeChildProcesses = true;
-const WCHAR* szIniFile = L"\bootstrap.ini";
+const WCHAR* szIniFile = L"\fundamental.override.ini";
const size_t nDirLen = wcslen(szIniDirectory);
if (wcslen(szIniFile) + nDirLen < MAX_PATH)
{
@@ -232,8 +232,8 @@ int officeloader_impl(bool bAllowConsole)
boost::property_tree::ptree pt;
std::ifstream aFile(szBootstrapIni);
boost::property_tree::ini_parser::read_ini(aFile, pt);
-nMaxMemoryInMB = pt.get("Win32.LimitMaximumMemoryInMB",
nMaxMemoryInMB);
-bExcludeChildProcesses =
pt.get("Win32.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
+nMaxMemoryInMB = pt.get("Bootstrap.LimitMaximumMemoryInMB",
nMaxMemoryInMB);
+bExcludeChildProcesses =
pt.get("Bootstrap.ExcludeChildProcessesFromLimit", bExcludeChildProcesses);
}
catch (...)
{
[Bug 159698] New: Undo change doesn't restore previous layout
https://bugs.documentfoundation.org/show_bug.cgi?id=159698 Bug ID: 159698 Summary: Undo change doesn't restore previous layout Product: LibreOffice Version: Inherited From OOo Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tele...@surfxs.nl Description: Undo change doesn't restore previous layout Steps to Reproduce: 1. Open attachment 192528 (bug 159675 ) 2. Type after: Nom du perso: something (without overwrite enabled -> additional page is added 3. Press CTRL+Z Actual Results: CTRL+Z has no (visual) effect. Save & reload does show the proper layout Expected Results: Undo should be visible on screen Reproducible: Always User Profile Reset: No Additional Info: Found in Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 4d381b54d1c598c181b4a21a8bf0db86eb4668d1 CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL threaded and in Versie: 4.4.7.2 Build ID: f3153a8b245191196a4b6b9abd1d0da16eead600 Locale: nl_NL and in OpenOffice 2.2.0 -- You are receiving this mail because: You are the assignee for the bug.
core.git: vcl/win
vcl/win/window/salframe.cxx | 39 ++-
1 file changed, 6 insertions(+), 33 deletions(-)
New commits:
commit 6047341fd5933ba96a07a0fc7c4b8ae1fb0e73d5
Author: Stephan Bergmann
AuthorDate: Tue Jan 16 14:59:16 2024 +0100
Commit: Stephan Bergmann
CommitDate: Mon Feb 12 20:29:08 2024 +0100
EnableAttachThreadInputHack can be a normal bootstrap variable
(For simplicity, only treat a value of exactly "true" as enabling it, not
whatever else the original Boost property_tree code might have considered as
equivalent to "true".)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162189
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
(cherry picked from commit b5ed6906bd215f1338ae49e33d484350a26cb25f)
Conflicts:
vcl/win/window/salframe.cxx
Change-Id: I616c5d838d2b9046b3a92e01ebb68fc6deb37024
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163253
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 313ae0ffcf2d..121596eb5b8c 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -32,12 +32,7 @@
#include
-#include
-#include
-#include
-#include
-#include
-
+#include
#include
#include
#include
@@ -1951,33 +1946,11 @@ void WinSalFrame::SetAlwaysOnTop( bool bOnTop )
static bool EnableAttachThreadInputHack()
{
-OUString aBootstrapUri;
-if (osl_getProcessWorkingDir() != osl_Process_E_None)
-return false;
-aBootstrapUri += "/bootstrap.ini";
-
-OUString aSystemFileName;
-if (osl::FileBase::getSystemPathFromFileURL(aBootstrapUri,
aSystemFileName) != osl::FileBase::E_None)
-return false;
-if (aSystemFileName.getLength() > MAX_PATH)
-return false;
-
-// this uses the Boost ini parser, instead of tools::Config, as we already
use it to read other
-// values from bootstrap.ini in desktop/win32/source/loader.cxx, because
that watchdog process
-// can't access LO libs. This way the handling is consistent.
-try
-{
-boost::property_tree::ptree pt;
-std::ifstream aFile(o3tl::toW(aSystemFileName.getStr()));
-boost::property_tree::ini_parser::read_ini(aFile, pt);
-const bool bEnabled = pt.get("Win32.EnableAttachThreadInputHack",
false);
-SAL_WARN_IF(bEnabled, "vcl", "AttachThreadInput hack is enabled. Watch
out for deadlocks!");
-return bEnabled;
-}
-catch (...)
-{
-return false;
-}
+OUString s("$EnableAttachThreadInputHack");
+rtl::Bootstrap::expandMacros(s);
+const bool bEnabled = s == "true";
+SAL_WARN_IF(bEnabled, "vcl", "AttachThreadInput hack is enabled. Watch out
for deadlocks!");
+return bEnabled;
}
static void ImplSalToTop( HWND hWnd, SalFrameToTop nFlags )
core.git: bin/find-mergedlib-can-be-private.classes.results chart2/inc chart2/source include/basegfx include/comphelper include/docmodel include/drawinglayer include/editeng include/filter include/fra
bin/find-mergedlib-can-be-private.classes.results | 351 -- chart2/inc/ChartModel.hxx | 2 chart2/inc/ChartTypeManager.hxx| 3 chart2/inc/ChartView.hxx | 2 chart2/source/inc/Axis.hxx | 2 chart2/source/inc/AxisHelper.hxx | 3 chart2/source/inc/BaseGFXHelper.hxx| 23 chart2/source/inc/CharacterProperties.hxx | 8 chart2/source/inc/ChartModelHelper.hxx | 3 chart2/source/inc/ChartType.hxx| 2 chart2/source/inc/ChartTypeHelper.hxx | 3 chart2/source/inc/ChartTypeTemplate.hxx| 2 chart2/source/inc/ChartViewHelper.hxx | 9 chart2/source/inc/ColorPerPointHelper.hxx | 3 chart2/source/inc/ControllerLockGuard.hxx | 7 chart2/source/inc/DataSeries.hxx | 2 chart2/source/inc/DataSeriesHelper.hxx | 72 +- chart2/source/inc/DataSource.hxx | 3 chart2/source/inc/DataSourceHelper.hxx | 3 chart2/source/inc/DataTable.hxx| 4 chart2/source/inc/Diagram.hxx | 2 chart2/source/inc/DiagramHelper.hxx| 2 chart2/source/inc/ErrorBar.hxx | 3 chart2/source/inc/ExplicitCategoriesProvider.hxx | 3 chart2/source/inc/FillProperties.hxx | 4 chart2/source/inc/GridProperties.hxx | 2 chart2/source/inc/LabeledDataSequence.hxx | 3 chart2/source/inc/Legend.hxx | 2 chart2/source/inc/LegendHelper.hxx | 3 chart2/source/inc/LifeTime.hxx | 3 chart2/source/inc/LinePropertiesHelper.hxx | 4 chart2/source/inc/MediaDescriptorHelper.hxx| 3 chart2/source/inc/ModifyListenerCallBack.hxx | 3 chart2/source/inc/NumberFormatterWrapper.hxx | 3 chart2/source/inc/OPropertySet.hxx | 4 chart2/source/inc/ObjectIdentifier.hxx | 2 chart2/source/inc/PopupRequest.hxx | 3 chart2/source/inc/PropertyHelper.hxx | 17 chart2/source/inc/ReferenceSizeProvider.hxx| 2 chart2/source/inc/RegressionCurveHelper.hxx| 61 - chart2/source/inc/RelativePositionHelper.hxx | 3 chart2/source/inc/RelativeSizeHelper.hxx | 3 chart2/source/inc/SceneProperties.hxx | 5 chart2/source/inc/StatisticsHelper.hxx | 25 chart2/source/inc/ThreeDHelper.hxx | 3 chart2/source/inc/Title.hxx| 2 chart2/source/inc/TitleHelper.hxx | 2 chart2/source/inc/UserDefinedProperties.hxx| 3 chart2/source/inc/WrappedDefaultProperty.hxx | 2 chart2/source/inc/WrappedDirectStateProperty.hxx | 2 chart2/source/inc/WrappedIgnoreProperty.hxx| 4 chart2/source/inc/WrappedProperty.hxx | 3 chart2/source/inc/WrappedPropertySet.hxx | 3 chart2/source/inc/chartview/DataPointSymbolSupplier.hxx| 2 chart2/source/inc/chartview/DrawModelWrapper.hxx | 2 chart2/source/inc/chartview/ExplicitScaleValues.hxx| 5 chart2/source/inc/chartview/ExplicitValueProvider.hxx | 3 include/basegfx/color/bcolormodifier.hxx | 2 include/basegfx/utils/systemdependentdata.hxx
[Bug 159683] Crash on closing LibreOffice with certain content on the clipboard
https://bugs.documentfoundation.org/show_bug.cgi?id=159683 Julien Nabet changed: What|Removed |Added OS|Windows (All) |All Keywords||haveBacktrace -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159683] Crash on closing LibreOffice with certain content on the clipboard
https://bugs.documentfoundation.org/show_bug.cgi?id=159683 Julien Nabet changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #7 from Julien Nabet --- Created attachment 192529 --> https://bugs.documentfoundation.org/attachment.cgi?id=192529=edit bt On pc Debian x86-64 with master sources updated today, I got an assertion. I noticed that if I wait a bit more once the file is opened (I mean until there's no extra log in console), I don't get the assertion. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 141073] Crash on multiple open documents with UI Tabbed, Tabbed Compact, Contextual Single
https://bugs.documentfoundation.org/show_bug.cgi?id=141073 --- Comment #7 from Yulay Fatkullin --- relevant for: Version: 7.6.4.1 (X86_64) / LibreOffice Community Build ID: e19e193f88cd6c0525a17fb7a176ed8e6a3e2aa1 CPU threads: 4; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: ru-RU Calc: CL threaded Version: 24.2.0.3 (X86_64) / LibreOffice Community Build ID: da48488a73ddd66ea24cf16bbc4f7b9c08e9bea1 CPU threads: 4; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: ru-RU Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
core.git: sal/rtl
sal/rtl/bootstrap.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit a993b2823a106d15a50005567266acfe2f65e28f
Author: Stephan Bergmann
AuthorDate: Fri Jan 26 12:43:37 2024 +0100
Commit: Stephan Bergmann
CommitDate: Mon Feb 12 19:43:06 2024 +0100
Log uses of fundamental.override.ini
Change-Id: I36fa44b063a439edf5411a89f76ec342b1388351
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162601
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
(cherry picked from commit 6d553405101090ef7a7ff5270e5ef32aa41bd9b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163254
Tested-by: Jenkins
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 27773e8a3b42..485d582cc875 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -479,7 +479,10 @@ bool Bootstrap_Impl::getValue(
if (_override_base_ini != nullptr
&& _override_base_ini->getDirectValue(key, value, mode, requestStack))
+{
+SAL_INFO("sal.bootstrap", "getValue(" << key << ") from
fundamental.override.ini");
return true;
+}
if (key == "_OS")
{
[Bug 159390] when a comment box is made very wide, then it does not print properly,
https://bugs.documentfoundation.org/show_bug.cgi?id=159390 --- Comment #4 from vena.c...@virgin.net --- I just wanted to clarify what was confirmed above. The bug that I reported, is not that the comment box is printed in the margin. The problem is the the comment box is printed right across the margin and goes off the page, so that that the right side of the text box is not printed on the page nor the margin. -- You are receiving this mail because: You are the assignee for the bug.
[Bug 125943] [META] Qt5 VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=125943 Bug 125943 depends on bug 125934, which changed state. Bug 125934 Summary: No application icon on Wayland with the qt5 / kf5 backend https://bugs.documentfoundation.org/show_bug.cgi?id=125934 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 102495] [META] KDE (kf5) VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Bug 102495 depends on bug 125934, which changed state. Bug 125934 Summary: No application icon on Wayland with the qt5 / kf5 backend https://bugs.documentfoundation.org/show_bug.cgi?id=125934 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 100156] [META] Wayland-related bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=100156 Bug 100156 depends on bug 125934, which changed state. Bug 125934 Summary: No application icon on Wayland with the qt5 / kf5 backend https://bugs.documentfoundation.org/show_bug.cgi?id=125934 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 141776] Shown mnemonic/accelerators in Start Center require + key on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=141776 --- Comment #43 from ska...@yahoo.co.uk --- (In reply to V Stuart Foote from comment #42) > (In reply to skagon from comment #39) > >... > > Yeah, why would I care about a bug that was not submitted by me, and solves > > nothing I'd care about? Let whoever submitted that bug check if it was > > resolved or not. > > Because, as you are dependent on others to design and implement this open > source software, actually testing and commenting on what is relevant to the > project would be more appreciated than your intransigent position. > > Alternatively code submissions are welcome. Looking forward to your first > submission. My first code here would be to undo this crap. Oh, wait… You WONTFIX, then I WONTTEST… -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159675] FORMATTING - Text in column disappears when modified
https://bugs.documentfoundation.org/show_bug.cgi?id=159675 --- Comment #4 from ludovic.cre...@gmail.com --- Created attachment 192528 --> https://bugs.documentfoundation.org/attachment.cgi?id=192528=edit Sample file showing issues Adding a line in one of the two bottom sub-columns creates an offset in the next page / main column. Removing a line break hides the text of the whole sub-column. -- You are receiving this mail because: You are the assignee for the bug.
core.git: include/rtl sal/rtl
include/rtl/bootstrap.h | 14 +++---
sal/rtl/bootstrap.cxx | 112 ++--
2 files changed, 89 insertions(+), 37 deletions(-)
New commits:
commit 8b53fa726e0d496f18228b0ca9ce2f61196f6a57
Author: Stephan Bergmann
AuthorDate: Tue Jan 16 14:41:21 2024 +0100
Commit: Stephan Bergmann
CommitDate: Mon Feb 12 19:02:13 2024 +0100
Introduce a fundamental.override.ini for bootstrap variables
...that is looked for next to the application and, when present, overrides
all
the other ways of setting bootstrap variables. LibreOffice itself does not
bring along such a fundamental.override.ini, but it can be convenient for an
administrator to place one in the installation (which can then not be
modified
or overridden by end users).
(For convenience, the naming of this ini-file starts to deviate from the
old and
rather pointless tradition of naming our ini-files *rc vs. *.ini on
different
platforms.)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162187
Tested-by: Stephan Bergmann
Reviewed-by: Stephan Bergmann
(cherry picked from commit f4d376e9a10a8c66f7f6ecfe6a1f4763c1927b52)
Conflicts:
sal/rtl/bootstrap.cxx
Change-Id: I057cc67b1af1d806587c3a4dc0bc31c28e79d22b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163251
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/bootstrap.h b/include/rtl/bootstrap.h
index e532cd0e3dac..b4d85305987b 100644
--- a/include/rtl/bootstrap.h
+++ b/include/rtl/bootstrap.h
@@ -45,27 +45,29 @@ extern "C" {
the next level is tried. Every query starts at the first level again, so
that one setting may be taken from the 3rd and one from the 1st level.
- 1st level: explicitly set variables via rtl_bootstrap_set()
+ 1st level: a fundamental.override.ini next to the application
- 2nd level: command line arguments. A `-env:SETTINGNAME=value` is given on
+ 2nd level: explicitly set variables via rtl_bootstrap_set()
+
+ 3rd level: command line arguments. A `-env:SETTINGNAME=value` is given on
command line. This allows giving an application a certain setting, even
if an ini-file exists (especially useful for e.g. daemons that want to
start an executable with dynamical changing settings).
- 3rd level: environment variables. The application tries to get the
+ 4th level: environment variables. The application tries to get the
setting from the environment.
- 4th level: executable ini-file. Every application looks for an ini-file.
+ 5th level: executable ini-file. Every application looks for an ini-file.
The filename defaults to `/absolute/path/to/executable[rc|.ini]`
without .bin or .exe suffix. The ini-filename can be
set by the special command line parameter
`-env:INIFILENAME=/absolute/path/to/inifile` at runtime or it may
be set at compile time by an API-call.
- 5th level: URE_BOOTSTRAP ini-file. If the bootstrap variable URE_BOOTSTRAP
+ 6th level: URE_BOOTSTRAP ini-file. If the bootstrap variable URE_BOOTSTRAP
expands to the URL of an ini-file, that ini-file is searched.
- 6th level: default. An application can have some default settings decided
+ 7th level: default. An application can have some default settings decided
at compile time, which allow the application to run even with no
deployment settings.
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index a3ada36a4439..27773e8a3b42 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -207,37 +207,44 @@ static void getExecutableDirectory_Impl(rtl_uString **
ppDirURL)
rtl_uString_newFromStr_WithLength(ppDirURL,fileName.getStr(),nDirEnd);
}
-static OUString & getIniFileName_Impl()
-{
-static OUString aStaticName = []() {
-OUString fileName;
+static OUString getIniFileName(bool overriding) {
+OUString fileName;
#if defined IOS
-// On iOS hardcode the inifile as "rc" in the .app
-// directory. Apps are self-contained anyway, there is no
-// possibility to have several "applications" in the same
-// installation location with different inifiles.
-const char *inifile = [[@"vnd.sun.star.pathname:"
stringByAppendingString: [[[NSBundle mainBundle] bundlePath]
stringByAppendingPathComponent: @"rc"]] UTF8String];
-fileName = OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8);
-resolvePathnameUrl();
+// On iOS hardcode the inifile as "rc" in the .app
+// directory. Apps are self-contained anyway, there is no
+// possibility to have several "applications" in the same
+// installation location with different inifiles.
+const char *inifile = [[@"vnd.sun.star.pathname:" stringByAppendingString:
[[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent: (overriding
? @"fundamental.override.ini" : @"rc")]] UTF8String];
+fileName =
[Bug 150900] [META] Excel Functions
https://bugs.documentfoundation.org/show_bug.cgi?id=150900 Bug 150900 depends on bug 127293, which changed state. Bug 127293 Summary: Add XLOOKUP function in Calc https://bugs.documentfoundation.org/show_bug.cgi?id=127293 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Bug 107657] [META] Font effects bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107657 V Stuart Foote changed: What|Removed |Added Depends on||159696 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=159696 [Bug 159696] Small capitals with 'Underlining' does not react to the flag for 'Single words' -- You are receiving this mail because: You are the assignee for the bug.
core.git: config_host/config_options.h.in config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1 config_host/config_options.h.in|2 configure.ac | 31 ++-- solenv/gbuild/extensions/pre_MergedLibsList.mk | 60 + 4 files changed, 87 insertions(+), 7 deletions(-) New commits: commit b663d94cf67a5af4fd89c1ac8bdffd6059f6bf85 Author: Noel Grandin AuthorDate: Mon Feb 5 08:50:24 2024 +0200 Commit: Noel Grandin CommitDate: Mon Feb 12 18:52:42 2024 +0100 create --enable-mergelibs=more The existing --enable-mergelibs is in use by Linux distro people, who do not want any further mergeing because they want to be able to split libreoffice up into things like nogui, calc, writer, dbaccess, etc. So this work is to enable combining even more into libmerged for platforms like Windows and macOS and COOL, where we really want everything in one big lump of code. Change-Id: I4b268864955747d9859e16ebb569debbfc32fa78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162999 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/config_host.mk.in b/config_host.mk.in index ddca2a41ca05..04745d508fc3 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -479,6 +479,7 @@ export BUNDLE_MARIADB_CONNECTOR_C=@BUNDLE_MARIADB_CONNECTOR_C@ export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@ export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@ export MERGELIBS=@MERGELIBS@ +export MERGELIBS_MORE=@MERGELIBS_MORE@ export ML_EXE=@ML_EXE@ export MOC5=@MOC5@ export MOC6=@MOC6@ diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in index 37f044f1b493..abce3417e45a 100644 --- a/config_host/config_options.h.in +++ b/config_host/config_options.h.in @@ -7,6 +7,8 @@ #define ENABLE_MERGELIBS 0 +#define ENABLE_MERGELIBS_MORE 0 + #define ENABLE_RUNTIME_OPTIMIZATIONS 0 // Used to turn off visibility for some classes/symbols when linking with --enable-mergelibs diff --git a/configure.ac b/configure.ac index 6440f1f734dc..48b325790b80 100644 --- a/configure.ac +++ b/configure.ac @@ -1525,8 +1525,11 @@ libo_FUZZ_ARG_ENABLE(skia, dnl -- *** -- libo_FUZZ_ARG_ENABLE(mergelibs, -AS_HELP_STRING([--enable-mergelibs], -[Merge several of the smaller libraries into one big, "merged", one.]) +AS_HELP_STRING([--enable-mergelibs=yes/no/more], +[Merge several of the smaller libraries into one big "merged" library. + The "more" option will link even more of the smaller libraries. + "more" not appropriate for distros which split up LibreOffice into multiple packages. + It is only appropriate for situations where all of LO is delivered in a single install/package. ]) ) libo_FUZZ_ARG_ENABLE(breakpad, @@ -14815,6 +14818,7 @@ AC_LANG_POP([C++]) # === AC_MSG_CHECKING([whether to create huge library]) MERGELIBS= +MERGELIBS_MORE= if test $_os = iOS -o $_os = Android; then # Never any point in mergelibs for these as we build just static @@ -14823,16 +14827,29 @@ if test $_os = iOS -o $_os = Android; then fi if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then -if test $_os != Linux -a $_os != WINNT; then -add_warning "--enable-mergelibs is not tested for this platform" +if test "$enable_mergelibs" = "more"; then +if test $_os != Linux; then +add_warning "--enable-mergelibs=more is not tested for this platform" +fi +MERGELIBS="TRUE" +MERGELIBS_MORE="TRUE" +AC_MSG_RESULT([yes (more)]) +AC_DEFINE(ENABLE_MERGELIBS) +elif test "$enable_mergelibs" = "yes" -o "$enable_mergelibs" = ""; then +if test $_os != Linux -a $_os != WINNT; then +add_warning "--enable-mergelibs is not tested for this platform" +fi +MERGELIBS="TRUE" +AC_MSG_RESULT([yes]) +AC_DEFINE(ENABLE_MERGELIBS) +else +AC_MSG_ERROR([unknown value --enable-mergelibs=$enable_mergelibs]) fi -MERGELIBS="TRUE" -AC_MSG_RESULT([yes]) -AC_DEFINE(ENABLE_MERGELIBS) else AC_MSG_RESULT([no]) fi AC_SUBST([MERGELIBS]) +AC_SUBST([MERGELIBS_MORE]) dnl === dnl icerun is a wrapper that stops us spawning tens of processes diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 2763929de360..c2ec1e3b083b 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -113,6 +113,66 @@ gb_MERGE_LIBRARY_LIST := \ xsltfilter \ xstor \ +# if we have --enable-mergelibs=more +ifneq ($(MERGELIBS_MORE),) + +gb_MERGE_LIBRARY_LIST += \ + analysis \ + animcore \ + $(call gb_Helper_optional,AVMEDIA, \ + $(if $(filter MACOSX,$(OS)),\ +
[Bug 159696] Small capitals with 'Underlining' does not react to the flag for 'Single words'
https://bugs.documentfoundation.org/show_bug.cgi?id=159696 V Stuart Foote changed: What|Removed |Added Blocks||107657 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=107657 [Bug 107657] [META] Font effects bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159696] Small capitals with 'Underlining' does not react to the flag for 'Single words'
https://bugs.documentfoundation.org/show_bug.cgi?id=159696 V Stuart Foote changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 CC||vsfo...@libreoffice.org See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=98 ||367 --- Comment #1 from V Stuart Foote --- Confirmed with STR The 'individual words' is honored in the Character... dialog 'Font affects' preview, but not on the slide canvas. Small Caps are otherwise correct (bug 98367). Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 17fc445938dedb05125a6d6a5b4ce7f34ea95f59 CPU threads: 8; OS: Windows 10.0 Build 22621; UI render: Skia/Vulkan; VCL: win Locale: en-US (en_US); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Bug 159685] FILEOPEN PPTX: Mathematical Equation is missing (which works in 7.6.4.1 and broken in 24.2.0.3 (tested on windows))
https://bugs.documentfoundation.org/show_bug.cgi?id=159685 V Stuart Foote changed: What|Removed |Added CC||vsfo...@libreoffice.org --- Comment #5 from V Stuart Foote --- Can't reproduce Win11 with current master against 24.8. The imported OLE formulas are fully rendered to Impress canvas using default OpenSymbol fonts. Please check the font you are using, double click a formula and check the Format -> Fonts... dialog for the OLE. Version: 24.8.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 17fc445938dedb05125a6d6a5b4ce7f34ea95f59 CPU threads: 8; OS: Windows 10.0 Build 22621; UI render: Skia/Vulkan; VCL: win Locale: en-US (en_US); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
core.git: 2 commits - bridges/IwyuFilter_bridges.yaml vcl/qt5
bridges/IwyuFilter_bridges.yaml |3 +++
vcl/qt5/QtFrame.cxx | 14 ++
2 files changed, 17 insertions(+)
New commits:
commit cea0371ac77145ad1f3db7e558c279aeed6f4d00
Author: Michael Weghorn
AuthorDate: Mon Feb 12 14:09:45 2024 +0100
Commit: Michael Weghorn
CommitDate: Mon Feb 12 18:19:03 2024 +0100
tdf#125934 qt: Support module-specific window icons on Wayland
As discussed in QTBUG-77182 [1], Qt currently doesn't provide
API to directly set the app_id for a single window/toplevel on Wayland,
but the one set for the application is used when the window gets shown.
Make use of that by temporarily setting the app's desktop file
name and doing a hide/show cycle in `QtFrame::SetIcon` on
Wayland.
A big thanks for David Redondo for mentioning that possibility
in QTBUG-77182!
An alternative would be to use private Qt API and low-level wayland API to
set the app_id directly, s. discussion in QTBUG-77182.
[1] https://bugreports.qt.io/browse/QTBUG-77182
Change-Id: I2a93cd39756e2ebf55b91486927d73d3896245b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163249
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 24dcb5ff6f61..6aff814aacd2 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -376,6 +376,20 @@ void QtFrame::SetIcon(sal_uInt16 nIcon)
QIcon aIcon = QIcon::fromTheme(appicon);
m_pQWidget->window()->setWindowIcon(aIcon);
+
+if (QGuiApplication::platformName() == "wayland" &&
m_pQWidget->window()->isVisible())
+{
+// Qt currently doesn't provide API to directly set the app_id for a
single
+// window/toplevel on Wayland, but the one set for the application is
picked up
+// on hide/show, so do that.
+// An alternative would be to use private Qt API and low-level wayland
API to set the
+// app_id directly, s. discussion in QTBUG-77182.
+const QString sOrigDesktopFileName =
QGuiApplication::desktopFileName();
+QGuiApplication::setDesktopFileName(appicon);
+m_pQWidget->window()->hide();
+m_pQWidget->window()->show();
+QGuiApplication::setDesktopFileName(sOrigDesktopFileName);
+}
}
void QtFrame::SetMenu(SalMenu*) {}
commit 9d994e7ba64588d144f028d8873bedae42f3d021
Author: Gabor Kelemen
AuthorDate: Fri Feb 9 12:49:02 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Feb 12 18:18:59 2024 +0100
Fix IwyuFilter in bridges
after commit b3fa6e6e65031f92d7f13b44f8422fe4aa07e2f9
Change-Id: I79e99d13d982f2190473904db4d63886c479b4f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163167
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/bridges/IwyuFilter_bridges.yaml b/bridges/IwyuFilter_bridges.yaml
index 071db0504370..00fbd47b3e87 100644
--- a/bridges/IwyuFilter_bridges.yaml
+++ b/bridges/IwyuFilter_bridges.yaml
@@ -7,6 +7,9 @@ excludelist:
bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx:
# No .hxx -> .h replacement in URE headers
- typelib/typedescription.hxx
+bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx:
+# Actually needed for ifdefs to work in all cases
+- share.hxx
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:
# Actually needed
- callvirtualmethod.hxx
core.git: 2 commits - configure.ac include/svx sw/inc sw/sdi sw/source sw/uiconfig
configure.ac|2
include/svx/relfld.hxx |1
sw/inc/cmdid.h |5
sw/inc/strings.hrc |7 +
sw/sdi/_tabsh.sdi | 20 +++
sw/sdi/swriter.sdi | 50 +
sw/source/uibase/shells/tabsh.cxx | 144 +++
sw/source/uibase/sidebar/TableEditPanel.cxx | 147 +++-
sw/source/uibase/sidebar/TableEditPanel.hxx | 11 ++
sw/uiconfig/swriter/ui/sidebartableedit.ui | 115 +
10 files changed, 493 insertions(+), 9 deletions(-)
New commits:
commit 828d2637fd3120bfd342b41548caf9c55fc0f603
Author: Oliver Specht
AuthorDate: Tue Jan 30 17:07:46 2024 +0100
Commit: Gabor Kelemen
CommitDate: Mon Feb 12 18:17:18 2024 +0100
tdf#159662 Add table alignment and left/right spacing to sidebar in Writer
Change-Id: I12d898f21ca8c7d581aaa1c587c5b6434a35f516
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162769
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 8bc4c05580ec..85cec451cb94 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -46,6 +46,7 @@ public:
voidEnableNegativeMode() {bNegativeEnabled = true;}
void set_sensitive(bool sensitive) {
m_xSpinButton->set_sensitive(sensitive); }
+bool get_sensitive() const { return m_xSpinButton->get_sensitive(); }
void set_value(int nValue, FieldUnit eValueUnit) {
m_xSpinButton->set_value(nValue, eValueUnit); }
int get_value(FieldUnit eDestUnit) const { return
m_xSpinButton->get_value(eDestUnit); }
int get_min(FieldUnit eValueUnit) const { return
m_xSpinButton->get_min(eValueUnit); }
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 4773f173d603..e8521380c62c 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -520,7 +520,10 @@ class SwUINumRuleItem;
#define FN_FORMAT_APPLY_DEFAULT (FN_FORMAT2 + 157)
#define FN_FORMAT_APPLY_TEXTBODY(FN_FORMAT2 + 158)
#define FN_REMOVE_DIRECT_CHAR_FORMATS (FN_FORMAT2 + 159)
-//free (160)
+#define SID_ATTR_TABLE_ALIGNMENT(FN_FORMAT2 + 160)
+#define SID_ATTR_TABLE_LEFT_SPACE (FN_FORMAT2 + 161)
+#define SID_ATTR_TABLE_RIGHT_SPACE (FN_FORMAT2 + 162)
+//free (163 except 194 already used above)
// Region: Extras
#define FN_LINE_NUMBERING_DLG (FN_EXTRA + 2 ) /* */
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8f3eadcab6d8..b3e9a9370bfc 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1492,6 +1492,13 @@
#define STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP
NC_("STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP", "Render non-breaking spaces (NBSP)
as standard-space-width (off for fixed size)")
#define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after
number in footnotes / endnotes with hanging first line")
+#define STR_TABLE_PANEL_ALIGN_AUTO
NC_("sidebartableedit|alignautolabel", "Automatic")
+#define STR_TABLE_PANEL_ALIGN_LEFT
NC_("sidebartableedit|alignleftlabel", "Left")
+#define STR_TABLE_PANEL_ALIGN_FROM_LEFT
NC_("sidebartableedit|alignfromleftlabel", "From left")
+#define STR_TABLE_PANEL_ALIGN_RIGHT
NC_("sidebartableedit|alignrightlabel", "Right")
+#define STR_TABLE_PANEL_ALIGN_CENTER
NC_("sidebartableedit|aligncenterlabel", "Center")
+#define STR_TABLE_PANEL_ALIGN_MANUAL
NC_("sidebartableedit|alignmanuallabel", "Manual")
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index e4b6b9a2dd6c..7596d2c29bda 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -446,5 +446,25 @@ interface BaseTextTable
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
+
+SID_ATTR_TABLE_ALIGNMENT
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_LEFT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
+SID_ATTR_TABLE_RIGHT_SPACE
+[
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
}
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 861d5ccec21a..16d939a8903d 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -8693,6 +8693,56 @@ SfxUInt32Item TableColumWidth SID_ATTR_TABLE_COLUMN_WIDTH
GroupId = SfxGroupId::Table;
]
+SfxUInt32Item TableAlignment SID_ATTR_TABLE_ALIGNMENT
+(SfxInt32Item TableLeftSpace SID_ATTR_TABLE_LEFT_SPACE, SfxInt32Item
TableRightSpace SID_ATTR_TABLE_RIGHT_SPACE)
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc =
[Bug 141776] Shown mnemonic/accelerators in Start Center require + key on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=141776 V Stuart Foote changed: What|Removed |Added Keywords|needsUXEval | CC|ilmari.lauhakangas@libreoff | |ice.org,| |libreoffice-ux-advise@lists | |.freedesktop.org, | |pavlograd...@gmail.com, | |vsfo...@libreoffice.org | -- You are receiving this mail because: You are the assignee for the bug.
[Bug 141776] Shown mnemonic/accelerators in Start Center require + key on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=141776 V Stuart Foote changed: What|Removed |Added Keywords|needsUXEval | CC|ilmari.lauhakangas@libreoff | |ice.org,| |libreoffice-ux-advise@lists | |.freedesktop.org, | |pavlograd...@gmail.com, | |vsfo...@libreoffice.org | -- You are receiving this mail because: You are on the CC list for the bug.
[Bug 141776] Shown mnemonic/accelerators in Start Center require + key on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=141776 V Stuart Foote changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #42 from V Stuart Foote --- (In reply to skagon from comment #39) >... > Yeah, why would I care about a bug that was not submitted by me, and solves > nothing I'd care about? Let whoever submitted that bug check if it was > resolved or not. Because, as you are dependent on others to design and implement this open source software, actually testing and commenting on what is relevant to the project would be more appreciated than your intransigent position. Alternatively code submissions are welcome. Looking forward to your first submission. -- You are receiving this mail because: You are on the CC list for the bug.
[Bug 141776] Shown mnemonic/accelerators in Start Center require + key on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=141776 V Stuart Foote changed: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #42 from V Stuart Foote --- (In reply to skagon from comment #39) >... > Yeah, why would I care about a bug that was not submitted by me, and solves > nothing I'd care about? Let whoever submitted that bug check if it was > resolved or not. Because, as you are dependent on others to design and implement this open source software, actually testing and commenting on what is relevant to the project would be more appreciated than your intransigent position. Alternatively code submissions are welcome. Looking forward to your first submission. -- You are receiving this mail because: You are the assignee for the bug.
core.git: Branch 'libreoffice-7-6' - svgio/qa svgio/source
svgio/qa/cppunit/SvgImportTest.cxx | 21 ++---
svgio/qa/cppunit/data/tdf159594.svg |7 +++
svgio/source/svgreader/svgsymbolnode.cxx |8 +++-
3 files changed, 28 insertions(+), 8 deletions(-)
New commits:
commit 81454c1c3a98860a82fa54fd3a417d3bcb72f8ae
Author: Xisco Fauli
AuthorDate: Tue Feb 6 12:50:59 2024 +0100
Commit: Michael Weghorn
CommitDate: Mon Feb 12 18:13:58 2024 +0100
tdf#159601, tdf#159594: reuse target for symbols' children
Regression from e7186b49a9a0b24ddc3b1c5384b5d9facb03518c
"tdf#158445: support viewBox in symbol elements"
Change-Id: Ie2198c47149def17fa3cb612046b61bf32e873bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163046
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
(cherry picked from commit 8b7dbf40a06bc900562887889c17606ae5ef0587)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163015
Tested-by: Xisco Fauli
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163127
Reviewed-by: Michael Weghorn
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index a97f5084cb38..90b62bcce7ff 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -1601,9 +1601,24 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf158445)
CPPUNIT_ASSERT (pDocument);
-assertXPath(pDocument,
"/primitive2D/transform/transform/transform/transform/polypolygoncolor",
"color", "#00");
-assertXPath(pDocument,
"/primitive2D/transform/transform/transform/transform/polypolygoncolor/polypolygon",
"height", "8.052");
-assertXPath(pDocument,
"/primitive2D/transform/transform/transform/transform/polypolygoncolor/polypolygon",
"width", "5.328");
+assertXPath(pDocument,
"/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor",
"color", "#00");
+assertXPath(pDocument,
"/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor/polypolygon",
"height", "8.052");
+assertXPath(pDocument,
"/primitive2D/transform/mask/transform/transform/transform/polypolygoncolor/polypolygon",
"width", "5.328");
+}
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf159594)
+{
+Primitive2DSequence aSequence =
parseSvg(u"/svgio/qa/cppunit/data/tdf159594.svg");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument =
dumper.dumpAndParse(Primitive2DContainer(aSequence));
+
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument,
"/primitive2D/transform/transform/polypolygoncolor", "color", "#00");
+assertXPath(pDocument,
"/primitive2D/transform/transform/polypolygoncolor/polypolygon", "height",
"11.671875");
+assertXPath(pDocument,
"/primitive2D/transform/transform/polypolygoncolor/polypolygon", "width",
"7.5");
}
CPPUNIT_TEST_FIXTURE(Test, testTdf97663)
diff --git a/svgio/qa/cppunit/data/tdf159594.svg
b/svgio/qa/cppunit/data/tdf159594.svg
new file mode 100644
index ..c2b470ec0fdc
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf159594.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg;
xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="0 0 100 100" version="1.1">
+
+
+
+
+
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx
b/svgio/source/svgreader/svgsymbolnode.cxx
index b5125357f61c..222880d1cba2 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -126,12 +126,10 @@ namespace svgio::svgreader
void
SvgSymbolNode::decomposeSvgNode(drawinglayer::primitive2d::Primitive2DContainer&
rTarget, bool bReferenced) const
{
-drawinglayer::primitive2d::Primitive2DContainer aNewTarget;
-
// decompose children
-SvgNode::decomposeSvgNode(aNewTarget, bReferenced);
+SvgNode::decomposeSvgNode(rTarget, bReferenced);
-if(aNewTarget.empty())
+if (rTarget.empty())
return;
if(getViewBox())
@@ -157,7 +155,7 @@ namespace svgio::svgreader
const drawinglayer::primitive2d::Primitive2DReference xRef(
new drawinglayer::primitive2d::TransformPrimitive2D(
aEmbeddingTransform,
-std::move(aNewTarget)));
+
drawinglayer::primitive2d::Primitive2DContainer(rTarget)));
rTarget.push_back(xRef);
}
