[Libreoffice-bugs] [Bug 148131] the standard date format of NNNND MMMM YYYY add a spurious 0
https://bugs.documentfoundation.org/show_bug.cgi?id=148131 Brian Quarterman changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #3 from Brian Quarterman --- User error - cell contained a valid date with the addition character. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 146962] Track Changes: Deleting rows in Hide Changes mode doesn't hide the deleted rows immediately (only changing to Show Changes, and back to Hide Changes)
https://bugs.documentfoundation.org/show_bug.cgi?id=146962 László Németh changed: What|Removed |Added Assignee|nem...@numbertext.org |libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143002] [META] Tracked Changes of tables
https://bugs.documentfoundation.org/show_bug.cgi?id=143002 László Németh changed: What|Removed |Added Depends on||148346 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148346 [Bug 148346] Writer track changes: missing Redo of tracked table row deletion in Hide Changes mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143002] [META] Tracked Changes of tables
https://bugs.documentfoundation.org/show_bug.cgi?id=143002 Bug 143002 depends on bug 148345, which changed state. Bug 148345 Summary: Writer track changes: not visible Reject Changes of tracked table row deletion in Hide Changes mode https://bugs.documentfoundation.org/show_bug.cgi?id=148345 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143002] [META] Tracked Changes of tables
https://bugs.documentfoundation.org/show_bug.cgi?id=143002 László Németh changed: What|Removed |Added Depends on||148345 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148345 [Bug 148345] Writer track changes: not visible Reject Changes of tracked table row deletion in Hide Changes mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148345] Writer track changes: not visible Reject Changes of tracked table row deletion in Hide Changes mode
https://bugs.documentfoundation.org/show_bug.cgi?id=148345 László Németh changed: What|Removed |Added Resolution|--- |FIXED Status|ASSIGNED|RESOLVED CC||nem...@numbertext.org Assignee|nem...@numbertext.org |libreoffice-b...@lists.free ||desktop.org Blocks||143002 Keywords|filter:docx | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=143002 [Bug 143002] [META] Tracked Changes of tables -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter3.cxx | 53
sw/source/uibase/app/docsh2.cxx | 42
2 files changed, 95 insertions(+)
New commits:
commit d4e2ed9324bd736275f07577ba81c974a0a70eb1
Author: László Németh
AuthorDate: Mon Apr 4 18:46:17 2022 +0200
Commit: László Németh
CommitDate: Tue Apr 5 07:48:18 2022 +0200
tdf#148345 sw: reject all tracked row deletion in Hide Changes
In Hide Changes mode, undeleted rows didn't reappear at applying
Reject All for tracked row deletions.
See also commit a74c51025fa4519caaf461492e4ed8e68bd34885
"tdf#146962 sw: hide deleted row at deletion in Hide Changes".
Change-Id: I55d76fb0165fefc330934c5a2a6b018904d3a1a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132527
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 839106e5d41c..654e08ace527 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -2416,6 +2416,59 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf147347)
assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf148345)
+{
+// load a 2-row table, set Hide Changes mode and delete the first row with
change tracking
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf116789.fodt");
+CPPUNIT_ASSERT(pDoc);
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+// enable redlining
+dispatchCommand(mxComponent, ".uno:TrackChanges", {});
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+ pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+// hide changes
+dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines());
+
+dispatchCommand(mxComponent, ".uno:DeleteRows", {});
+
+// Without the fix in place, the deleted row would be visible
+
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+// This was 2
+assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 1);
+
+// check it in Show Changes mode
+
+dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+CPPUNIT_ASSERT(!pWrtShell->GetLayout()->IsHideRedlines());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+// 2 rows are visible now
+assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2);
+
+// check it in Hide Changes mode again
+
+dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+// only a single row is visible again
+assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 1);
+
+// tdf#148227 check Reject All of tracked table row deletion
+
+dispatchCommand(mxComponent, ".uno:RejectAllTrackedChanges", {});
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+// This was 1
+assertXPath(pXmlDoc, "/root/page[1]/body/tab/row", 2);
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135014)
{
createSwDoc();
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index a443e1574c78..92514a5e1486 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -69,6 +69,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1296,6 +1297,39 @@ void SwDocShell::Execute(SfxRequest& rReq)
break;
}
+// tables with tracked deletion need Show Changes
+bool bHideChanges = pWrtShell && pWrtShell->GetLayout() &&
+pWrtShell->GetLayout()->IsHideRedlines();
+bool bChangedHideChanges = false;
+if ( bHideChanges )
+{
+SwTableNode* pOldTableNd = nullptr;
+const SwRedlineTable& aRedlineTable =
rRedlineAccess.GetRedlineTable();
+for (SwRedlineTable::size_type n = 0; n <
aRedlineTable.size(); ++n)
+{
+const SwRangeRedline* pRedline = aRedlineTable[n];
+if ( pRedline->GetType() == RedlineType::Delete )
+{
+SwTableNode* pTableNd =
+
pRedline->GetPoint()->nNode.GetNode().FindTableNode();
+if ( pTableNd && pTableNd !=
+pOldTableNd &&
pTableNd->GetTable().HasDeletedRow() )
+{
+SfxBoolItem aShow(FN_REDLINE_SHOW, true);
+SfxViewShell* pViewShell = GetView()
+? GetView()
+: SfxViewShell::Current();
+
[Libreoffice-bugs] [Bug 148380] FILESAVE DOCX: CreateDate field saved as plain text "DocInformation:Created"
https://bugs.documentfoundation.org/show_bug.cgi?id=148380 Justin L changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |jl...@mail.com |desktop.org | Keywords||filter:docx Status|UNCONFIRMED |ASSIGNED Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148380] New: FILESAVE DOCX: CreateDate field saved as plain text "DocInformation:Created"
https://bugs.documentfoundation.org/show_bug.cgi?id=148380 Bug ID: 148380 Summary: FILESAVE DOCX: CreateDate field saved as plain text "DocInformation:Created" 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: jl...@mail.com CC: jl...@mail.com A DocInfo.CreateDateTime field is not exported as a field in DOCX, but just as a plain text variable name. This has been true at least since LO 3.5. (Since 7.2/7.1.1 the field is always imported as FIXED.) There are many of these field issues I expect, but each is handled with separate code, so they might as well be handled in separate bug reports as needed. This is a follow-up of FILEOPEN bug 134592's writerfilter/qa/cppunittests/dmapper/data/create-date-preserve.docx This is also seen in the header.xml in ooxmlexport14's tdf83309.docx. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 97341] Width for document comments cannot be changed manually
https://bugs.documentfoundation.org/show_bug.cgi?id=97341 --- Comment #37 from latest jobs --- https://www.govtjobsapply.com/2021/09/jkpsc-govt-jobs-latest-govt-jobs.html -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/source vcl/source wizards/source
sw/source/core/text/pormulti.cxx |2 +-
vcl/source/gdi/CommonSalLayout.cxx |2 +-
wizards/source/sfdialogs/SF_Dialog.xba |6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 684ec4b870ad13b2eff3e10ef429f4e19bb57441
Author: Andrea Gelmini
AuthorDate: Mon Apr 4 23:04:27 2022 +0200
Commit: Julien Nabet
CommitDate: Tue Apr 5 07:08:04 2022 +0200
Fix typos
Change-Id: I77ad3b01dbb2e8f8438b6f4a30ca2239490fb8f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132537
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index c798a0dfc519..3fb6a3091ad0 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -139,7 +139,7 @@ void SwMultiPortion::dumpAsXml(xmlTextWriterPtr pWriter,
const OUString& rText,
{
(void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwMultiPortion"));
dumpAsXmlAttributes(pWriter, rText, nOffset);
-// Indentionally not incrementing nOffset here, one of the child portions
will do that.
+// Intentionally not incrementing nOffset here, one of the child portions
will do that.
const SwLineLayout* pLine = ();
while (pLine)
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 74478e0ef268..be6480bfde1a 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -437,7 +437,7 @@ bool
GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay
}
}
-// Charters with U and Tu vertical orientation should
+// Characters with U and Tu vertical orientation should
// be shaped in vertical direction. But characters
// with Tr should be shaped in vertical direction
// only if they have vertical alternates, otherwise
diff --git a/wizards/source/sfdialogs/SF_Dialog.xba
b/wizards/source/sfdialogs/SF_Dialog.xba
index c772c9d1a4b4..fea3eac98f8f 100644
--- a/wizards/source/sfdialogs/SF_Dialog.xba
+++ b/wizards/source/sfdialogs/SF_Dialog.xba
@@ -341,7 +341,7 @@ Dim oParentPosSize As Object Parent
com.sun.star.awt.Rectangle
Dim lParentX As Long X position of parent
dialog
Dim lParentY As Long Y position of parent
dialog
Dim oPosSize As Object Dialog
com.sun.star.awt.Rectangle
-Dim iFlags As Integer
com.sun.star.awt.PosSize conatnts
+Dim iFlags As Integer
com.sun.star.awt.PosSize constants
Const cstThisSub = SFDialogs.Dialog.Center
Const cstSubArgs = [Parent]
@@ -756,7 +756,7 @@ Public Function Resize(Optional ByVal Left As Variant _
Dim bResize As Boolean Return value
Dim oPosSize As Object
com.sun.star.awt.Rectangle
-Dim iFlags As Integer
com.sun.star.awt.PosSize conatnts
+Dim iFlags As Integer
com.sun.star.awt.PosSize constants
Const cstThisSub = SFDialogs.Dialog.Resize
Const cstSubArgs = [Left], [Top], [Width], [Height]
@@ -1108,4 +1108,4 @@ Private Function _Repr() As String
End Function SFDialogs.SF_Dialog._Repr
REM END OF SFDIALOGS.SF_DIALOG
-
\ No newline at end of file
+
[Libreoffice-commits] core.git: oox/source sc/inc sc/qa
oox/source/drawingml/diagram/datamodel.hxx |4 ++-- sc/inc/SparklineAttributes.hxx |2 +- sc/qa/unit/SparklineImportExportTest.cxx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 50b56ee25b119fb18480d7c9c670ec3986b725cd Author: Andrea Gelmini AuthorDate: Mon Apr 4 23:04:20 2022 +0200 Commit: Julien Nabet CommitDate: Tue Apr 5 07:06:44 2022 +0200 Fix typos Change-Id: Ieb57b614962b398a19d87e0a7427d897b38cf37c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132536 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/oox/source/drawingml/diagram/datamodel.hxx b/oox/source/drawingml/diagram/datamodel.hxx index eef345edb630..3f410e5d9033 100644 --- a/oox/source/drawingml/diagram/datamodel.hxx +++ b/oox/source/drawingml/diagram/datamodel.hxx @@ -71,8 +71,8 @@ protected: PointShapeMap maPointShapeMap; }; -// Oox-lcal definiitkion of DiagramData. Doing and using this onm Oox -// allows to do much less static_cast(s) - if at all from svx::diagram::DiagramData +// Oox-local definition of DiagramData. Doing and using this on Oox +// allows to do much less static_cast(s) - if at all from svx::diagram::DiagramData typedef std::shared_ptr< DiagramData > OoxDiagramDataPtr; } diff --git a/sc/inc/SparklineAttributes.hxx b/sc/inc/SparklineAttributes.hxx index e89e15bc1a1b..d1baf732ced3 100644 --- a/sc/inc/SparklineAttributes.hxx +++ b/sc/inc/SparklineAttributes.hxx @@ -93,7 +93,7 @@ public: AxisType getMaxAxisType() const; void setMaxAxisType(AxisType eAxisType); -/** Line weigth or width in points */ +/** Line weight or width in points */ double getLineWeight() const; void setLineWeight(double nWeight); diff --git a/sc/qa/unit/SparklineImportExportTest.cxx b/sc/qa/unit/SparklineImportExportTest.cxx index 7060a120c49a..f6969831ee17 100644 --- a/sc/qa/unit/SparklineImportExportTest.cxx +++ b/sc/qa/unit/SparklineImportExportTest.cxx @@ -187,7 +187,7 @@ void SparklineImportExportTest::testSparklinesExportODS() std::shared_ptr pXPathFile = ScBootstrapFixture::exportTo(*xDocSh, FORMAT_ODS); xmlDocUniquePtr pXmlDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, "content.xml"); -// We have 3 sparkline groups = 3 tables that contain spakrlines +// We have 3 sparkline groups = 3 tables that contain sparklines assertXPath(pXmlDoc, "//table:table/calcext:sparkline-groups", 3); // Check the number of sparkline groups in table[1]
[Libreoffice-commits] core.git: oox/qa
0 files changed New commits: commit d48b472372f3d0b04338455ea8615f9af6e29169 Author: Andrea Gelmini AuthorDate: Mon Apr 4 22:53:38 2022 +0200 Commit: Julien Nabet CommitDate: Tue Apr 5 07:05:34 2022 +0200 Removed execution bits on odp file Change-Id: I32aa1660f4b83b349fd6e231fd08eac36d342973 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132534 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/oox/qa/unit/data/tdf100391_TextAreaRect.odp b/oox/qa/unit/data/tdf100391_TextAreaRect.odp old mode 100755 new mode 100644
[Libreoffice-commits] core.git: sc/inc sc/Library_sc.mk sc/qa sc/source
sc/Library_sc.mk |1
sc/inc/SparklineGroup.hxx|3
sc/inc/globstr.hrc |1
sc/qa/unit/SparklineTest.cxx | 69 ++
sc/source/ui/dialogs/SparklineDialog.cxx | 146 ++-
sc/source/ui/docshell/docfunc.cxx| 12 +
sc/source/ui/inc/SparklineDialog.hxx |6
sc/source/ui/inc/docfunc.hxx |4
sc/source/ui/inc/undo/UndoEditSparklineGroup.hxx | 44 ++
sc/source/ui/sparklines/SparklineGroup.cxx |6
sc/source/ui/undo/UndoEditSparklineGroup.cxx | 65 ++
11 files changed, 279 insertions(+), 78 deletions(-)
New commits:
commit 12bb0d897d97c9231e86d6b0071f8a0d29c7e660
Author: Tomaž Vajngerl
AuthorDate: Thu Mar 31 23:07:44 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 06:42:05 2022 +0200
sc: add SparklineGroup Undo/Redo
As SparklineAttributes are COW, we can just exchange them around
in the SparklineGroup when undoing and redoing.
This also changes SparklineDialog to work with a local copy of
SparklineAttributes when editing, or an empty initial copy when
inserting a new Sparkline into the sheet.
Change-Id: I36e9c887ca640f40266f381e98e57f027a5ca07f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132542
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index e97f6e04b4c2..294c36b4578c 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -555,6 +555,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/ui/undo/undotab \
sc/source/ui/undo/undoutil \
sc/source/ui/undo/UndoInsertSparkline \
+sc/source/ui/undo/UndoEditSparklineGroup \
sc/source/ui/undo/UndoDeleteSparkline \
sc/source/ui/unoobj/ChartRangeSelectionListener \
sc/source/ui/unoobj/addruno \
diff --git a/sc/inc/SparklineGroup.hxx b/sc/inc/SparklineGroup.hxx
index c5e917f059f3..7d2e75e6e9e3 100644
--- a/sc/inc/SparklineGroup.hxx
+++ b/sc/inc/SparklineGroup.hxx
@@ -29,12 +29,15 @@ public:
SparklineAttributes& getAttributes() { return m_aAttributes; }
SparklineAttributes const& getAttributes() const { return m_aAttributes; }
+void setAttributes(SparklineAttributes const& rAttributes) { m_aAttributes
= rAttributes; };
+
tools::Guid& getID() { return m_aGUID; }
void setID(tools::Guid const& rGuid) { m_aGUID = rGuid; }
SparklineGroup();
SparklineGroup(SparklineGroup const& pOtherSparkline);
+SparklineGroup(SparklineAttributes const& rSparklineAttributes);
SparklineGroup& operator=(const SparklineGroup&) = delete;
};
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 0eb0e7929625..de33f2d4e61b 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -541,6 +541,7 @@
#define STR_INDENTCELL NC_("STR_INDENTCELL", "Indent:
")
#define STR_UNDO_INSERT_SPARKLINE_GROUP
NC_("STR_UNDO_INSERT_SPARKLINE", "Insert Sparkline Group")
#define STR_UNDO_DELETE_SPARKLINE
NC_("STR_UNDO_DELETE_SPARKLINE", "Delete Sparkline")
+#define STR_UNDO_EDIT_SPARKLINE_GROUP
NC_("STR_UNDO_EDIT_SPARKLINE_GROUP", "Edit Sparkline Group")
#endif
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/SparklineTest.cxx
index 6e203131e9c5..42ac88467b6d 100644
--- a/sc/qa/unit/SparklineTest.cxx
+++ b/sc/qa/unit/SparklineTest.cxx
@@ -53,6 +53,7 @@ public:
void testUndoRedoInsertSparkline();
void testUndoRedoDeleteSparkline();
void testUndoRedoClearContentForSparkline();
+void testUndoRedoEditSparklineGroup();
CPPUNIT_TEST_SUITE(SparklineTest);
CPPUNIT_TEST(testAddSparkline);
@@ -62,6 +63,7 @@ public:
CPPUNIT_TEST(testUndoRedoInsertSparkline);
CPPUNIT_TEST(testUndoRedoDeleteSparkline);
CPPUNIT_TEST(testUndoRedoClearContentForSparkline);
+CPPUNIT_TEST(testUndoRedoEditSparklineGroup);
CPPUNIT_TEST_SUITE_END();
};
@@ -427,6 +429,73 @@ void SparklineTest::testUndoRedoClearContentForSparkline()
xDocSh->DoClose();
}
+void SparklineTest::testUndoRedoEditSparklineGroup()
+{
+ScDocShellRef xDocSh = loadEmptyDocument();
+CPPUNIT_ASSERT(xDocSh);
+
+ScDocument& rDocument = xDocSh->GetDocument();
+ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pViewShell);
+
+auto& rDocFunc = xDocSh->GetDocFunc();
+
+auto pSparklineGroup = std::make_shared();
+{
+sc::SparklineAttributes& rAttibutes = pSparklineGroup->getAttributes();
+rAttibutes.setType(sc::SparklineType::Column);
+rAttibutes.setColorSeries(COL_YELLOW);
+rAttibutes.setColorAxis(COL_GREEN);
+}
+
+rDocument.CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup);
+
+sc::SparklineAttributes aNewAttributes;
+aNewAttributes.setType(sc::SparklineType::Stacked);
+
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/SparklineRenderer.hxx | 572 +
sc/source/ui/view/output.cxx | 256 +-
2 files changed, 590 insertions(+), 238 deletions(-)
New commits:
commit 574384e90fdb24aed40e0dcffd17adae3443aa04
Author: Tomaž Vajngerl
AuthorDate: Thu Mar 31 21:47:53 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 06:39:41 2022 +0200
sc: Sparkline rendering improvement, take all attrs. into account
This change moves Sparkline rendering into a new class and into
a separate file - SparklineRenderer, and improve the rendering by
taking all the sparkline attributes into account.
Improvements:
- render correct line width for lines
- take hidden cells into account
- draw the X axis
- allow to override the min, max values (custom X axis limits)
- handle empty cells (interpret as zero, as a gap or interpolate)
- correctly handle first and last value
- take marker attribute and color into account (missing before)
- simplify range iteration (with RangeTraverser class)
- show min, max also for stacked sparkline type
- ...
Change-Id: Id855f775677aa309b42174e086ad4f5d7de079c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132541
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/source/ui/inc/SparklineRenderer.hxx
b/sc/source/ui/inc/SparklineRenderer.hxx
new file mode 100644
index ..9f697a6002b2
--- /dev/null
+++ b/sc/source/ui/inc/SparklineRenderer.hxx
@@ -0,0 +1,572 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+namespace sc
+{
+/** Contains the marker polygon and the color of a marker */
+struct SparklineMarker
+{
+basegfx::B2DPolygon maPolygon;
+Color maColor;
+};
+
+/** Sparkline value and action that needs to me performed on the value */
+struct SparklineValue
+{
+enum class Action
+{
+None, // No action on the value
+Skip, // Skip the value
+Interpolate // Intrpolate the value
+};
+
+double maValue;
+Action meAction;
+
+SparklineValue(double aValue, Action eAction)
+: maValue(aValue)
+, meAction(eAction)
+{
+}
+};
+
+/** Contains and manages the values of the sparkline.
+ *
+ * It automatically keeps track of the minimums and maximums, and
+ * skips or interpolates the sparkline values if needed, depending on
+ * the input. This is done so it is easier to handle the sparkline
+ * values later on.
+ */
+class SparklineValues
+{
+private:
+double mfPreviousValue = 0.0;
+size_t mnPreviousIndex = std::numeric_limits::max();
+
+std::vector maToInterpolateIndex;
+
+std::vector maValueList;
+
+public:
+size_t mnFirstIndex = std::numeric_limits::max();
+size_t mnLastIndex = 0;
+
+double mfMinimum = std::numeric_limits::max();
+double mfMaximum = std::numeric_limits::min();
+
+std::vector const& getValuesList() const { return
maValueList; }
+
+void add(double fValue, SparklineValue::Action eAction)
+{
+maValueList.emplace_back(fValue, eAction);
+size_t nCurrentIndex = maValueList.size() - 1;
+
+if (eAction == SparklineValue::Action::None)
+{
+mnLastIndex = nCurrentIndex;
+
+if (mnLastIndex < mnFirstIndex)
+mnFirstIndex = mnLastIndex;
+
+if (fValue < mfMinimum)
+mfMinimum = fValue;
+
+if (fValue > mfMaximum)
+mfMaximum = fValue;
+
+interpolatePastValues(fValue, nCurrentIndex);
+
+mnPreviousIndex = nCurrentIndex;
+mfPreviousValue = fValue;
+}
+else if (eAction == SparklineValue::Action::Interpolate)
+{
+maToInterpolateIndex.push_back(nCurrentIndex);
+maValueList.back().meAction = SparklineValue::Action::Skip;
+}
+}
+
+static constexpr double interpolate(double x1, double y1, double x2,
double y2, double x)
+{
+return (y1 * (x2 - x) + y2 * (x - x1)) / (x2 - x1);
+}
+
+void interpolatePastValues(double nCurrentValue, size_t nCurrentIndex)
+{
+if (maToInterpolateIndex.empty())
+return;
+
+if (mnPreviousIndex == std::numeric_limits::max())
+{
+for (size_t nIndex : maToInterpolateIndex)
+{
+auto& rValue = maValueList[nIndex];
+rValue.meAction = SparklineValue::Action::Skip;
+}
+}
+else
+{
+for (size_t nIndex : maToInterpolateIndex)
+
[Libreoffice-bugs] [Bug 148363] FILEOPEN: RTF: Incorrect char color
https://bugs.documentfoundation.org/show_bug.cgi?id=148363 Rainer Bielefeld Retired changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||LibreOffice@bielefeldundbus ||s.de Version|7.4.0.0 alpha0+ Master |6.0.7.3 release Ever confirmed|0 |1 --- Comment #1 from Rainer Bielefeld Retired --- Already REPRODUCIBLE with Installation of Version: 7.3.1.3 (x64) Build ID a69ca51ded25f3eefd52d7bf9a5fad8c90b87951 CPU threads: 12; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win | Locale: de-DE (de_DE); UI: de-DE | Calc: threaded | ElementaryTheme | My normal User Profile Already REPRODUCIBLE with Server Installation of Version: 6.0.7.3 (x64) Build-ID dc89aa7a9eabfd848af146d5086077aeed2ae4a5; CPU-Threads: 12; BS: Windows 10.0; UI-Render: GL; Gebietsschema: de-DE (de_DE); Calc: CL, Special devUserProfile -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148365] CRASH: Writer 7.4 enters infinite loop while opening DOCX file (works fine in 7.3)
https://bugs.documentfoundation.org/show_bug.cgi?id=148365 Rainer Bielefeld Retired changed: What|Removed |Added CC||LibreOffice@bielefeldundbus ||s.de --- Comment #7 from Rainer Bielefeld Retired --- REPRODUCIBLE with Server Installation of Version: 7.4.0.0.alpha0+ (x64) Build ID c856f9bec12d98ed49f01578ded79f16ae7be051 CPU threads: 12; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-US | Calc: CL | Auto Colibre Theme | Special devUserProfile -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144583] Blurry icon on HiDPI
https://bugs.documentfoundation.org/show_bug.cgi?id=144583 --- Comment #3 from tothes...@gmail.com --- I can reproduce this on Arch Linux and Gnome 41 Wayland with my 13-inch 2K laptop: Version: 7.3.2.2 / LibreOffice Community Build ID: 30(Build:2) CPU threads: 16; OS: Linux 5.17; UI render: default; VCL: gtk3 Locale: ja-JP (ja_JP.UTF-8); UI: en-US 7.3.2-1 Calc: threaded The non-SVG version is a bit blurry as expected, but the SVG version blurry even more, which is annoying. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148258] Allow customization of Alt+ on gtk3
https://bugs.documentfoundation.org/show_bug.cgi?id=148258 QA Administrators changed: What|Removed |Added Keywords||bibisectRequest -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148120] Presentation on external monitor is cut on kde plasma
https://bugs.documentfoundation.org/show_bug.cgi?id=148120 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148116] Cannot download/install extensions in Libreoffice Writer.
https://bugs.documentfoundation.org/show_bug.cgi?id=148116 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148115] Tooltips are being rendered with artifacts (flashing, blinking, zooming...)
https://bugs.documentfoundation.org/show_bug.cgi?id=148115 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148106] Setting a line in a chart to "ignore blanks" does not get saved.
https://bugs.documentfoundation.org/show_bug.cgi?id=148106 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148256] Deadlocks while typing (macOS only?)
https://bugs.documentfoundation.org/show_bug.cgi?id=148256 QA Administrators changed: What|Removed |Added Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148256] Deadlocks while typing (macOS only?)
https://bugs.documentfoundation.org/show_bug.cgi?id=148256 --- Comment #7 from QA Administrators --- [Automated Action] NeedInfo-To-Unconfirmed -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144314] Slowness opening documents
https://bugs.documentfoundation.org/show_bug.cgi?id=144314 --- Comment #4 from QA Administrators --- Dear moll, 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.
[Libreoffice-bugs] [Bug 144314] Slowness opening documents
https://bugs.documentfoundation.org/show_bug.cgi?id=144314 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144254] LibreCalc UI: The display of the drop-down box when selecting a police in the "Insert a special character"box goes crazy.
https://bugs.documentfoundation.org/show_bug.cgi?id=144254 --- Comment #4 from QA Administrators --- Dear Ramdan, 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.
[Libreoffice-bugs] [Bug 144254] LibreCalc UI: The display of the drop-down box when selecting a police in the "Insert a special character"box goes crazy.
https://bugs.documentfoundation.org/show_bug.cgi?id=144254 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 140604] Some DDE Fields won't load - Multiple empty fields on large/frequently updated dde links.
https://bugs.documentfoundation.org/show_bug.cgi?id=140604 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 140604] Some DDE Fields won't load - Multiple empty fields on large/frequently updated dde links.
https://bugs.documentfoundation.org/show_bug.cgi?id=140604 --- Comment #3 from QA Administrators --- Dear pedroh.u, 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.
[Libreoffice-bugs] [Bug 139794] Version 6.4.6 of Math works weel with STIX font (version 1), but version 6.4.7 doesn't
https://bugs.documentfoundation.org/show_bug.cgi?id=139794 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 139794] Version 6.4.6 of Math works weel with STIX font (version 1), but version 6.4.7 doesn't
https://bugs.documentfoundation.org/show_bug.cgi?id=139794 --- Comment #3 from QA Administrators --- Dear aldemarcalazans, 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.
[Libreoffice-bugs] [Bug 135887] "Email Document" in Writer on Windows 10 produces an error
https://bugs.documentfoundation.org/show_bug.cgi?id=135887 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 135887] "Email Document" in Writer on Windows 10 produces an error
https://bugs.documentfoundation.org/show_bug.cgi?id=135887 --- Comment #8 from QA Administrators --- Dear smkbot, 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.
[Libreoffice-bugs] [Bug 144963] Crash in: EditUndo::GetComment()
https://bugs.documentfoundation.org/show_bug.cgi?id=144963 --- Comment #2 from QA Administrators --- Dear Micaela, 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.
[Libreoffice-bugs] [Bug 144953] date year changes when copied
https://bugs.documentfoundation.org/show_bug.cgi?id=144953 --- Comment #2 from QA Administrators --- Dear smcwrc, 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.
[Libreoffice-bugs] [Bug 144919] Crash if I export a dialog-screen and click the 'Save' button.
https://bugs.documentfoundation.org/show_bug.cgi?id=144919 --- Comment #5 from QA Administrators --- Dear Alexander Van den Panhuysen, 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.
[Libreoffice-bugs] [Bug 144635] The border button does not work in 7.2.1 Calc
https://bugs.documentfoundation.org/show_bug.cgi?id=144635 --- Comment #4 from QA Administrators --- Dear BarryHavenga, 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.
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/dialogs/SparklineDialog.cxx | 174
sc/source/ui/inc/SparklineDialog.hxx | 18
sc/uiconfig/scalc/ui/sparklinedialog.ui | 1095 ---
3 files changed, 929 insertions(+), 358 deletions(-)
New commits:
commit d97d1f2643d30ebcab149854137cd3c4f46004d2
Author: Tomaž Vajngerl
AuthorDate: Tue Mar 29 09:31:08 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 05:17:23 2022 +0200
sc: edit all sparkline attributes in SparklineDialog
Change-Id: I6ca9e3436e0dd807b30585576ae2067076c3b7ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132516
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/source/ui/dialogs/SparklineDialog.cxx
b/sc/source/ui/dialogs/SparklineDialog.cxx
index ba01a64912c6..59068077b969 100644
--- a/sc/source/ui/dialogs/SparklineDialog.cxx
+++ b/sc/source/ui/dialogs/SparklineDialog.cxx
@@ -16,6 +16,7 @@
#include
#include
+#include
namespace sc
{
@@ -56,9 +57,20 @@ SparklineDialog::SparklineDialog(SfxBindings* pBindings,
SfxChildWindow* pChildW
, mxCheckButtonLow(m_xBuilder->weld_check_button("check-low"))
, mxCheckButtonFirst(m_xBuilder->weld_check_button("check-first"))
, mxCheckButtonLast(m_xBuilder->weld_check_button("check-last"))
+, mxSpinLineWidth(m_xBuilder->weld_spin_button("spin-line-width"))
, mxRadioLine(m_xBuilder->weld_radio_button("line-radiobutton"))
, mxRadioColumn(m_xBuilder->weld_radio_button("column-radiobutton"))
, mxRadioStacked(m_xBuilder->weld_radio_button("stacked-radiobutton"))
+,
mxCheckDisplayXAxis(m_xBuilder->weld_check_button("check-display-x-axis"))
+,
mxCheckDisplayHidden(m_xBuilder->weld_check_button("check-display-hidden"))
+, mxCheckRightToLeft(m_xBuilder->weld_check_button("check-right-to-left"))
+,
mxRadioDisplayEmptyGap(m_xBuilder->weld_radio_button("display-empty-radiobutton-gap"))
+,
mxRadioDisplayEmptyZero(m_xBuilder->weld_radio_button("display-empty-radiobutton-zero"))
+,
mxRadioDisplayEmptySpan(m_xBuilder->weld_radio_button("display-empty-radiobutton-span"))
+, mxComboMinAxisType(m_xBuilder->weld_combo_box("combo-min-axis-type"))
+, mxComboMaxAxisType(m_xBuilder->weld_combo_box("combo-max-axis-type"))
+,
mxSpinCustomMin(m_xBuilder->weld_formatted_spin_button("spin-custom-min"))
+,
mxSpinCustomMax(m_xBuilder->weld_formatted_spin_button("spin-custom-max"))
, mbEditMode(false)
{
mxInputRangeEdit->SetReferences(this, mxInputRangeLabel.get());
@@ -94,6 +106,9 @@ SparklineDialog::SparklineDialog(SfxBindings* pBindings,
SfxChildWindow* pChildW
mxRadioLine->connect_toggled(aRadioButtonLink);
mxRadioColumn->connect_toggled(aRadioButtonLink);
mxRadioStacked->connect_toggled(aRadioButtonLink);
+mxRadioDisplayEmptyGap->connect_toggled(aRadioButtonLink);
+mxRadioDisplayEmptyZero->connect_toggled(aRadioButtonLink);
+mxRadioDisplayEmptySpan->connect_toggled(aRadioButtonLink);
Link aLink = LINK(this, SparklineDialog,
ToggleHandler);
mxCheckButtonNegative->connect_toggled(aLink);
@@ -102,6 +117,26 @@ SparklineDialog::SparklineDialog(SfxBindings* pBindings,
SfxChildWindow* pChildW
mxCheckButtonLow->connect_toggled(aLink);
mxCheckButtonFirst->connect_toggled(aLink);
mxCheckButtonLast->connect_toggled(aLink);
+mxCheckDisplayXAxis->connect_toggled(aLink);
+mxCheckDisplayHidden->connect_toggled(aLink);
+mxCheckRightToLeft->connect_toggled(aLink);
+
+mxSpinLineWidth->connect_value_changed(LINK(this, SparklineDialog,
SpinLineWidthChanged));
+
+mxComboMinAxisType->connect_changed(LINK(this, SparklineDialog,
ComboValueChanged));
+mxComboMaxAxisType->connect_changed(LINK(this, SparklineDialog,
ComboValueChanged));
+
+mxSpinCustomMin->connect_value_changed(LINK(this, SparklineDialog,
SpinCustomChanged));
+Formatter& rSpinCustomMinFormatter = mxSpinCustomMin->GetFormatter();
+rSpinCustomMinFormatter.ClearMinValue();
+rSpinCustomMinFormatter.ClearMaxValue();
+rSpinCustomMinFormatter.UseInputStringForFormatting();
+
+mxSpinCustomMax->connect_value_changed(LINK(this, SparklineDialog,
SpinCustomChanged));
+Formatter& rSpinCustomMaxFormatter = mxSpinCustomMax->GetFormatter();
+rSpinCustomMaxFormatter.ClearMinValue();
+rSpinCustomMaxFormatter.ClearMaxValue();
+rSpinCustomMaxFormatter.UseInputStringForFormatting();
setupValues();
@@ -145,7 +180,7 @@ void SparklineDialog::setupValues()
setInputSelection();
-auto& rAttribute = mpLocalSparklineGroup->getAttributes();
+auto const& rAttribute = mpLocalSparklineGroup->getAttributes();
switch (rAttribute.getType())
{
@@ -160,6 +195,19 @@ void SparklineDialog::setupValues()
break;
}
+switch (rAttribute.getDisplayEmptyCellsAs())
+{
+case sc::DisplayEmptyCellsAs::Gap:
+mxRadioDisplayEmptyGap->set_active(true);
+break;
+
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/SparklineGroup.hxx |7 ---
sc/inc/document.hxx |7 +--
sc/qa/unit/SparklineImportExportTest.cxx |4 ++--
sc/qa/unit/SparklineTest.cxx | 11 +++
sc/source/core/data/column2.cxx |7 ---
sc/source/core/data/column4.cxx |7 +--
sc/source/core/data/document.cxx | 16
sc/source/filter/excel/export/SparklineExt.cxx|2 +-
sc/source/filter/oox/SparklineFragment.cxx|5 +++--
sc/source/filter/xml/SparklineGroupsExport.cxx|7 ++-
sc/source/filter/xml/SparklineGroupsImportContext.cxx |4 +++-
sc/source/ui/sparklines/SparklineGroup.cxx|7 +--
12 files changed, 61 insertions(+), 23 deletions(-)
New commits:
commit 5ff13a0866fe5c408f9e9c7441a9d052b383d99c
Author: Tomaž Vajngerl
AuthorDate: Mon Mar 28 22:51:08 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 05:16:59 2022 +0200
sc: use GUID for the SparklineGroup ID and use that
This adds tools::Guid as the SparklineGroup ID. At import the
Guid is parsed by tools::Guid and later it is used to identify
the SparklineGroup.
This is useful when copying sparklines so we can preserve to
which group it belongs, when that is desired.
Change-Id: I4f2b560d5ea74552e8add57bb05469be57cf4a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132515
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/SparklineGroup.hxx b/sc/inc/SparklineGroup.hxx
index 5a3bda62b6ab..c5e917f059f3 100644
--- a/sc/inc/SparklineGroup.hxx
+++ b/sc/inc/SparklineGroup.hxx
@@ -13,6 +13,7 @@
#include "scdllapi.h"
#include "SparklineAttributes.hxx"
#include
+#include
#include
namespace sc
@@ -22,15 +23,15 @@ class SC_DLLPUBLIC SparklineGroup
{
private:
SparklineAttributes m_aAttributes;
-OUString m_sUID;
+tools::Guid m_aGUID;
public:
SparklineAttributes& getAttributes() { return m_aAttributes; }
SparklineAttributes const& getAttributes() const { return m_aAttributes; }
-OUString getID() { return m_sUID; }
+tools::Guid& getID() { return m_aGUID; }
-void setID(OUString const& rID) { m_sUID = rID; }
+void setID(tools::Guid const& rGuid) { m_aGUID = rGuid; }
SparklineGroup();
SparklineGroup(SparklineGroup const& pOtherSparkline);
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e31900dee7cd..1cde9b95fe4c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -69,12 +69,12 @@ enum class EEHorizontalTextDirection;
namespace editeng { class SvxBorderLine; }
namespace formula { struct VectorRefArray; }
namespace svl {
-
class SharedString;
class SharedStringPool;
-
}
+namespace tools { class Guid; }
+
namespace sc {
struct FormulaGroupContext;
@@ -208,6 +208,7 @@ typedef o3tl::sorted_vector ScCondFormatIndexes;
struct ScSheetLimits;
struct ScDataAreaExtras;
+
namespace sc {
typedef std::map IconSetBitmapMap;
@@ -1255,6 +1256,8 @@ public:
SC_DLLPUBLIC sc::SparklineList* GetSparklineList(SCTAB nTab);
SC_DLLPUBLIC bool DeleteSparkline(ScAddress const& rPosition);
SC_DLLPUBLIC bool HasOneSparklineGroup(ScRange const& rRange);
+SC_DLLPUBLIC std::shared_ptr
SearchSparklineGroup(tools::Guid const& rGuid);
+
/** Notes **/
SC_DLLPUBLIC ScPostIt* GetNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
index 6da76fb2dcfb..7060a120c49a 100644
--- a/sc/qa/unit/SparklineImportExportTest.cxx
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -69,8 +69,8 @@ void checkSparklines(ScDocument& rDocument)
{
auto pSparkline = rDocument.GetSparkline(ScAddress(0, 1, 0)); // A2
CPPUNIT_ASSERT(pSparkline);
-
CPPUNIT_ASSERT_EQUAL(OUString("{1C5C5DE0-3C09-4CB3-A3EC-9E763301EC82}"),
- pSparkline->getSparklineGroup()->getID());
+CPPUNIT_ASSERT_EQUAL(OString("{1C5C5DE0-3C09-4CB3-A3EC-9E763301EC82}"),
+
pSparkline->getSparklineGroup()->getID().getString());
auto& rAttributes = pSparkline->getSparklineGroup()->getAttributes();
CPPUNIT_ASSERT_EQUAL(sc::SparklineType::Line, rAttributes.getType());
diff --git a/sc/qa/unit/SparklineTest.cxx b/sc/qa/unit/SparklineTest.cxx
index ac9c0996ac59..6e203131e9c5 100644
--- a/sc/qa/unit/SparklineTest.cxx
+++ b/sc/qa/unit/SparklineTest.cxx
@@ -153,6 +153,7 @@ void SparklineTest::testCopyPasteSparkline()
ScRange aSourceRange(0, 6, 0, 0, 6, 0);
auto pSparkline = rDocument.GetSparkline(aSourceRange.aStart);
+auto const& pOriginalGroup = pSparkline->getSparklineGroup();
CPPUNIT_ASSERT(pSparkline);
[Libreoffice-bugs] [Bug 135602] Filesave DOCX: substitute fonts not working on open when odt with Wingdings saved as DOCX in Linux/Mac (OK in Win and OK as DOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=135602 --- Comment #8 from Aron Budea --- Created attachment 179312 --> https://bugs.documentfoundation.org/attachment.cgi?id=179312=edit 1.odt saved as DOCX in Word There's a FILEOPEN aspect of this bug as well, see 1.odt that was saved as DOCX in Word, it doesn't show the correct symbols when opened. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 103030] [META] Navigator sidebar deck and floating window
https://bugs.documentfoundation.org/show_bug.cgi?id=103030 Bug 103030 depends on bug 148103, which changed state. Bug 148103 Summary: Navigator hides some H1 paragraphs when choosing 2 outline levels (probably document specific) https://bugs.documentfoundation.org/show_bug.cgi?id=148103 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 097bcd530c7facde50c7fe21e1cee9b4bf4a7949
Author: Jim Raykowski
AuthorDate: Mon Apr 4 12:48:39 2022 -0800
Commit: Jim Raykowski
CommitDate: Tue Apr 5 04:20:51 2022 +0200
tdf#148103 SwNavigator: fix outline levels shown
fixes regression introduced in commit
3771a81060f9e1f60ada37c3b7fa0a51b3042952
Change-Id: Ie9a839f0de32177f06bd47a204c55b38eb9371f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132533
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 36f7801f375a..281821d183ad 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4480,13 +4480,18 @@ void SwContentTree::DeleteOutlineSelections()
void SwContentTree::SetOutlineLevel(sal_uInt8 nSet)
{
+if (nSet == m_nOutlineLevel)
+return;
m_nOutlineLevel = nSet;
m_pConfig->SetOutlineLevel( m_nOutlineLevel );
std::unique_ptr& rpContentT = (State::ACTIVE == m_eState)
? m_aActiveContentArr[ContentTypeId::OUTLINE]
: m_aHiddenContentArr[ContentTypeId::OUTLINE];
if(rpContentT)
+{
rpContentT->SetOutlineLevel(m_nOutlineLevel);
+rpContentT->FillMemberList();
+}
Display(State::ACTIVE == m_eState);
}
[Libreoffice-bugs] [Bug 148051] Mac: Crashings for unkown reasons, despite reset user profile etc.
https://bugs.documentfoundation.org/show_bug.cgi?id=148051 --- Comment #19 from Sam --- - upgraded to the latest macOS (12.3.1, Monterey) - deleted LibreOffice completely (incl. user profile) - installed the latest LibreOffice version (7.3.2) - made sure "Full Disk Access" is provided - restarted LO in Safe Mode, disabled hardware acceleration - did a few minor changes in Preferences (turned off all options in Writing Aids, etc.) - quit LO - restarted LO - created a new Writer document, went to Tools (without typing anything first), LO crashed Bottom line: The crashing problem has not been resolved with the latest macOS update. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148379] New: Can't permanently change font in Libre Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=148379 Bug ID: 148379 Summary: Can't permanently change font in Libre Writer Product: LibreOffice Version: 7.3.2.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: geocav...@gmail.com Description: The changed fond reverts back once the Writer is restarted Steps to Reproduce: 1.tools 2.options 3.writer 4. basic fonts 5. change font and push ok 6. restart writer and it reverts back. Actual Results: Font reverts back to Liberation Serif every time Expected Results: Font reverts back to Liberation Serif every time Reproducible: Always User Profile Reset: Yes OpenGL enabled: Yes Additional Info: I am using a windows PC and Libre office 7.3.2 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx |3 +
sc/source/core/data/column2.cxx | 31
sc/source/core/data/table1.cxx | 61 +++-
sc/source/core/data/table2.cxx |4 ++
sc/source/ui/view/printfun.cxx |2 +
5 files changed, 100 insertions(+), 1 deletion(-)
New commits:
commit c07d2ea9589cf794bd300697e8a40bf9f94a8346
Author: Tomaž Vajngerl
AuthorDate: Mon Mar 28 14:31:21 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 03:45:59 2022 +0200
sc: make printing of Sparklines work
Sparkline cells don't contain any data, so they would be ignored
if we don't include them in the function that determine if there
is any data in a cell or not.
This is the main reason why the cells weren't drawn when printing
as they had no data so they were ignored.
Change-Id: I7849f1a00c9421616b8af90bdac368fd63ae1087
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132514
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f60ea22cbc30..0a2b16c809d9 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -677,6 +677,9 @@ public:
void CopyCellSparklinesToDocument(SCROW nRow1, SCROW nRow2, ScColumn&
rDestCol, SCROW nRowOffsetDest = 0) const;
void DuplicateSparklines(SCROW nStartRow, size_t nDataSize, ScColumn&
rDestCol,
sc::ColumnBlockPosition& rDestBlockPos, SCROW
nRowOffsetDest = 0) const;
+bool HasSparklines() const;
+SCROW GetSparklinesMaxRow() const;
+SCROW GetSparklinesMinRow() const;
// cell notes
ScPostIt* GetCellNote( SCROW nRow );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 787059376f44..d8e1003beaff 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2088,6 +2088,37 @@ void ScColumn::DuplicateSparklines(SCROW nStartRow,
size_t nDataSize, ScColumn&
rDestBlockPos.miSparklinePos = rDestCol.maSparklines.begin();
}
+bool ScColumn::HasSparklines() const
+{
+if (maSparklines.block_size() == 1 && maSparklines.begin()->type ==
sc::element_type_empty)
+return false; // all elements are empty
+return true; // otherwise some must be sparklines
+}
+
+SCROW ScColumn::GetSparklinesMaxRow() const
+{
+SCROW maxRow = 0;
+for (const auto& rSparkline : maSparklines)
+{
+if (rSparkline.type == sc::element_type_sparkline)
+maxRow = rSparkline.position + rSparkline.size - 1;
+}
+return maxRow;
+}
+
+SCROW ScColumn::GetSparklinesMinRow() const
+{
+SCROW minRow = 0;
+sc::SparklineStoreType::const_iterator it =
std::find_if(maSparklines.begin(), maSparklines.end(),
+[](const auto& rSparkline)
+{
+return rSparkline.type == sc::element_type_sparkline;
+});
+if (it != maSparklines.end())
+minRow = it->position;
+return minRow;
+}
+
// Notes
ScPostIt* ScColumn::GetCellNote(SCROW nRow)
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 51f6d35710a7..5c35eba2fb9c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -539,6 +539,20 @@ bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow
) const
nMaxX = i;
}
}
+if (aCol[i].HasSparklines())
+{
+SCROW maxSparklineRow = aCol[i].GetSparklinesMaxRow();
+if (maxSparklineRow >= nMaxY)
+{
+bFound = true;
+nMaxY = maxSparklineRow;
+}
+if (i > nMaxX)
+{
+bFound = true;
+nMaxX = i;
+}
+}
}
rEndCol = nMaxX;
@@ -608,6 +622,20 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW&
rEndRow, bool bNotes, bool bC
nMaxX = i;
}
}
+if (aCol[i].HasSparklines())
+{
+SCROW maxSparklineRow = aCol[i].GetSparklinesMaxRow();
+if (maxSparklineRow >= nMaxY)
+{
+bFound = true;
+nMaxY = maxSparklineRow;
+}
+if (i > nMaxX)
+{
+bFound = true;
+nMaxX = i;
+}
+}
}
}
@@ -695,8 +723,16 @@ bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW
nEndRow,
if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow ))//TODO: bNotes
??
{
bFound = true;
-if (i>nMaxX)
+if (i > nMaxX)
+nMaxX = i;
+}
+else if (aCol[i].HasSparklines())
+{
+if (i > nMaxX)
+{
+bFound = true;
nMaxX = i;
+}
}
[Libreoffice-bugs] [Bug 148375] CALC FORMATTING False information concerning setting for decimal separator, calculating not possible because numbers are treated as text.
https://bugs.documentfoundation.org/show_bug.cgi?id=148375 Albert changed: What|Removed |Added Resolution|NOTABUG |--- Status|RESOLVED|REOPENED Ever confirmed|0 |1 --- Comment #3 from Albert --- Sorry, but I think there is a misunderstanding. I've copied a part of the help-text in de 'Additional Info'. "... If that check box is NOT selected, then the character specified IN YOUR KEYBOARD DRIVER is inserted" I think here is the misunderstanding! CALC does recognize only the language-setting but not the keyboarddriver? In the Dutch language are two different Keyboards used: - Dutch NL (= The Netherlands) uses the Dutch language but a QWERTY-keyboarddriver which has no accents and a comma as separator key on the numeric keyboard. - Dutch BE (= Belgium) uses (almost) the same Dutch language but has normaly an AZERTY-keyboard which has a dot (.) as separatorkey on the numeric keyboard. In my attached picture, you can see the check box is NOT selected. I wrote that I am using Windows 10 and Windows 11 and the 'character specified in my keyboard driver (the dot . ) is inserted' This is working fine. The character, when I use the decimal separator key of my numeric keyboard shows a dot (.). The problem comes when I type decimal numbers in Calc, the dot (and not a comma) is placed but Calc does not recognise the numbers as decimal but places the numbers as text, to the left side in the column, and can not calculate while it sees only text. In my opinion, the problem is that it does not matter if the check box is selected or not, Calc places yes a dot but does not looks to the KEYBOARD setting and stil needs a comma to see the difference between text and number? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: comphelper/source include/tools sc/source tools/CppunitTest_tools_test.mk tools/qa
comphelper/source/xml/xmltools.cxx | 13 --
include/tools/Guid.hxx | 166 +++
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 20 +--
tools/CppunitTest_tools_test.mk |1
tools/qa/cppunit/test_guid.cxx | 123
5 files changed, 300 insertions(+), 23 deletions(-)
New commits:
commit cf4d5ed026c8799a70432a832a8a707c2e316216
Author: Tomaž Vajngerl
AuthorDate: Sun Mar 27 22:52:48 2022 +0900
Commit: Tomaž Vajngerl
CommitDate: Tue Apr 5 01:57:21 2022 +0200
add tools::Guid class to generate, parse GUID values
Change-Id: Ie4d8fad4d8f22c8277c22c21b7a9eb3e7c9e4f1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132513
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/comphelper/source/xml/xmltools.cxx
b/comphelper/source/xml/xmltools.cxx
index 366321076bad..1b10964b1a35 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -9,7 +9,7 @@
#include
#include
-#include
+#include
#include
using namespace com::sun::star;
@@ -92,15 +92,8 @@ namespace comphelper::xml
OString generateGUIDString()
{
-sal_uInt8 aSeq[16];
-rtl_createUuid(aSeq, nullptr, true);
-
-char str[39];
-sprintf(str,
"{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-aSeq[0], aSeq[1], aSeq[2], aSeq[3], aSeq[4], aSeq[5],
aSeq[6], aSeq[7], aSeq[8],
-aSeq[9], aSeq[10], aSeq[11], aSeq[12], aSeq[13], aSeq[14],
aSeq[15]);
-
-return OString(str);
+tools::Guid aGuid(tools::Guid::Generate);
+return aGuid.getString();
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/tools/Guid.hxx b/include/tools/Guid.hxx
new file mode 100644
index ..980048d9415d
--- /dev/null
+++ b/include/tools/Guid.hxx
@@ -0,0 +1,166 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace tools
+{
+class Guid
+{
+private:
+typedef std::array GuidArrayType;
+
+GuidArrayType maGuidArray;
+
+static sal_uInt8 gethex(char nChar)
+{
+if (nChar >= '0' && nChar <= '9')
+return nChar - '0';
+else if (nChar >= 'a' && nChar <= 'f')
+return nChar - 'a' + 10;
+else if (nChar >= 'A' && nChar <= 'F')
+return nChar - 'A' + 10;
+else
+return 0;
+}
+
+static sal_uInt8 covertHexChar(char high, char low)
+{
+return (gethex(high) << 4) + gethex(low);
+}
+
+void parse(OString const& rString)
+{
+if (rString.getLength() != 38)
+return;
+
+if (rString[0] != '{' || rString[37] != '}' || rString[9] != '-' ||
rString[14] != '-'
+|| rString[19] != '-' || rString[24] != '-')
+return;
+
+for (size_t x = 1; x <= 8; x++)
+if (!std::isxdigit(rString[x]))
+return;
+for (size_t x = 10; x <= 13; x++)
+if (!std::isxdigit(rString[x]))
+return;
+for (size_t x = 15; x <= 18; x++)
+if (!std::isxdigit(rString[x]))
+return;
+for (size_t x = 20; x <= 23; x++)
+if (!std::isxdigit(rString[x]))
+return;
+for (size_t x = 25; x <= 36; x++)
+if (!std::isxdigit(rString[x]))
+return;
+
+maGuidArray[0] = covertHexChar(rString[1], rString[2]);
+maGuidArray[1] = covertHexChar(rString[3], rString[4]);
+maGuidArray[2] = covertHexChar(rString[5], rString[6]);
+maGuidArray[3] = covertHexChar(rString[7], rString[8]);
+
+maGuidArray[4] = covertHexChar(rString[10], rString[11]);
+maGuidArray[5] = covertHexChar(rString[12], rString[13]);
+
+maGuidArray[6] = covertHexChar(rString[15], rString[16]);
+maGuidArray[7] = covertHexChar(rString[17], rString[18]);
+
+maGuidArray[8] = covertHexChar(rString[20], rString[21]);
+maGuidArray[9] = covertHexChar(rString[22], rString[23]);
+
+maGuidArray[10] = covertHexChar(rString[25], rString[26]);
+maGuidArray[11] = covertHexChar(rString[27], rString[28]);
+maGuidArray[12] = covertHexChar(rString[29], rString[30]);
+maGuidArray[13] = covertHexChar(rString[31], rString[32]);
+maGuidArray[14] = covertHexChar(rString[33], rString[34]);
+maGuidArray[15] = covertHexChar(rString[35], rString[36]);
+}
+
[Libreoffice-bugs] [Bug 148375] CALC FORMATTING False information concerning setting for decimal separator, calculating not possible because numbers are treated as text.
https://bugs.documentfoundation.org/show_bug.cgi?id=148375 m.a.riosv changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||miguelangelrv@libreoffice.o ||rg --- Comment #2 from m.a.riosv --- How an introduced number it's interpreted has nothing to do with the setting about decimal separator on the numeric keyboard. Calc recognizes the numbers, with the decimal separator of the language in the cell style. Changing the language on default cell style, could solve your problem, and can be changed as many times you need, numbers are remained fine in the cells. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147967] Libreoffice Writer crashes after trying to insert a formula via the formula editor (macOS)
https://bugs.documentfoundation.org/show_bug.cgi?id=147967 Oliver changed: What|Removed |Added CC||warummailen+bugzilla@gmail. ||com --- Comment #18 from Oliver --- (In reply to Alex Thurgood from comment #17) > Confirming that the crash still occurs with > > Version: 7.4.0.0.alpha0+ / LibreOffice Community Same here! Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: d925d1ca9e03863650dd3e450331598624f21724 CPU threads: 2; OS: Mac OS X 10.13.6; UI render: Skia/Raster; VCL: osx Locale: de-DE (de_DE.UTF-8); UI: en-US Calc: threaded => Crash! I could track it down - 7.1.8.1 is working fine, first version with bug is 7.2.0.1 (did not check the alpha versions...) Version: 7.2.0.1 / LibreOffice Community Build ID: 32efc3b7f3a71cfa6a7fa3f6c208333df48656cc CPU threads: 2; OS: Mac OS X 10.13.6; UI render: default; VCL: osx Locale: de-DE (de_DE.UTF-8); UI: en-US Calc: threaded => Crash! -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148378] Allow user to set Data > Sort, Options: "Range contains column labels" as a persistent variable
https://bugs.documentfoundation.org/show_bug.cgi?id=148378 --- Comment #1 from Eike Rathke --- This happens when using Ctrl+A to select *all* before the Sort. Don't. See https://ask.libreoffice.org/t/set-persistent-option-to-include-column-headers-when-using-data-sort/76087/11 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148280] Calc, Autofill erases existing data when aborted
https://bugs.documentfoundation.org/show_bug.cgi?id=148280 Ezinne changed: What|Removed |Added CC||nnamani.ezi...@collabora.co ||m --- Comment #1 from Ezinne --- Not reproducible in: Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: 678446780446ae568ee8b1b814158c54ea5e393f CPU threads: 8; OS: Linux 5.13; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148241] LO Writer has issues editing index entries in tables
https://bugs.documentfoundation.org/show_bug.cgi?id=148241 Ezinne changed: What|Removed |Added CC||nnamani.ezi...@collabora.co ||m Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Ezinne --- Please can you attach a sample file to aid in testing the bug? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148243] Regression: Autocorrect replace bullets with no longer works
https://bugs.documentfoundation.org/show_bug.cgi?id=148243 --- Comment #1 from Ezinne --- Not reproducible in: Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: 678446780446ae568ee8b1b814158c54ea5e393f CPU threads: 8; OS: Linux 5.13; UI render: default; VCL: gtk3 Locale: en-US (en_US.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148242] Confusing range handle when editing formula
https://bugs.documentfoundation.org/show_bug.cgi?id=148242 Ezinne changed: What|Removed |Added Ever confirmed|0 |1 CC||nnamani.ezi...@collabora.co ||m Status|UNCONFIRMED |NEW --- Comment #3 from Ezinne --- Reproducible in: Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: 678446780446ae568ee8b1b814158c54ea5e393f CPU threads: 8; OS: Linux 5.13; UI render: default; VCL: gtk3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148287] Scrolling not possible when mouse pointer over row/column index
https://bugs.documentfoundation.org/show_bug.cgi?id=148287 Ezinne changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Ezinne --- Reproducible on: Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: 678446780446ae568ee8b1b814158c54ea5e393f CPU threads: 8; OS: Linux 5.13; UI render: default; VCL: gtk3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148103] Navigator hides some H1 paragraphs when choosing 2 outline levels (probably document specific)
https://bugs.documentfoundation.org/show_bug.cgi?id=148103 Jim Raykowski changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |rayk...@gmail.com |desktop.org | --- Comment #2 from Jim Raykowski --- Regression from commit 3771a81060f9e1f60ada37c3b7fa0a51b3042952 Here is a fix: https://gerrit.libreoffice.org/c/core/+/132533 Eyal, Dieter, Thanks! -- You are receiving this mail because: You are the assignee for the bug.
Daniel Kamil Kozar license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Lots of love, dkk
[Libreoffice-bugs] [Bug 148378] New: Allow user to set Data > Sort, Options: "Range contains column labels" as a persistent variable
https://bugs.documentfoundation.org/show_bug.cgi?id=148378 Bug ID: 148378 Summary: Allow user to set Data > Sort, Options: "Range contains column labels" as a persistent variable Product: LibreOffice Version: 7.3.2.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jw.he...@gmail.com This is a possible repeat/re-creation of #94668 which was closed as "worksforme." tl;dr: allow me to set Data > Sort, Options: "Range contains column labels" globally instead of per session/per file. I always want it to default as checked. I'm on 7.3.2.2 and for years have always had to go into the Options tab to select "Range contains column labels" whenever I sort. I can't recall the last (or any?) time I *didn't* want this. Could this be made a globally persistent options so that users who [almost] always work with data containing a header row don't have to do this one additional step (or more accurately, forget, sort, wonder where their header is, ctrl+z, sort, this time click options and check box, apply)? Related to #131155, which wants to move the option from Options to in the main sort pane... This would save a click, but I'd just prefer to toggle this globally like e.g. auto-fill/auto-correct options. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102495] [META] KDE VCL backend bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102495 Bug 102495 depends on bug 147523, which changed state. Bug 147523 Summary: unable to expand formula region in calc using mouse in 7.4 (kf5) https://bugs.documentfoundation.org/show_bug.cgi?id=147523 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147523] unable to expand formula region in calc using mouse in 7.4 (kf5)
https://bugs.documentfoundation.org/show_bug.cgi?id=147523 Jan-Marek Glogowski changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148255] LibreOffice Writer: Text "disappears" while writing between two formulas that are next to each other
https://bugs.documentfoundation.org/show_bug.cgi?id=148255 --- Comment #7 from Antoni Aloy Torrens --- The bug is NOT reproducible on: Version: 7.2.6.2 / LibreOffice Community Build ID: b0ec3a565991f7569a5a7f5d24fed7f52653d754 CPU threads: 16; OS: Linux 5.13; UI render: default; VCL: gtk3 Locale: en-US (C.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 118320] Add support for Windows 10/11 dark mode
https://bugs.documentfoundation.org/show_bug.cgi?id=118320 V Stuart Foote changed: What|Removed |Added Depends on||148376 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148376 [Bug 148376] Insert Table toolbar: text with table size does not respect dark mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148376] Insert Table toolbar: text with table size does not respect dark mode
https://bugs.documentfoundation.org/show_bug.cgi?id=148376 V Stuart Foote changed: What|Removed |Added Blocks||118320 Status|UNCONFIRMED |NEW CC||vstuart.fo...@utsa.edu Ever confirmed|0 |1 --- Comment #1 from V Stuart Foote --- as for bug 118320#c99 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=118320 [Bug 118320] Add support for Windows 10/11 dark mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: basic/Library_sb.mk
basic/Library_sb.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit be7d84a3fbd47bf9a078ac7e6854bc4927e84933
Author: Jan-Marek Glogowski
AuthorDate: Mon Apr 4 15:11:10 2022 +0200
Commit: Jan-Marek Glogowski
CommitDate: Mon Apr 4 21:36:10 2022 +0200
Fix --disable-scripting build (WASM)
Simply include the global transliterator in all builds.
Regression from commit de81c2545aec06a1b269218b7d00656e97d8b66c
("Related: tdf#144245 Optimize case-insensitive handling").
Change-Id: Ica1c6e5d67c8458f9977f2ff87d9594a43b4cff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132517
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 17fbcbd1010e..28effaaae0e1 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/basmgr/vbahelper \
basic/source/classes/codecompletecache \
basic/source/classes/eventatt \
- basic/source/classes/global \
basic/source/classes/image \
basic/source/classes/propacc \
basic/source/classes/sb \
@@ -104,6 +103,7 @@ endif
$(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/basrdll \
+ basic/source/classes/global \
basic/source/runtime/methods \
basic/source/runtime/methods1 \
basic/source/classes/sbintern \
[Libreoffice-bugs] [Bug 148332] Undo deleting a row restores the wrong data information (track changes involved)
https://bugs.documentfoundation.org/show_bug.cgi?id=148332 Xisco Faulí changed: What|Removed |Added CC||xiscofa...@libreoffice.org --- Comment #2 from Xisco Faulí --- Not reproducible in Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: bd992ae1228b2f7e556f89f95949da0aeade5b91 CPU threads: 8; OS: Linux 5.10; UI render: default; VCL: gtk3 Locale: en-US (es_ES.UTF-8); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148374] Desert Safari Company
https://bugs.documentfoundation.org/show_bug.cgi?id=148374 Xisco Faulí changed: What|Removed |Added Resolution|--- |INVALID URL|https://www.desertsafaricom | |pany.com/ | CC||xiscofa...@libreoffice.org Component|Base|deletionRequest Status|UNCONFIRMED |RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.24-1'
Tag 'cp-21.06.24-1' created by Andras Timar at 2022-04-04 19:27 + cp-21.06.24-1 Changes since co-21.06.24-1: Andras Timar (1): add a few more languages to Android build --- distro-configs/CPAndroidBranding.conf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---
[Libreoffice-bugs] [Bug 108914] [META] Password protected file bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108914 Bug 108914 depends on bug 144996, which changed state. Bug 144996 Summary: FILESAVE XLSX Read-only passwords on XLSX files are not working https://bugs.documentfoundation.org/show_bug.cgi?id=144996 What|Removed |Added Status|VERIFIED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/layout/data/forcepoint99.html |binary sw/qa/extras/layout/layout.cxx |6 ++ sw/source/core/text/itrform2.cxx | 15 +++ sw/source/core/text/itrform2.hxx |2 ++ sw/source/core/text/porlay.cxx |4 +++- 5 files changed, 22 insertions(+), 5 deletions(-) New commits: commit 0a34ac386187c5ca328aebc27851c2a2ff38f293 Author: Caolán McNamara AuthorDate: Fri Apr 1 16:52:06 2022 +0100 Commit: Caolán McNamara CommitDate: Mon Apr 4 20:57:24 2022 +0200 forcepoint#99 SwTextFormatter unaware that FirstOfBorderMerge was deleted READ of size 8 at 0x606000a49e50 thread T0 #0 0x7f7ab6214bf5 in SwPosSize::Height() const /home/caolan/LibreOffice/core-asan/sw/source/core/text/possiz.hxx:49:37 #1 0x7f7ab636c311 in SwTextFormatter::MergeCharacterBorder(SwLinePortion&, SwLinePortion const*, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:2807:43 #2 0x7f7ab636ae08 in SwTextFormatter::InsertPortion(SwTextFormatInfo&, SwLinePortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:354:13 #3 0x7f7ab6371db1 in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:709:9 #4 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9 #5 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44 #6 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23 #7 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5 #8 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17 #9 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17 0x606000a49e50 is located 16 bytes inside of 56-byte region [0x606000a49e40,0x606000a49e78) freed by thread T0 here: #0 0x4fe1f7 in operator delete(void*) (/home/caolan/LibreOffice/core-asan/instdir/program/soffice.bin+0x4fe1f7) #1 0x7f7ab6486d35 in SwTextPortion::~SwTextPortion() /home/caolan/LibreOffice/core-asan/sw/source/core/text/portxt.hxx:26:7 #2 0x7f7ab63da0c9 in SwLineLayout::CalcLine(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/porlay.cxx:430:21 #3 0x7f7ab6435413 in SwMultiPortion::CalcSize(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:75:15 #4 0x7f7ab6457749 in SwTextFormatter::BuildMultiPortion(SwTextFormatInfo&, SwMultiPortion&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:2090:16 #5 0x7f7ab636f12c in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:550:21 #6 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9 #7 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44 #8 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23 #9 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5 #10 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17 #11 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17 similar seen in the past as: commit 96acebb72211b4718eb3038c427df37b55b17b0b Date: Tue May 14 01:49:03 2019 +0800 tdf#124937 reset m_pFirstOfBorderMerge before truncate. commit ecd855794b22c0f7e6fb2f362b566c4d9c5f624a Date: Mon Jan 15 22:29:31 2018 +0100 tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder() Change-Id: Iad855f382a0daf50dac2537d4a91bfeaa9ff3799 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132439 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit b46baea4d1cce81c56ee0d82fbdc352921445fa7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132380 Reviewed-by:
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/layout/data/forcepoint103.html |binary
sw/qa/extras/layout/layout.cxx |6 ++
sw/source/core/layout/layact.cxx| 12 +++-
sw/source/core/layout/tabfrm.cxx|1 +
4 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 934b5a9cd658be0dabe18fec0f7bc29943050bd2
Author: Caolán McNamara
AuthorDate: Sun Apr 3 17:07:45 2022 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 4 20:54:38 2022 +0200
forcepoint#103 avoid crash on layout of specific html
return early if the prev frame was unexpectedly deleted
and another similar case to forcepoint#100 and drop a
SwBorderAttrAccess to allow the cache entry to be removed
in SwCache::DeleteObj
Change-Id: Ia83fe8911e2f6071a28d69c3089a96e3b87cc548
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132487
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132494
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/data/forcepoint103.html
b/sw/qa/extras/layout/data/forcepoint103.html
new file mode 100644
index ..006a6d340ef0
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint103.html differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 18c766904615..9ba5927f3e41 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2547,6 +2547,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint102)
createSwDoc(DATA_DIRECTORY, "forcepoint102.rtf");
}
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint103)
+{
+createSwWebDoc(DATA_DIRECTORY, "forcepoint103.html");
+}
+
//just care it doesn't crash/assert
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint)
{
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index da6e7c938f6b..b2b246e5eb2f 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -59,6 +59,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1693,7 +1694,10 @@ bool SwLayAction::FormatContent(SwPageFrame *const pPage)
// We do this so we don't have to search later on.
const bool bNxtCnt = IsCalcLayout() && !pContent->GetFollow();
const SwContentFrame *pContentNext = bNxtCnt ?
pContent->GetNextContentFrame() : nullptr;
-const SwContentFrame *pContentPrev = pContent->GetPrev() ?
pContent->GetPrevContentFrame() : nullptr;
+SwContentFrame* const pContentPrev = pContent->GetPrev() ?
pContent->GetPrevContentFrame() : nullptr;
+std::optional oPrevDeleteListener;
+if (pContentPrev)
+oPrevDeleteListener.emplace(*pContentPrev);
const SwLayoutFrame*pOldUpper = pContent->GetUpper();
const SwTabFrame *pTab = pContent->FindTabFrame();
@@ -1772,6 +1776,12 @@ bool SwLayAction::FormatContent(SwPageFrame *const pPage)
bool bSetContent = true;
if ( pContentPrev )
{
+if (oPrevDeleteListener->WasDeleted())
+{
+SAL_WARN("sw", "ContentPrev was deleted");
+return false;
+}
+
if ( !pContentPrev->isFrameAreaDefinitionValid() &&
pPage->IsAnLower( pContentPrev ) )
{
pPage->InvalidateContent();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index c9683f6956e4..a650663de659 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2548,6 +2548,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
}
}
+oAccess.reset();
const bool bSplitError = !Split( nDeadLine, bTryToSplit, (
bTableRowKeep && !(bAllowSplitOfRow || bEmulateTableKeepSplitAllowed) ) );
// tdf#130639 don't start table on a new page after the
fallback "switch off repeating header"
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/layout/data/forcepoint102.rtf | 178 +
sw/qa/extras/layout/layout.cxx | 18 +-
sw/source/core/text/txtfrm.cxx |8 +
3 files changed, 197 insertions(+), 7 deletions(-)
New commits:
commit 1c4ebab83edb8fe70282f6467700a56c3aff6c1b
Author: Caolán McNamara
AuthorDate: Sun Apr 3 17:07:45 2022 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 4 20:53:44 2022 +0200
forcepoint#102 refetch pPara if it might have been destroyed
by SwTextFly::Relax
READ of size 8 at 0x616006d9ab08 thread T0
#0 0x7f5c56a0fbe5 in Size::Height() const include/tools/gen.hxx:213:52
#1 0x7f5c56a0fb98 in Size::getHeight() const
include/tools/gen.hxx:219:55
#2 0x7f5c56a040f0 in SwRect::IsEmpty() const sw/inc/swrect.hxx:306:21
#3 0x7f5c56dbb018 in SwRect::HasArea() const sw/inc/swrect.hxx:302:13
#4 0x7f5c58571d04 in SwTextFrame::Prepare(PrepareHint, void const*,
bool) sw/source/core/text/txtfrm.cxx:2986:45
0x616006d9ab08 is located 136 bytes inside of 608-byte region
[0x616006d9aa80,0x616006d9ace0)
freed by thread T0 here:
#0 0x4fe1f7 in operator delete(void*)
(instdir/program/soffice.bin+0x4fe1f7)
#1 0x7f5c584602c5 in SwParaPortion::~SwParaPortion()
sw/source/core/text/porlay.cxx:2557:1
#2 0x7f5c5850b997 in
std::default_delete::operator()(SwParaPortion*) const
/usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:85:2
#3 0x7f5c5850b826 in std::__uniq_ptr_impl >::reset(SwParaPortion*)
/usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:182:4
#4 0x7f5c5850b630 in std::unique_ptr >::reset(SwParaPortion*)
/usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:456:7
#5 0x7f5c5850960d in SwTextLine::SetPara(SwParaPortion*, bool)
sw/source/core/text/txtcache.hxx:45:17
#6 0x7f5c58509e7d in SwTextFrame::ClearPara()
sw/source/core/text/txtcache.cxx:113:24
#7 0x7f5c5855606e in SwTextFrame::Init()
sw/source/core/text/txtfrm.cxx:758:9
#8 0x7f5c585735c4 in SwTextFrame::Prepare(PrepareHint, void const*,
bool) sw/source/core/text/txtfrm.cxx:3090:17
#9 0x7f5c57ecafb4 in lcl_NotifyContent(SdrObject const*,
SwContentFrame*, SwRect const&, PrepareHint)
sw/source/core/layout/frmtool.cxx:3367:15
#10 0x7f5c57ec968b in Notify_Background(SdrObject const*, SwPageFrame*,
SwRect const&, PrepareHint, bool) sw/source/core/layout/frmtool.cxx:3443:9
#11 0x7f5c57958669 in lcl_NotifyBackgroundOfObj(SwDrawContact const&,
SdrObject const&, tools::Rectangle const*)
sw/source/core/draw/dcontact.cxx:951:13
#12 0x7f5c579556bc in SwDrawContact::Changed_(SdrObject const&,
SdrUserCallType, tools::Rectangle const*)
sw/source/core/draw/dcontact.cxx:1233:21
#13 0x7f5c57953b8d in SwDrawContact::Changed(SdrObject const&,
SdrUserCallType, tools::Rectangle const&)
sw/source/core/draw/dcontact.cxx:1009:5
#14 0x7f5c96008baf in SdrObject::SendUserCall(SdrUserCallType,
tools::Rectangle const&) const svx/source/svdraw/svdobj.cxx:2767:22
#15 0x7f5c9601befa in SdrObject::Resize(Point const&, Fraction const&,
Fraction const&, bool) svx/source/svdraw/svdobj.cxx:1561:5
#16 0x7f5c57da650c in SwAnchoredDrawObject::GetObjBoundRect() const
sw/source/core/layout/anchoreddrawobject.cxx:733:22
#17 0x7f5c57dae236 in SwAnchoredObject::GetObjRectWithSpaces() const
sw/source/core/layout/anchoredobject.cxx:569:31
#18 0x7f5c5853c39e in SwTextFly::InitAnchoredObjList()
sw/source/core/text/txtfly.cxx:900:48
#19 0x7f5c58537b0c in SwTextFly::GetAnchoredObjList() const
sw/source/core/inc/txtfly.hxx:311:44
#20 0x7f5c58532a5d in SwTextFly::ForEach(SwRect const&, SwRect*, bool)
const sw/source/core/text/txtfly.cxx:1067:56
#21 0x7f5c58533eec in SwTextFly::IsAnyFrame() const
sw/source/core/text/txtfly.cxx:405:12
#22 0x7f5c5832ccbe in SwTextFly::Relax()
sw/source/core/inc/txtfly.hxx:337:17
#23 0x7f5c58571af5 in SwTextFrame::Prepare(PrepareHint, void const*,
bool) sw/source/core/text/txtfrm.cxx:2976:48
Change-Id: Ibd0d4af69d2a8d74ad538afba7da53c864fa27b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132480
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit f49d218a671df5f7a956ccb219dc46a5c8d0a53c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132485
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/data/forcepoint102.rtf
b/sw/qa/extras/layout/data/forcepoint102.rtf
new file mode 100644
index ..2a830ff73c10
--- /dev/null
+++ b/sw/qa/extras/layout/data/forcepoint102.rtf
@@ -0,0 +1,178 @@
+{\rtf1\ansh\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033{\fonttbl{\f0
Times New Roman;}{\f1 Courier New;}{\f2
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - 2 commits - sw/qa sw/source
sw/qa/extras/layout/data/forcepoint100.html |binary
sw/qa/extras/layout/data/forcepoint98.html |binary
sw/qa/extras/layout/layout.cxx | 12
sw/source/core/layout/sectfrm.cxx |3 +-
sw/source/core/layout/tabfrm.cxx| 42 +---
5 files changed, 40 insertions(+), 17 deletions(-)
New commits:
commit ff6ca44405e0f472441bfa3902f6a3d614028029
Author: Caolán McNamara
AuthorDate: Fri Apr 1 15:49:13 2022 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 4 20:53:26 2022 +0200
forcepoint#98 don't delete SwFrame flagged as IsDeleteForbidden
Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/data/forcepoint98.html
b/sw/qa/extras/layout/data/forcepoint98.html
new file mode 100644
index ..9d4b76c53e76
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint98.html differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index bc80f22d0094..046b6da50650 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2548,6 +2548,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
}
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint98)
+{
+createSwWebDoc(DATA_DIRECTORY, "forcepoint98.html");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128611)
{
createSwDoc(DATA_DIRECTORY, "tdf128611.fodt");
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 9b33ceeadd63..34e86e51808b 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2885,7 +2885,8 @@ void SwRootFrame::DeleteEmptySct_()
mpDestroy->erase( mpDestroy->begin() );
OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(),
"DeleteEmptySct: Locked SectionFrame" );
-if( !pSect->getFrameArea().HasArea() && !pSect->ContainsContent() )
+SAL_WARN_IF(pSect->IsDeleteForbidden(), "sw.layout", "not allowed
delete SwFrame");
+if( !pSect->getFrameArea().HasArea() && !pSect->ContainsContent() &&
!pSect->IsDeleteForbidden() )
{
SwLayoutFrame* pUp = pSect->GetUpper();
pSect->RemoveFromLayout();
commit 697a695dbddd9bcea60e3c65de7d91e88308e557
Author: Caolán McNamara
AuthorDate: Sat Apr 2 20:20:10 2022 +0100
Commit: Caolán McNamara
CommitDate: Mon Apr 4 20:53:09 2022 +0200
forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removed
for SwBorderAttr which gets deleted during this call
also includes...
Related: forcepoint#100 we don't need pAttrs for the duration of the full
scope
similar to the case of
commit 6b1eae0334ba8bad7656a859695551ce51b62f95
Date: Fri May 18 08:26:14 2001 +
Fix #87058#: Locked boraderattribut
the SwCache object cannot be deleted if its locked, leading to a leak,
we don't need pAttrs for the entire scope here so we can defer to the
end of the scope the reacquire the lock to set pAttrs
and also includes...
Related: forcepoint#100 don't reacquire after every release
instead release when we have to, and only reacquire if necessary
before use of pAttrs
Change-Id: Ie52aab7e5933d76b0c055389798104e4d93f39e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132461
Reviewed-by: Michael Stahl
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/layout/data/forcepoint100.html
b/sw/qa/extras/layout/data/forcepoint100.html
new file mode 100644
index ..6e9b83a6c95e
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint100.html differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 489518c693ef..bc80f22d0094 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2529,6 +2529,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint94)
createSwWebDoc(DATA_DIRECTORY, "forcepoint94.html");
}
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint100)
+{
+createSwWebDoc(DATA_DIRECTORY, "forcepoint100.html");
+}
+
//just care it doesn't crash/assert
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint)
{
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 98f5229d4ba5..c9683f6956e4 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2059,8 +2059,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
[Libreoffice-bugs] [Bug 148340] Crash in: o3tl::sorted_vector::erase
https://bugs.documentfoundation.org/show_bug.cgi?id=148340 Dan Carr changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME --- Comment #2 from Dan Carr --- I have tried to reproduce this condition several times, but at this point, I have been unsuccessful. Therefore I recommend closing this. I am not sure if I put the correct status on it. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLTextShapeImportHelper.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b812150696c574aea0a173d11f178e8d458b1a3e
Author: Michael Stahl
AuthorDate: Mon Apr 4 20:29:07 2022 +0200
Commit: Michael Stahl
CommitDate: Mon Apr 4 20:30:18 2022 +0200
oops, forgot to fix the comment
Change-Id: Ib9281395087c8b21c2693a233d77236f9353e9c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132529
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/xmloff/source/text/XMLTextShapeImportHelper.cxx
b/xmloff/source/text/XMLTextShapeImportHelper.cxx
index 1c567b689632..f4a62f4ad9b7 100644
--- a/xmloff/source/text/XMLTextShapeImportHelper.cxx
+++ b/xmloff/source/text/XMLTextShapeImportHelper.cxx
@@ -119,8 +119,7 @@ void XMLTextShapeImportHelper::addShape(
// anchor type
xPropSet->setPropertyValue( gsAnchorType, Any(eAnchorType) );
-// page number (must be set after the frame is inserted, because it
-// will be overwritten then inserting the frame.
+// page number must be set before the frame is inserted
switch( eAnchorType )
{
case TextContentAnchorType_AT_PAGE:
[Libreoffice-bugs] [Bug 148372] Dubai Desert Safari Offer
https://bugs.documentfoundation.org/show_bug.cgi?id=148372 Buovjaga changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |INVALID URL|https://www.dubaidesertsafa | |rioffer.com/| Component|Base|deletionRequest -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148373] Dubai Desert Safari AE
https://bugs.documentfoundation.org/show_bug.cgi?id=148373 Buovjaga changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Component|BASIC |deletionRequest Resolution|--- |INVALID URL|https://www.dubaidesertsafa | |ri.ae/ | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/qa sw/source xmloff/source
sw/qa/extras/odfimport/data/forcepoint101.fodt | 13 + sw/qa/extras/odfimport/odfimport.cxx|6 ++ sw/source/core/unocore/unodraw.cxx |4 +++- sw/source/core/unocore/unoframe.cxx |1 + xmloff/source/text/XMLTextShapeImportHelper.cxx | 12 +--- 5 files changed, 32 insertions(+), 4 deletions(-) New commits: commit 8fbe27a53c038cd32c45bad1f0b417e79d483185 Author: Michael Stahl AuthorDate: Mon Apr 4 17:19:51 2022 +0200 Commit: Michael Stahl CommitDate: Mon Apr 4 20:23:15 2022 +0200 forcepoint#101 sw: fix inserting at-page shapes to not set anchor pos The problem is that for an at-page anchor SwXDrawPage::add() sets an anchor position, but then a fieldmark is inserted and the node with the anchor position is deleted. The code that sets the surprising anchor position for at-page shape was added in commit cf345e026fc0378c4436173c8064717c7db4d538 "Fix #91289#: Draw objects anchored at page but without page number" and is similar to the code for fly-frames added in commit 2e6d999cf8ceacabb94b11feee6ee0808c2a75bc "If no page number is given for page bound frames, calculate it using cursor" except that it is missing a check for GetPageNum() == 0, for no obvious reason. The matching code to replace the anchor position with a page number is in SwFlyFrameFormat::MakeFrames() and was added in commit 572a48cd16f6ce3a68ffead44a975698954dfe11 "Fix #85019#: Insertion of flyframes without correct pagenumber"; it's not clear if this is only needed for shapes inserted via the above 2 UNO APIs or also for shapes inserted via UI. Then there is the issue that the page number is set in XMLTextShapeImportHelper::addShape() only after the shape is inserted, which was added and commented in commit b5fc47fe5c2892dd712e2bda922656eacbd932f1, earlier than all the above commits; testing shows that if the page number is set before inserting the shape, the shape ends up on the expected page anyway. Let's change this: 1. the page number is set before inserting the shape 2. at-page anchor with page number is left as is 3. at-page anchor without page number gets anchor position and is changed to at-char Change-Id: I2f874bec8424de5eee94cf022e3b49382eaa55f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132479 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/qa/extras/odfimport/data/forcepoint101.fodt b/sw/qa/extras/odfimport/data/forcepoint101.fodt new file mode 100644 index ..7210888262dc --- /dev/null +++ b/sw/qa/extras/odfimport/data/forcepoint101.fodt @@ -0,0 +1,13 @@ + +http://openoffice.org/2009/office; xmlns:css3t="http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:rpt="http://openoffice.org/2005/report; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table; xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> + + + + + + + + foobar + + + diff
[Libreoffice-bugs] [Bug 136358] [META] ODF to OOXML shape export related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=136358 Bug 136358 depends on bug 100391, which changed state. Bug 100391 Summary: FILESAVE PPTX Text in shape shifted from center to upper left corner https://bugs.documentfoundation.org/show_bug.cgi?id=100391 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/core/layout/tabfrm.cxx | 42 ---
1 file changed, 26 insertions(+), 16 deletions(-)
New commits:
commit 37f39a4156069ba5f099045ce93370507d9ba215
Author: Caolán McNamara
AuthorDate: Sat Apr 2 20:20:10 2022 +0100
Commit: Michael Stahl
CommitDate: Mon Apr 4 20:21:58 2022 +0200
forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removed
for SwBorderAttr which gets deleted during this call
also includes...
Related: forcepoint#100 we don't need pAttrs for the duration of the full
scope
similar to the case of
commit 6b1eae0334ba8bad7656a859695551ce51b62f95
Date: Fri May 18 08:26:14 2001 +
Fix #87058#: Locked boraderattribut
the SwCache object cannot be deleted if its locked, leading to a leak,
we don't need pAttrs for the entire scope here so we can defer to the
end of the scope the reacquire the lock to set pAttrs
and also includes...
Related: forcepoint#100 don't reacquire after every release
instead release when we have to, and only reacquire if necessary
before use of pAttrs
Change-Id: Ie52aab7e5933d76b0c055389798104e4d93f39e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132462
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index adc0491b88ba..e836bfb73a01 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2023,8 +2023,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
pAccess.reset();
m_bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrame( *this ) );
-pAccess =
std::make_unique(SwFrame::GetCache(), this);
-pAttrs = pAccess->Get();
}
setFramePrintAreaValid(false);
@@ -2059,6 +2057,12 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
const tools::Long nOldPrtWidth =
aRectFnSet.GetWidth(getFramePrintArea());
const tools::Long nOldFrameWidth =
aRectFnSet.GetWidth(getFrameArea());
const Point aOldPrtPos = aRectFnSet.GetPos(getFramePrintArea());
+
+if (!pAccess)
+{
+pAccess =
std::make_unique(SwFrame::GetCache(), this);
+pAttrs = pAccess->Get();
+}
Format( getRootFrame()->GetCurrShell()->GetOut(), pAttrs );
SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
@@ -2069,8 +2073,6 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
pAccess.reset();
m_bCalcLowers |= pLayout->Resize(
pLayout->GetBrowseWidthByTabFrame( *this ) );
-pAccess =
std::make_unique(SwFrame::GetCache(), this);
-pAttrs = pAccess->Get();
}
if ( aOldPrtPos != aRectFnSet.GetPos(getFramePrintArea()) )
aNotify.SetLowersComplete( false );
@@ -2119,15 +2121,22 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
pAccess.reset();
m_bCalcLowers |= pHTMLLayout->Resize(
pHTMLLayout->GetBrowseWidthByTabFrame( *this )
);
+}
+
+setFramePrintAreaValid(false);
+if (!pAccess)
+{
pAccess =
std::make_unique(SwFrame::GetCache(), this);
pAttrs = pAccess->Get();
}
-
-setFramePrintAreaValid(false);
Format( getRootFrame()->GetCurrShell()->GetOut(),
pAttrs );
}
+
+pAccess.reset();
+
lcl_RecalcTable( *this, nullptr, aNotify );
+
m_bLowersFormatted = true;
if ( bKeep && KEEPTAB )
{
@@ -2291,11 +2300,18 @@ void SwTabFrame::MakeAll(vcl::RenderContext*
pRenderContext)
// 6. There is no section change behind the table (see
IsKeep)
// 7. The last table row wants to keep with its next.
const SwRowFrame* pLastRow = static_cast(GetLastLower());
-if (pLastRow
-&& IsKeep(pAttrs->GetAttrSet().GetKeep(),
GetBreakItem(), true)
-&& pLastRow->ShouldRowKeepWithNext())
+if (pLastRow)
{
-bFormat = true;
+if (!pAccess)
+{
+pAccess =
std::make_unique(SwFrame::GetCache(), this);
+pAttrs = pAccess->Get();
+}
+
[Libreoffice-commits] core.git: oox/qa oox/source
oox/qa/unit/data/tdf100391_TextAreaRect.odp |binary
oox/qa/unit/export.cxx | 21 ++
oox/source/export/drawingml.cxx | 98 +++-
3 files changed, 116 insertions(+), 3 deletions(-)
New commits:
commit 1ad58c77352e418124387b804b18da2aeea22c8b
Author: Regina Henschel
AuthorDate: Mon Apr 4 01:55:29 2022 +0200
Commit: Regina Henschel
CommitDate: Mon Apr 4 20:21:14 2022 +0200
tdf#100391 calculate true textarea rect for custGeom
Without the fix the attributes for were set to 'l', 't', 'r'
and 'b'. That means that the textarea rectangle equals the shape
rectangle. That is the default and works for many shapes. But 'Puzzle'
has a smaller textarea rectangle, for example.
Because the values in draw:text-areas are relative to the internal
coordinate system given by draw:viewBox in ODF, but the values in
are relative to the shape coordinate system in OOXML, we
cannot simple write the current absolute values but need to calculate
them depending on actual width and height. For that we need guides.
The patch introduces a guide list. Currently the list contains only the
guides for the textarea rectangle, but it can be extended when export
of handles will be implemented one day.
Change-Id: I1050627ef6459ab5f8fafa939d7905122870c903
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132489
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/oox/qa/unit/data/tdf100391_TextAreaRect.odp
b/oox/qa/unit/data/tdf100391_TextAreaRect.odp
new file mode 100755
index ..b9b9e5b39e4a
Binary files /dev/null and b/oox/qa/unit/data/tdf100391_TextAreaRect.odp differ
diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx
index 60e20e2d933a..91b8d7608c24 100644
--- a/oox/qa/unit/export.cxx
+++ b/oox/qa/unit/export.cxx
@@ -590,6 +590,27 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf147978_subpath)
assertXPath(pXmlDoc, "//a:pathLst/a:path[4]", "w", "80");
assertXPath(pXmlDoc, "//a:pathLst/a:path[4]", "h", "80");
}
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf100391TextAreaRect)
+{
+// The document has a custom shape of type "non-primitive" to trigger the
custGeom export
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"tdf100391_TextAreaRect.odp";
+// When saving to PPTX the textarea rect was set to default instead of
using the actual area
+loadAndSave(aURL, "Impress Office Open XML");
+
+// Verify the markup. Without fix the values were l="l", t="t", r="r",
b="b"
+std::unique_ptr pStream = parseExportStream(getTempFile(),
"ppt/slides/slide1.xml");
+xmlDocUniquePtr pXmlDoc = parseXmlStream(pStream.get());
+assertXPath(pXmlDoc, "//a:custGeom/a:rect", "l", "textAreaLeft");
+assertXPath(pXmlDoc, "//a:custGeom/a:rect", "t", "textAreaTop");
+assertXPath(pXmlDoc, "//a:custGeom/a:rect", "r", "textAreaRight");
+assertXPath(pXmlDoc, "//a:custGeom/a:rect", "b", "textAreaBottom");
+// The values are calculated in guides, for example
+assertXPath(pXmlDoc, "//a:custGeom/a:gdLst/a:gd[1]", "name",
"textAreaLeft");
+assertXPath(pXmlDoc, "//a:custGeom/a:gdLst/a:gd[1]", "fmla", "*/ 144 w
288");
+// The test reflects the state of Apr 2022. It needs to be adapted when
export of handles and
+// guides is implemented.
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 54f94278d782..1d2d601a40f0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3857,6 +3857,83 @@ sal_Int32 GetCustomGeometryPointValue(const
css::drawing::EnhancedCustomShapePar
return nValue;
}
+
+struct TextAreaRect
+{
+OString left;
+OString top;
+OString right;
+OString bottom;
+};
+
+struct Guide
+{
+OString sName;
+OString sFormula;
+};
+
+void prepareTextArea(const EnhancedCustomShape2d& rEnhancedCustomShape2d,
+std::vector& rGuideList, TextAreaRect&
rTextAreaRect)
+{
+tools::Rectangle aTextAreaLO(rEnhancedCustomShape2d.GetTextRect());
+tools::Rectangle aLogicRectLO(rEnhancedCustomShape2d.GetLogicRect());
+if (aTextAreaLO == aLogicRectLO)
+{
+rTextAreaRect.left = "l";
+rTextAreaRect.top = "t";
+rTextAreaRect.right = "r";
+rTextAreaRect.bottom = "b";
+return;
+}
+// Flip aTextAreaLO if shape is flipped
+if (rEnhancedCustomShape2d.IsFlipHorz())
+aTextAreaLO.Move((aLogicRectLO.Center().X() -
aTextAreaLO.Center().X()) * 2, 0);
+if (rEnhancedCustomShape2d.IsFlipVert())
+aTextAreaLO.Move(0, (aLogicRectLO.Center().Y() -
aTextAreaLO.Center().Y()) * 2);
+
+Guide aGuide;
+// horizontal
+const sal_Int32 nWidth = aLogicRectLO.Right() - aLogicRectLO.Left();
+const OString sWidth =
OString::number(oox::drawingml::convertHmmToEmu(nWidth));
+
+// left
+
[Libreoffice-bugs] [Bug 102985] [META] Font bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102985 Dieter changed: What|Removed |Added Depends on||148122 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148122 [Bug 148122] Celtic MD font appears wrong -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148122] Celtic MD font appears wrong
https://bugs.documentfoundation.org/show_bug.cgi?id=148122 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de Priority|medium |low Blocks||102985 Ever confirmed|0 |1 Status|UNCONFIRMED |NEW Severity|normal |minor --- Comment #4 from Dieter --- I confirm it with Version: 7.3.2.2 (x64) / LibreOffice Community Build ID: 49f2b1bff42cfccbd8f788c8dc32c1c309559be0 CPU threads: 4; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: zh-CN (de_DE); UI: en-GB Calc: CL But I can only confirm it for the first line of a page. Following lines don't show that problem, although characters of different lines are very close to each other. Workaround: Add spacing before first paragraph Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=102985 [Bug 102985] [META] Font bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/ods/tdf85553.ods |binary
sc/qa/unit/subsequent_export_test2.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit 0225f1dd04e49191bbf1fa787bb15d1617ab996c
Author: Xisco Fauli
AuthorDate: Mon Apr 4 16:50:43 2022 +0200
Commit: Xisco Fauli
CommitDate: Mon Apr 4 20:19:18 2022 +0200
tdf#85553: subsequent_export_test2: Add unittest
Change-Id: I70f436ec26ae5127869be971a09d8ca119906009
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132522
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/data/ods/tdf85553.ods b/sc/qa/unit/data/ods/tdf85553.ods
new file mode 100644
index ..37cebbd42fe0
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf85553.ods differ
diff --git a/sc/qa/unit/subsequent_export_test2.cxx
b/sc/qa/unit/subsequent_export_test2.cxx
index ee3c14117307..b0ffb138c51f 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -139,6 +139,7 @@ public:
void testXltxExport();
void testRotatedImageODS();
+void testTdf85553();
void testTdf128976();
void testTdf143979();
void testTdf120502();
@@ -259,6 +260,7 @@ public:
CPPUNIT_TEST(testXltxExport);
CPPUNIT_TEST(testRotatedImageODS);
+CPPUNIT_TEST(testTdf85553);
CPPUNIT_TEST(testTdf128976);
CPPUNIT_TEST(testTdf143979);
CPPUNIT_TEST(testTdf120502);
@@ -1765,6 +1767,25 @@ void ScExportTest2::testRotatedImageODS()
xDocSh->DoClose();
}
+void ScExportTest2::testTdf85553()
+{
+ScDocShellRef xShell = loadDoc(u"tdf85553.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+ScDocShellRef xDocSh = saveAndReload(*xShell, FORMAT_XLS);
+xShell->DoClose();
+CPPUNIT_ASSERT(xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Without the fix in place, this test would have failed with
+// - Expected: 4.5
+// - Actual : #N/A
+CPPUNIT_ASSERT_EQUAL(OUString("4.5"), rDoc.GetString(ScAddress(2, 2, 0)));
+
+xDocSh->DoClose();
+}
+
void ScExportTest2::testTdf128976()
{
ScDocShellRef xShell = loadDoc(u"tdf128976.", FORMAT_XLS);
[Libreoffice-bugs] [Bug 148377] New: Crashes soon after opening and choosing icon for picture insertion. I am using the Mac Mini Silicone Processor, 16 gigs ram
https://bugs.documentfoundation.org/show_bug.cgi?id=148377 Bug ID: 148377 Summary: Crashes soon after opening and choosing icon for picture insertion. I am using the Mac Mini Silicone Processor, 16 gigs ram Product: LibreOffice Version: 7.3.2.2 release Hardware: Other OS: macOS (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: oldguyphoto2...@gmail.com Description: Crashes soon after opening and choosing icon for picture insertion Actual Results: load document and try to add picture by clicking on the menu bar, system then crashes, even if I am just pointing to see the function in the menu. Expected Results: crash and locks, have to use forced shutdown. Then on restart I have to recover the document. Reproducible: Always User Profile Reset: No Additional Info: I expect if I want to add a picture I would be taken to the hard drive for the media I want to include. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/tiledrendering/tiledrendering.cxx | 39 +
sw/source/core/doc/docredln.cxx|9 +
2 files changed, 48 insertions(+)
New commits:
commit 81bcee981ee0558474467d83c0fa929e932c
Author: Miklos Vajna
AuthorDate: Mon Apr 4 16:01:57 2022 +0200
Commit: Miklos Vajna
CommitDate: Mon Apr 4 19:45:58 2022 +0200
sw lok: fix missing cache invalidation in SwRedlineTable::Insert()
The trouble is that the FillRects() call in
SwRedlineTable::LOKRedlineNotification() builds a text portion list, but
that's not yet correct, and later we don't build a text portion list as
we already have one.
Fix this similar to the frame size problem by invalidating the cache
after we got our rectangles.
Change-Id: Ida759be418bc3706810d9774e060d06143893bb6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132521
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index a5083731c5a3..9d603643e652 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -166,6 +166,7 @@ public:
void testBulletMultiDeleteInvalidation();
void testCondCollCopy();
void testMoveShapeHandle();
+void testRedlinePortions();
CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
CPPUNIT_TEST(testRegisterCallback);
@@ -252,6 +253,7 @@ public:
CPPUNIT_TEST(testBulletMultiDeleteInvalidation);
CPPUNIT_TEST(testCondCollCopy);
CPPUNIT_TEST(testMoveShapeHandle);
+CPPUNIT_TEST(testRedlinePortions);
CPPUNIT_TEST_SUITE_END();
private:
@@ -3554,6 +3556,43 @@ void SwTiledRenderingTest::testCondCollCopy()
xTransferable->getTransferData(aFlavor);
}
+void SwTiledRenderingTest::testRedlinePortions()
+{
+// Given a document with 3 portions: before insert redline (foo), the
insert redline (ins) and after insert
+// redline (bar):
+SwXTextDocument* pXTextDocument = createDoc();
+SwDocShell* pDocShell = pXTextDocument->GetDocShell();
+SwView* pView = pDocShell->GetView();
+pView->SetRedlineAuthor("first");
+pDocShell->SetView(pView);
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+pWrtShell->Insert("foo");
+pDocShell->SetChangeRecording(true);
+pWrtShell->Insert("ins");
+pDocShell->SetChangeRecording(false);
+pWrtShell->Insert("bar after");
+
+// When deleting "fooinsbar":
+pView->SetRedlineAuthor("second");
+pDocShell->SetView(pView);
+pWrtShell->SttEndDoc(/*bStt*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, /*nCount=*/9,
/*bBasicCall=*/false);
+pDocShell->SetChangeRecording(true);
+pWrtShell->Delete();
+
+// Then make sure that the portion list is updated, so "bar" can be marked
as deleted without
+// marking " after" as well:
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[1]",
"portion", "foo");
+assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[2]",
"portion", "ins");
+// Without the accompanying fix in place, this test would have failed
width:
+// - Expected: bar
+// - Actual : bar after
+// i.e. the portion list was outdated, even " after" was marked as deleted.
+assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[3]",
"portion", "bar");
+assertXPath(pXmlDoc, "//SwParaPortion/SwLineLayout/SwLinePortion[4]",
"portion", " after");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 428f67026f29..107d6f9afc95 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -58,6 +58,7 @@
#include
#include
+#include
using namespace com::sun::star;
@@ -287,6 +288,14 @@ void lcl_LOKInvalidateFrames(const sw::BroadcastingModify&
rMod, const SwRootFra
if (pPoint)
{
pTmpFrame->InvalidateSize();
+
+// Also empty the text portion cache, so it gets rebuilt,
taking the new redlines
+// into account.
+if (pTmpFrame->IsTextFrame())
+{
+auto pTextFrame = static_cast(pTmpFrame);
+pTextFrame->ClearPara();
+}
}
}
}
[Libreoffice-bugs] [Bug 148356] Transliteration of apostrophe ’ (solving the 3rd level quotation marks ’…’ with it, too)
https://bugs.documentfoundation.org/show_bug.cgi?id=148356 László Németh changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Ever confirmed|0 |1 Assignee|libreoffice-b...@lists.free |nem...@numbertext.org |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148365] CRASH: Writer 7.4 enters infinite loop while opening DOCX file (works fine in 7.3)
https://bugs.documentfoundation.org/show_bug.cgi?id=148365 --- Comment #6 from Rafael Lima --- > I see 100% CPU loading (in oldest and in master builds in 7-4 bisect repo) > but I couldn't get the LO's hanging/crash > > I need some clear steps... Hi Roman! I ran it by building the master branch on my PC today. After building it, I launched Writer from the terminal: ./instdir/program/soffice --writer And then from within Writer, I open the sample DOCX file (Attachment 179304). After that, from the terminal I keep getting an infinite loop of the following message: warn:legacy.osl:201586:201586:sw/source/core/layout/objectformatter.cxx:326: LoopControl in SwObjectFormatter::FormatObj_: Stage 3!!! On my PC, Writer becomes unusable after that and the only way to get around it is by pressing Ctrl + C in the terminal. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa sw/source
sw/qa/extras/layout/data/forcepoint89.html|binary
sw/qa/extras/layout/data/forcepoint91.html|binary
sw/qa/extras/layout/data/tdf147485-forcepoint.doc |binary
sw/qa/extras/layout/layout.cxx| 25 --
sw/source/core/layout/tabfrm.cxx |2 +
5 files changed, 25 insertions(+), 2 deletions(-)
New commits:
commit 4abce69fca83f5c98bb1fc0678cc1ce9cedd4750
Author: Caolán McNamara
AuthorDate: Fri Mar 25 21:26:43 2022 +
Commit: Michael Stahl
CommitDate: Mon Apr 4 19:14:34 2022 +0200
forcepoint#91 fix crash on layout of specific html
Change-Id: I145649e18f382c67ea34290f44fa219b7926127f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit be04a8072e4af30ca6ead36aa92d5f380cd9feb9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132483
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/layout/data/forcepoint89.html
b/sw/qa/extras/layout/data/forcepoint89.html
new file mode 100644
index ..7998a2b0b979
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint89.html differ
diff --git a/sw/qa/extras/layout/data/forcepoint91.html
b/sw/qa/extras/layout/data/forcepoint91.html
new file mode 100644
index ..eacbd2e05ab8
Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint91.html differ
diff --git a/sw/qa/extras/layout/data/tdf147485-forcepoint.doc
b/sw/qa/extras/layout/data/tdf147485-forcepoint.doc
new file mode 100644
index ..cb630efb8717
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf147485-forcepoint.doc
differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 72db33e49b7c..489518c693ef 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2493,8 +2493,17 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter,
testForcepointFootnoteFrame)
createSwDoc(DATA_DIRECTORY, "forcepoint-swfootnoteframe-1.rtf");
}
-//FIXME: disabled after failing again with fixed layout
-//CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76) {
createSwDoc(DATA_DIRECTORY, "forcepoint76-1.rtf"); }
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint76)
+{
+createSwDoc(DATA_DIRECTORY, "forcepoint76-1.rtf");
+}
+
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint89)
+{
+createSwWebDoc(DATA_DIRECTORY, "forcepoint89.html");
+}
//just care it doesn't crash/assert
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint90)
@@ -2502,6 +2511,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint90)
createSwDoc(DATA_DIRECTORY, "forcepoint90.rtf");
}
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint91)
+{
+createSwWebDoc(DATA_DIRECTORY, "forcepoint91.html");
+}
+
//just care it doesn't crash/assert
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint92)
{
@@ -2514,6 +2529,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint94)
createSwWebDoc(DATA_DIRECTORY, "forcepoint94.html");
}
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint)
+{
+createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.doc");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
{
SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118058.fodt");
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7ee960a5684c..98f5229d4ba5 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1616,6 +1616,8 @@ static bool lcl_InnerCalcLayout( SwFrame *pFrame,
if ( pFrame->IsLayoutFrame() &&
( !_bOnlyRowsAndCells || pFrame->IsRowFrame() ||
pFrame->IsCellFrame() ) )
{
+SwFrameDeleteGuard aDeleteGuard(pFrame);
+
// #130744# An invalid locked table frame will
// not be calculated => It will not become valid =>
// Loop in lcl_RecalcRow(). Therefore we do not consider them for
bRet.
[Libreoffice-bugs] [Bug 148365] CRASH: Writer 7.4 enters infinite loop while opening DOCX file (works fine in 7.3)
https://bugs.documentfoundation.org/show_bug.cgi?id=148365 --- Comment #5 from Roman Kuznetsov <79045_79...@mail.ru> --- (In reply to Xisco Faulí from comment #4) > @Roman, could you please try to bisect this on your end ? I see 100% CPU loading (in oldest and in master builds in 7-4 bisect repo) but I couldn't get the LO's hanging/crash I need some clear steps... -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - 2 commits - external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk | 14 +
external/liborcus/forcepoint-87.patch.1 | 27 ++
external/liborcus/forcepoint-95.patch.1 | 11 ++
3 files changed, 48 insertions(+), 4 deletions(-)
New commits:
commit 50f0dc8d49d52a9c8bc2079c69bd5feb150cd71a
Author: Caolán McNamara
AuthorDate: Fri Mar 25 10:14:19 2022 +
Commit: Caolán McNamara
CommitDate: Mon Apr 4 19:13:45 2022 +0200
forcepoint#95 read past end of malformed document
Change-Id: I8b2c558c733af3d7662f668af47e962e252ee339
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132311
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 0b9892fee990b7f6d0457ab6191f87c3991580e6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132414
Reviewed-by: Michael Stahl
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 3dbcef54ee52..e9ce3f16c356 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -15,10 +15,14 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,1))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
-# forcepoint-83.patch.1 submitted as
-# https://gitlab.com/orcus/orcus/-/merge_requests/117
-# forcepoint-84.patch.1 submitted as
-# https://gitlab.com/orcus/orcus/-/merge_requests/118
+# forcepoint-83.patch.1 merged as
+#
https://gitlab.com/orcus/orcus/-/commit/9f6400b8192e39fefd475a96222713e9e9c60038
+# forcepoint-84.patch.1 merged as
+#
https://gitlab.com/orcus/orcus/-/commit/223defe95d6f20f1bc5fd22fecc80a79a9519028
+# forcepoint-87.patch.1 merged as
+#
https://gitlab.com/orcus/orcus/-/commit/a718524ca424fb8a7e7931345a118342d1d4a507
+# forcepoint-95.patch.1 submitted as
+# https://gitlab.com/orcus/orcus/-/merge_requests/124
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/rpath.patch.0 \
@@ -34,6 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/forcepoint-83.patch.1 \
external/liborcus/forcepoint-84.patch.1 \
external/liborcus/forcepoint-87.patch.1 \
+ external/liborcus/forcepoint-95.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/forcepoint-95.patch.1
b/external/liborcus/forcepoint-95.patch.1
new file mode 100644
index ..93dc822298b0
--- /dev/null
+++ b/external/liborcus/forcepoint-95.patch.1
@@ -0,0 +1,11 @@
+--- a/include/orcus/sax_parser.hpp 2022-03-30 10:54:44.043568760 +0100
b/include/orcus/sax_parser.hpp 2022-03-30 10:54:55.645037322 +0100
+@@ -547,7 +547,7 @@
+
+ skip_space_and_control();
+
+-char c = cur_char();
++char c = cur_char_checked();
+ if (c != '=')
+ {
+ std::ostringstream os;
commit efed5861b51cd54182e2c173a0fc98dee2a7742f
Author: Caolán McNamara
AuthorDate: Fri Mar 25 09:12:30 2022 +
Commit: Caolán McNamara
CommitDate: Mon Apr 4 19:13:31 2022 +0200
forcepoint#87 Assertion 'mp_char <= mp_end' failed
Change-Id: I434928cb2425a2e8eb9440dff67f52cda241b2d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132097
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 32019baffa19a8f79cacf93d5dd5a95c7d416657)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132413
Reviewed-by: Michael Stahl
Tested-by: Caolán McNamara
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 0c54dd5e5ef2..3dbcef54ee52 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/allow-utf-8-in-xml-names.patch \
external/liborcus/forcepoint-83.patch.1 \
external/liborcus/forcepoint-84.patch.1 \
+ external/liborcus/forcepoint-87.patch.1 \
))
ifeq ($(OS),WNT)
diff --git a/external/liborcus/forcepoint-87.patch.1
b/external/liborcus/forcepoint-87.patch.1
new file mode 100644
index ..ddc9118a43ed
--- /dev/null
+++ b/external/liborcus/forcepoint-87.patch.1
@@ -0,0 +1,27 @@
+From e4f3741197a3af6d434850d388483b523138a214 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?=
+Date: Thu, 24 Mar 2022 21:31:14 +
+Subject: [PATCH] forcepoint#87 Assertion `mp_char <= mp_end' failed
+
+soffice.bin: ../../include/orcus/parser_base.hpp:65: bool
orcus::parser_base::has_char() const: Assertion `mp_char <= mp_end' failed.
+---
+ src/parser/sax_parser_base.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
+index 46acb81d..cb7a9c04 100644
+--- a/src/parser/sax_parser_base.cpp
b/src/parser/sax_parser_base.cpp
+@@ -293,7 +293,8 @@
+
+ // Skip the closing
[Libreoffice-bugs] [Bug 146988] Opening at cursor position doesn't work in large documents (User Data must be entered)
https://bugs.documentfoundation.org/show_bug.cgi?id=146988 Timur changed: What|Removed |Added CC||gddel...@gmail.com --- Comment #7 from Timur --- *** Bug 148368 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148368] Latest LibreOffice 7..1.3 doesn't open file at last cursor position
https://bugs.documentfoundation.org/show_bug.cgi?id=148368 Timur changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Timur --- I guess this can be marked duplicate. *** This bug has been marked as a duplicate of bug 146988 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143344] [META] Linux Dark Mode bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=143344 Rafael Lima changed: What|Removed |Added Depends on||148376 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148376 [Bug 148376] Insert Table toolbar: text with table size does not respect dark mode -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148376] Insert Table toolbar: text with table size does not respect dark mode
https://bugs.documentfoundation.org/show_bug.cgi?id=148376 Rafael Lima changed: What|Removed |Added Blocks||143344 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=143344 [Bug 143344] [META] Linux Dark Mode bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147546] Transliteration with punctuation marks
https://bugs.documentfoundation.org/show_bug.cgi?id=147546 --- Comment #8 from Commit Notification --- László Németh committed a patch related to this issue. It has been pushed to "libreoffice-7-3": https://git.libreoffice.org/core/commit/09dfe214a30f58ddcd7a857db8f5eee68d4cef2a tdf#147546 bump libnumbertext to 1.0.10 It will be available in 7.3.3. 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.
[Libreoffice-bugs] [Bug 148376] New: Insert Table toolbar: text with table size does not respect dark mode
https://bugs.documentfoundation.org/show_bug.cgi?id=148376 Bug ID: 148376 Summary: Insert Table toolbar: text with table size does not respect dark mode Product: LibreOffice Version: 7.4.0.0 alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: rafael.palma.l...@gmail.com Created attachment 179311 --> https://bugs.documentfoundation.org/attachment.cgi?id=179311=edit Image showing the problem In Writer / Impress / Draw, if you use the Insert Table toolbar using dark mode, the text inside the tool showing the table size is written in black, which makes it almost invisible. See attached image for more details. System info: Version: 7.3.2.2 / LibreOffice Community Build ID: 30(Build:2) CPU threads: 16; OS: Linux 5.13; UI render: default; VCL: kf5 (cairo+xcb) Locale: pt-BR (pt_BR.UTF-8); UI: en-US Ubuntu package version: 1:7.3.2~rc2-0ubuntu0.21.10.1~lo1 Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147546] Transliteration with punctuation marks
https://bugs.documentfoundation.org/show_bug.cgi?id=147546 Commit Notification changed: What|Removed |Added Whiteboard|target:7.4.0|target:7.4.0 target:7.3.3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - download.lst sw/qa
download.lst|4 ++-- sw/qa/extras/uiwriter/uiwriter4.cxx | 35 +++ 2 files changed, 37 insertions(+), 2 deletions(-) New commits: commit 09dfe214a30f58ddcd7a857db8f5eee68d4cef2a Author: László Németh AuthorDate: Mon Apr 4 10:26:50 2022 +0200 Commit: László Németh CommitDate: Mon Apr 4 19:06:44 2022 +0200 tdf#147546 bump libnumbertext to 1.0.10 fixing only regression of hu_Hung transliteration of punctuation marks. Add unit test for the fix. Regression from commit 98fd4fcdc61202846e0957cb6aaed9e4a2d2c520 "tdf#136368 bump to libnumbertext 1.0.8". (cherry picked from commit d925d1ca9e03863650dd3e450331598624f21724) Change-Id: Ie92cad96f48f0a7f735bc9cde93a0fded4681800 Conflicts: sw/qa/extras/uiwriter/uiwriter6.cxx Change-Id: I7b49467943c97582dba0e5aca20c02a92c43deff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132492 Tested-by: László Németh Reviewed-by: László Németh diff --git a/download.lst b/download.lst index 081ea2ad1e5f..f3cdbb1dafa1 100644 --- a/download.lst +++ b/download.lst @@ -160,8 +160,8 @@ export LIBGPGERROR_SHA256SUM := a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa3 export LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2 export LIBLANGTAG_SHA256SUM := 1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2 -export LIBNUMBERTEXT_SHA256SUM := db9060d208501bd7bc06300a55d8489d29dd560ee0fbbd0f41b78af56816680c -export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.8.tar.xz +export LIBNUMBERTEXT_SHA256SUM := a285573864eaac8d36a0f66d946e9b1d3cf01c5d93d31fda00264a76f2633beb +export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.10.tar.xz export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931 diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx b/sw/qa/extras/uiwriter/uiwriter4.cxx index aa807418e348..fc7bd27e3124 100644 --- a/sw/qa/extras/uiwriter/uiwriter4.cxx +++ b/sw/qa/extras/uiwriter/uiwriter4.cxx @@ -3963,6 +3963,41 @@ void SwUiWriterTest4::testTdf133589() pWrtShell->AutoCorrect(corr, ' '); sReplaced += u" "; CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); + +// tdf#147546 transliterate punctuation marks + +// question mark +pWrtShell->Insert(u"Kérdőjel"); +pWrtShell->AutoCorrect(corr, '?'); +sReplaced += u"ಓೋೢೇೖ"; +OUString sReplaced2(sReplaced + "?"); +CPPUNIT_ASSERT_EQUAL(sReplaced2, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +pWrtShell->AutoCorrect(corr, ' '); +sReplaced += u"⸮ "; +CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +// comma +pWrtShell->Insert(u"Vessző"); +pWrtShell->AutoCorrect(corr, ','); +sReplaced += u"ಮ"; +sReplaced2 = sReplaced + ","; +CPPUNIT_ASSERT_EQUAL(sReplaced2, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +pWrtShell->AutoCorrect(corr, ' '); +sReplaced += u"⹁ "; +CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +// semicolon +pWrtShell->Insert(u"pontosvessző"); +pWrtShell->AutoCorrect(corr, ';'); +sReplaced += u"ೠ೦೮"; +sReplaced2 = sReplaced + ";"; +CPPUNIT_ASSERT_EQUAL(sReplaced2, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +pWrtShell->AutoCorrect(corr, ' '); +sReplaced += u"⁏ "; +CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); +// quotation marks +pWrtShell->Insert(u"„idézőjel”"); +pWrtShell->AutoCorrect(corr, ' '); +sReplaced += u"⹂ೇೋ೯ೖ‟ "; +CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); } void SwUiWriterTest4::testTdf143176()
