[Libreoffice-commits] core.git: sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf136453.fodt |   66 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   51 +++
 sw/source/core/undo/undel.cxx |3 -
 3 files changed, 119 insertions(+), 1 deletion(-)

New commits:
commit c4967928475f2be20ac2d79e3fa84ac435a7e560
Author: Michael Stahl 
AuthorDate: Tue Oct 27 16:33:30 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Oct 28 08:01:53 2020 +0100

tdf#136453 sw_redlinehide: SwUndoDelete: only create extra frames...

... at the start if the section nodes were at the start.

m_bBackSp and m_bJoinNext can't both be true.

(regression from 740f1796504f66408b692225a9676c9ee3d63722)

Change-Id: I999ed3809ca8f527bc3e754b229df02da4576825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104891
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/data/tdf136453.fodt 
b/sw/qa/extras/uiwriter/data/tdf136453.fodt
new file mode 100644
index ..2234957e1db8
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf136453.fodt
@@ -0,0 +1,66 @@
+
+http://www.w3.org/TR/css3-text/"; 
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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:d
 r3d="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:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   foo
+   bar
+   
+baz
+   
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index b1f93e1b8422..26a2f8a21056 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1220,6 +1220,57 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134252)
 CPPUNIT_ASSERT_EQUAL(OUString(""), xCursor->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf136453)
+{
+load(DATA_DIRECTORY, "tdf136453.fodt");
+
+SwXTextDocument *const 
pTextDoc(dynamic_cast(mxComponent.get()));
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* const pDoc(pTextDoc->GetDocShell()->GetDoc());
+SwWrtShell *const pWrtShell(pDoc->GetDocShell()->GetWrtShell());
+
+sal_uLong const nNodes(pDoc->GetNodes().Count());
+
+pWrtShell->SttEndDoc(false);
+pWrtShell->SetMark();
+pWrtShell->Up(true, 1);
+pWrtShell->SttPara(true);
+pWrtShell->Delete();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+pWrtShell->Undo();
+
+CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count());
+
+// check that every node has 1 frame
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3);
+assertXPath(pXmlDoc, "/root/page[1]/body/section", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 1);
+
+pWrtShell->Redo();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3);
+assertXPath(pXmlDoc, "/root/page[1]/body/section", 0);
+
+pWrtShell->Undo();
+
+CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count());

[Libreoffice-commits] core.git: chart2/qa comphelper/qa compilerplugins/clang cui/source desktop/qa drawinglayer/source sal/qa sc/qa sd/qa sd/source sfx2/source sw/qa sw/source

[Stephan Bergmann (via logerrit)]

 chart2/qa/extras/chart2geometry.cxx|   32 ++---
 comphelper/qa/string/test_string.cxx   |   12 --
 compilerplugins/clang/elidestringvar.cxx   |   47 ---
 compilerplugins/clang/test/elidestringvar.cxx  |   12 +-
 cui/source/dialogs/AdditionsDialog.cxx |4 
 desktop/qa/desktop_lib/test_desktop_lib.cxx|3 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   25 +---
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |   59 +++--
 sal/qa/rtl/digest/rtl_digest.cxx   |   18 ---
 sal/qa/rtl/oustring/rtl_OUString2.cxx  |   78 -
 sal/qa/rtl/uri/rtl_Uri.cxx |3 
 sc/qa/unit/copy_paste_test.cxx |3 
 sc/qa/unit/screenshots/screenshots.cxx |3 
 sc/qa/unit/subsequent_export-test.cxx  |8 -
 sd/qa/unit/dialogs-test.cxx|4 
 sd/qa/unit/export-tests-ooxml1.cxx |6 -
 sd/qa/unit/export-tests-ooxml2.cxx |4 
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   10 +
 sd/source/ui/remotecontrol/Communicator.cxx|5 
 sfx2/source/bastyp/frmhtmlw.cxx|5 
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |8 -
 sw/qa/extras/uiwriter/uiwriter.cxx |   10 -
 sw/source/filter/html/wrthtml.cxx  |4 
 23 files changed, 145 insertions(+), 218 deletions(-)

New commits:
commit 40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af
Author: Stephan Bergmann 
AuthorDate: Tue Oct 27 23:18:23 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 28 08:03:52 2020 +0100

Extend loplugin:elidestringvar to OString

(In VisitVarDecl, filtering out AbstractConditionalOperator avoids an 
unhelpful

> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:63:32: error: replace single use 
of literal 'rtl::OString' variable with a literal [loplugin:elidestringvar]
> aXmlWriter.content(sPdfConformance);
>^~~
> ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:52:21: note: literal 
'rtl::OString' variable defined here [loplugin:elidestringvar]
> OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B";
> ^~~~

)

Change-Id: I7d0410f04827d79b4b526752917c37d33cad2671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104911
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/chart2/qa/extras/chart2geometry.cxx 
b/chart2/qa/extras/chart2geometry.cxx
index be6d842d7780..08e909162766 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -296,9 +296,9 @@ void 
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
 // Find transparency gradient name
 xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
 CPPUNIT_ASSERT(pXmlDoc);
-const OString sChartPath(
+const OUString sOUChartStyleName = getXPathContent(
+pXmlDoc,
 
"//office:document-content/office:body/office:chart/chart:chart/@chart:style-name");
-const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);
 const OString sStylePath(
 
"//office:document-content/office:automatic-styles/style:style[@style:name='"
 + OU2O(sOUChartStyleName) + "']");
@@ -310,9 +310,8 @@ void 
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
 // Verify the content of the opacity definition
 xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8");
 CPPUNIT_ASSERT(pXmlDoc2);
-const OString 
sOpacityPath("//office:document-styles/office:styles/draw:opacity");
 const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'");
-const OString sStart(sOpacityPath + "[" + sAttribute);
+const OString 
sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute);
 assertXPath(pXmlDoc2, sStart + "]", 1);
 assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']");
 assertXPath(pXmlDoc2, sStart + " and @draw:start='30%']");
@@ -348,9 +347,9 @@ void 
Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
 // Find transparency gradient name
 xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
 CPPUNIT_ASSERT(pXmlDoc);
-const OString 
sChartPath("//office:document-content/office:body/office:chart/chart:chart/"
- "chart:plot-area/chart:wall/@chart:style-name");
-const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath);
+const OUString sOUChartStyleName
+= getXPathContent(pXmlDoc, 
"//office:document-content/office:body/office:c

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf132911.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   74 +++
 2 files changed, 74 insertions(+)

New commits:
commit b2faa46071ff4a00672b0699e524e7ae66915fc0
Author: Xisco Fauli 
AuthorDate: Tue Jul 28 18:34:48 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 08:19:07 2020 +0100

tdf#132911: sw_uiwriter: Add unittest

Change-Id: I0ad6697d8dce814f20ea5f98e9c8f4b9c68f278d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99641
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit a206054ac048702d48077eea6f3d464c3d241ab3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104824
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/data/tdf132911.odt 
b/sw/qa/extras/uiwriter/data/tdf132911.odt
new file mode 100644
index ..3c311f3ed36b
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf132911.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index d287894f94db..0bd769d2b121 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5784,6 +5784,80 @@ void SwUiWriterTest::testRedlineViewAuthor()
 pDocShell->SetView(pView);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf132911)
+{
+load(DATA_DIRECTORY, "tdf132911.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+auto getShapes = [&]() -> int
+{
+uno::Reference 
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference xDraws = 
xDrawPageSupplier->getDrawPage();
+return xDraws->getCount();
+};
+
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {});
+lcl_dispatchCommand(mxComponent, ".uno:Cut", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+// Without the fix in place, it would have crashed here
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(8, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(8, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+
+//FIXME: tdf#135247
+//lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+//Scheduler::ProcessEventsToIdle();
+//CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+//CPPUNIT_ASSERT_EQUAL(4, getShapes());
+}
+
 void SwUiWriterTest::testTdf91292()
 {
 createDoc("tdf91292_paraBackground.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf135056.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   25 +++
 sw/source/core/layout/fly.cxx|   49 +--
 3 files changed, 72 insertions(+), 2 deletions(-)

New commits:
commit fc67a79cd9268795f8049aea79c8f94d7165de8a
Author: Michael Stahl 
AuthorDate: Thu Oct 22 19:17:24 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 08:19:36 2020 +0100

tdf#131679 sw: fix crash when copying fly via context menu

sw::DocumentContentOperationsManager::CopyImplImpl() is called with a
rPam that's on an SwOLENode.

The problem (which i can't reproduce in --enable-dbgutil build,
presumably for timing reasons) is that after the context menu pops up,
some idle layout runs and reformats the document and deletes a
SwFlyFrame and that calls SdrMarkView::UnmarkAllObj().

Then when SwFEShell::Copy() is called, it finds IsFrameSelected()
returns false, and it tries to copy normal text when the cursor is on
an SwOLENode.

Fix this in SwFlyFrame::FinitDrawObj() by first moving the cursor out
of any selected flys.

(regression from 81ec0039b2085faab49380c7a56af0c562d4c9e4
 - previously CopyImplImpl() would return early)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104697
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 40bff2567fa4a3fa8ec4445182cbbe3547c17410)

tdf#131679 sw: follow-up: Unmark before SetSelection()

Backporting this to 6.4, it crashes in CppunitTest_desktop_lib because
some sidebar is loaded from SwView::AttrChangedNotify()/SelectShell()
and that ends up calling SwView::StateTabWin() about 40 stack frames
later and this calls SwFEShell::GetAnyCurRect() which gets the still
selected fly but its page frame is null.

So make sure shells don't see the deleted fly.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104815
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit f63afb95b5c2d80d33a35820ef1d9abd9e70d3ca)

Change-Id: Id135fcc002c03c07c34fbdc0355f2895d8b6565b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104683
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index b5f364511f6e..190e799dbc56 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -377,6 +377,32 @@ void SwFlyFrame::InitDrawObj()
 : nHellId );
 }
 
+static SwPosition ResolveFlyAnchor(SwFrameFormat const& rFlyFrame)
+{
+SwFormatAnchor const& rAnch(rFlyFrame.GetAnchor());
+if (rAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE)
+{   // arbitrarily pick last node
+return 
SwPosition(SwNodeIndex(rFlyFrame.GetDoc()->GetNodes().GetEndOfContent(), -1));
+}
+else
+{
+SwPosition const*const pPos(rAnch.GetContentAnchor());
+assert(pPos);
+if (SwFrameFormat const*const pParent = 
pPos->nNode.GetNode().GetFlyFormat())
+{
+return ResolveFlyAnchor(*pParent);
+}
+else if (pPos->nContent.GetIdxReg())
+{
+return *pPos;
+}
+else
+{
+return SwPosition(*pPos->nNode.GetNode().GetContentNode(), 0);
+}
+}
+}
+
 void SwFlyFrame::FinitDrawObj()
 {
 if(!GetVirtDrawObj() )
@@ -391,8 +417,27 @@ void SwFlyFrame::FinitDrawObj()
 for(SwViewShell& rCurrentShell : p1St->GetRingContainer())
 {   // At the moment the Drawing can do just do an Unmark on 
everything,
 // as the Object was already removed
-if(rCurrentShell.HasDrawView() )
-rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
+if (rCurrentShell.HasDrawView() &&
+
rCurrentShell.Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount())
+{
+if (SwFEShell *const pFEShell = 
dynamic_cast(&rCurrentShell))
+{   // tdf#131679 move any cursor out of fly
+SwFlyFrame const*const pOldSelFly = 
::GetFlyFromMarked(nullptr,  pFEShell);
+rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
+if (pOldSelFly)
+{
+SwPosition const 
pos(ResolveFlyAnchor(*pOldSelFly->GetFormat()));
+SwPaM const temp(pos);
+pFEShell->SetSelection(temp);
+// could also call SetCursor() like 
SwFEShell::SelectObj()
+// does, but that would access layout a bit much...
+}
+}
+else
+{
+rCurrentShell.Imp()->GetDrawView()->UnmarkAll();
+ 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   32 
 1 file changed, 32 insertions(+)

New commits:
commit a780fd334a3a6d9a5a300f1b0ba0e067b500dcad
Author: Xisco Fauli 
AuthorDate: Tue Sep 29 13:20:21 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 08:18:50 2020 +0100

tdf#133358: sw_uiwriter: Add unittest

Change-Id: I148052d7038824b43ec0c473d4bcbcb64e2f92b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103608
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 416cb76758719b88a4cdefe8c9d16131c35cfdf5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104747
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 43abc73da811..d287894f94db 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -7557,6 +7557,38 @@ void SwUiWriterTest::testTdf59666()
 CPPUNIT_ASSERT_EQUAL(sReplaced, 
static_cast(pDoc->GetNodes()[nIndex])->GetText());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf133358)
+{
+mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtSh);
+
+pWrtSh->Insert("Test");
+
+CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString());
+
+uno::Reference xParagraph(getParagraph(1), 
uno::UNO_QUERY);
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xParagraph, 
"ParaLeftMargin"));
+
+lcl_dispatchCommand(mxComponent, ".uno:IncrementIndent", {});
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1251), getProperty(xParagraph, 
"ParaLeftMargin"));
+
+lcl_dispatchCommand(mxComponent, ".uno:Undo", {});
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xParagraph, 
"ParaLeftMargin"));
+
+// Without the fix in place, this test would have crashed here
+lcl_dispatchCommand(mxComponent, ".uno:Redo", {});
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1251), getProperty(xParagraph, 
"ParaLeftMargin"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/nss-restore-manual-pre-dependencies.patch.1 |   83 +++
 2 files changed, 84 insertions(+)

New commits:
commit e13d8f6a5d481cab3fb450cf1244aec0f4e10e06
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 1 12:57:53 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 08:20:32 2020 +0100

nss: restore manual pre-dependency build

We had some seldom build failures on Windows, with errors like:
PermissionError: [WinError 32] The process cannot access the file
because it is being used by another process: '/nssckmdt.h'.

This happens, because of the "." / parent shell hack. Thinking
about it again, it doesn't prevent the parent make to run in
parallel to the "." directory make. So I tried to use a terminal
match-all rule like

ifneq (,$(filter .,$(DIRS)))
%::
# empty terminal rule triggered
$(error can't happen)
endif

to stop the original parent make, but that doesn't work and the
$(error ...) is triggered.

So AFAIK I'm out of options here and have to restore the old
manual pre-dependency build variant - still much better then no
parallel build.

An alternative idea was to put the rest of the rules.mk in the
"else" of the terminal rule, to skip all normal rules, but this
still leaves out all rules from the rest of the make-files,
which might result in some hard to debug errors.

This reverts my upstream patch 15608:744881490c78.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103777
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit d2f9c55e065d559de903d540da28502646714a24)

Change-Id: I9e2e9e1ec9f35697c7853c92f60434f514cba5ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104882
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 2e6e7f80e3ee..100b32b31efe 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/clang-cl.patch.0 \
 external/nss/nss.vs2015.patch \
 external/nss/nss.vs2015.pdb.patch \
+external/nss/nss-restore-manual-pre-dependencies.patch.1 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 
b/external/nss/nss-restore-manual-pre-dependencies.patch.1
new file mode 100644
index ..ebcc5b48c540
--- /dev/null
+++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1
@@ -0,0 +1,83 @@
+Revert of upstream:
+
+changeset:   15608:744881490c78
+user:Jan-Marek Glogowski 
+date:Wed May 13 19:00:40 2020 +
+summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea
+
+--- b/nss/coreconf/rules.mkWed May 13 19:00:40 2020 +
 a/nss/coreconf/rules.mkTue May 12 21:33:43 2020 +
+@@ -31,21 +31,10 @@
+ USE_NT_C_SYNTAX=1
+ endif
+ 
+-# For whatever reason, "." can't be handled using make conditionals.
+-# Based on automake's SUBDIRS "." handling.
+ ifdef DIRS
+ ifndef IGNORE_DIRS
+-ifneq (,$(filter .,$(DIRS)))
+-TARGETS = $(NULL)
+-ALL_TRASH = $(NULL)
+-endif
+-
+ $(DIRS):
++  $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS)
+-  $(IGNORE_ERROR)@if [ "$@" != "." ]; then \
+-  $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  else \
+-  IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  fi
+   @$(CLICK_STOPWATCH)
+ endif
+ endif
+@@ -84,9 +73,7 @@
+ check: $(DIRS)
+ 
+ clean clobber: $(DIRS)
+-ifneq (,$(ALL_TRASH))
+   rm -rf $(ALL_TRASH)
+-endif
+ 
+ realclean clobber_all: $(DIRS)
+   rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH)
+--- b/nss/lib/ckfw/builtins/manifest.mnWed May 13 19:00:40 2020 +
 a/nss/lib/ckfw/builtins/manifest.mnTue May 12 21:33:43 2020 +
+@@ -5,9 +5,7 @@
+ 
+ CORE_DEPTH = ../../..
+ 
++DIRS = testlib
+-DIRS = . testlib
+-
+-testlib: .
+ 
+ MODULE = nss
+ 
+--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 +
 a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 +
+@@ -5,9 +5,7 @@
+ 
+ CORE_DEPTH = ../..
+ 
++DIRS = builtins
+-DIRS = . builtins
+-
+-builtins: .
+ 
+ PRIVATE_EXPORTS = \
+   ck.h  \
+--- b/nss/manifest.mn  Wed May 13 19:00:40 2020 +
 a/nss/manifest.mn  Tue May 12 21:33:43 2020 +
+@@ -23,6 +23,12 @@
+   # no real way to encode these in any sensible way
+   $(MAKE) -C coreconf/nsinstall program
+   $(MAKE) export
++  # pre-build child dir -> parent dir dependencies
++  # ckfw/builtins -> ckfw
++  IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs
++  # ckfw/builtins/testlib -> ckfw/builtins + base
++   

[Libreoffice-commits] core.git: include/vcl vcl/source

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |1 +
 vcl/source/filter/ipdf/pdfread.cxx   |4 ++--
 vcl/source/pdf/PDFiumLibrary.cxx |5 +
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 2beecc277959051026d7d1303e3c3ad7922c326c
Author: Miklos Vajna 
AuthorDate: Tue Oct 27 21:04:04 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 08:36:45 2020 +0100

pdfium: add an FPDFBitmap_FillRect() wrapper

Change-Id: I4201a9ead756cf814c8452ef504acd054c4fe38b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104908
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 556ca44ac4fd..43cbdb2f9a12 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -74,6 +74,7 @@ public:
 PDFiumBitmap(FPDF_BITMAP pBitmap);
 ~PDFiumBitmap();
 FPDF_BITMAP getPointer() { return mpBitmap; }
+void fillRect(int left, int top, int width, int height, sal_uInt32 nColor);
 };
 
 class VCL_DLLPUBLIC PDFiumAnnotation final
diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index f9d367002f2e..3e0207e86bd5 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -178,8 +178,8 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& r
 // the PDF is not transparent.
 bTransparent = true;
 }
-const FPDF_DWORD nColor = bTransparent ? 0x : 0x;
-FPDFBitmap_FillRect(pPdfBitmap->getPointer(), 0, 0, nPageWidth, 
nPageHeight, nColor);
+const sal_uInt32 nColor = bTransparent ? 0x : 0x;
+pPdfBitmap->fillRect(0, 0, nPageWidth, nPageHeight, nColor);
 FPDF_RenderPageBitmap(pPdfBitmap->getPointer(), 
pPdfPage->getPointer(), /*start_x=*/0,
   /*start_y=*/0, nPageWidth, nPageHeight, 
/*rotate=*/0, /*flags=*/0);
 
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index fa5baeebb0c3..607ad7ab9d2c 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -498,6 +498,11 @@ PDFiumBitmap::~PDFiumBitmap()
 }
 }
 
+void PDFiumBitmap::fillRect(int left, int top, int width, int height, 
sal_uInt32 nColor)
+{
+FPDFBitmap_FillRect(mpBitmap, left, top, width, height, nColor);
+}
+
 PDFiumAnnotation::PDFiumAnnotation(FPDF_ANNOTATION pAnnotation)
 : mpAnnotation(pAnnotation)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/source

[Dennis Francis (via logerrit)]

 sc/inc/editutil.hxx |4 
 sc/inc/scmod.hxx|2 
 sc/inc/spellcheckcontext.hxx|   71 +++---
 sc/source/ui/app/scmod.cxx  |   37 ---
 sc/source/ui/inc/gridwin.hxx|4 
 sc/source/ui/inc/output.hxx |2 
 sc/source/ui/inc/tabview.hxx|2 
 sc/source/ui/view/dbfunc.cxx|2 
 sc/source/ui/view/gridwin.cxx   |  200 -
 sc/source/ui/view/gridwin2.cxx  |6 
 sc/source/ui/view/spellcheckcontext.cxx |  360 
 sc/source/ui/view/tabview.cxx   |   18 -
 sc/source/ui/view/viewfun2.cxx  |   32 ++
 sc/source/ui/view/viewfun3.cxx  |   15 -
 sc/source/ui/view/viewfunc.cxx  |7 
 15 files changed, 426 insertions(+), 336 deletions(-)

New commits:
commit bdd149b1ff3d43b94cadc0d43365100c287c7639
Author: Dennis Francis 
AuthorDate: Sun Oct 4 12:47:46 2020 +0530
Commit: Noel Grandin 
CommitDate: Wed Oct 28 08:39:25 2020 +0100

Improve spell checking performance and impl. in several ways:

* do synchronous spell checking, avoiding an idle handler
* avoid continuous invalidations caused per-cell by spell-checking
* cache spell-checking information for a given SharedString to
  avoid repeated checking of frequently recurring strings.

Change-Id: Ie251f263a8932465297dd8bd66dfc4aa10984947
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104705
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index f28249145c06..d760faf5c53e 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -117,10 +117,8 @@ protected:
 
 class SC_DLLPUBLIC ScEditEngineDefaulter : public ScEnginePoolHelper, public 
EditEngine
 {
-private:
-using EditEngine::SetText;
-
 public:
+using EditEngine::SetText;
 /// bDeleteEnginePool: Engine becomes the owner of the pool
 /// and deletes it on destruction
 ScEditEngineDefaulter( SfxItemPool* pEnginePool,
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index c8af1d424d9b..20dc94e9e9e8 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -81,7 +81,6 @@ class SfxDialogController;
 class SAL_DLLPUBLIC_RTTI ScModule final : public SfxModule, public 
SfxListener, public utl::ConfigurationListener
 {
 Timer   m_aIdleTimer;
-Idlem_aSpellIdle;
 std::unique_ptr m_pDragData;
 ScSelectionTransferObj* m_pSelTransfer;
 ScMessagePool*  m_pMessagePool;
@@ -131,7 +130,6 @@ public:
 // moved by the application
 
 DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle
-DECL_LINK( SpellTimerHdl, Timer*, void );
 DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
 
 voidExecute( SfxRequest& rReq );
diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index 42ec80389af2..684b2ceb9edc 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -10,50 +10,53 @@
 #ifndef INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
 #define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
 
+#include 
 #include 
 #include "types.hxx"
 
-#include 
+#include 
 #include 
 
-namespace sc {
+class ScDocument;
+class ScTabEditEngine;
 
-struct SpellCheckContext
+namespace sc
 {
-struct CellPos
-{
-struct Hash
-{
-size_t operator() (const CellPos& rPos) const;
-};
-
-SCCOL mnCol;
-SCROW mnRow;
-
-CellPos();
-CellPos(SCCOL nCol, SCROW nRow);
-
-void setInvalid();
-bool isValid() const;
-void reset();
-
-bool operator== (const CellPos& r) const;
-};
-
-typedef std::unordered_map, 
CellPos::Hash> CellMapType;
-
-CellPos maPos;
-CellMapType maMisspellCells;
-
-SpellCheckContext();
-
-bool isMisspelled( SCCOL nCol, SCROW nRow ) const;
-const std::vector* getMisspellRanges( SCCOL nCol, 
SCROW nRow ) const;
-void setMisspellRanges( SCCOL nCol, SCROW nRow, const 
std::vector* pRanges );
+/**
+ * Class shared between grid windows to cache
+ * spelling results.
+ */
+class SpellCheckContext
+{
+class SpellCheckCache;
+struct SpellCheckStatus;
+struct SpellCheckResult;
+
+std::unique_ptr mpCache;
+std::unique_ptr mpResult;
+ScDocument* pDoc;
+std::unique_ptr mpEngine;
+std::unique_ptr mpStatus;
+SCTAB mnTab;
+LanguageType meLanguage;
+
+public:
+SpellCheckContext(ScDocument* pDocument, SCTAB nTab);
+~SpellCheckContext();
+
+bool isMisspelled(SCCOL nCol, SCROW nRow) const;
+const std::vector* getMisspellRanges(SCCOL nCol, 
SCROW nRow) const;
+void setMisspellRanges(SCCOL nCol, SCROW nRow,
+   const std::vector* 
pRanges);
 
 void reset();
-};
+void resetForContentChange();
 
+private:
+void ensureR

[Libreoffice-commits] core.git: sc/qa

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_dialogs/openDialogs.py |4 ++--
 sc/qa/uitest/calc_tests8/tdf137726.py|   28 
 2 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit 585f8dacba798afde6b4cc439c969a37a37e6162
Author: Xisco Fauli 
AuthorDate: Tue Oct 27 17:44:30 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 28 09:22:09 2020 +0100

tdf#tdf#137726: sc: Add UItest

Change-Id: I67bcafb3155b991dc8b1515f224675906e0a5955
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104897
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_dialogs/openDialogs.py 
b/sc/qa/uitest/calc_dialogs/openDialogs.py
index abf6857c02e1..79759b953328 100644
--- a/sc/qa/uitest/calc_dialogs/openDialogs.py
+++ b/sc/qa/uitest/calc_dialogs/openDialogs.py
@@ -26,8 +26,8 @@ dialogs = [
 # tested in sc/qa/uitest/search_replace/*
 # {"command": ".uno:InsertObjectChart", "closeButton": "cancel"},
 # tested in uitest/calc_tests/create_chart.py
-{"command": ".uno:DataDataPilotRun", "closeButton": "cancel", 
"skipTestOK": True},
-# OK button triggers a new dialog
+# {"command": ".uno:DataDataPilotRun", "closeButton": "cancel", 
"skipTestOK": True},
+# tested in sc/qa/uitest/calc_tests8/tdf137726.py
 # {"command": ".uno:FunctionDialog", "closeButton": "cancel"},
 # Cancel button tested in uitest/calc_tests/function_wizard.py
 # OK button tested in sc/qa/uitest/calc_tests7/tdf123479.py
diff --git a/sc/qa/uitest/calc_tests8/tdf137726.py 
b/sc/qa/uitest/calc_tests8/tdf137726.py
new file mode 100644
index ..8256a778ba26
--- /dev/null
+++ b/sc/qa/uitest/calc_tests8/tdf137726.py
@@ -0,0 +1,28 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+
+class tdf137726(UITestCase):
+
+def test_tdf137726(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun")
+
+# three dialogs are displayed one after the other, click OK in all of 
them
+for i in range(3):
+xDialog = self.xUITest.getTopFocusWindow()
+xOKBtn = xDialog.getChild('ok')
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+# Without the fix in place, this test would have hung here
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmlgrin.cxx |2 +-
 sw/source/filter/html/swhtml.cxx   |   21 -
 sw/source/filter/html/swhtml.hxx   |   11 ++-
 3 files changed, 31 insertions(+), 3 deletions(-)

New commits:
commit 1b7a02b4e48ca2d8160443517e03adcd8aaa77d0
Author: Caolán McNamara 
AuthorDate: Mon Oct 26 20:38:03 2020 +
Commit: Michael Stahl 
CommitDate: Wed Oct 28 09:35:49 2020 +0100

ofz#26619 detect if SwFrameFormat deleted during import

Change-Id: I5dc778e44dcb670353e83037a5a5d469fa437186
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104853
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 7ae9e8b6ba35dec2c556f6fac4034cd9bba1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104835
Reviewed-by: Michael Stahl 

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 628ef2704630..11ac33e698d4 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -280,7 +280,7 @@ void SwHTMLParser::RegisterFlyFrame( SwFrameFormat 
*pFlyFormat )
 (RndStdIds::FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
 css::text::WrapTextMode_THROUGH == 
pFlyFormat->GetSurround().GetSurround() )
 {
-m_aMoveFlyFrames.push_back( pFlyFormat );
+
m_aMoveFlyFrames.emplace_back(std::make_unique(pFlyFormat));
 m_aMoveFlyCnts.push_back( m_pPam->GetPoint()->nContent.GetIndex() );
 }
 }
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 940642a816d4..8503c342c858 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -2696,6 +2696,18 @@ SwViewShell *SwHTMLParser::CheckActionViewShell()
 return m_pActionViewShell;
 }
 
+SwHTMLFrameFormatListener::SwHTMLFrameFormatListener(SwFrameFormat* 
pFrameFormat)
+: m_pFrameFormat(pFrameFormat)
+{
+StartListening(m_pFrameFormat->GetNotifier());
+}
+
+void SwHTMLFrameFormatListener::Notify(const SfxHint& rHint)
+{
+if (rHint.GetId() == SfxHintId::Dying)
+m_pFrameFormat = nullptr;
+}
+
 void SwHTMLParser::SetAttr_( bool bChkEnd, bool bBeforeTable,
  std::deque> *pPostIts )
 {
@@ -2955,7 +2967,14 @@ void SwHTMLParser::SetAttr_( bool bChkEnd, bool 
bBeforeTable,
 
 for( auto n = m_aMoveFlyFrames.size(); n; )
 {
-SwFrameFormat *pFrameFormat = m_aMoveFlyFrames[ --n ];
+SwFrameFormat *pFrameFormat = m_aMoveFlyFrames[--n]->GetFrameFormat();
+if (!pFrameFormat)
+{
+SAL_WARN("sw.html", "SwFrameFormat deleted during import");
+m_aMoveFlyFrames.erase( m_aMoveFlyFrames.begin() + n );
+m_aMoveFlyCnts.erase( m_aMoveFlyCnts.begin() + n );
+continue;
+}
 
 const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
 OSL_ENSURE( RndStdIds::FLY_AT_PARA == rAnchor.GetAnchorId(),
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 59b7db28c467..9fb7dbfce7b5 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -331,6 +331,15 @@ namespace o3tl
 template<> struct typed_flags : 
is_typed_flags {};
 }
 
+class SwHTMLFrameFormatListener : public SvtListener
+{
+SwFrameFormat* m_pFrameFormat;
+public:
+SwHTMLFrameFormatListener(SwFrameFormat* pFrameFormat);
+SwFrameFormat* GetFrameFormat() { return m_pFrameFormat; }
+virtual void Notify(const SfxHint&) override;
+};
+
 class SwHTMLParser : public SfxHTMLParser, public SvtListener
 {
 friend class SectionSaveStruct;
@@ -366,7 +375,7 @@ class SwHTMLParser : public SfxHTMLParser, public 
SvtListener
 HTMLAttrs  m_aParaAttrs; // temporary paragraph attributes
 std::shared_ptr  m_xAttrTab;   // "open" attributes
 HTMLAttrContexts m_aContexts;// the current context of attribute/token
-std::vector m_aMoveFlyFrames;// Fly-Frames, the anchor is 
moved
+std::vector> 
m_aMoveFlyFrames;// Fly-Frames, the anchor is moved
 std::deque m_aMoveFlyCnts;// and the Content-Positions
 //stray SwTableBoxes which need to be deleted to avoid leaking, but hold
 //onto them until parsing is done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - fpicker/source

[Caolán McNamara (via logerrit)]

 fpicker/source/office/fileview.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2464e2e6894d5e820d8268bc80e3a696521d832f
Author: Caolán McNamara 
AuthorDate: Tue Oct 27 14:07:05 2020 +
Commit: Michael Stahl 
CommitDate: Wed Oct 28 09:37:14 2020 +0100

Resolves: tdf#137575 fpicker custom sorting setting not restored

Change-Id: Id5fae909a12621f68eb8defcb01b91c304c61df6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104839
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/fpicker/source/office/fileview.cxx 
b/fpicker/source/office/fileview.cxx
index 7b5bd1d63c85..5b91dfa2295d 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1096,8 +1096,8 @@ OUString SvtFileView::GetConfigString() const
 void SvtFileView::SetConfigString(const OUString& rCfgStr)
 {
 sal_Int32 nIdx = 0;
-mpImpl->mnSortColumn = static_cast(rCfgStr.getToken( 0, ';', 
nIdx ).toInt32());
-mpImpl->mbAscending = 
static_cast(static_cast(rCfgStr.getToken( 0, ';', nIdx 
).toInt32()));
+sal_uInt16 nSortColumn = static_cast(rCfgStr.getToken( 0, ';', 
nIdx ).toInt32());
+bool bAscending = 
static_cast(static_cast(rCfgStr.getToken( 0, ';', nIdx 
).toInt32()));
 
 std::vector aWidths(mpImpl->mxView->TypeColumnVisible() ? 4 : 3, -1);
 
@@ -1118,6 +1118,9 @@ void SvtFileView::SetConfigString(const OUString& rCfgStr)
 
 weld::TreeView* pView = mpImpl->mxView->getWidget();
 pView->set_column_fixed_widths(aWidths);
+if (mpImpl->mnSortColumn != nSortColumn)
+pView->set_sort_indicator(TRISTATE_INDET, mpImpl->GetSortColumn());
+mpImpl->Resort_Impl(nSortColumn, bAscending);
 }
 
 SvtFileView_Impl::SvtFileView_Impl(SvtFileView* pAntiImpl, weld::Window* 
pTopLevel,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - lotuswordpro/source

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwptablelayout.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0795050df0cf79b163c78e048a9f42051e401a61
Author: Caolán McNamara 
AuthorDate: Tue Oct 27 10:12:37 2020 +
Commit: Michael Stahl 
CommitDate: Wed Oct 28 09:38:07 2020 +0100

ofz#26676 null deref

Change-Id: Ic2bd8b49762266ad48263bd68a143b46fb5fd66f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104834
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 1e371b56426f..00da4c2545d2 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -889,7 +889,14 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 XFRow* pXFRow = pTmpTable->GetRow(1);
 pXFTable->AddHeaderRow(pXFRow);
 pTmpTable->RemoveRow(1);
-nContentRow = m_RowsMap[0]->GetCurMaxSpannedRows(0,nCol);
+auto iter = m_RowsMap.find(0);
+if (iter == m_RowsMap.end())
+{
+SAL_WARN("lwp", "row 0 is unknown");
+nContentRow = 0;
+}
+else
+nContentRow = iter->second->GetCurMaxSpannedRows(0,nCol);
 }
 }
 return nContentRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source sw/qa

[Bartosz Kosiorek (via logerrit)]

 sfx2/source/dialog/dinfdlg.cxx   |7 +++---
 sw/qa/extras/ooxmlexport/data/custom-properties.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|   20 +++
 3 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 966880403f6b9b58d53b7b6e0da9520cdfdc0baa
Author: Bartosz Kosiorek 
AuthorDate: Tue Oct 20 18:58:34 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 09:39:51 2020 +0100

tdf#116214 Allow for scientific notation in Custom Properties

To keep compatibility with OOXML format, it should be allowed
to use Scientific Format in Custom Properties.
The solution is backward compatible with standard numbers
(it is still possible to write integer numbers and fractions).

With that fix it is also possible to store very small and very big
numbers in scientific notation.

Change-Id: Ic788a6e3f4f748b905828f3d6c8c40dc7e46ba52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104569
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit b73151c8f8fd4e67dc5674ebb6538783bdfb91df)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104842
Reviewed-by: Michael Stahl 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0d1fac1a9622..0d09643680d4 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1408,15 +1408,16 @@ bool CustomPropertiesWindow::IsLineValid( 
CustomPropertyLine* pLine ) const
 if ( sValue.isEmpty() )
 return true;
 
-sal_uInt32 nIndex = 0x;
+sal_uInt32 nIndex = NUMBERFORMAT_ENTRY_NOT_FOUND;
 if ( CUSTOM_TYPE_NUMBER == nType )
+// tdf#116214 Scientific format allows to use also standard numbers
 nIndex = const_cast< SvNumberFormatter& >(
-m_aNumberFormatter ).GetFormatIndex( NF_NUMBER_SYSTEM );
+m_aNumberFormatter ).GetFormatIndex( NF_SCIENTIFIC_000E00 );
 else if ( CUSTOM_TYPE_DATE == nType )
 nIndex = const_cast< SvNumberFormatter& >(
 m_aNumberFormatter).GetFormatIndex( NF_DATE_SYS_DDMM );
 
-if ( nIndex != 0x )
+if ( nIndex != NUMBERFORMAT_ENTRY_NOT_FOUND )
 {
 sal_uInt32 nTemp = nIndex;
 double fDummy = 0.0;
diff --git a/sw/qa/extras/ooxmlexport/data/custom-properties.docx 
b/sw/qa/extras/ooxmlexport/data/custom-properties.docx
index 4d104cb26824..01db34977baa 100644
Binary files a/sw/qa/extras/ooxmlexport/data/custom-properties.docx and 
b/sw/qa/extras/ooxmlexport/data/custom-properties.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 5f160fab6007..8149a444e8f0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -94,14 +94,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testCustomProperties, 
"custom-properties.doc
 assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:Characters", "22");
 assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:CharactersWithSpaces", 
"24");
 assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:Company", "kompany");
-assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:Manager", "menadzer");
+assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:Manager", 
"menadzer;isecondmanager");
 assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:HyperlinkBase", 
"hiperlink");
 //assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:DocSecurity", "2");
 assertXPathContent(pXmlDoc, 
"/extended-properties:Properties/extended-properties:AppVersion", "15.");
 
 // Custom file properties - defined by user
 xmlDocUniquePtr pCustomXml = parseExport("docProps/custom.xml");
-assertXPath(pCustomXml, 
"/custom-properties:Properties/custom-properties:property", 8);
+assertXPath(pCustomXml, 
"/custom-properties:Properties/custom-properties:property", 9);
 assertXPath(pCustomXml, 
"/custom-properties:Properties/custom-properties:property[1]",
 "name", "testDateProperty");
 assertXPathContent(pCustomXml, 
"/custom-properties:Properties/custom-properties:property[1]/vt:filetime",
@@ -119,22 +119,26 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testCustomProperties, 
"custom-properties.doc
 assertXPathContent(pCustomXml, 
"/custom-properties:Properties/custom-properties:property[5]/vt:r8",
"-128.1");
 assertXPath(pCustomXml, 
"/custom-properties:Properties/custom-properties:property[6]",
+"name", "testScientificNumber");
+assertXPathContent(pCustomXml, 
"/custom-properties:Properties/custom-properties:property[6]/vt:r8",
+   "1.23456789E+023");
+assertXP

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

[Tor Lillqvist (via logerrit)]

 vcl/source/window/paint.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3d58e90a061dc0c6388939708f2c3f9bf926499a
Author: Tor Lillqvist 
AuthorDate: Wed Oct 28 09:43:13 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Oct 28 09:59:57 2020 +0100

Tentative fix for crash in the iOS app

See https://github.com/CollaboraOnline/online/issues/403 .

It seems that perhaps we can just bypass the whole ImplHandlePaintHdl
handler function on iOS. Not sure whether this has any unintended
side-effects. Testing will show. (Sure, if this is the right fix, it
would make more sense to not create that idle paint thing at all. Feel
free.)

As discussed in the issue, there is a problem on Linux, too, that
might have the same root cause, that can be reproduced in a simple
"make run" scenario. It is possible that to fix that, the
ImplHandlePaintHdl function should simply return right away if
comphelper::LibreOfficeKit::isActive() is true. (And if that is done,
the #ifndef added here can be dropped.) But I am even less convinced
that such a change doesn't have any ill side-effects, and the symptom
is perhaps less serious than on iOS, so I will leave that to others to
investigate, for now.

Change-Id: Ie4c1c70c65746961fa0730cae348ecc9bcdccf1d
Signed-off-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104918

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 42a3139b47a9..218cdd3216ed 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -642,6 +642,7 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
+#ifndef IOS
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
 // save paint events until layout is done
@@ -664,6 +665,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
 mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 }
+#endif
 }
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/source

[Caolán McNamara (via logerrit)]

 starmath/inc/edit.hxx|4 
 starmath/source/edit.cxx |   21 +
 2 files changed, 25 insertions(+)

New commits:
commit 8dcbbea3802670004c3e78a1ff1ec56b23df674c
Author: Caolán McNamara 
AuthorDate: Tue Oct 27 16:49:48 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 10:04:43 2020 +0100

tdf#137620 add explicit SurroundingText support to starmath Edit Window

Change-Id: Ie716dd66754dd774ee81fa97ebee8dc314002f12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104898
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index c1ce769ab1c6..43ef648ddd95 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -68,6 +68,10 @@ class SmEditWindow final : public vcl::Window, public 
DropTargetHelper
 virtual void MouseButtonUp(const MouseEvent &rEvt) override;
 virtual void MouseButtonDown(const MouseEvent &rEvt) override;
 
+virtual OUString GetSurroundingText() const override;
+virtual Selection GetSurroundingTextSelection() const override;
+virtual bool DeleteSurroundingText(const Selection& rSelection) override;
+
 virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
 virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index c8f82355468e..ef1da5bca1ab 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -144,6 +144,27 @@ void SmEditWindow::dispose()
 vcl::Window::dispose();
 }
 
+OUString SmEditWindow::GetSurroundingText() const
+{
+if (pEditView)
+return pEditView->GetSurroundingText();
+return OUString();
+}
+
+Selection SmEditWindow::GetSurroundingTextSelection() const
+{
+if (pEditView)
+return pEditView->GetSurroundingTextSelection();
+return Selection(0, 0);
+}
+
+bool SmEditWindow::DeleteSurroundingText(const Selection& rSelection)
+{
+if (pEditView)
+return pEditView->DeleteSurroundingText(rSelection);
+return false;
+}
+
 void SmEditWindow::StartCursorMove()
 {
 if (!IsInlineEditEnabled())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/0214.xhp |2 +-
 source/text/swriter/01/04090001.xhp |   33 +++--
 source/text/swriter/01/04090004.xhp |4 ++--
 3 files changed, 6 insertions(+), 33 deletions(-)

New commits:
commit 13b33e0bff785539fc858e1523cf68186531fd96
Author: Seth Chaiklin 
AuthorDate: Mon Oct 26 22:27:15 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 28 10:09:43 2020 +0100

For tdf#131206: clarify explanation of "Level" in Insert Field (Document 
tab)

  Also:

  Remove table for some controls not found in this tab.
  Rename some German ids from Insert Field help pages
inhaltfix  --> "fixed content"  ( in swriter/01/04090004.xhp )
datumuhrformat -->" datetimeformat"  ( in swriter/01/04090001.xhp )
and change all embeds to those ids

Change-Id: I457803d53bc0c841d94eed17b0cddc2f88669dc8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104829
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/0214.xhp 
b/source/text/swriter/01/0214.xhp
index 36dd8c234..740087ec3 100644
--- a/source/text/swriter/01/0214.xhp
+++ b/source/text/swriter/01/0214.xhp
@@ -63,7 +63,7 @@
 
 Value
 Displays the 
current value of the field variable. If you want, you can enter a new 
value.
-
+
 
 Condition
 Displays the 
condition that must be met for the field to be activated. If you want, you can 
enter a new condition.
diff --git a/source/text/swriter/01/04090001.xhp 
b/source/text/swriter/01/04090001.xhp
index 4a83021f3..de9b2ea05 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -162,46 +162,19 @@
 Format
 Click the format that you want 
to apply to the selected field, or click "Additional formats" to define a 
custom format.
 
-When you click "Additional formats", the Number 
Format dialog opens, where you can define a custom format. 

+When you click "Additional formats", the Number 
Format dialog opens, where you can define a custom format. 

 If you choose 
"Chapter number without separator" for a chapter field, the separators that are 
specified for chapter number in Tools - Chapter 
numbering are not displayed.
 If you choose 
"chapter number" as the format for reference fields, only the 
number of the chapter heading containing the referenced object is displayed in 
the field. If the paragraph style for the chapter heading is not numbered, the 
field is left blank.
 The following 
number range formats are for paragraphs formatted with numbered or bulleted 
lists:
 
-
-  
-
-  Category and number
-
-
-  The 
format contains everything between the beginning of the paragraph and directly 
after the number-range field
-
-  
-  
-
-  Caption text
-
-
-  The 
format contains the text following the number-range field up to the end of the 
paragraph
-
-  
-  
-
-  Number
-
-
-  The 
format only contains the reference number
-
-  
-
-
 
 Inserts the field as static 
content, that is, the field cannot be updated.
 For the HTML export and import of 
date and time fields, special $[officename] formats are 
used.
-
+
 
 
 Level
-Select the chapter heading level 
that you want to include in the selected field.
+Enter outline level of the 
chapter to be displayed. The inserted field will display the value taken from 
last paragraph with the specified outline level placed before the inserted 
field.
 
 
 
diff --git a/source/text/swriter/01/04090004.xhp 
b/source/text/swriter/01/04090004.xhp
index 28544ec33..714101a63 100644
--- a/source/text/swriter/01/04090004.xhp
+++ b/source/text/swriter/01/04090004.xhp
@@ -136,8 +136,8 @@
 
 Click the format that you 
want to apply to the selected field, or click "Additional formats" to define a 
custom format.
 
-
-
+
+
 
 Fixed content
 Inserts the field as static 
content, that is, the field cannot be updated.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aed40ae47a8bfb2f10d4f9989e9a7c55a1ea575e
Author: Seth Chaiklin 
AuthorDate: Wed Oct 28 11:09:43 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 10:09:43 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 13b33e0bff785539fc858e1523cf68186531fd96
  - For tdf#131206: clarify explanation of "Level" in Insert Field 
(Document tab)

  Also:

  Remove table for some controls not found in this tab.
  Rename some German ids from Insert Field help pages
inhaltfix  --> "fixed content"  ( in swriter/01/04090004.xhp )
datumuhrformat -->" datetimeformat"  ( in swriter/01/04090001.xhp )
and change all embeds to those ids

Change-Id: I457803d53bc0c841d94eed17b0cddc2f88669dc8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104829
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 4d260d542ebd..13b33e0bff78 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4d260d542ebddf6540285885c7750b5663c3862a
+Subproject commit 13b33e0bff785539fc858e1523cf68186531fd96
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - external/nss

[Jan-Marek Glogowski (via logerrit)]

 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/nss-restore-manual-pre-dependencies.patch.1 |   83 +++
 2 files changed, 84 insertions(+)

New commits:
commit 55ec34655e145b0728e4eee3071ea11c6a4ac90b
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 1 12:57:53 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 10:20:57 2020 +0100

nss: restore manual pre-dependency build

We had some seldom build failures on Windows, with errors like:
PermissionError: [WinError 32] The process cannot access the file
because it is being used by another process: '/nssckmdt.h'.

This happens, because of the "." / parent shell hack. Thinking
about it again, it doesn't prevent the parent make to run in
parallel to the "." directory make. So I tried to use a terminal
match-all rule like

ifneq (,$(filter .,$(DIRS)))
%::
# empty terminal rule triggered
$(error can't happen)
endif

to stop the original parent make, but that doesn't work and the
$(error ...) is triggered.

So AFAIK I'm out of options here and have to restore the old
manual pre-dependency build variant - still much better then no
parallel build.

An alternative idea was to put the rest of the rules.mk in the
"else" of the terminal rule, to skip all normal rules, but this
still leaves out all rules from the rest of the make-files,
which might result in some hard to debug errors.

This reverts my upstream patch 15608:744881490c78.

Change-Id: I9e2e9e1ec9f35697c7853c92f60434f514cba5ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103777
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit d2f9c55e065d559de903d540da28502646714a24)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104837
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8fa1edd530cc..f49d55fab46e 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.bzmozilla1238154.patch \
external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
+external/nss/nss-restore-manual-pre-dependencies.patch.1 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 
b/external/nss/nss-restore-manual-pre-dependencies.patch.1
new file mode 100644
index ..ebcc5b48c540
--- /dev/null
+++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1
@@ -0,0 +1,83 @@
+Revert of upstream:
+
+changeset:   15608:744881490c78
+user:Jan-Marek Glogowski 
+date:Wed May 13 19:00:40 2020 +
+summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea
+
+--- b/nss/coreconf/rules.mkWed May 13 19:00:40 2020 +
 a/nss/coreconf/rules.mkTue May 12 21:33:43 2020 +
+@@ -31,21 +31,10 @@
+ USE_NT_C_SYNTAX=1
+ endif
+ 
+-# For whatever reason, "." can't be handled using make conditionals.
+-# Based on automake's SUBDIRS "." handling.
+ ifdef DIRS
+ ifndef IGNORE_DIRS
+-ifneq (,$(filter .,$(DIRS)))
+-TARGETS = $(NULL)
+-ALL_TRASH = $(NULL)
+-endif
+-
+ $(DIRS):
++  $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS)
+-  $(IGNORE_ERROR)@if [ "$@" != "." ]; then \
+-  $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  else \
+-  IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+-  fi
+   @$(CLICK_STOPWATCH)
+ endif
+ endif
+@@ -84,9 +73,7 @@
+ check: $(DIRS)
+ 
+ clean clobber: $(DIRS)
+-ifneq (,$(ALL_TRASH))
+   rm -rf $(ALL_TRASH)
+-endif
+ 
+ realclean clobber_all: $(DIRS)
+   rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH)
+--- b/nss/lib/ckfw/builtins/manifest.mnWed May 13 19:00:40 2020 +
 a/nss/lib/ckfw/builtins/manifest.mnTue May 12 21:33:43 2020 +
+@@ -5,9 +5,7 @@
+ 
+ CORE_DEPTH = ../../..
+ 
++DIRS = testlib
+-DIRS = . testlib
+-
+-testlib: .
+ 
+ MODULE = nss
+ 
+--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 +
 a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 +
+@@ -5,9 +5,7 @@
+ 
+ CORE_DEPTH = ../..
+ 
++DIRS = builtins
+-DIRS = . builtins
+-
+-builtins: .
+ 
+ PRIVATE_EXPORTS = \
+   ck.h  \
+--- b/nss/manifest.mn  Wed May 13 19:00:40 2020 +
 a/nss/manifest.mn  Tue May 12 21:33:43 2020 +
+@@ -23,6 +23,12 @@
+   # no real way to encode these in any sensible way
+   $(MAKE) -C coreconf/nsinstall program
+   $(MAKE) export
++  # pre-build child dir -> parent dir dependencies
++  # ckfw/builtins -> ckfw
++  IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs
++  # ckfw/builtins/testlib -> ckfw/builtins

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - xmlscript/source

[Serge Krot (via logerrit)]

 xmlscript/source/xmldlg_imexp/imp_share.hxx|5 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |8 
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit d0124b5178d4edbbfeae0ea5edd64873bc942666
Author: Serge Krot 
AuthorDate: Wed Oct 21 13:39:01 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Oct 28 10:34:22 2020 +0100

tdf#137652 fix XDL import: no more missing empty items for combobox

Change-Id: I6837968ee7cc5e4b3bc9abd7e320f562c6ff0833
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104619
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit f4a5893eceabc1f6d541164a0e858456f0ce0905)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104679

diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx 
b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 977625bebae0..6d8e9128a336 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -311,6 +311,7 @@ class MenuPopupElement
 {
 std::vector< OUString > _itemValues;
 std::vector< sal_Int16 > _itemSelected;
+bool _allowEmptyItems;
 public:
 css::uno::Sequence< OUString > getItemValues();
 css::uno::Sequence< sal_Int16 > getSelectedItems();
@@ -323,9 +324,11 @@ public:
 MenuPopupElement(
 OUString const & rLocalName,
 css::uno::Reference< css::xml::input::XAttributes > const & 
xAttributes,
-ElementBase * pParent, DialogImport * pImport )
+ElementBase * pParent, DialogImport * pImport,
+bool aAllowEmptyItems)
 : ElementBase( pImport->XMLNS_DIALOGS_UID,
rLocalName, xAttributes, pParent, pImport )
+, _allowEmptyItems(aAllowEmptyItems)
 {}
 };
 
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 640776592e58..f3ed895b0c24 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1275,8 +1275,8 @@ Reference< xml::input::XElement > 
MenuPopupElement::startChildElement(
 else if ( rLocalName == "menuitem" )
 {
 OUString aValue( xAttributes->getValueByUidName( 
m_xImport->XMLNS_DIALOGS_UID,"value" ) );
-SAL_WARN_IF( aValue.isEmpty(), "xmlscript.xmldlg", "### menuitem has 
no value?" );
-if (!aValue.isEmpty())
+SAL_WARN_IF( aValue.isEmpty() && !_allowEmptyItems, 
"xmlscript.xmldlg", "### menuitem has no value?" );
+if ((!aValue.isEmpty()) || _allowEmptyItems)
 {
 _itemValues.push_back( aValue );
 
@@ -1331,7 +1331,7 @@ Reference< xml::input::XElement > 
MenuListElement::startChildElement(
 // menupopup
 else if ( rLocalName == "menupopup" )
 {
-_popup = new MenuPopupElement( rLocalName, xAttributes, this, 
m_xImport.get() );
+_popup = new MenuPopupElement( rLocalName, xAttributes, this, 
m_xImport.get(), false );
 return _popup;
 }
 else
@@ -1399,7 +1399,7 @@ Reference< xml::input::XElement > 
ComboBoxElement::startChildElement(
 // menupopup
 else if ( rLocalName == "menupopup" )
 {
-_popup = new MenuPopupElement( rLocalName, xAttributes, this, 
m_xImport.get() );
+_popup = new MenuPopupElement( rLocalName, xAttributes, this, 
m_xImport.get(), true );
 return _popup;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/svx svx/source

[Serge Krot (via logerrit)]

 cui/source/tabpages/border.cxx |  120 +++--
 include/svx/frmsel.hxx |2 
 svx/source/dialog/frmsel.cxx   |5 +
 3 files changed, 98 insertions(+), 29 deletions(-)

New commits:
commit de1c4863ab993c80d8fea50ce420d568f75bf2e6
Author: Serge Krot 
AuthorDate: Tue Oct 27 11:26:55 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Oct 28 10:36:38 2020 +0100

tdf#137790 calc: Minimal line width for different line styles

Change-Id: I4d062f054a5ef6da7ef595190a7b3c6e2a0b191e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104865
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index d952ae97ad8c..c60e2a9aba1d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -85,6 +85,43 @@ static void lcl_SetDecimalDigitsTo1(weld::MetricSpinButton& 
rField)
 rField.set_min(rField.normalize(nMin), FieldUnit::TWIP);
 }
 
+// returns in pt
+static sal_Int64 lcl_GetMinLineWidth(SvxBorderLineStyle aStyle)
+{
+switch (aStyle)
+{
+case SvxBorderLineStyle::NONE:
+return 0;
+
+case SvxBorderLineStyle::SOLID:
+case SvxBorderLineStyle::DOTTED:
+case SvxBorderLineStyle::DASHED:
+case SvxBorderLineStyle::FINE_DASHED:
+case SvxBorderLineStyle::DASH_DOT:
+case SvxBorderLineStyle::DASH_DOT_DOT:
+return 15;
+
+// Double lines
+case SvxBorderLineStyle::DOUBLE: return 22;
+case SvxBorderLineStyle::DOUBLE_THIN: return 22;
+case SvxBorderLineStyle::THINTHICK_SMALLGAP: return 20;
+case SvxBorderLineStyle::THINTHICK_MEDIUMGAP: return 15;
+case SvxBorderLineStyle::THINTHICK_LARGEGAP: return 15;
+case SvxBorderLineStyle::THICKTHIN_SMALLGAP: return 20;
+case SvxBorderLineStyle::THICKTHIN_MEDIUMGAP: return 15;
+case SvxBorderLineStyle::THICKTHIN_LARGEGAP: return 15;
+
+case SvxBorderLineStyle::EMBOSSED: return 15;
+case SvxBorderLineStyle::ENGRAVED: return 15;
+
+case SvxBorderLineStyle::OUTSET: return 10;
+case SvxBorderLineStyle::INSET: return 10;
+
+default:
+return 15;
+}
+}
+
 // number of preset images to show
 const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5;
 
@@ -1192,15 +1229,37 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl, 
weld::MetricSpinButton&,
 
 IMPL_LINK_NOARG(SvxBorderTabPage, SelStyleHdl_Impl, SvtLineListBox&, void)
 {
-sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE);
-nVal = static_cast(vcl::ConvertDoubleValue(
-nVal,
-m_xLineWidthMF->get_digits(),
-FieldUnit::POINT, MapUnit::MapTwip ));
-m_aFrameSel.SetStyleToSelection ( nVal,
+sal_Int64 nOldWidth = m_xLineWidthMF->get_value(FieldUnit::NONE);
+nOldWidth = static_cast(vcl::ConvertDoubleValue(
+nOldWidth,
+m_xLineWidthMF->get_digits(),
+FieldUnit::POINT,
+MapUnit::MapTwip));
+
+const sal_Int64 nOldMinWidth = 
lcl_GetMinLineWidth(m_aFrameSel.getCurrentStyleLineStyle());
+const sal_Int64 nNewMinWidth = 
lcl_GetMinLineWidth(m_xLbLineStyle->GetSelectEntryStyle());
+
+// auto change line-width if it doesn't correspond to minimal value
+// let's change only in case when user has not changed the line-width into 
some custom value
+const sal_Int64 nNewWidth = (nOldMinWidth == nOldWidth)? nNewMinWidth : 
nOldWidth;
+
+// set value inside edit box
+if (nOldWidth != nNewWidth)
+{
+const sal_Int64 nNewWidthPt = 
static_cast(vcl::ConvertDoubleValue(
+nNewWidth,
+m_xLineWidthMF->get_digits(),
+MapUnit::MapTwip,
+FieldUnit::POINT));
+m_xLineWidthMF->set_value(nNewWidthPt, FieldUnit::POINT);
+}
+
+// set value inside style box
+m_aFrameSel.SetStyleToSelection( nNewWidth,
 m_xLbLineStyle->GetSelectEntryStyle() );
 }
 
+
 // ValueSet handling
 sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const
 {
@@ -1331,34 +1390,33 @@ void SvxBorderTabPage::FillLineListBox_Impl()
 
 static struct {
 SvxBorderLineStyle mnStyle;
-tools::Long mnMinWidth;
 SvtLineListBox::ColorFunc mpColor1Fn;
 SvtLineListBox::ColorFunc mpColor2Fn;
 SvtLineListBox::ColorDistFunc mpColorDistFn;
 } const aLines[] = {
 // Simple lines
-{ SvxBorderLineStyle::SOLID,0, &sameColor, &sameColor, 
&sameDistColor },
-{ SvxBorderLineStyle::DOTTED,   0, &sameColor, &sameColor, 
&sameDistColor },
-{ SvxBorderLineStyle::DASHED,   0, &sameColor, &sameColor, 
&sameDistColor },
-{ SvxBorderLineStyle::FINE_DASHED,  0, &sameColor, &sameColor, 
&sameDistColor },
-{ SvxBorderLineStyle::DASH_DOT, 0, &sameColor, &sameColor, 
&sameDistColor },
-{ SvxBorderLineStyle::DASH_DOT_DOT, 0, &sameColor, &sameColor, 
&sameDistColor },
+{ SvxBorderLineStyle::SOL

[Libreoffice-commits] core.git: 2 commits - dictionaries sw/qa sw/source

[Marina Latini (via logerrit)]

 dictionaries |2 -
 sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak2.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |   24 ---
 sw/source/filter/ww8/wrtw8nds.cxx|   15 ---
 4 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit 996cb4e64c8e7c4757695334c781efe8816caffc
Author: Marina Latini 
AuthorDate: Wed Oct 28 11:37:27 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 10:37:27 2020 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to b75fdcfc8695ba95d624d348fa580ccbc2eff9ce
  - Italian Writing Aids extension forked by LibreItalia.

See CHANGELOG.txt for more details.

Change-Id: Id033e666ba8ef80efd72a22cc68772e1c1e67141
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/104701
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dictionaries b/dictionaries
index 8cd579e3a67a..b75fdcfc8695 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 8cd579e3a67ab36040501138d17c647db24547a0
+Subproject commit b75fdcfc8695ba95d624d348fa580ccbc2eff9ce
commit 284f7e255c74c17c0c6b263303f4567b5678
Author: Justin Luth 
AuthorDate: Fri Aug 28 15:32:11 2020 +0300
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 10:37:15 2020 +0100

tdf#132149 ww8export: respect ginormous paragraphs

This handles the extremely unlikely case where
a single paragraph contains multiple soft-page-breaks
from spanning more than two pages.

But it makes the unit tests I designed look much
better, so I am happy. I think it might help to
make the code slightly more understandable too,
and it convinces me that I am understanding
this section as I write multiple fixes against it.
[Better evidence than all of this is that Michael Stahl
came the the same conclusion from a code read - I just
beat him to it.]

(P.S. It isn't enough to change CurrentPageDesc, because
that is reset from rNode.FindPageDesc on every WriteText.
So the effective pageDesc needs to be kept track of.)

Change-Id: I5852e90571a74f3df4362caf058f7960f413dad3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101545
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak2.odt 
b/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak2.odt
new file mode 100644
index ..afa7961cb23f
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf132149_pgBreak2.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 65286eaa08b8..a9618eb20145 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -535,11 +536,28 @@ DECLARE_OOXMLEXPORT_TEST(testTdf132149_pgBreak, 
"tdf132149_pgBreak.odt")
 assertXPath(pDump, "//page[2]/infos/bounds", "width", "5953");  //portrait
 // This two-line 3rd page ought not to exist. DID YOU FIX ME? The real 
page 3 should be "8391" landscape.
 assertXPath(pDump, "//page[3]/infos/bounds", "width", "5953");
+// This really ought to be on odd page 3, but now it is on odd page 5.
+assertXPath(pDump, "//page[5]/infos/bounds", "width", "8391");
+assertXPath(pDump, "//page[5]/infos/prtBounds", "right", "6122");  //Left 
page style
 
 
-//Page break is not lost. This SHOULD be on page 4, but sadly it is not.
-assertXPathContent(pDump, "//page[5]/header/txt", "First Page Style");
-CPPUNIT_ASSERT(getXPathContent(pDump, 
"//page[5]/body/txt").startsWith("Lorem ipsum"));
+//Page style change here must not be lost. This SHOULD be on page 4, but 
sadly it is not.
+assertXPathContent(pDump, "//page[6]/header/txt", "First Page Style");
+CPPUNIT_ASSERT(getXPath(pDump, "//page[6]/body/txt[1]/Text[1]", 
"Portion").startsWith("Lorem ipsum"));
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf132149_pgBreak2, "tdf132149_pgBreak2.odt")
+{
+// This 3 page document is designed to visually exaggerate the problems
+// of emulating LO's followed-by-page-style into MSWord's sections.
+
+// The only specified page style change should be between page 1 and 2.
+// When the first paragraph was split into 3, each paragraph specified a 
page break. The last was unnecessary.
+uno::Reference xParaThree(getParagraph(3), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(uno::Any(), 
xParaThree->getPropertyValue("PageDescName"));
+// The ODT is only 2 paragraphs, but a hack to get the right page style 
breaks para1 into pieces.
+// This was 4 paragraphs - the unnecessary page break had hacked in 
another paragraph split.
+CPPUNIT_ASSERT_LESSEQUAL( 3, getPar

[Libreoffice-commits] core.git: dictionaries

[Ismael Olea (via logerrit)]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 864e27cd63e45d44eff883ed27c25c055fc2b837
Author: Ismael Olea 
AuthorDate: Wed Oct 28 11:40:44 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 10:40:44 2020 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 2b9183e45954cfd9d1638f838b461de1ce68b296
  - Update all Spanish dictionaries to RLA v2.6

For first time we publish here all the different localized dicts for
every Spanish variation CLDR registered, as complete as possible and
including a reasonable set of related toponyms.

Change-Id: I4fa780659d837552699f4ced0b7aeed5ef599e5b
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/102979
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dictionaries b/dictionaries
index b75fdcfc8695..2b9183e45954 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b75fdcfc8695ba95d624d348fa580ccbc2eff9ce
+Subproject commit 2b9183e45954cfd9d1638f838b461de1ce68b296
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: 2 commits - Dictionary_es.mk es/description.xml es/dictionaries.xcu es/es.aff es/es_ANY.aff es/es_ANY.dic es/es_AR.aff es/es_AR.dic es/es_BO.aff es/es_BO.dic es

[Ismael Olea (via logerrit)]

 Dictionary_es.mk|   59 
 es/GPLv3.txt|  674 
 es/LGPLv2.1.txt | 1029 
 es/LGPLv3.txt   |  165 
 es/LICENSE.md   |   25 
 es/META-INF/manifest.xml|6 
 es/MPL-1.1.txt  |  470 
 es/README_es_ANY.txt|  191 
 es/README_hunspell_es.txt   |   75 
 es/README_hyph_es.txt   |   43 
 es/README_hyph_es_ANY.txt   |  154 
 es/README_th_es.txt |   18 
 es/README_th_es_ANY.txt |  524 
 es/RLA-ES.png   |binary
 es/description.xml  |   31 
 es/dictionaries.xcu |  271 
 es/es.aff   |   11 
 es/es.dic   |42200 +-
 es/es_AR.aff| 6907 
 es/es_AR.dic|56305 +++
 es/es_BO.aff| 6528 
 es/es_BO.dic|55764 ++
 es/es_CL.aff| 6528 
 es/es_CL.dic|56034 +++
 es/es_CO.aff| 6407 
 es/es_CO.dic|61233 ++
 es/es_CR.aff| 6528 
 es/es_CR.dic|55561 ++
 es/es_CU.aff| 6528 
 es/es_CU.dic|55761 ++
 es/es_DO.aff| 6528 
 es/es_DO.dic|55446 ++
 es/es_EC.aff| 6528 
 es/es_EC.dic|55609 ++
 es/es_ES.aff| 6785 
 es/es_ES.dic|57086 +++
 es/es_GQ.aff| 6907 
 es/es_GQ.dic|70159 
 es/es_GT.aff| 6528 
 es/es_GT.dic|55525 ++
 es/es_HN.aff| 6528 
 es/es_HN.dic|55697 ++
 es/es_MX.aff| 6407 
 es/es_MX.dic|57997 
 es/es_NI.aff| 6528 
 es/es_NI.dic|55600 ++
 es/es_PA.aff| 6528 
 es/es_PA.dic|55498 ++
 es/es_PE.aff| 6407 
 es/es_PE.dic|57332 +++
 es/es_PH.aff| 6907 
 es/es_PH.dic|66745 +
 es/es_PR.aff| 6528 
 es/es_PR.dic|55458 ++
 es/es_PY.aff| 6528 
 es/es_PY.dic|55514 ++
 es/es_SV.aff| 6528 
 es/es_SV.dic|55565 ++
 es/es_US.aff| 6907 
 es/es_US.dic|55157 ++
 es/es_UY.aff| 6528 
 es/es_UY.dic|55695 ++
 es/es_VE.aff| 6407 
 es/es_VE.dic|55988 +++
 es/package-description.txt  |   14 
 it_IT/CHANGELOG.txt |   10 
 it_IT/README_hyph_it_IT.txt |2 
 it_IT/README_it_IT.txt  |   35 
 it_IT/README_th_it_IT.txt   |   55 
 it_IT/description.xml   |6 
 it_IT/hyph_it_IT.dic|2 
 it_IT/it_IT.aff | 2470 -
 it_IT/it_IT.dic |  295 
 it_IT/th_it_IT_v2.dat   | 8552 ++---
 it_IT/th_it_IT_v2.idx   |25853 
 75 files changed, 1524744 insertions(+), 26658 deletions(-)

New commits:
commit 2b9183e45954cfd9d1638f838b461de1ce68b296
Author: Ismael Olea 
AuthorDate: Thu Sep 17 19:23:37 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Oct 28 10:40:44 2020 +0100

Update all Spanish dictionaries to RLA v2.6

For first time we publish here all the different localized dicts for
every Spanish variation CLDR registered, as complete as possible and
including a reasonable set of related toponyms.

Change-Id: I4fa780659d837552699f4ced0b7aeed5ef599e5b
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/102979
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/Dictionary_es.mk b/Dictionary_es.mk
index 07e625c..4a034e0 100644
--- a/Dictionary_es.mk
+++ b/Dictionary_es.mk
@@ -10,17 +10,62 @@
 $(eval $(call gb_Dictionary_Dictionary,dict-es,dictionaries/es))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-es,\
-   dictionaries/es/es_ANY.aff \
-   dictionaries/es/es_ANY.dic \
-   dictionaries/es/hyph_es_ANY.dic \
+   dictionaries/es_AR.aff \
+   dictionaries/es_AR.dic \
+   dictionaries/es_BO.aff \
+   dictionaries/es_BO.dic \
+   dictionaries/es_CL.aff \
+  

[Libreoffice-commits] core.git: external/cairo

[Stephan Bergmann (via logerrit)]

 external/cairo/pixman/pixman-ubsan.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit f57e30eb56c1b593dcb9e801202ded9d079d9043
Author: Stephan Bergmann 
AuthorDate: Wed Oct 28 08:25:13 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 28 10:44:09 2020 +0100

external/cairo: Fix another UBSan invalid-shift-base

> pixman-utils.c:217:14: runtime error: left shift of 155 by 24 places 
cannot be represented in type 'int'

...which happened once while using the LO GUI

Change-Id: I174a29e240f09576859308ada56fe240881f0dad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104915
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/cairo/pixman/pixman-ubsan.patch 
b/external/cairo/pixman/pixman-ubsan.patch
index 4455d4a324e8..8f68d569e117 100644
--- a/external/cairo/pixman/pixman-ubsan.patch
+++ b/external/cairo/pixman/pixman-ubsan.patch
@@ -183,3 +183,14 @@
w--;
  }
  
+--- misc/pixman/pixman/pixman-utils.c
 misc/build/pixman/pixman/pixman-utils.c
+@@ -214,7 +214,7 @@
+   g = float_to_unorm (src[i].g, 8);
+   b = float_to_unorm (src[i].b, 8);
+ 
+-  dst[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0);
++  dst[i] = ((uint32_t)a << 24) | (r << 16) | (g << 8) | (b << 0);
+ }
+ }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/qa

[Stephan Bergmann (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42efdb71bce9b6ec3469236e0de8e08c00b3c90e
Author: Stephan Bergmann 
AuthorDate: Wed Oct 28 08:32:57 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 28 10:45:02 2020 +0100

strtol returns long, so that needs to be used here

Reverting part of 6436302f40252bc6619e304e2051115fee902e20 "convert some 
more
long -> tools::Long"

Change-Id: I72a0029e580885a1714a85d105b6f666343ebdd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104916
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index b2015dbafcf2..5d44a289af0f 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1008,7 +1008,7 @@ void DesktopLOKTest::testSheetSelections()
 {
 char* pUsedMimeType = nullptr;
 char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, 
nullptr, &pUsedMimeType);
-std::vector aExpected = {5, 6, 7, 8, 9};
+std::vector aExpected = {5, 6, 7, 8, 9};
 std::istringstream iss(pCopiedContent);
 for (size_t i = 0; i < aExpected.size(); i++)
 {
@@ -1055,7 +1055,7 @@ void DesktopLOKTest::testSheetSelections()
 {
 char* pUsedMimeType  = nullptr;
 char* pCopiedContent = pDocument->pClass->getTextSelection(pDocument, 
nullptr, &pUsedMimeType);
-std::vector aExpected = { 8 };
+std::vector aExpected = { 8 };
 std::istringstream iss(pCopiedContent);
 for (size_t i = 0; i < aExpected.size(); i++)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Ilkyu Ju (via logerrit)]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e19d85856e9c9e1c33971b350ab74de278185fe0
Author: Ilkyu Ju 
AuthorDate: Wed Oct 28 18:46:18 2020 +0900
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 10:46:18 2020 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 975046e0970d4300bb229fb0cbe3d5d0afec8c8f
  - tdf#135405 Add Korean(ko_KR) spellcheck dictionary

add Korean spellcheck dictionary

Change-Id: I1ca5c60fd77f9cfe52feacbfbf021a2d37332ea6
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/100395
Reviewed-by: DaeHyun Sung 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/dictionaries b/dictionaries
index 2b9183e45954..975046e0970d 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2b9183e45954cfd9d1638f838b461de1ce68b296
+Subproject commit 975046e0970d4300bb229fb0cbe3d5d0afec8c8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/source

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx |4 +++-
 vcl/source/filter/ipdf/pdfread.cxx   |4 ++--
 vcl/source/pdf/PDFiumLibrary.cxx |7 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 49a39d1abccc61b6dace3e92059ae50a6a2c298d
Author: Miklos Vajna 
AuthorDate: Wed Oct 28 08:37:32 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 10:55:45 2020 +0100

pdfium: add an FPDF_RenderPageBitmap() wrapper

Change-Id: I2238aeb4b2f7483440ded2600a328436f861f178
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104917
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 43cbdb2f9a12..84cfccae2aa2 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -62,6 +62,8 @@ public:
 std::unique_ptr createBitmap(int nWidth, int nHeight, int 
nAlpha);
 };
 
+class PDFiumPage;
+
 class VCL_DLLPUBLIC PDFiumBitmap final
 {
 private:
@@ -75,6 +77,7 @@ public:
 ~PDFiumBitmap();
 FPDF_BITMAP getPointer() { return mpBitmap; }
 void fillRect(int left, int top, int width, int height, sal_uInt32 nColor);
+void renderPageBitmap(PDFiumPage* pPage, int nStartX, int nStartY, int 
nSizeX, int nSizeY);
 };
 
 class VCL_DLLPUBLIC PDFiumAnnotation final
@@ -109,7 +112,6 @@ public:
 std::vector getLineGeometry();
 };
 
-class PDFiumPage;
 class PDFiumTextPage;
 
 class VCL_DLLPUBLIC PDFiumPathSegment final
diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 3e0207e86bd5..c027acb38777 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -180,8 +180,8 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, 
std::vector& r
 }
 const sal_uInt32 nColor = bTransparent ? 0x : 0x;
 pPdfBitmap->fillRect(0, 0, nPageWidth, nPageHeight, nColor);
-FPDF_RenderPageBitmap(pPdfBitmap->getPointer(), 
pPdfPage->getPointer(), /*start_x=*/0,
-  /*start_y=*/0, nPageWidth, nPageHeight, 
/*rotate=*/0, /*flags=*/0);
+pPdfBitmap->renderPageBitmap(pPdfPage.get(), /*start_x=*/0,
+ /*start_y=*/0, nPageWidth, nPageHeight);
 
 // Save the buffer as a bitmap.
 Bitmap aBitmap(Size(nPageWidth, nPageHeight), 24);
diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 607ad7ab9d2c..c3deee13d889 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -503,6 +503,13 @@ void PDFiumBitmap::fillRect(int left, int top, int width, 
int height, sal_uInt32
 FPDFBitmap_FillRect(mpBitmap, left, top, width, height, nColor);
 }
 
+void PDFiumBitmap::renderPageBitmap(PDFiumPage* pPage, int nStartX, int 
nStartY, int nSizeX,
+int nSizeY)
+{
+FPDF_RenderPageBitmap(mpBitmap, pPage->getPointer(), nStartX, nStartY, 
nSizeX, nSizeY,
+  /*rotate=*/0, /*flags=*/0);
+}
+
 PDFiumAnnotation::PDFiumAnnotation(FPDF_ANNOTATION pAnnotation)
 : mpAnnotation(pAnnotation)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/inc sc/source

[Michael Meeks (via logerrit)]

 sc/inc/spellcheckcontext.hxx|2 +-
 sc/source/ui/view/gridwin.cxx   |2 ++
 sc/source/ui/view/spellcheckcontext.cxx |   14 --
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 5245723d92e92773d4679b3cd60a70706e3b4782
Author: Michael Meeks 
AuthorDate: Mon Oct 26 19:31:56 2020 +
Commit: Andras Timar 
CommitDate: Wed Oct 28 11:46:33 2020 +0100

Don't let sc's spell-checking EditEngine linger around as long.

Attempted blind fix for problems with stale OutputDevice usage.

Change-Id: Ifa9eb000907aa18e2007cc1020c269d97d182e72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104848
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index 8e2392ef5ff1..d4a0e0162530 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -57,7 +57,7 @@ public:
 private:
 void ensureResults(SCCOL nCol, SCROW nRow);
 void resetCache(bool bContentChangeOnly = false);
-void resetEngine();
+void setup();
 };
 }
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9dfca179a4ed..3a7c0491133e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -500,6 +500,8 @@ void ScGridWindow::dispose()
 mpDPFieldPopup.disposeAndClear();
 aComboButton.SetOutputDevice(nullptr);
 
+if (mpSpellCheckCxt)
+mpSpellCheckCxt->reset();
 mpSpellCheckCxt.reset();
 
 vcl::Window::dispose();
diff --git a/sc/source/ui/view/spellcheckcontext.cxx 
b/sc/source/ui/view/spellcheckcontext.cxx
index 8861e91a41e4..d75525d90b4d 100644
--- a/sc/source/ui/view/spellcheckcontext.cxx
+++ b/sc/source/ui/view/spellcheckcontext.cxx
@@ -269,7 +269,8 @@ void SpellCheckContext::reset()
 {
 meLanguage = ScGlobal::GetEditDefaultLanguage();
 resetCache();
-resetEngine();
+mpEngine.reset();
+mpStatus.reset();
 }
 
 void SpellCheckContext::resetForContentChange()
@@ -279,8 +280,12 @@ void SpellCheckContext::resetForContentChange()
 
 void SpellCheckContext::ensureResults(SCCOL nCol, SCROW nRow)
 {
-if (!mpEngine || !mpCache)
+if (!mpEngine || !mpCache ||
+ScGlobal::GetEditDefaultLanguage() != meLanguage)
+{
 reset();
+setup();
+}
 
 // perhaps compute the pivot rangelist once in some pivot-table change 
handler ?
 if (pDoc->HasPivotTable())
@@ -306,8 +311,6 @@ void SpellCheckContext::ensureResults(SCCOL nCol, SCROW 
nRow)
 return;
 }
 
-if (ScGlobal::GetEditDefaultLanguage() != meLanguage)
-reset();
 
 // Cell content is either shared-string or EditTextObject
 
@@ -366,7 +369,6 @@ void SpellCheckContext::ensureResults(SCCOL nCol, SCROW 
nRow)
 
 mpResult->set(nCol, nRow, pRanges.get());
 mpCache->set(nCol, nRow, aCell, std::move(pRanges));
-
 }
 
 void SpellCheckContext::resetCache(bool bContentChangeOnly)
@@ -384,7 +386,7 @@ void SpellCheckContext::resetCache(bool bContentChangeOnly)
 mpCache->clear(meLanguage);
 }
 
-void SpellCheckContext::resetEngine()
+void SpellCheckContext::setup()
 {
 mpEngine.reset(new ScTabEditEngine(pDoc));
 mpStatus.reset(new SpellCheckStatus());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source cppcanvas/source drawinglayer/source i18npool/source include/comphelper include/svl include/vcl sc/source sd/source svtools/source svx/source sw/inc sw/so

[Noel (via logerrit)]

 canvas/source/cairo/cairo_textlayout.cxx |2 +-
 canvas/source/vcl/textlayout.cxx |8 
 cppcanvas/source/mtfrenderer/implrenderer.cxx|2 +-
 cppcanvas/source/mtfrenderer/textaction.cxx  |2 +-
 drawinglayer/source/primitive2d/textlayoutdevice.cxx |2 +-
 i18npool/source/localedata/LocaleNode.cxx|   12 +++-
 include/comphelper/numberedcollection.hxx|5 +++--
 include/svl/svdde.hxx|2 +-
 include/vcl/toolkit/controllayout.hxx|2 +-
 sc/source/core/data/postit.cxx   |   10 +-
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx  |2 +-
 sd/source/ui/annotations/annotationmanager.cxx   |4 ++--
 sd/source/ui/dlg/tpaction.cxx|2 +-
 sd/source/ui/inc/tpaction.hxx|2 +-
 svtools/source/table/tablecontrol_impl.cxx   |8 
 svtools/source/table/tablecontrol_impl.hxx   |2 +-
 svx/source/accessibility/lookupcolorname.cxx |2 +-
 svx/source/stbctrls/zoomsliderctrl.cxx   |2 +-
 sw/inc/EnhancedPDFExportHelper.hxx   |2 +-
 sw/source/core/docnode/ndtbl.cxx |8 
 sw/source/core/inc/tblrwcl.hxx   |2 +-
 toolkit/source/awt/animatedimagespeer.cxx|2 +-
 ucb/source/ucp/cmis/cmis_content.cxx |2 +-
 ucb/source/ucp/webdav/SerfSession.cxx|2 +-
 vcl/source/control/throbber.cxx  |2 +-
 25 files changed, 47 insertions(+), 44 deletions(-)

New commits:
commit 7a09d67e1c76db7cb6a87a2ceaa6de7325342b75
Author: Noel 
AuthorDate: Wed Oct 28 09:15:54 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 28 12:03:48 2020 +0100

convert some more long -> tools::Long

Change-Id: Ide9811c1a7582454b3fcf655b70ea106ed56509a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104914
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index 3d4b9ca5a7c3..b7235b30d3c1 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -273,7 +273,7 @@ namespace cairocanvas
 ::osl::MutexGuard aGuard( m_aMutex );
 setupLayoutMode( rOutDev, mnTextDirection );
 
-std::unique_ptr< long []> aOffsets(new 
long[maLogicalAdvancements.getLength()]);
+std::unique_ptr< tools::Long []> aOffsets(new 
tools::Long[maLogicalAdvancements.getLength()]);
 
 if( maLogicalAdvancements.hasElements() )
 setupTextOffsets( aOffsets.get(), maLogicalAdvancements, 
viewState, renderState );
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 0e64c8f8a255..2a0e1fec1a70 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -21,7 +21,7 @@
 #include 
 
 #include 
-
+#include 
 #include 
 #include 
 #include 
@@ -118,7 +118,7 @@ namespace vclcanvas
 uno::Sequence(4),
 rendering::CompositeOperation::SOURCE);
 
-std::unique_ptr< long []> aOffsets(new 
long[maLogicalAdvancements.getLength()]);
+std::unique_ptr< ::tools::Long []> aOffsets(new 
::tools::Long[maLogicalAdvancements.getLength()]);
 setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, 
aRenderState);
 
 std::vector< uno::Reference< rendering::XPolyPolygon2D> > 
aOutlineSequence;
@@ -166,7 +166,7 @@ namespace vclcanvas
 uno::Sequence(4),
 rendering::CompositeOperation::SOURCE);
 
-std::unique_ptr< long []> aOffsets(new 
long[maLogicalAdvancements.getLength()]);
+std::unique_ptr< ::tools::Long []> aOffsets(new 
::tools::Long[maLogicalAdvancements.getLength()]);
 setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, 
aRenderState);
 
 MetricVector aMetricVector;
@@ -335,7 +335,7 @@ namespace vclcanvas
 if( maLogicalAdvancements.hasElements() )
 {
 // TODO(P2): cache that
-std::unique_ptr< long []> aOffsets(new 
long[maLogicalAdvancements.getLength()]);
+std::unique_ptr< ::tools::Long []> aOffsets(new 
::tools::Long[maLogicalAdvancements.getLength()]);
 setupTextOffsets( aOffsets.get(), maLogicalAdvancements, 
viewState, renderState );
 
 // TODO(F3): ensure correct length and termination for DX
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx 
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index e957ca79697a..c16534e3dda1 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -2567,7 +2567,7 @@ namespace cppcanvas::internal
 // generating a DX array, and uniformly
 // 

Improve 'resize with cell'

[Regina Henschel]

Hi all,

I want to change the way 'resize with cell' is handled, because the 
current way causes a lot of bugs. My intended patch is in 
https://gerrit.libreoffice.org/c/core/+/104643


A review would be nice. Especially
- Do you agree with the changes in principle?
- Do you see any problem, which I need to solve before merging the patch?

The patch has no unit tests. I will write unit tests as separate commit 
afterwards.


Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Michael Meeks (via logerrit)]

 sc/inc/spellcheckcontext.hxx|1 +
 sc/source/ui/inc/gridwin.hxx|4 ++--
 sc/source/ui/inc/tabview.hxx|2 ++
 sc/source/ui/view/gridwin.cxx   |7 ++-
 sc/source/ui/view/spellcheckcontext.cxx |7 +++
 sc/source/ui/view/tabview.cxx   |   10 +-
 sc/source/ui/view/tabview5.cxx  |7 ++-
 7 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 65f42a4540d495a11d255af63c7ee15397b57bfa
Author: Michael Meeks 
AuthorDate: Thu Oct 22 19:45:16 2020 +0100
Commit: Noel Grandin 
CommitDate: Wed Oct 28 13:08:15 2020 +0100

tdf#136694 - share spelling context across all ScGridWindows.

Adding new ScGridWindows later (as we do for split panes)
didn't call EnableAutoSpell on them; also duplicating the
spell-checking cache looks wasteful, so share it.

Change-Id: Ieb67bb292590a097bb5a59d369416a094c54c954
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104706
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index 684b2ceb9edc..ac2b19141360 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -43,6 +43,7 @@ class SpellCheckContext
 public:
 SpellCheckContext(ScDocument* pDocument, SCTAB nTab);
 ~SpellCheckContext();
+void dispose();
 
 bool isMisspelled(SCCOL nCol, SCROW nRow) const;
 const std::vector* getMisspellRanges(SCCOL nCol, 
SCROW nRow) const;
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index d9c0606b2dd2..448c33ba6b10 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -145,7 +145,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 // zoom levels demanded from a ScGridWindow instance.
 std::vector maLOKLastCursor;
 
-std::unique_ptr mpSpellCheckCxt;
+std::shared_ptr mpSpellCheckCxt;
 
 ScViewData& mrViewData;
 ScSplitPos  eWhich;
@@ -433,7 +433,7 @@ public:
 
 void CursorChanged();
 void DrawLayerCreated();
-void EnableAutoSpell( bool bEnable );
+void SetAutoSpellContext( const std::shared_ptr 
&ctx );
 void ResetAutoSpell();
 void ResetAutoSpellForContentChange();
 void SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const 
std::vector* pRanges );
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index a716763f1d73..17809c51fdc8 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -156,6 +156,8 @@ private:
 VclPtr  aTopButton;
 VclPtraScrollBarBox;
 
+std::shared_ptr mpSpellCheckCxt;
+
 std::unique_ptr mxInputHintOO; // help 
hint for data validation
 
 std::unique_ptr  pPageBreakData;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 07a4a8317bac..67b815bfc1c1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5501,12 +5501,9 @@ void ScGridWindow::DrawLayerCreated()
 ImpCreateOverlayObjects();
 }
 
-void ScGridWindow::EnableAutoSpell( bool bEnable )
+void ScGridWindow::SetAutoSpellContext( const 
std::shared_ptr &ctx )
 {
-if (bEnable)
-mpSpellCheckCxt.reset(new 
sc::SpellCheckContext(&mrViewData.GetDocument(), mrViewData.GetTabNo()));
-else
-mpSpellCheckCxt.reset();
+mpSpellCheckCxt = ctx;
 }
 
 void ScGridWindow::ResetAutoSpell()
diff --git a/sc/source/ui/view/spellcheckcontext.cxx 
b/sc/source/ui/view/spellcheckcontext.cxx
index 6ff81468c5b1..026c0c5a7968 100644
--- a/sc/source/ui/view/spellcheckcontext.cxx
+++ b/sc/source/ui/view/spellcheckcontext.cxx
@@ -202,6 +202,13 @@ SpellCheckContext::~SpellCheckContext()
 {
 }
 
+void SpellCheckContext::dispose()
+{
+mpEngine.reset();
+mpCache.reset();
+pDoc = nullptr;
+}
+
 bool SpellCheckContext::isMisspelled(SCCOL nCol, SCROW nRow) const
 {
 const_cast(this)->ensureResults(nCol, nRow);
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 2f4a407aca5c..dd7e152f0e93 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -46,6 +46,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2234,12 +2235,19 @@ void ScTabView::EnableRefInput(bool bFlag)
 
 void ScTabView::EnableAutoSpell( bool bEnable )
 {
+if (bEnable)
+mpSpellCheckCxt =
+std::make_shared(&aViewData.GetDocument(),
+  aViewData.GetTabNo());
+else
+mpSpellCheckCxt.reset();
+
 for (VclPtr & pWin : pGridWin)
 {
 if (!pWin)
 continue;
 
-pWin->EnableAutoSpell(bEnable);
+pWin->SetAutoSpellContext(mpSpellCheckCxt);
 }
 }
 
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 73727a0f13d4..c41f08b0aca1 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/sou

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf136453.fodt |   66 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   51 +++
 sw/source/core/undo/undel.cxx |3 -
 3 files changed, 119 insertions(+), 1 deletion(-)

New commits:
commit 815f58fe60dca8ee41f362748a144fc16c89b1f9
Author: Michael Stahl 
AuthorDate: Tue Oct 27 16:33:30 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 28 13:20:57 2020 +0100

tdf#136453 sw_redlinehide: SwUndoDelete: only create extra frames...

... at the start if the section nodes were at the start.

m_bBackSp and m_bJoinNext can't both be true.

(regression from 740f1796504f66408b692225a9676c9ee3d63722)

Change-Id: I999ed3809ca8f527bc3e754b229df02da4576825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104891
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c4967928475f2be20ac2d79e3fa84ac435a7e560)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104846
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/data/tdf136453.fodt 
b/sw/qa/extras/uiwriter/data/tdf136453.fodt
new file mode 100644
index ..2234957e1db8
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf136453.fodt
@@ -0,0 +1,66 @@
+
+http://www.w3.org/TR/css3-text/"; 
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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:d
 r3d="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:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   foo
+   bar
+   
+baz
+   
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e824be2ae56c..0529ef6e4ab9 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1207,6 +1207,57 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134252)
 CPPUNIT_ASSERT_EQUAL(OUString(""), xCursor->getString());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf136453)
+{
+load(DATA_DIRECTORY, "tdf136453.fodt");
+
+SwXTextDocument *const 
pTextDoc(dynamic_cast(mxComponent.get()));
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* const pDoc(pTextDoc->GetDocShell()->GetDoc());
+SwWrtShell *const pWrtShell(pDoc->GetDocShell()->GetWrtShell());
+
+sal_uLong const nNodes(pDoc->GetNodes().Count());
+
+pWrtShell->SttEndDoc(false);
+pWrtShell->SetMark();
+pWrtShell->Up(true, 1);
+pWrtShell->SttPara(true);
+pWrtShell->Delete();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+pWrtShell->Undo();
+
+CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count());
+
+// check that every node has 1 frame
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3);
+assertXPath(pXmlDoc, "/root/page[1]/body/section", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 1);
+
+pWrtShell->Redo();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]

[Libreoffice-commits] dictionaries.git: Dictionary_es.mk es/META-INF

[Thorsten Behrens (via logerrit)]

 Dictionary_es.mk |   94 +++
 es/META-INF/manifest.xml |6 +++
 2 files changed, 53 insertions(+), 47 deletions(-)

New commits:
commit 885370c2fe87ad45605cf7bcb949554c48dbb919
Author: Thorsten Behrens 
AuthorDate: Wed Oct 28 12:32:38 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 13:23:08 2020 +0100

Fixup Spanish dictionary update

This manifest.xml is now required since
c918f1d4242d9fd9a8de284e6b32b8c00e59debe

Change-Id: I094bf2342d04dd752c7fdc7227b8c5654b3e768a
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/104930
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/Dictionary_es.mk b/Dictionary_es.mk
index 4a034e0..5a6f300 100644
--- a/Dictionary_es.mk
+++ b/Dictionary_es.mk
@@ -10,55 +10,55 @@
 $(eval $(call gb_Dictionary_Dictionary,dict-es,dictionaries/es))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-es,\
-   dictionaries/es_AR.aff \
-   dictionaries/es_AR.dic \
-   dictionaries/es_BO.aff \
-   dictionaries/es_BO.dic \
-   dictionaries/es_CL.aff \
-   dictionaries/es_CL.dic \
-   dictionaries/es_CO.aff \
-   dictionaries/es_CO.dic \
-   dictionaries/es_CR.aff \
-   dictionaries/es_CR.dic \
-   dictionaries/es_CU.aff \
-   dictionaries/es_CU.dic \
-   dictionaries/es_DO.aff \
-   dictionaries/es_DO.dic \
-   dictionaries/es_EC.aff \
-   dictionaries/es_EC.dic \
-   dictionaries/es_ES.aff \
-   dictionaries/es_ES.dic \
-   dictionaries/es_GQ.aff \
-   dictionaries/es_GQ.dic \
-   dictionaries/es_GT.aff \
-   dictionaries/es_GT.dic \
-   dictionaries/es_HN.aff \
-   dictionaries/es_HN.dic \
-   dictionaries/es_MX.aff \
-   dictionaries/es_MX.dic \
-   dictionaries/es_NI.aff \
-   dictionaries/es_NI.dic \
-   dictionaries/es_PA.aff \
-   dictionaries/es_PA.dic \
-   dictionaries/es_PE.aff \
-   dictionaries/es_PE.dic \
-   dictionaries/es_PH.aff \
-   dictionaries/es_PH.dic \
-   dictionaries/es_PR.aff \
-   dictionaries/es_PR.dic \
-   dictionaries/es_PY.aff \
-   dictionaries/es_PY.dic \
-   dictionaries/es_SV.aff \
-   dictionaries/es_SV.dic \
-   dictionaries/es_US.aff \
-   dictionaries/es_US.dic \
-   dictionaries/es_UY.aff \
-   dictionaries/es_UY.dic \
-   dictionaries/es_VE.aff \
-   dictionaries/es_VE.dic \
+   dictionaries/es/es_AR.aff \
+   dictionaries/es/es_AR.dic \
+   dictionaries/es/es_BO.aff \
+   dictionaries/es/es_BO.dic \
+   dictionaries/es/es_CL.aff \
+   dictionaries/es/es_CL.dic \
+   dictionaries/es/es_CO.aff \
+   dictionaries/es/es_CO.dic \
+   dictionaries/es/es_CR.aff \
+   dictionaries/es/es_CR.dic \
+   dictionaries/es/es_CU.aff \
+   dictionaries/es/es_CU.dic \
+   dictionaries/es/es_DO.aff \
+   dictionaries/es/es_DO.dic \
+   dictionaries/es/es_EC.aff \
+   dictionaries/es/es_EC.dic \
+   dictionaries/es/es_ES.aff \
+   dictionaries/es/es_ES.dic \
+   dictionaries/es/es_GQ.aff \
+   dictionaries/es/es_GQ.dic \
+   dictionaries/es/es_GT.aff \
+   dictionaries/es/es_GT.dic \
+   dictionaries/es/es_HN.aff \
+   dictionaries/es/es_HN.dic \
+   dictionaries/es/es_MX.aff \
+   dictionaries/es/es_MX.dic \
+   dictionaries/es/es_NI.aff \
+   dictionaries/es/es_NI.dic \
+   dictionaries/es/es_PA.aff \
+   dictionaries/es/es_PA.dic \
+   dictionaries/es/es_PE.aff \
+   dictionaries/es/es_PE.dic \
+   dictionaries/es/es_PH.aff \
+   dictionaries/es/es_PH.dic \
+   dictionaries/es/es_PR.aff \
+   dictionaries/es/es_PR.dic \
+   dictionaries/es/es_PY.aff \
+   dictionaries/es/es_PY.dic \
+   dictionaries/es/es_SV.aff \
+   dictionaries/es/es_SV.dic \
+   dictionaries/es/es_US.aff \
+   dictionaries/es/es_US.dic \
+   dictionaries/es/es_UY.aff \
+   dictionaries/es/es_UY.dic \
+   dictionaries/es/es_VE.aff \
+   dictionaries/es/es_VE.dic \
dictionaries/es/hyph_es.dic \
dictionaries/es/package-description.txt \
-   dictionaries/es/README.txt \
+   dictionaries/es/README_hunspell_es.txt \
dictionaries/es/README_hyph_es.txt \
dictionaries/es/README_th_es.txt \
dictionaries/es/LICENSE.md \
diff --git a/es/META-INF/manifest.xml b/es/META-INF/manifest.xml
new file mode 100644
index 000..0383ca4
--- /dev/null
+++ b/es/META-INF/manifest.xml
@@ -0,0 +1,6 @@
+
+
+http://openoffice.org/2001/manifest";>
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Thorsten Behrens (via logerrit)]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6ed9cfe37a4a88e8f4911c004c0aea0b2568211
Author: Thorsten Behrens 
AuthorDate: Wed Oct 28 13:23:08 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 13:23:08 2020 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 885370c2fe87ad45605cf7bcb949554c48dbb919
  - Fixup Spanish dictionary update

This manifest.xml is now required since
c918f1d4242d9fd9a8de284e6b32b8c00e59debe

Change-Id: I094bf2342d04dd752c7fdc7227b8c5654b3e768a
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/104930
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/dictionaries b/dictionaries
index 975046e0970d..885370c2fe87 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 975046e0970d4300bb229fb0cbe3d5d0afec8c8f
+Subproject commit 885370c2fe87ad45605cf7bcb949554c48dbb919
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source

[Szymon Kłos (via logerrit)]

 chart2/source/controller/main/ChartController.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2be854e8441b870a2e9bed2d583d4f7aeb73d5d9
Author: Szymon Kłos 
AuthorDate: Tue Oct 6 16:59:52 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Oct 28 13:36:23 2020 +0100

Fire selection change event before sidebar is unregistered

Prevent us from crash in online using mobile phone
when leaving chart edit mode with chart type modified.

Change-Id: I8da70612786141a2c92b55a45822ef8ff5713e5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104035
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 3d88f3aadd1a..fb1ed3efabc1 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -754,6 +754,9 @@ void SAL_CALL ChartController::dispose()
 {
 m_bDisposed = true;
 
+mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
+mpSelectionChangeHandler->Disconnect();
+
 if (getModel().is())
 {
 uno::Reference xSidebar = 
getSidebarFromModel(getModel());
@@ -762,8 +765,6 @@ void SAL_CALL ChartController::dispose()
 
sfx2::sidebar::SidebarController::unregisterSidebarForFrame(pSidebar, this);
 }
 }
-mpSelectionChangeHandler->selectionChanged(css::lang::EventObject());
-mpSelectionChangeHandler->Disconnect();
 
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Dictionary_es.mk es/dictionaries.xcu

[Caolán McNamara (via logerrit)]

 Dictionary_es.mk|2 ++
 es/dictionaries.xcu |   52 ++--
 2 files changed, 28 insertions(+), 26 deletions(-)

New commits:
commit c3d2d1d3d338904eb442fddf0c52ac763ea0b5e9
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 12:49:52 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 13:57:53 2020 +0100

fix es_TT (to es-TT) Locale patterns

and add es.aff es.dic referenced in xcu to makefile

Change-Id: Ice69a75ca47889b9eaa95cf28c472068428dcc3c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/104934
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/Dictionary_es.mk b/Dictionary_es.mk
index 5a6f300..f905e04 100644
--- a/Dictionary_es.mk
+++ b/Dictionary_es.mk
@@ -10,6 +10,8 @@
 $(eval $(call gb_Dictionary_Dictionary,dict-es,dictionaries/es))
 
 $(eval $(call gb_Dictionary_add_root_files,dict-es,\
+   dictionaries/es/es.aff \
+   dictionaries/es/es.dic \
dictionaries/es/es_AR.aff \
dictionaries/es/es_AR.dic \
dictionaries/es/es_BO.aff \
diff --git a/es/dictionaries.xcu b/es/dictionaries.xcu
index de66b39..b453842 100644
--- a/es/dictionaries.xcu
+++ b/es/dictionaries.xcu
@@ -10,7 +10,7 @@
 DICT_SPELL
 
 
-es es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC 
es_ES es_GQ es_GT es_HN es_MX es_NI es_PA es_PE es_PH es_PR es_PY es_SV es_US 
es_UY es_VE
+es es-AR es-BO es-CL es-CO es-CR es-CU es-DO es-EC 
es-ES es-GQ es-GT es-HN es-MX es-NI es-PA es-PE es-PH es-PR es-PY es-SV es-US 
es-UY es-VE
 
 
 
@@ -21,7 +21,7 @@
 DICT_SPELL
 
 
-es_AR
+es-AR
 
 
 
@@ -32,7 +32,7 @@
 DICT_SPELL
 
 
-es_BO
+es-BO
 
 
 
@@ -43,7 +43,7 @@
 DICT_SPELL
 
 
-es_CL
+es-CL
 
 
 
@@ -54,7 +54,7 @@
 DICT_SPELL
 
 
-es_CO
+es-CO
 
 
 
@@ -65,7 +65,7 @@
 DICT_SPELL
 
 
-es_CR
+es-CR
 
 
 
@@ -76,7 +76,7 @@
 DICT_SPELL
 
 
-es_CU
+es-CU
 
 
 
@@ -87,7 +87,7 @@
 DICT_SPELL
 
 
-es_DO
+es-DO
 
 
 
@@ -98,7 +98,7 @@
 DICT_SPELL
 
 
-es_EC
+es-EC
 
 
 
@@ -109,7 +109,7 @@
 DICT_SPELL
 
 
-es_ES
+es-ES
 
 
 
@@ -120,7 +120,7 @@
 DICT_SPELL
 
 
-es_GQ
+es-GQ
 
 
 
@@ -131,7 +131,7 @@
 DICT_SPELL
 
 
-es_GT
+es-GT
 
 
 
@@ -142,7 +142,7 @@
 DICT_SPELL
 
 
-es_HN
+es-HN
 
 
 
@@ -153,7 +153,7 @@
 DICT_SPELL
 
 
-es_MX
+es-MX
 
 
 
@@ -164,7 +164,7 @@
 DICT_SPELL
 
 
-es_NI
+es-NI
 
 
 
@@ -175,7 +175,7 @@
 DICT_SPELL
 
 
-es_PA
+es-PA
 
 
 
@@ -186,7 +186,7 @@
 DICT_SPELL
 
 
-es_PE
+es-PE
 
 
 
@@ -197,7 +197,7 @@
 DICT_SPELL
 
 
-es_PH
+es-PH
 
 
 
@@ -208,7 +208,7 @@
 DICT_SPELL
 
 
-es_PR
+es-PR
 
 
 
@@ -219,7 +219,7 @@
 DICT_SPELL
 
 
-es_PY
+es-PY
 
 
 
@@ -230,7 +230,7 @@
 DICT_SPELL
 
 
-es_SV
+es-SV
 
 
 
@@ -241,7 +241,7 @@
 DICT_SPELL
 
 
-es_US
+es-US
 
 
 
@@ -252,7 +252,7 @@
 DICT_SPELL
 

[Libreoffice-commits] core.git: dictionaries

[Caolán McNamara (via logerrit)]

 dictionaries |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e3f7227621208d869453a1e03a66036391b46909
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 12:57:53 2020 +
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 13:57:53 2020 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to c3d2d1d3d338904eb442fddf0c52ac763ea0b5e9
  - fix es_TT (to es-TT) Locale patterns

and add es.aff es.dic referenced in xcu to makefile

Change-Id: Ice69a75ca47889b9eaa95cf28c472068428dcc3c
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/104934
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/dictionaries b/dictionaries
index 885370c2fe87..c3d2d1d3d338 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 885370c2fe87ad45605cf7bcb949554c48dbb919
+Subproject commit c3d2d1d3d338904eb442fddf0c52ac763ea0b5e9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/ww8export3.cxx |5 +
 sw/source/filter/ww8/wrtww8.cxx   |6 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit fda7c92d2b71a5e0bb4366f4fba140104efcc554
Author: Justin Luth 
AuthorDate: Mon Sep 28 20:21:52 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Oct 28 14:01:59 2020 +0100

tdf#136983 partial revert NFC ww8 cleanup: remove unused variables

This is a partial revert of LO 6.2
commit 2ec0cf500222aef55d02df80154b47fbb92970c9

I can't think of any excuse for how I possibly missed that
xDocProps was being defined/used outside of this clause.
Just plain stupid and blind.

The good news is that the create and modified date still
seem to be getting saved somehow/somewhere. So it isn't
the disaster that it looks like it could have been.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495
Reviewed-by: Miklos Vajna 
(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547)

Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104502
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 721fc95fa8a6..b9f8f668c7a7 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -47,6 +48,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, 
"tdf37778_readonlySection.d
 // The problem was that section protection was being enabled in addition 
to being read-only.
 // This created an explicit section with protection. There should be just 
the default, non-explicit section.
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of Sections", sal_Int32(0), 
xSections->getCount());
+
+// tdf#136983
+uno::Reference xDPS(mxComponent, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), 
xDPS->getDocumentProperties()->getPrintDate().Year);
 }
 
 DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 096be4c81e4c..f3e8754fc28f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -502,7 +502,11 @@ static void WriteDop( WW8Export& rWrt )
 uno::Reference xProps;
 if ( pDocShell )
 {
-xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
+uno::Reference xModelComp(pDocShell->GetModel(), 
uno::UNO_QUERY);
+xProps.set(xModelComp, uno::UNO_QUERY);
+uno::Reference xDPS(xModelComp, 
uno::UNO_QUERY_THROW);
+xDocProps = xDPS->getDocumentProperties();
+OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
 
 rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

2 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)


** CID 1468666:  Possible Control flow issues  (DEADCODE)
/cui/source/options/optgdlg.cxx: 766 in OfaViewTabPage::UpdateSkiaStatus()()



*** CID 1468666:  Possible Control flow issues  (DEADCODE)
/cui/source/options/optgdlg.cxx: 766 in OfaViewTabPage::UpdateSkiaStatus()()
760 m_xSkiaStatusEnabled->hide();
761 m_xSkiaStatusDisabled->hide();
762 return;
763 }
764 
765 // Easier than a custom translation string.
>>> CID 1468666:  Possible Control flow issues  (DEADCODE)
>>> Execution cannot reach this statement: "bEnabled = SkiaHelper::isVC...".
766 bool bEnabled = SkiaHelper::isVCLSkiaEnabled();
767 m_xSkiaStatusEnabled->set_visible(bEnabled);
768 m_xSkiaStatusDisabled->set_visible(!bEnabled);
769 
770 // FIXME: should really add code to show a 'lock' icon here.
771 
m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly());

** CID 1468665:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1468665:  Null pointer dereferences  (FORWARD_NULL)
/sw/source/uibase/shells/textfld.cxx: 807 in SwTextShell::StateField(SfxItemSet 
&)()
801 else if ( !pPostItMgr->HasActiveSidebarWin() )
802 {
803 rSet.InvalidateItem( FN_DELETE_COMMENT );
804 rSet.InvalidateItem( FN_HIDE_NOTE );
805 }
806 // tdf#137568 do not offer comment formating, if no 
comments are present
>>> CID 1468665:  Null pointer dereferences  (FORWARD_NULL)
>>> Passing null pointer "pPostItMgr" to "HasNotes", which dereferences it.
807 if ( !pPostItMgr->HasNotes() )
808 rSet.DisableItem( FN_FORMAT_ALL_NOTES );
809 }
810 break;
811 
812 case FN_EDIT_FIELD:



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3D2ZcC_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJieP-2F63v7J1-2F2QityukfF6pcaezW7fvxt5Yy4XXM9h0swqAkI-2BVdPvQ6YZaWuAZa8vwh4E1JZkJKIC8ltUBS3eDKy2adtP5HhBOBBEHDYVAmn7ZXmUBAiJjLqwOZv9wruJC8No2242WasWsHf9PJuwwhAGqFqjC3pY0J7sV3bOFAXasb7ZQ5mTxh-2BEfg-2BvM5Mo

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa sw/source

[Michael Stahl (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf136453.fodt |   66 ++
 sw/qa/extras/uiwriter/uiwriter.cxx|   51 +++
 sw/source/core/undo/undel.cxx |3 -
 3 files changed, 119 insertions(+), 1 deletion(-)

New commits:
commit 0e0c7616bace9f64079fe9c19c06aca823815666
Author: Michael Stahl 
AuthorDate: Tue Oct 27 16:33:30 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Oct 28 14:28:23 2020 +0100

tdf#136453 sw_redlinehide: SwUndoDelete: only create extra frames...

... at the start if the section nodes were at the start.

m_bBackSp and m_bJoinNext can't both be true.

(regression from 740f1796504f66408b692225a9676c9ee3d63722)

Change-Id: I999ed3809ca8f527bc3e754b229df02da4576825
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104891
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c4967928475f2be20ac2d79e3fa84ac435a7e560)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104920
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/uiwriter/data/tdf136453.fodt 
b/sw/qa/extras/uiwriter/data/tdf136453.fodt
new file mode 100644
index ..2234957e1db8
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf136453.fodt
@@ -0,0 +1,66 @@
+
+http://www.w3.org/TR/css3-text/"; 
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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:d
 r3d="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:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   foo
+   bar
+   
+baz
+   
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index b98a12d0e90c..7e28d0f57ead 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1136,6 +1136,57 @@ void SwUiWriterTest::testWatermarkDOCX()
 CPPUNIT_ASSERT_EQUAL(sal_Int16(50), pWatermark->GetTransparency());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf136453)
+{
+load(DATA_DIRECTORY, "tdf136453.fodt");
+
+SwXTextDocument *const 
pTextDoc(dynamic_cast(mxComponent.get()));
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* const pDoc(pTextDoc->GetDocShell()->GetDoc());
+SwWrtShell *const pWrtShell(pDoc->GetDocShell()->GetWrtShell());
+
+sal_uLong const nNodes(pDoc->GetNodes().Count());
+
+pWrtShell->SttEndDoc(false);
+pWrtShell->SetMark();
+pWrtShell->Up(true, 1);
+pWrtShell->SttPara(true);
+pWrtShell->Delete();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+pWrtShell->Undo();
+
+CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count());
+
+// check that every node has 1 frame
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3);
+assertXPath(pXmlDoc, "/root/page[1]/body/section", 1);
+assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 1);
+
+pWrtShell->Redo();
+
+// one paragraph deleted, section is gone
+CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count());
+
+discardDumpedLayout();
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/body

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-26'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-26' created by Andras Timar  at 
2020-10-28 13:33 +

cp-6.2-26

Changes since cp-6.2-25-17:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79c270f6f19e86c02a88f78ea613b1445df46540
Author: Andras Timar 
AuthorDate: Wed Oct 28 14:32:44 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Oct 28 14:32:44 2020 +0100

Bump version to 6.2-26

Change-Id: Ic3f548cf7e482114c7dd328ae2031361a54b6dd7

diff --git a/configure.ac b/configure.ac
index 4963620e569e..cd83fc5b111b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.2.10.25],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.26],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-26'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-26' created by Andras Timar  at 
2020-10-28 13:33 +

cp-6.2-26

Changes since cp-6.2-23:
Andras Timar (1):
  Update mobile Word Count dialog translations and some more

---
 source/ar/sw/messages.po  | 1364 +++-
 source/as/sw/messages.po  | 1364 +++-
 source/ast/sw/messages.po | 1426 --
 source/bg/sw/messages.po  | 1374 +++--
 source/bn-IN/sw/messages.po   | 1364 +++-
 source/br/sw/messages.po  | 1364 +++-
 source/ca-valencia/sw/messages.po | 1794 --
 source/ca/sw/messages.po  | 1374 +++--
 source/cs/sw/messages.po  | 1374 +++--
 source/cy/sw/messages.po  | 1374 +++--
 source/da/sw/messages.po  | 1374 +++--
 source/de/sw/messages.po  | 1370 +++--
 source/el/sw/messages.po  | 1374 +++--
 source/es/sw/messages.po  |  113 +-
 source/et/sw/messages.po  | 1410 +++--
 source/eu/sw/messages.po  | 1374 +++--
 source/fi/sw/messages.po  | 1384 +++--
 source/fr/sw/messages.po  | 1374 +++--
 source/ga/sw/messages.po  | 1364 +++-
 source/gd/sw/messages.po  | 1364 +++-
 source/gl/sw/messages.po  | 1374 +++--
 source/gu/sw/messages.po  | 1364 +++-
 source/he/sw/messages.po  | 1374 +++--
 source/hi/sw/messages.po  | 1364 +++-
 source/hr/sw/messages.po  | 1374 +++--
 source/hu/sw/messages.po  | 1364 +++-
 source/id/sw/messages.po  | 1390 +++--
 source/is/sw/messages.po  | 1368 +++-
 source/it/sw/messages.po  | 1374 +++--
 source/ja/sw/messages.po  | 1404 +++--
 source/km/sw/messages.po  | 1364 +++-
 source/kn/sw/messages.po  | 1364 +++-
 source/ko/sw/messages.po  | 1364 +++-
 source/lt/sw/messages.po  | 1388 +++--
 source/lv/sw/messages.po  | 1374 +++--
 source/ml/sw/messages.po  | 1364 +++-
 source/mr/sw/messages.po  | 1364 +++-
 source/nb/sw/messages.po  | 1374 +++--
 source/nl/sw/messages.po  | 1374 +++--
 source/nn/sw/messages.po  | 1374 +++--
 source/oc/sw/messages.po  | 1364 +++-
 source/or/sw/messages.po  | 1364 +++-
 source/pa-IN/sw/messages.po   | 1366 +++-
 source/pl/sw/messages.po  | 1400 +++--
 source/pt-BR/sw/messages.po   |  121 +-
 source/pt/sw/messages.po  | 1374 +++--
 source/ro/sw/messages.po  | 1364 +++-
 source/ru/sw/messages.po  | 1374 +++--
 source/sk/sw/messages.po  | 1374 +++--
 source/sl/sw/messages.po  | 1374 +++--
 source/sr-Latn/sw/messages.po | 1363 +++-
 source/sr/sw/messages.po  | 1378 +++--
 source/sv/sw/messages.po  | 1404 +++--
 source/ta/sw/messages.po  | 1364 +++-
 source/te/sw/messages.po  | 1364 +++-
 source/tr/sw/messages.po  | 1387 +++--
 source/uk/sw/messages.po  | 1376 +++--
 source/vi/sw/messages.po  | 1364 +++-
 source/zh-CN/sw/messages.po   | 1374 +++--
 source/zh-TW/sw/messages.po   | 1376 +++--
 60 files changed, 43140 insertions(+), 37212 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-26'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-26' created by Andras Timar  at 
2020-10-28 13:33 +

cp-6.2-26

Changes since CODE-4.2.2-2:
Andras Timar (1):
  [cp] add info about xapian omega search and the cp-query template

---
 xapian/cp-query   |  141 ++
 xapian/xapian.txt |  109 +
 2 files changed, 250 insertions(+)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-26'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-26' created by Andras Timar  at 
2020-10-28 13:33 +

cp-6.2-26

Changes since cp-6.2-25-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d07ba3c1e887993715425721ab165567ee5fdea
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 09:26:01 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 14:52:51 2020 +0100

cid#1468665 Dereference after null check

Change-Id: I43de6ea072ac5e462c109328ba614f308cd6f27d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index ff104e8544d7..9eaa2241e339 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -804,7 +804,7 @@ void SwTextShell::StateField( SfxItemSet &rSet )
 rSet.InvalidateItem( FN_HIDE_NOTE );
 }
 // tdf#137568 do not offer comment formating, if no comments 
are present
-if ( !pPostItMgr->HasNotes() )
+if (!pPostItMgr || !pPostItMgr->HasNotes())
 rSet.DisableItem( FN_FORMAT_ALL_NOTES );
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optgdlg.cxx |   21 +++--
 cui/source/options/optgdlg.hxx |1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 38dd55f6022a6ec217a2a54459a2875f1bef1f5e
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 09:39:37 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 14:53:10 2020 +0100

cid#1468666 'Constant' variable guards dead code

Change-Id: Ie27df6c7e4a10d943d0a2e2a6880a5fe2c34fbcb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104922
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 535285b70d90..b1b128a000c6 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -742,23 +742,29 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnUseSkiaToggled, 
weld::ToggleButton&, void)
 UpdateSkiaStatus();
 }
 
+void OfaViewTabPage::HideSkiaWidgets()
+{
+m_xUseSkia->hide();
+m_xForceSkiaRaster->hide();
+m_xSkiaStatusEnabled->hide();
+m_xSkiaStatusDisabled->hide();
+}
+
 void OfaViewTabPage::UpdateSkiaStatus()
 {
-bool skiaHidden = true;
 #if HAVE_FEATURE_SKIA
+bool skiaHidden = true;
+
 // For now Skia is used mainly on Windows, enable the controls there.
 if (Application::GetToolkitName() == "win")
 skiaHidden = false;
 // It can also be used on Linux, but only with the rarely used 'gen' 
backend.
 if (Application::GetToolkitName() == "x11")
 skiaHidden = false;
-#endif
+
 if (skiaHidden)
 {
-m_xUseSkia->hide();
-m_xForceSkiaRaster->hide();
-m_xSkiaStatusEnabled->hide();
-m_xSkiaStatusDisabled->hide();
+HideSkiaWidgets();
 return;
 }
 
@@ -770,6 +776,9 @@ void OfaViewTabPage::UpdateSkiaStatus()
 // FIXME: should really add code to show a 'lock' icon here.
 
m_xUseSkia->set_sensitive(!officecfg::Office::Common::VCL::UseSkia::isReadOnly());
 m_xForceSkiaRaster->set_sensitive(m_xUseSkia->get_active() && 
!officecfg::Office::Common::VCL::ForceSkiaRaster::isReadOnly());
+#else
+HideSkiaWidgets();
+#endif
 }
 
 std::unique_ptr OfaViewTabPage::Create( weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet* rAttrSet )
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 973260283aaf..93dc5280b98e 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -124,6 +124,7 @@ private:
 DECL_LINK(OnUseSkiaToggled, weld::ToggleButton&, void);
 DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void);
 void UpdateSkiaStatus();
+void HideSkiaWidgets();
 
 public:
 OfaViewTabPage(weld::Container* pPage, weld::DialogController* 
pController, const SfxItemSet& rSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 sfx2/source/dialog/backingwindow.cxx |   99 ++-
 sfx2/source/dialog/backingwindow.hxx |8 ++
 vcl/qt5/Qt5Frame.cxx |7 ++
 3 files changed, 76 insertions(+), 38 deletions(-)

New commits:
commit 804f051e8504338ada4ab1fe958aa7fc66a1297c
Author: Jan-Marek Glogowski 
AuthorDate: Fri Oct 23 18:43:25 2020 +0200
Commit: Michael Weghorn 
CommitDate: Wed Oct 28 15:26:51 2020 +0100

tdf#136555 apply window bg color for button boxes

The default background color of the frame is APPBACKGROUND, which
is matched to GetWorkspaceColor(). That color is visible in Writer
as the default document workspace background.

Originally I just saw the dark background of the button box in the
start center, and thought the workspace color in Qt is wrong and
changed it in the reverted commit, missing the change of the color
around the Writer document.

Now that the button boxes's background color isn't fixed via the
"branding" setting, we also must react to changed style settings,
so we override the DataChanged function.

This also reverts commit ef267dc5c1e46d236478ff32fc14925a0eeb0266.

Regressed-by: a927e0964ba0442d53fffb22c577e54bcf183ed7
Change-Id: I62396355054523baef1197a8a8af61c2f0d29ef3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104743
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 7ee1b63e7604..caff3c45a832 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star::document;
 const char SERVICENAME_CFGREADACCESS[] = 
"com.sun.star.configuration.ConfigurationAccess";
 
 // increase size of the text in the buttons on the left fMultiplier-times
-float const fMultiplier = 1.4f;
+float const g_fMultiplier = 1.4f;
 
 BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 Window( i_pParent ),
@@ -227,43 +227,82 @@ void BackingWindow::initControls()
 mpLocalView->SetStyle( mpLocalView->GetStyle() | WB_VSCROLL);
 mpLocalView->Hide();
 
-mpTemplateButton->SetDelayMenu(true);
-mpTemplateButton->SetDropDown(PushButtonDropdownStyle::SplitMenuButton);
-mpRecentButton->SetDelayMenu(true);
-mpRecentButton->SetDropDown(PushButtonDropdownStyle::SplitMenuButton);
-
 //set handlers
 mpLocalView->setCreateContextMenuHdl(LINK(this, BackingWindow, 
CreateContextMenuHdl));
 mpLocalView->setOpenTemplateHdl(LINK(this, BackingWindow, 
OpenTemplateHdl));
 mpLocalView->setEditTemplateHdl(LINK(this, BackingWindow, 
EditTemplateHdl));
 mpLocalView->ShowTooltips( true );
 
-setupButton( mpOpenButton );
-setupButton( mpRemoteButton );
-setupButton( mpRecentButton );
-setupButton( mpTemplateButton );
-setupButton( mpWriterAllButton );
-setupButton( mpDrawAllButton );
-setupButton( mpCalcAllButton );
-setupButton( mpDBAllButton );
-setupButton( mpImpressAllButton );
-setupButton( mpMathAllButton );
-
 checkInstalledModules();
 
 mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, 
ExtLinkClickHdl));
 
-// setup nice colors
-vcl::Font 
aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont());
-aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
-mpCreateLabel->SetControlFont(aFont);
+mpOpenButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpRemoteButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpWriterAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpDrawAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpCalcAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpDBAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpImpressAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+mpMathAllButton->SetClickHdl(LINK(this, BackingWindow, ClickHdl));
+
+setupMenuButton(mpRecentButton);
+setupMenuButton(mpTemplateButton);
+
+ApplyStyleSettings();
+}
+
+void BackingWindow::DataChanged(const DataChangedEvent& rDCEvt)
+{
+if ((rDCEvt.GetType() != DataChangedEventType::SETTINGS)
+|| !(rDCEvt.GetFlags() & AllSettingsFlags::STYLE))
+{
+vcl::Window::DataChanged(rDCEvt);
+return;
+}
+
+ApplyStyleSettings();
+Invalidate();
+}
+
+template 
+void BackingWindow::setLargerFont(WidgetClass& pWidget, const vcl::Font& rFont)
+{
+vcl::Font aFont(rFont);
+aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * g_fMultiplier));
+pWidget->SetControlFont(aFont);
+}
+
+void BackingWindow::ApplyStyleSettings()
+{
+const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+const Color aButtonsBackground(rStyleSettings.GetWindowColor());
+const vcl::Font& aButtonFont(rStyleSettings.GetPushButtonFont());

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.2-26'

[Andras Timar (via logerrit)]

Tag 'co-6.2-26' created by Andras Timar  at 
2020-10-28 15:01 +

co-6.2-26

Changes since cp-6.2-23:
Andras Timar (1):
  Update mobile Word Count dialog translations and some more

---
 source/ar/sw/messages.po  | 1364 +++-
 source/as/sw/messages.po  | 1364 +++-
 source/ast/sw/messages.po | 1426 --
 source/bg/sw/messages.po  | 1374 +++--
 source/bn-IN/sw/messages.po   | 1364 +++-
 source/br/sw/messages.po  | 1364 +++-
 source/ca-valencia/sw/messages.po | 1794 --
 source/ca/sw/messages.po  | 1374 +++--
 source/cs/sw/messages.po  | 1374 +++--
 source/cy/sw/messages.po  | 1374 +++--
 source/da/sw/messages.po  | 1374 +++--
 source/de/sw/messages.po  | 1370 +++--
 source/el/sw/messages.po  | 1374 +++--
 source/es/sw/messages.po  |  113 +-
 source/et/sw/messages.po  | 1410 +++--
 source/eu/sw/messages.po  | 1374 +++--
 source/fi/sw/messages.po  | 1384 +++--
 source/fr/sw/messages.po  | 1374 +++--
 source/ga/sw/messages.po  | 1364 +++-
 source/gd/sw/messages.po  | 1364 +++-
 source/gl/sw/messages.po  | 1374 +++--
 source/gu/sw/messages.po  | 1364 +++-
 source/he/sw/messages.po  | 1374 +++--
 source/hi/sw/messages.po  | 1364 +++-
 source/hr/sw/messages.po  | 1374 +++--
 source/hu/sw/messages.po  | 1364 +++-
 source/id/sw/messages.po  | 1390 +++--
 source/is/sw/messages.po  | 1368 +++-
 source/it/sw/messages.po  | 1374 +++--
 source/ja/sw/messages.po  | 1404 +++--
 source/km/sw/messages.po  | 1364 +++-
 source/kn/sw/messages.po  | 1364 +++-
 source/ko/sw/messages.po  | 1364 +++-
 source/lt/sw/messages.po  | 1388 +++--
 source/lv/sw/messages.po  | 1374 +++--
 source/ml/sw/messages.po  | 1364 +++-
 source/mr/sw/messages.po  | 1364 +++-
 source/nb/sw/messages.po  | 1374 +++--
 source/nl/sw/messages.po  | 1374 +++--
 source/nn/sw/messages.po  | 1374 +++--
 source/oc/sw/messages.po  | 1364 +++-
 source/or/sw/messages.po  | 1364 +++-
 source/pa-IN/sw/messages.po   | 1366 +++-
 source/pl/sw/messages.po  | 1400 +++--
 source/pt-BR/sw/messages.po   |  121 +-
 source/pt/sw/messages.po  | 1374 +++--
 source/ro/sw/messages.po  | 1364 +++-
 source/ru/sw/messages.po  | 1374 +++--
 source/sk/sw/messages.po  | 1374 +++--
 source/sl/sw/messages.po  | 1374 +++--
 source/sr-Latn/sw/messages.po | 1363 +++-
 source/sr/sw/messages.po  | 1378 +++--
 source/sv/sw/messages.po  | 1404 +++--
 source/ta/sw/messages.po  | 1364 +++-
 source/te/sw/messages.po  | 1364 +++-
 source/tr/sw/messages.po  | 1387 +++--
 source/uk/sw/messages.po  | 1376 +++--
 source/vi/sw/messages.po  | 1364 +++-
 source/zh-CN/sw/messages.po   | 1374 +++--
 source/zh-TW/sw/messages.po   | 1376 +++--
 60 files changed, 43140 insertions(+), 37212 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/tags/cp-6.2-26' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.2-26'

[Andras Timar (via logerrit)]

Tag 'co-6.2-26' created by Andras Timar  at 
2020-10-28 15:01 +

co-6.2-26

Changes since cp-6.2-25-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'refs/tags/cp-6.2-26' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'refs/tags/cp-6.2-26' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.2-26'

[Andras Timar (via logerrit)]

Tag 'co-6.2-26' created by Andras Timar  at 
2020-10-28 15:01 +

co-6.2-26

Changes since CODE-4.2.2-2:
Andras Timar (1):
  [cp] add info about xapian omega search and the cp-query template

---
 xapian/cp-query   |  141 ++
 xapian/xapian.txt |  109 +
 2 files changed, 250 insertions(+)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.2-26'

[Andras Timar (via logerrit)]

Tag 'co-6.2-26' created by Andras Timar  at 
2020-10-28 15:01 +

co-6.2-26

Changes since cp-6.2-25-17:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/cp-6.2-26' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/04090001.xhp |7 ++-
 source/text/swriter/01/04090004.xhp |2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit c8a9ac72bc5e68f8a69490e3c157fe26b935f524
Author: Seth Chaiklin 
AuthorDate: Wed Oct 28 16:43:10 2020 +0200
Commit: Seth Chaiklin 
CommitDate: Wed Oct 28 16:40:37 2020 +0100

tdf#131206  update "Select" section in Insert Document field tab help

The focus is the  with id "auswahl".  This section
is embedded from swriter/01/04090001.xhp to swriter/01/04090004.xhp
(no other pages found that embed section "auswahl" from 04090001.xhp)

( swriter/01/04090001.xhp )
  - change section id from "auswahl" to "select"
  - delete one paragraph (about formatting) because
already mentioned in both help pages.
  - move paragraph about "offset" down to the "Offset"
section.  "Offset" does not appear in the
tab for 04090004.xhp, so no need to embed it.

( swriter/01/04090004.xhp )
   change select id from "auswahl" to "select"

Change-Id: Id238a7187595eca0d1ecc0d38fd3c27917f7e984
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104949
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/swriter/01/04090001.xhp 
b/source/text/swriter/01/04090001.xhp
index de9b2ea05..45cb67033 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -145,15 +145,11 @@
 The following fields can only be 
inserted if the corresponding field type is selected in the Type 
list.
 
 
-
+
 
-
 Selecton "Document" and 
"DocInformation" tab page this is called "Select", on the other tab pages 
"Selection"
 Lists the available fields for 
the field type selected in the Type list. To insert a field, click 
the field, and then click Insert.
 To quickly insert a field from the 
Select list, double-click the field.
-
-In the 
Format, click the numbering format that you want to 
use.
-If you want, 
you can enter an Offset for the displayed page number. With an 
Offset value of 1, the field will display a number that is 1 more 
than the current page number, but only if a page with that number exists. On 
the last page of the document, this same field will be empty.
 
 
 
@@ -182,6 +178,7 @@
 Offset
 Enter the offset value that you 
want to apply to a page number field, for example "+1".
 
+If you want, 
you can enter an Offset for the displayed page number. With an 
Offset value of 1, the field will display a number that is 1 more 
than the current page number, but only if a page with that number exists. On 
the last page of the document, this same field will be empty.
 If you want to change the actual page 
number and not the displayed number, do not use the Offset value. 
To change page numbers, read the Page 
Numbers guide.
 
 Offset in days/minutes
diff --git a/source/text/swriter/01/04090004.xhp 
b/source/text/swriter/01/04090004.xhp
index 714101a63..6ac16a257 100644
--- a/source/text/swriter/01/04090004.xhp
+++ b/source/text/swriter/01/04090004.xhp
@@ -131,7 +131,7 @@
 
 
 Lists the available fields 
for the field type selected in the Type list. To insert a field, 
click the field, and then click Insert.
-
+
 For the "Created", "Modified", and 
"Last printed" field types, you can include the author, date, and time of the 
corresponding operation.
 
 Click the format that you 
want to apply to the selected field, or click "Additional formats" to define a 
custom format.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9699516d3e979f776b1ecb04390719b538f440d5
Author: Seth Chaiklin 
AuthorDate: Wed Oct 28 17:40:37 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 16:40:37 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to c8a9ac72bc5e68f8a69490e3c157fe26b935f524
  - tdf#131206  update "Select" section in Insert Document field tab help

The focus is the  with id "auswahl".  This section
is embedded from swriter/01/04090001.xhp to swriter/01/04090004.xhp
(no other pages found that embed section "auswahl" from 
04090001.xhp)

( swriter/01/04090001.xhp )
  - change section id from "auswahl" to "select"
  - delete one paragraph (about formatting) because
already mentioned in both help pages.
  - move paragraph about "offset" down to the "Offset"
section.  "Offset" does not appear in the
tab for 04090004.xhp, so no need to embed it.

( swriter/01/04090004.xhp )
   change select id from "auswahl" to "select"

Change-Id: Id238a7187595eca0d1ecc0d38fd3c27917f7e984
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104949
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 13b33e0bff78..c8a9ac72bc5e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 13b33e0bff785539fc858e1523cf68186531fd96
+Subproject commit c8a9ac72bc5e68f8a69490e3c157fe26b935f524
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests/data/tdf135018.odt |binary
 sw/qa/uitest/writer_tests/trackedChanges.py  |   36 +++
 2 files changed, 36 insertions(+)

New commits:
commit b87fa88ee93601703394dd97be9b101370ecf1a5
Author: Xisco Fauli 
AuthorDate: Tue Sep 1 17:30:44 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 16:51:06 2020 +0100

tdf#135018: sw: Add UItest

Change-Id: Ia88e28b1569ea69df81d905cb76a6791a887ef3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101883
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit b6ab2330d97672936edc56de8d6f5b6f772908ff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104941
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/uitest/writer_tests/data/tdf135018.odt 
b/sw/qa/uitest/writer_tests/data/tdf135018.odt
new file mode 100644
index ..2dc9e2a4da0d
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/tdf135018.odt differ
diff --git a/sw/qa/uitest/writer_tests/trackedChanges.py 
b/sw/qa/uitest/writer_tests/trackedChanges.py
index 5bc8fecf7b03..bf98162cdda5 100644
--- a/sw/qa/uitest/writer_tests/trackedChanges.py
+++ b/sw/qa/uitest/writer_tests/trackedChanges.py
@@ -7,9 +7,13 @@
 
 from uitest.framework import UITestCase
 from uitest.debug import sleep
+from uitest.path import get_srcdir_url
 import time
 from uitest.uihelper.common import get_state_as_dict, type_text
 
+def get_url_for_data_file(file_name):
+   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+
 class trackedchanges(UITestCase):
 
 def test_tdf91270(self):
@@ -151,4 +155,36 @@ class trackedchanges(UITestCase):
 self.assertEqual(document.Text.String[0:30], "Test LibreOffice Test2 
Test4")
 
 self.ui_test.close_doc()
+
+def test_tdf135018(self):
+self.ui_test.load_file(get_url_for_data_file("tdf135018.odt"))
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+
+self.assertEqual(5, document.CurrentController.PageCount)
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges")
+xTrackDlg = self.xUITest.getTopFocusWindow()
+changesList = xTrackDlg.getChild("writerchanges")
+self.assertEqual(147, len(changesList.getChildren()))
+
+# Without the fix in place, it would have crashed here
+xAccBtn = xTrackDlg.getChild("acceptall")
+xAccBtn.executeAction("CLICK", tuple())
+
+self.assertEqual(0, len(changesList.getChildren()))
+
+xUndoBtn = xTrackDlg.getChild("undo")
+xUndoBtn.executeAction("CLICK", tuple())
+
+self.assertEqual(147, len(changesList.getChildren()))
+
+xcloseBtn = xTrackDlg.getChild("close")
+xcloseBtn.executeAction("CLICK", tuple())
+
+#self.assertEqual(18, document.CurrentController.PageCount)
+
+self.ui_test.close_doc()
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/core/inc/rolbck.hxx  |1 +
 sw/source/core/undo/rolbck.cxx |   27 +--
 2 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 496771a6466d6a48f0bcbd8976df24308e052f38
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 10:22:58 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 16:54:19 2020 +0100

Related: tdf#98868 split out reusable hunk as function

Change-Id: I7e410ba55f94e87c007acbe1887a022948ef354f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104925
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 295279fd9396..c0506fdf91e6 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -177,6 +177,7 @@ public:
 virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) override;
 bool IsEqual( const SwTOXMark& rCmp ) const;
 
+static SwTOXType* GetSwTOXType(SwDoc& rDoc, TOXTypes eTOXTypes, const 
OUString& rTOXName);
 };
 
 class SwHistoryResetText : public SwHistoryHint
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 54fcd33b6815..dd04451c0d84 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -376,20 +376,15 @@ SwHistorySetTOXMark::SwHistorySetTOXMark( const 
SwTextTOXMark* pTextHt, sal_uLon
 static_cast(&m_TOXMark)->EndListeningAll();
 }
 
-void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
+SwTOXType* SwHistorySetTOXMark::GetSwTOXType(SwDoc& rDoc, TOXTypes eTOXTypes, 
const OUString& rTOXName)
 {
-SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
-OSL_ENSURE( pTextNd, "SwHistorySetTOXMark: no TextNode" );
-if ( !pTextNd )
-return;
-
 // search for respective TOX type
-const sal_uInt16 nCnt = pDoc->GetTOXTypeCount( m_eTOXTypes );
+const sal_uInt16 nCnt = rDoc.GetTOXTypeCount(eTOXTypes);
 SwTOXType* pToxType = nullptr;
 for ( sal_uInt16 n = 0; n < nCnt; ++n )
 {
-pToxType = const_cast(pDoc->GetTOXType( m_eTOXTypes, n ));
-if ( pToxType->GetTypeName() == m_TOXName )
+pToxType = const_cast(rDoc.GetTOXType(eTOXTypes, n));
+if (pToxType->GetTypeName() == rTOXName)
 break;
 pToxType = nullptr;
 }
@@ -397,9 +392,21 @@ void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
 if ( !pToxType )  // TOX type not found, create new
 {
 pToxType = const_cast(
-pDoc->InsertTOXType( SwTOXType( m_eTOXTypes, m_TOXName )));
+rDoc.InsertTOXType(SwTOXType(eTOXTypes, rTOXName)));
 }
 
+return pToxType;
+}
+
+void SwHistorySetTOXMark::SetInDoc( SwDoc* pDoc, bool )
+{
+SwTextNode * pTextNd = pDoc->GetNodes()[ m_nNodeIndex ]->GetTextNode();
+OSL_ENSURE( pTextNd, "SwHistorySetTOXMark: no TextNode" );
+if ( !pTextNd )
+return;
+
+SwTOXType* pToxType = GetSwTOXType(*pDoc, m_eTOXTypes, m_TOXName);
+
 SwTOXMark aNew( m_TOXMark );
 aNew.RegisterToTOXType( *pToxType );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Information regarding Contribution

[Raghav Khanna]

Respected Sir/Madam,

I am a computer enthusiast who is highly interested in Contributing to
LibreOffice.
Please Guide me how I can start doing so. I have learnt C++ in my School
and have been learning some python lately. I have made some websites in the
past too( just for fun ), so I know some Javascript too.I am open to learn
anything and everything and that too quickly as I'm highly interested in
Computers.
Please Guide me so that I can Contribute to the Community.

*How I came to know about LibreOffice*?
I have got a chance to use Ubuntu.in my class 11th once. When I used it I
found LibreOffice as an alternative for MS Office.
I've just finished my drop year and I'm ready to go to some good college
this year. After some research I came to know about GSOC and on their
website I saw LibreOffice. I immediately wanted to contribute to such a
great community that has been providing such a great product for free!

Thanks for reading.
Regards,
Raghav Khanna,
A Computer Enthusiast.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/UndoDraw.hxx |1 +
 sw/source/core/undo/undraw.cxx  |   23 +++
 2 files changed, 24 insertions(+)

New commits:
commit 15f2bf415bb25324eaf26ea87ef8b724a090b942
Author: Miklos Vajna 
AuthorDate: Wed Oct 28 12:16:15 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 17:45:01 2020 +0100

sw: add an xml dumper for SwUndoDrawDelete

Change-Id: I1b06cce99ae0a45b1765d2259d3d14fbb89e6676
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104929
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index f4117a6fd61e..468db932a476 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -127,6 +127,7 @@ public:
 virtual void RedoImpl( ::sw::UndoRedoContext & ) override;
 
 void AddObj( SwDrawFrameFormat*, const SdrMark& );
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index f355d8263df3..9ed78bd680a3 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -556,4 +556,27 @@ void SwUndoDrawDelete::AddObj( SwDrawFrameFormat* pFormat,
 m_pMarkList->InsertEntry( rMark );
 }
 
+void SwUndoDrawDelete::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwUndoDrawDelete"));
+
+for (size_t i = 0; i < m_pMarkList->GetMarkCount(); ++i)
+{
+SwUndoGroupObjImpl& rObj = m_pObjArray[i];
+xmlTextWriterStartElement(pWriter, BAD_CAST("SwUndoGroupObjImpl"));
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST("index"),
+BAD_CAST(OString::number(i).getStr()));
+
+if (rObj.pFormat)
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("pFormat"));
+rObj.pFormat->dumpAsXml(pWriter);
+xmlTextWriterEndElement(pWriter);
+}
+xmlTextWriterEndElement(pWriter);
+}
+
+xmlTextWriterEndElement(pWriter);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx |   28 
 sw/source/uibase/inc/edtwin.hxx   |1 +
 2 files changed, 29 insertions(+)

New commits:
commit 1b40a48bdfd1e73dc41394bd914e9ec417458a2d
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 11:50:48 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 18:19:59 2020 +0100

tdf#95096 add a DeleteSurroundingText to SwEditWin

Change-Id: I6995a4e0e3a08a9cca26580585cdfe151389321f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104931
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index f28599ccf030..f28f7088d798 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6481,6 +6481,34 @@ Selection SwEditWin::GetSurroundingTextSelection() const
 }
 }
 
+bool SwEditWin::DeleteSurroundingText(const Selection& rSelection)
+{
+SwWrtShell& rSh = m_rView.GetWrtShell();
+
+if (rSh.HasSelection())
+return false;
+
+// rSelection is relative to the start of the sentence, so find that and
+// adjust the range by it
+SwPosition *pPos = rSh.GetCursor()->GetPoint();
+const sal_Int32 nPos = pPos->nContent.GetIndex();
+
+rSh.HideCursor();
+rSh.GoStartSentence();
+const sal_Int32 nStartPos = 
rSh.GetCursor()->GetPoint()->nContent.GetIndex();
+pPos->nContent = nPos;
+rSh.ClearMark();
+rSh.ShowCursor();
+
+if (rSh.SelectText(nStartPos + rSelection.Min(), nStartPos + 
rSelection.Max()))
+{
+rSh.Delete();
+return true;
+}
+
+return false;
+}
+
 void SwEditWin::LogicInvalidate(const tools::Rectangle* pRectangle)
 {
 OString sRectangle;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ec8994cf791e..a74afc85d085 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -190,6 +190,7 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::Window,
 
 virtual OUString GetSurroundingText() const override;
 virtual Selection GetSurroundingTextSelection() const override;
+virtual bool DeleteSurroundingText(const Selection& rSelection) override;
 
 void ShowAutoCorrectQuickHelp(const OUString& rWord, SvxAutoCorrect& 
rACorr);
 bool ShowAutoText(const std::vector& rChunkCandidates);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/Library_vcl.mk vcl/qa vcl/source

[Tomaž Vajngerl (via logerrit)]

 vcl/Library_vcl.mk |1 
 vcl/inc/pdf/ExternalPDFStreams.hxx |   65 +
 vcl/inc/pdf/objectcopier.hxx   |3 +
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |2 -
 vcl/source/gdi/pdfobjectcopier.cxx |7 +++
 vcl/source/gdi/pdfwriter_impl.cxx  |   33 
 vcl/source/gdi/pdfwriter_impl.hxx  |   21 --
 vcl/source/pdf/ExternalPDFStreams.cxx  |   43 +
 8 files changed, 151 insertions(+), 24 deletions(-)

New commits:
commit e528293bc17ecce92124e8dd8841bcea2bda562e
Author: Tomaž Vajngerl 
AuthorDate: Wed Oct 28 13:55:23 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 18:24:24 2020 +0100

pdf: deduplicate resources when copying from external PDF stream

When using external PDF stream/data (from PDF graphic objects),
make sure to copy the content of external PDF resources (fonts,
bitmaps, forms) only one time (by sharing the map between calls)
and every other use, just use the reference to the objects.

Change-Id: Ibaa632c8f74806eb195e69404551db6fd077a986
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104935
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e9d820806870..9afdac80ef86 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -319,6 +319,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/gdi/CommonSalLayout \
 vcl/source/gdi/TypeSerializer \
 vcl/source/pdf/PDFiumLibrary \
+vcl/source/pdf/ExternalPDFStreams \
 vcl/source/graphic/GraphicID \
 vcl/source/graphic/GraphicLoader \
 vcl/source/graphic/GraphicObject \
diff --git a/vcl/inc/pdf/ExternalPDFStreams.hxx 
b/vcl/inc/pdf/ExternalPDFStreams.hxx
new file mode 100644
index ..3bd59478c212
--- /dev/null
+++ b/vcl/inc/pdf/ExternalPDFStreams.hxx
@@ -0,0 +1,65 @@
+/* -*- 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 vcl
+{
+struct VCL_DLLPUBLIC ExternalPDFStream
+{
+std::vector maData;
+std::shared_ptr mpPDFDocument;
+std::map maCopiedResources;
+
+std::map& getCopiedResources() { return 
maCopiedResources; }
+
+filter::PDFDocument& getPDFDocument()
+{
+if (!mpPDFDocument)
+{
+SvMemoryStream aPDFStream;
+aPDFStream.WriteBytes(maData.data(), maData.size());
+aPDFStream.Seek(0);
+mpPDFDocument = std::make_unique();
+if (!mpPDFDocument->Read(aPDFStream))
+{
+SAL_WARN("vcl.pdfwriter",
+ "PDFWriterImpl::writeReferenceXObject: reading the 
PDF document failed");
+}
+}
+return *mpPDFDocument;
+}
+};
+
+class VCL_DLLPUBLIC ExternalPDFStreams
+{
+private:
+std::map, sal_Int32> maStreamIndexMap;
+std::vector maStreamList;
+
+public:
+ExternalPDFStreams() {}
+
+sal_Int32 store(const sal_uInt8* pData, sal_uInt32 nLength);
+
+ExternalPDFStream& get(sal_uInt32 nIndex);
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/pdf/objectcopier.hxx b/vcl/inc/pdf/objectcopier.hxx
index a6ff12d116af..487d03186682 100644
--- a/vcl/inc/pdf/objectcopier.hxx
+++ b/vcl/inc/pdf/objectcopier.hxx
@@ -48,6 +48,9 @@ public:
 /// Copies resources of pPage into rLine.
 void copyPageResources(filter::PDFObjectElement* pPage, OStringBuffer& 
rLine);
 
+void copyPageResources(filter::PDFObjectElement* pPage, OStringBuffer& 
rLine,
+   std::map& rCopiedResources);
+
 /// Copies page one or more page streams from rContentStreams into rStream.
 static sal_Int32 copyPageStreams(std::vector& 
rContentStreams,
  SvMemoryStream& rStream, bool& 
rCompressed);
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 190e26cce19b..5f50661b013e 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -2131,7 +2131,7 @@ void PdfExportTest::testMultiPagePDF()
 {   // embedded PDF page 2
 vcl::filter::PDFObjectElement* pXObject2 = 
pXObjects->LookupObject(rIDs[1]);
 CPPUNIT_ASSERT(pXObject2);
-CPPUNIT_ASSERT_EQUAL(OString("Im34"), rIDs[1]);
+CPPUNIT_ASSERT_EQUAL(OString("Im24"), rIDs[1]);
 
 auto pSubtype2 = 
dynamic_cast(pXObject2->Lookup("Subtype"));
 CPPUNIT_ASSERT(pSubtype2);
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx 
b/vcl/source/gdi/pdfob

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-10' created by Andras Timar  at 
2020-10-28 17:28 +

cp-6.4-10

Changes since cp-6.4-9-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-10' created by Andras Timar  at 
2020-10-28 17:28 +

cp-6.4-10

Changes since cp-6.4-9-12:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d2f2e313e62993baadf899c0a9771292e32dc72
Author: Andras Timar 
AuthorDate: Wed Oct 28 18:27:43 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Oct 28 18:27:43 2020 +0100

Bump version to 6.4-10

Change-Id: I21f9d974380b0fabe1deb8444cd3a28ec8a7b2ba

diff --git a/configure.ac b/configure.ac
index df979d553f87..2beb573652c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.9],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.10],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-10' created by Andras Timar  at 
2020-10-28 17:28 +

cp-6.4-10

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-10'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-10' created by Andras Timar  at 
2020-10-28 17:28 +

cp-6.4-10

Changes since cp-6.4-7:
Andras Timar (1):
  more/better suggestions for Spanish

---
 es/es_ANY.aff |3 +++
 es/es_ANY.dic |   20 ++--
 2 files changed, 13 insertions(+), 10 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Information regarding Contribution

[Jan-Marek Glogowski]

Hi,

Am 28.10.20 um 06:37 schrieb Raghav Khanna:
I am a computer enthusiast who is highly interested in Contributing to 
LibreOffice.
Please Guide me how I can start doing so. I have learnt C++ in my School 
and have been learning some python lately. I have made some websites in 
the past too( just for fun ), so I know some Javascript too.I am open to 
learn anything and everything and that too quickly as I'm highly 
interested in Computers.

Please Guide me so that I can Contribute to the Community.


Please have a look at 
https://wiki.documentfoundation.org/Development/GetInvolved


HTH

Jan-Marek
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Thorsten Behrens (via logerrit)]

 vcl/inc/unx/gtk/gtkframe.hxx  |2 +-
 vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9350b162c3432ca3f160ce6b86cc50a00eb7de0a
Author: Thorsten Behrens 
AuthorDate: Wed Oct 28 14:19:59 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Oct 28 18:44:54 2020 +0100

Fix build for UNX x86

Change-Id: I971aa787a33fa3a6bd9913abb94c90ddf53109cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104937
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index ad67070f2b0c..d8d2d0d2e834 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -528,7 +528,7 @@ public:
 static gboolean NativeWidgetHelpPressed(GtkAccelGroup*, 
GObject*, guint,
 GdkModifierType, gpointer pFrame);
 static OUString GetPreeditDetails(GtkIMContext* pIMContext, 
std::vector& rInputFlags, sal_Int32& rCursorPos, sal_uInt8& 
rCursorFlags);
-static SelectionCalcDeleteSurroundingSelection(const OUString& 
rSurroundingText, int nCursorIndex, int nOffset, int nChars);
+static SelectionCalcDeleteSurroundingSelection(const OUString& 
rSurroundingText, sal_Int32 nCursorIndex, int nOffset, int nChars);
 
 void DisallowCycleFocusOut();
 bool IsCycleFocusOutDisallowed() const;
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 8c62814bc183..c540105d03f0 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4377,7 +4377,7 @@ gboolean 
GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
 return true;
 }
 
-Selection GtkSalFrame::CalcDeleteSurroundingSelection(const OUString& 
rSurroundingText, int nCursorIndex, int nOffset, int nChars)
+Selection GtkSalFrame::CalcDeleteSurroundingSelection(const OUString& 
rSurroundingText, sal_Int32 nCursorIndex, int nOffset, int nChars)
 {
 Selection aInvalid(SAL_MAX_UINT32, SAL_MAX_UINT32);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 43 commits - sw/inc sw/qa sw/source

[Xisco Fauli (via logerrit)]

 sw/inc/node.hxx |2 
 sw/inc/undobj.hxx   |6 
 sw/qa/extras/uiwriter/data/tdf132160.odt|binary
 sw/qa/extras/uiwriter/data/tdf132911.odt|binary
 sw/qa/extras/uiwriter/data/tdf133967.odt|binary
 sw/qa/extras/uiwriter/data/tdf133982.docx   |binary
 sw/qa/extras/uiwriter/data/tdf133990.odt|binary
 sw/qa/extras/uiwriter/data/tdf134021.docx   |binary
 sw/qa/extras/uiwriter/data/tdf134250.fodt   |   86 ++
 sw/qa/extras/uiwriter/data/tdf134252.fodt   |   95 ++
 sw/qa/extras/uiwriter/data/tdf134436.fodt   |   83 ++
 sw/qa/extras/uiwriter/data/tdf134931.odt|binary
 sw/qa/extras/uiwriter/data/tdf135056.odt|binary
 sw/qa/extras/uiwriter/data/tdf136453.fodt   |   66 +
 sw/qa/extras/uiwriter/data2/try2.fodt   |   66 +
 sw/qa/extras/uiwriter/uiwriter.cxx  |  655 
 sw/qa/extras/uiwriter/uiwriter2.cxx |   97 ++
 sw/qa/uitest/writer_tests/data/tdf135018.odt|binary
 sw/qa/uitest/writer_tests/trackedChanges.py |   36 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   43 -
 sw/source/core/doc/DocumentRedlineManager.cxx   |  268 --
 sw/source/core/docnode/ndsect.cxx   |8 
 sw/source/core/docnode/nodes.cxx|   13 
 sw/source/core/edit/eddel.cxx   |   12 
 sw/source/core/edit/edglss.cxx  |7 
 sw/source/core/layout/colfrm.cxx|3 
 sw/source/core/layout/frmtool.cxx   |9 
 sw/source/core/layout/tabfrm.cxx|1 
 sw/source/core/layout/trvlfrm.cxx   |   61 -
 sw/source/core/text/redlnitr.cxx|2 
 sw/source/core/text/txtfrm.cxx  |6 
 sw/source/core/txtnode/ndtxt.cxx|   31 
 sw/source/core/undo/unattr.cxx  |5 
 sw/source/core/undo/undel.cxx   |   38 
 sw/source/core/undo/untblk.cxx  |   38 
 sw/source/uibase/wrtsh/wrtsh1.cxx   |4 
 36 files changed, 1551 insertions(+), 190 deletions(-)

New commits:
commit 3270dbc15af87f9b8bdc62bba832ec2a5420d431
Author: Xisco Fauli 
AuthorDate: Tue Sep 1 17:30:44 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 28 16:45:03 2020 +0100

tdf#135018: sw: Add UItest

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101883
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit b6ab2330d97672936edc56de8d6f5b6f772908ff)

Change-Id: Ia88e28b1569ea69df81d905cb76a6791a887ef3f

diff --git a/sw/qa/uitest/writer_tests/data/tdf135018.odt 
b/sw/qa/uitest/writer_tests/data/tdf135018.odt
new file mode 100644
index ..2dc9e2a4da0d
Binary files /dev/null and b/sw/qa/uitest/writer_tests/data/tdf135018.odt differ
diff --git a/sw/qa/uitest/writer_tests/trackedChanges.py 
b/sw/qa/uitest/writer_tests/trackedChanges.py
index 5bc8fecf7b03..274d65d99294 100644
--- a/sw/qa/uitest/writer_tests/trackedChanges.py
+++ b/sw/qa/uitest/writer_tests/trackedChanges.py
@@ -7,9 +7,13 @@
 
 from uitest.framework import UITestCase
 from uitest.debug import sleep
+from uitest.path import get_srcdir_url
 import time
 from uitest.uihelper.common import get_state_as_dict, type_text
 
+def get_url_for_data_file(file_name):
+   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+
 class trackedchanges(UITestCase):
 
 def test_tdf91270(self):
@@ -151,4 +155,36 @@ class trackedchanges(UITestCase):
 self.assertEqual(document.Text.String[0:30], "Test LibreOffice Test2 
Test4")
 
 self.ui_test.close_doc()
+
+def test_tdf135018(self):
+self.ui_test.load_file(get_url_for_data_file("tdf135018.odt"))
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+
+#self.assertEqual(5, document.CurrentController.PageCount)
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:AcceptTrackedChanges")
+xTrackDlg = self.xUITest.getTopFocusWindow()
+changesList = xTrackDlg.getChild("changes")
+self.assertEqual(147, len(changesList.getChildren()))
+
+# Without the fix in place, it would have crashed here
+xAccBtn = xTrackDlg.getChild("acceptall")
+xAccBtn.executeAction("CLICK", tuple())
+
+self.assertEqual(0, len(changesList.getChildren()))
+
+xUndoBtn = xTrackDlg.getChild("undo")
+xUndoBtn.executeAction("CLICK", tuple())
+
+self.assertEqual(147, len(changesList.getChildren()))
+
+xcloseBtn = xTr

[Libreoffice-commits] core.git: include/svtools officecfg/registry svtools/source

[Bryan Gazali (via logerrit)]

 include/svtools/strings.hrc|6 +-
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |3 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 ++
 svtools/source/java/javainteractionhandler.cxx |   28 +++--
 4 files changed, 27 insertions(+), 15 deletions(-)

New commits:
commit 2048a5afc9b1c6340cea594c4ead75914b358e74
Author: Bryan Gazali 
AuthorDate: Sat Oct 3 01:46:48 2020 -0400
Commit: Mike Kaganski 
CommitDate: Wed Oct 28 19:08:05 2020 +0100

tdf#125379 updated javainteractionhandler.cxx to add a link for the JRE 
missing warning

Change-Id: Iac940b24a9fbe914af46fe928b758ad962d3d3e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103881
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index c8b84f0e53a4..e07a94f6aa2b 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -261,9 +261,9 @@
 
 #define STR_SVT_DEFAULT_SERVICE_LABEL   
NC_("STR_SVT_DEFAULT_SERVICE_LABEL", "$user$'s $service$")
 
-#define STR_WARNING_JAVANOTFOUND
NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime 
environment (JRE) to perform this task. Please install a JRE and restart 
%PRODUCTNAME.")
-#define STR_WARNING_JAVANOTFOUND_WIN
NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java 
runtime environment (JRE) to perform this task. Please install a JRE and 
restart %PRODUCTNAME.")
-#define STR_WARNING_JAVANOTFOUND_MAC
NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java 
Development Kit (JDK) on macOS 10.10 or greater to perform this task. Please 
install them and restart %PRODUCTNAME.")
+#define STR_WARNING_JAVANOTFOUND
NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime 
environment (JRE) to perform this task. Please install a JRE and restart 
%PRODUCTNAME. %FAQLINK")
+#define STR_WARNING_JAVANOTFOUND_WIN
NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java 
runtime environment (JRE) to perform this task. Please install a JRE and 
restart %PRODUCTNAME. %FAQLINK")
+#define STR_WARNING_JAVANOTFOUND_MAC
NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java 
Development Kit (JDK) on macOS 10.10 or greater to perform this task. Please 
install them and restart %PRODUCTNAME. %FAQLINK")
 #define STR_WARNING_INVALIDJAVASETTINGS_MAC 
NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has 
been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, 
select the Java runtime environment you want to have used by %PRODUCTNAME.")
 #define STR_WARNING_INVALIDJAVASETTINGS 
NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been 
changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java 
runtime environment you want to have used by %PRODUCTNAME.")
 #define STR_ERROR_JVMCREATIONFAILED_MAC 
NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%PRODUCTNAME requires a Java runtime 
environment (JRE) to perform this task. The selected JRE is defective. Please 
select another version or install a new JRE and select it under %PRODUCTNAME - 
Preferences - %PRODUCTNAME - Advanced.")
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 2ae05c749fc6..e4c3fca51f7e 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -376,6 +376,9 @@
 
   https://hub.libreoffice.org/ReleaseNotes/
 
+
+  https://hub.libreoffice.org/InstallJava/
+
   
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f0420ec158cd..02e62d950ed2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2131,6 +2131,11 @@
   Specifies the URL used with the UNO command WhatsNew 
(SID_WHATSNEW).
 
   
+  
+
+  Specifies the URL used for Install Java message box.
+
+  
 
 
   
diff --git a/svtools/source/java/javainteractionhandler.cxx 
b/svtools/source/java/javainteractionhandler.cxx
index e484eb56a0ac..ce360463b6dc 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::task;
@@ -126,23 +128,25 @@ void SAL_CALL JavaInteractionHandler::handle( const 
Reference< XInteractionReque
 if( !g_JavaEvents.bNotFoundHandled )
 {
// No suitable J

[Libreoffice-commits] core.git: sw/qa sw/source

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/extras/uiwriter/data3/txbx_crash.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   31 +
 sw/source/core/doc/textboxhelper.cxx   |7 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 056933bc55608d0ca061539ae124d7b9386cdb62
Author: Attila Bakos (NISZ) 
AuthorDate: Thu Oct 15 16:45:15 2020 +0200
Commit: László Németh 
CommitDate: Wed Oct 28 19:09:50 2020 +0100

tdf#137802 sw: fix crash on deleting last paragraph

if the last paragraph of document had a text box
anchored to.

Change-Id: Ibe29a0f37d06223c31f3add0c194e4414f65d5ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104379
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/data3/txbx_crash.odt 
b/sw/qa/extras/uiwriter/data3/txbx_crash.odt
new file mode 100755
index ..0a029da88289
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/txbx_crash.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index a19ceff4c6b2..477652a6369e 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1391,6 +1391,37 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf121031)
 assertXPath(pXmlDoc, "/root/page[1]/body/tab", 1);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, TestTextBoxCrashAfterLineDel)
+{
+// Open the desired file
+load(DATA_DIRECTORY, "txbx_crash.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// Get the Writer shell
+SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtSh);
+
+// Get the format of the shape
+const SwFrameFormats& rFrmFormats = 
*pWrtSh->GetDoc()->GetSpzFrameFormats();
+CPPUNIT_ASSERT(rFrmFormats.size() >= size_t(o3tl::make_unsigned(1)));
+SwFrameFormat* pShape = rFrmFormats.front();
+CPPUNIT_ASSERT(pShape);
+
+// Add a textbox
+SwTextBoxHelper::create(pShape);
+SwFrameFormat* pTxBxFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(getShape(1));
+CPPUNIT_ASSERT(pTxBxFrm);
+
+// remove the last paragraph
+auto xCursor = getParagraph(1)->getText()->createTextCursor();
+xCursor->gotoEnd(false);
+xCursor->goLeft(3, true);
+
+// This caused crash before, now it should pass with the patch.
+xCursor->setString(OUString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf96067)
 {
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 94f43c61af02..e5b7f82dc94b 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -73,7 +73,12 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 }
 catch (uno::Exception&)
 {
-xTextContentAppend->appendTextContent(xTextFrame, 
uno::Sequence());
+// Before the textframe was appended now it is inserted to the begin 
of the doc in order
+// to prevent crash when someone removes the para where the textframe 
anchored:
+uno::Reference xCursor = 
xTextDocument->getText()->createTextCursor();
+xCursor->gotoStart(false);
+xTextContentAppend->insertTextContentWithProperties(
+xTextFrame, uno::Sequence(), 
xCursor->getStart());
 }
 // Link FLY and DRAW formats, so it becomes a text box (needed for 
syncProperty calls).
 uno::Reference xRealTextFrame(xTextFrame, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[László Németh (via logerrit)]

 sw/source/core/text/itrpaint.cxx |3 ++-
 sw/source/core/text/porlay.cxx   |   12 +++-
 sw/source/core/text/porlay.hxx   |6 ++
 sw/source/core/text/porrst.cxx   |6 +-
 sw/source/core/text/porrst.hxx   |5 -
 sw/source/core/text/redlnitr.cxx |   10 +++---
 sw/source/core/text/redlnitr.hxx |2 +-
 7 files changed, 36 insertions(+), 8 deletions(-)

New commits:
commit 350dbba44ee7703b1da11cc4732a5090ce5efe3d
Author: László Németh 
AuthorDate: Wed Oct 28 12:35:51 2020 +0100
Commit: László Németh 
CommitDate: Wed Oct 28 19:13:05 2020 +0100

tdf#105967 sw change tracking: fix pilcrow symbol

formatting according to the tracked insertion or
deletion of the paragraph break. There was no
formatting at all or only (often bad) inheritance
of the character style (strike out or underline)
of the previous character, confusing the user.

Note: because the pilcrow symbol is painted by
the temporary text portion SwTmpEndPortion, see
sw/qa/extras/layout/data/tdf42748.fodt for testing.

Change-Id: I8afef01c515b8abd368cae12d3a02cabf6d897f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104933
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 6c3e7a2e4eeb..b00507c907c8 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -427,7 +427,8 @@ void SwTextPainter::DrawTextLine( const SwRect &rPaint, 
SwSaveClip &rClip,
 GetInfo().GetOpt().IsParagraph() && !GetTextFrame()->GetFollow() &&
 GetInfo().GetIdx() >= 
TextFrameIndex(GetInfo().GetText().getLength()))
 {
-const SwTmpEndPortion aEnd( *pEndTempl );
+const SwTmpEndPortion aEnd( *pEndTempl, m_pCurr->HasRedlineEnd(),
+   m_pCurr->HasRedlineEndDel() );
 GetFnt()->ChgPhysFnt( GetInfo().GetVsh(), *pOut );
 
 if ( bAdjustBaseLine )
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index bb3fb103260f..69a7c39b5dc2 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -605,10 +605,19 @@ void SwLineLayout::CalcLine( SwTextFormatter &rLine, 
SwTextFormatInfo &rInf )
 if( bHasRedline )
 {
 OUString sRedlineText;
+bool bHasRedlineEnd, bHasRedlineEndDel;
 bHasRedline = rLine.GetRedln()->CheckLine(start.first->GetIndex(), 
start.second,
-end.first->GetIndex(), end.second, sRedlineText );
+end.first->GetIndex(), end.second, sRedlineText, bHasRedlineEnd, 
bHasRedlineEndDel );
 if( bHasRedline )
+{
 SetRedlineText( sRedlineText );
+if( bHasRedlineEnd )
+{
+SetRedlineEnd( bHasRedlineEnd );
+if( bHasRedlineEndDel )
+SetRedlineEndDel( bHasRedlineEndDel );
+}
+}
 }
 SetRedline( bHasRedline );
 }
@@ -670,6 +679,7 @@ void SwLineLayout::ResetFlags()
 {
 m_bFormatAdj = m_bDummy = m_bEndHyph = m_bMidHyph = m_bFly
 = m_bRest = m_bBlinking = m_bClipping = m_bContent = m_bRedline
+= m_bRedlineEnd = m_bRedlineEndDel
 = m_bForcedLeftMargin = m_bHanging = false;
 }
 
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 255337d583c1..39e50d28ba94 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -93,6 +93,8 @@ private:
 bool m_bClipping  : 1; // Clipping needed for exact line height
 bool m_bContent   : 1; // Text for line numbering
 bool m_bRedline   : 1; // The Redlining
+bool m_bRedlineEnd: 1; // Redlining for paragraph mark: tracked change at 
the end
+bool m_bRedlineEndDel : 1; // Redlining for paragraph mark: tracked 
deletion at the end
 bool m_bForcedLeftMargin : 1; // Left adjustment moved by the Fly
 bool m_bHanging : 1; // Contains a hanging portion in the margin
 bool m_bUnderscore : 1;
@@ -130,6 +132,10 @@ public:
 bool HasContent() const { return m_bContent; }
 void SetRedline( const bool bNew ) { m_bRedline = bNew; }
 bool HasRedline() const { return m_bRedline; }
+void SetRedlineEnd( const bool bNew ) { m_bRedlineEnd = bNew; }
+bool HasRedlineEnd() const { return m_bRedlineEnd; }
+void SetRedlineEndDel( const bool bNew ) { m_bRedlineEndDel = bNew; }
+bool HasRedlineEndDel() const { return m_bRedlineEndDel; }
 void SetRedlineText ( const OUString& sText ) { m_sRedlineText = sText; }
 const OUString* GetRedlineText() const { return &m_sRedlineText; }
 void SetForcedLeftMargin() { m_bForcedLeftMargin = true; }
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index a304958613a7..58cf0cf3f3e3 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -46,7 +46,9 @@
 
 #include 
 
-SwTmpEndPortion::SwTmpEndPortion( const Sw

[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source include/unotools unotools/source vcl/source

[Stephan Bergmann (via logerrit)]

 cui/Library_cui.mk|2 
 cui/source/dialogs/AdditionsDialog.cxx|  130 --
 cui/source/inc/AdditionsDialog.hxx|4 
 include/unotools/ucbstreamhelper.hxx  |2 
 unotools/source/ucbhelper/ucbstreamhelper.cxx |5 +
 vcl/source/graphic/GraphicLoader.cxx  |1 
 6 files changed, 53 insertions(+), 91 deletions(-)

New commits:
commit db6c7a486395304f38e9ea52951f576f34749cbc
Author: Stephan Bergmann 
AuthorDate: Wed Oct 28 13:25:25 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 28 19:15:28 2020 +0100

Use UCB instead of cURL to download https files

Since 7dc6fc32eb618da6defb8a9f330978fa019677b8 "uitest: Check the more icons
dialog opens" started to test the AdditionsDialog code, some ASan builds 
started
to report use-after-poison from within SearchAndParseThread::execute ->
curlGet -> curl_easy_perform -> ... -> https_connecting -> ... ->
secmod_ModuleInit -> pemC_Initialize -> ..., see the comments starting at
 "tdf#133026: Tight
integration of extensions - Adding thread structure".

The exact cause for that ASan use-after-poison is not quite clear to me.  
First,
I thought it was due to liberal use of curl_easy_init (without a central
curl_global_init) in a multi-threaded process; see
 for this being 
considered
"lethal".  But then, another issue could be that most of the nss libraries 
like
instdir/program/libnss3.so (implementing the "... -> secmod_ModuleInit" 
part)
come from LO's bundled --without-system-nss while /lib64/libnsspem.so
(implementing the "pemC_Initialize -> ..." part) comes from the system, and
there could be some mismatch when mixing these (esp. if the former are built
with ASan).

So whatever the actual cause, the right fix should be to use LO's UCB 
instead of
directly calling into cURL anyway.

That required a version of utl::UcbStreamHelper::CreateStream that uses a 
given
XInteractionHandler (which may be null to indicate no interaction handling,
instead reporting all interaction requests as exceptions) instead of 
internally
creating an XInteractionHandler using the GUI, and which would cause 
deadlock
in 7dc6fc32eb618da6defb8a9f330978fa019677b8's UITest_sw_options.  (And
introducing that additional utl::UcbStreamHelper::CreateStream overload 
required
css::awt::XWindow to be a complete type now in
vcl/source/graphic/GraphicLoader.cxx, for

> include/com/sun/star/uno/Reference.h:277:18: note: in instantiation of 
variable template specialization 
'std::is_base_of_v' requested here
> std::is_base_of_v
>  ^

)

(The removed code in cui/source/dialogs/AdditionsDialog.cxx should have 
been the
last remaining use of curl in Library_cui.  Apparently,
e1e9e2aa16f08a8fd9e38db706d63e8eceeda8d1 "Kill Mozilla personas" had 
forgotten
to remove it from cui/Library_cui.mk the last time Library_cui had become
curl-free, before the introduction of the AdditionsDialog code.)

(I did not remove the #undef ABSOLUTE FIXME from
cui/source/dialogs/AdditionsDialog.cxx.
c4bee547b02fbe3d07b1e9ee203c73e48f86e6bf "tdf#133026: Additions: Better 
Search
Function" does not tell whether it had been added to mitigate a macro 
definition
from the (now removed) #include .)

Change-Id: I1fec7488d36df81c3543d12d97da1291f77712fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104938
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 1d1f0feb9ea8..ff221a9cc55a 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_externals,cui,\
boost_headers \
$(call gb_Helper_optional,OPENCL,\
clew) \
-$(call gb_Helper_optional,DESKTOP,\
-   curl) \
 icuuc \
 icu_headers \
 libxml2 \
diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index dd994839681a..39f841d03996 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -15,6 +15,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -30,7 +31,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 
 #include 
@@ -40,8 +41,6 @@
 
 #include 
 
-//cURL
-#include 
 #include 
 #include 
 #include 
@@ -70,97 +69,54 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::beans;
 
-#ifdef UNX
-const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (Linux)";
-#else
-const char kUserAgent[] = "LibreOffice AdditionsDownloader/1.0 (

[Libreoffice-commits] core.git: filter/CppunitTest_filter_textfilterdetect.mk filter/Library_textfd.mk filter/qa filter/source include/tools sfx2/source tools/source

[Miklos Vajna (via logerrit)]

 filter/CppunitTest_filter_textfilterdetect.mk   |7 ---
 filter/Library_textfd.mk|1 
 filter/qa/unit/textfilterdetect.cxx |   46 ++--
 filter/source/textfilterdetect/filterdetect.cxx |   32 
 include/tools/stream.hxx|6 +++
 sfx2/source/doc/objstor.cxx |6 ++-
 tools/source/stream/stream.cxx  |   20 ++
 7 files changed, 108 insertions(+), 10 deletions(-)

New commits:
commit ada07f303e7cd1e39c73abe0741aefe7d9d73a57
Author: Miklos Vajna 
AuthorDate: Wed Oct 28 14:54:52 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 19:34:45 2020 +0100

tdf#123476 filter: try to detect 0-byte files based on extension

A 0-byte ("empty") pptx file is obviously junk input, so it's not
surprising if the catch-all generic_Text filter is chosen to open it in
Writer at the end.

But we can do better: if we really get an empty file URL with an
extension we can recognize, that we can fake the filter type / filter
name, so the empty "presentation" opens in Impress, and also a re-save
works as expected.

This builds on top of commit 8a201be240b6d408d15166be7ffc576b9e123634
(fdo#68903 Import .tsv and .xls plain text files in Calc by default,
2013-10-27), just the new way works for all supported file extensions
and also with filters which would not handle empty input (e.g. pptx
refuses the import if the ZIP storage is broken).

Change-Id: Ie01650a5eb6ca42c35e090133965467b621bb526
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104939
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/filter/CppunitTest_filter_textfilterdetect.mk 
b/filter/CppunitTest_filter_textfilterdetect.mk
index a5a6263abdb8..4066c26591a3 100644
--- a/filter/CppunitTest_filter_textfilterdetect.mk
+++ b/filter/CppunitTest_filter_textfilterdetect.mk
@@ -36,12 +36,7 @@ $(eval $(call 
gb_CppunitTest_use_ure,filter_textfilterdetect))
 
 $(eval $(call gb_CppunitTest_use_vcl,filter_textfilterdetect))
 
-$(eval $(call gb_CppunitTest_use_components,filter_textfilterdetect,\
-configmgr/source/configmgr \
-filter/source/textfilterdetect/textfd \
-ucb/source/core/ucb1 \
-ucb/source/ucp/file/ucpfile1 \
-))
+$(eval $(call gb_CppunitTest_use_rdb,filter_textfilterdetect,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,filter_textfilterdetect))
 
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index e6d3889410af..c6155f1e9876 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_use_libraries,textfd,\
cppuhelper \
cppu \
sal \
+   sfx \
tl \
utl \
svt \
diff --git a/filter/qa/unit/data/empty.pptx b/filter/qa/unit/data/empty.pptx
new file mode 100644
index ..e69de29bb2d1
diff --git a/filter/qa/unit/textfilterdetect.cxx 
b/filter/qa/unit/textfilterdetect.cxx
index 0995147c3b78..fb1ff1d2ac7e 100644
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@@ -7,10 +7,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+#include 
+
 #include 
+#include 
+#include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -25,10 +29,31 @@ using namespace com::sun::star;
 namespace
 {
 /// Test class for PlainTextFilterDetect.
-class TextFilterDetectTest : public test::BootstrapFixture
+class TextFilterDetectTest : public test::BootstrapFixture, public 
unotest::MacrosTest
 {
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
 };
 
+void TextFilterDetectTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void TextFilterDetectTest::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
 char const DATA_DIRECTORY[] = "/filter/qa/unit/data/";
 
 CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testTdf114428)
@@ -50,6 +75,23 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testTdf114428)
 // This was empty, XML declaration caused HTML detect to not handle XHTML.
 CPPUNIT_ASSERT_EQUAL(OUString("HTML (StarWriter)"), aFilterName);
 }
+
+CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile)
+{
+// Given an empty file, with a pptx extension
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "empty.pptx";
+
+// When loading the file
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure it is opened in Impress.
+uno::Reference xServiceInfo(getComponent(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xServiceInfo.is());
+
+// Without the accompanying fix in place, this test would have failed, as 
it was opened in
+//

[Libreoffice-commits] core.git: sw/source

[Attila Bakos (NISZ) (via logerrit)]

 sw/source/core/doc/textboxhelper.cxx |   54 +++
 1 file changed, 54 insertions(+)

New commits:
commit 0b5801fc2c768d1774957c2c122c9061d3a74756
Author: Attila Bakos (NISZ) 
AuthorDate: Wed Oct 21 15:50:25 2020 +0200
Commit: László Németh 
CommitDate: Wed Oct 28 19:41:13 2020 +0100

tdf#137798 sw: apply textbox Text alignment

set in "Text" dialog window using "Text Anchor"
in Format -> Text Box and Shape -> Text
attributes... on the selected text box.

Follow up of commit 726c911b90b9a3170fa6b3a34bb952a8d2dbe148
(tdf#137025 sw: apply textbox padding set in Text).

Change-Id: I8c575ceb1d0b0772c1f7d99dc746531b0cd7ceb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104632
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index e5b7f82dc94b..e982174e51ac 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -46,6 +46,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -148,6 +150,8 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 if (xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_WRITINGMODE) >>= 
eMode)
 syncProperty(pShape, RES_FRAMEDIR, 0, uno::makeAny(sal_Int16(eMode)));
 
+// TODO: Text dialog attr setting to frame
+
 const SwFormatAnchor& rAnch = pShape->GetAnchor();
 if (!((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE && rAnch.GetPageNum() 
!= 0)
   || ((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA
@@ -395,6 +399,45 @@ tools::Rectangle 
SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool b
 void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& 
rPropertyName,
const css::uno::Any& rValue)
 {
+// Textframes does not have valid horizontal adjust property, so map it to 
paragraph adjust property
+if (rPropertyName == UNO_NAME_TEXT_HORZADJUST)
+{
+SwFrameFormat* pFormat = getOtherTextBoxFormat(pShape, RES_DRAWFRMFMT);
+if (!pFormat)
+return;
+
+auto xTextFrame = SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), 
pFormat);
+uno::Reference xCursor = 
xTextFrame->getText()->createTextCursor();
+
+// Select all paragraps in the textframe
+xCursor->gotoStart(false);
+xCursor->gotoEnd(true);
+uno::Reference xFrameParaProps(xCursor, 
uno::UNO_QUERY);
+
+// And simply map the property
+switch (rValue.get())
+{
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_CENTER:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_CENTER)); //3
+break;
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_LEFT:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_LEFT)); //0
+break;
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_RIGHT:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_RIGHT)); //1
+break;
+default:
+break;
+}
+return;
+}
+
 if (rPropertyName == "CustomShapeGeometry")
 {
 // CustomShapeGeometry changes the textbox position offset and size, 
so adjust both.
@@ -838,6 +881,7 @@ void SwTextBoxHelper::updateTextBoxMargin(SdrObject* pObj)
 if (!pParentFormat)
 return;
 
+// Sync the padding
 syncProperty(pParentFormat, UNO_NAME_TEXT_LEFTDIST,
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_LEFTDIST));
 syncProperty(pParentFormat, UNO_NAME_TEXT_RIGHTDIST,
@@ -846,6 +890,16 @@ void SwTextBoxHelper::updateTextBoxMargin(SdrObject* pObj)
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_UPPERDIST));
 syncProperty(pParentFormat, UNO_NAME_TEXT_LOWERDIST,
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_LOWERDIST));
+
+// Sync the text aligning
+syncProperty(pParentFormat, UNO_NAME_TEXT_VERTADJUST,
+ xPropertySet->getPropertyValue(UNO_NAME_TEXT_VERTADJUST));
+syncProperty(pParentFormat, UNO_NAME_TEXT_HORZADJUST,
+ xPropertySet->getPropertyValue(UNO_NAME_TEXT_HORZADJUST));
+
+//FIXME: Sync autogrow: needs repositioning after sync
+//syncProperty(pParentFormat, RES_FRM_SIZE, MID_FRMSIZE_IS_AUTO_HEIGHT,
+// 
xPropertySet->getPropertyValue(UNO_NAME_TEXT_AUTOGROWHEIGHT));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa96113f89ded1ff8ee877abc3ab0d48619327b3
Author: Johnny_M 
AuthorDate: Wed Oct 28 21:01:07 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:01:07 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a7381ac50a77e80b08f77c1ee2527fbc28ba720e
  - tdf#132643 Translate German section IDs

Change-Id: Ibe35e3fe95f1e9a62c2bf364eeb9350d62c7c81a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104755
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c8a9ac72bc5e..a7381ac50a77 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8a9ac72bc5e68f8a69490e3c157fe26b935f524
+Subproject commit a7381ac50a77e80b08f77c1ee2527fbc28ba720e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/scalc/01/0502.xhp|2 +-
 source/text/scalc/01/0507.xhp|2 +-
 source/text/scalc/01/cell_styles.xhp |2 +-
 source/text/scalc/01/format_graphic.xhp  |2 +-
 source/text/scalc/main0203.xhp   |4 ++--
 source/text/schart/01/05010100.xhp   |2 +-
 source/text/schart/01/05010200.xhp   |2 +-
 source/text/schart/01/05020100.xhp   |2 +-
 source/text/schart/01/05020200.xhp   |2 +-
 source/text/schart/01/0503.xhp   |2 +-
 source/text/schart/01/0506.xhp   |2 +-
 source/text/schart/01/0507.xhp   |2 +-
 source/text/schart/01/0508.xhp   |2 +-
 source/text/sdraw/main0202.xhp   |4 ++--
 source/text/shared/00/00040502.xhp   |6 +++---
 source/text/shared/01/02100300.xhp   |2 +-
 source/text/shared/01/0503.xhp   |2 +-
 source/text/shared/01/0521.xhp   |6 +++---
 source/text/shared/01/05210100.xhp   |4 ++--
 source/text/shared/01/05210200.xhp   |2 +-
 source/text/simpress/01/0509m.xhp|2 +-
 source/text/simpress/main0202.xhp|4 ++--
 source/text/swriter/01/0402.xhp  |2 +-
 source/text/swriter/01/04120200.xhp  |2 +-
 source/text/swriter/01/0413.xhp  |2 +-
 source/text/swriter/01/0504.xhp  |2 +-
 source/text/swriter/01/05040501.xhp  |2 +-
 source/text/swriter/01/0506.xhp  |2 +-
 source/text/swriter/01/0508.xhp  |2 +-
 source/text/swriter/01/0509.xhp  |2 +-
 source/text/swriter/01/format_object.xhp |2 +-
 source/text/swriter/main0205.xhp |4 ++--
 32 files changed, 41 insertions(+), 41 deletions(-)

New commits:
commit a7381ac50a77e80b08f77c1ee2527fbc28ba720e
Author: Johnny_M 
AuthorDate: Sat Oct 24 16:49:44 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:01:07 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: Ibe35e3fe95f1e9a62c2bf364eeb9350d62c7c81a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104755
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0502.xhp 
b/source/text/scalc/01/0502.xhp
index 5abb23bef..914bdf834 100644
--- a/source/text/scalc/01/0502.xhp
+++ b/source/text/scalc/01/0502.xhp
@@ -50,7 +50,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/scalc/01/0507.xhp 
b/source/text/scalc/01/0507.xhp
index 945b0ff83..ba45acc41 100644
--- a/source/text/scalc/01/0507.xhp
+++ b/source/text/scalc/01/0507.xhp
@@ -44,7 +44,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/source/text/scalc/01/cell_styles.xhp 
b/source/text/scalc/01/cell_styles.xhp
index 8b5620e0f..cf8471849 100644
--- a/source/text/scalc/01/cell_styles.xhp
+++ b/source/text/scalc/01/cell_styles.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/scalc/01/format_graphic.xhp 
b/source/text/scalc/01/format_graphic.xhp
index 291ca395d..c0d0118e5 100644
--- a/source/text/scalc/01/format_graphic.xhp
+++ b/source/text/scalc/01/format_graphic.xhp
@@ -37,7 +37,7 @@
 
 
 
-
+
 Define Text Attributes
 Sets the layout 
and anchoring properties for text in the selected drawing or text 
object.
 Points
diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index 9d53c4118..113a02a78 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -48,8 +48,8 @@
 Line 
Color
 
 
-
-
+
+
 Background 
Color
 
 
diff --git a/source/text/schart/01/05010100.xhp 
b/source/text/schart/01/05010100.xhp
index c67c535cf..69747a9dd 100644
--- a/source/text/schart/01/05010100.xhp
+++ b/source/text/schart/01/05010100.xhp
@@ -38,7 +38,7 @@
   
 
   
-  
+  
   
   
   
diff --git a/source/text/schart/01/05010200.xhp 
b/source/text/schart/01/05010200.xhp
index f6bebfdc1..ad26df74d 100644
--- a/source/text/schart/01/05010200.xhp
+++ b/source/text/schart/01/05010200.xhp
@@ -33,7 +33,7 @@
   
 
 
-
+
 
 
 
diff --git a/source/text/schart/01/05020100.xhp 
b/source/text/schart/01/05020100.xhp
index a18228ff5..ee62bf183 100644
--- a/source/text/schart/01/05020100.xhp
+++ b/source/text/schart/01/05020100.xhp
@@ -42,7 +42,7 @@
  
   
   
-  
+  
   
   
   
diff --git a/source/text/schart/01/05020200.xhp 
b/source/text/schart/01/05020200.xhp
index e4ac4b86e..dc58ebc2e 100644
--- a/source/text/schart/01/05020200.xhp
+++ b/source/text/schart/01/05020200.xhp
@@ -36,7 +36,7 @@
   
 
 
-
+
 
 
 
diff --git a/source/text/schart/01/0503.xhp 
b/source/text/schart/01/0503.xhp
index 4683a943b..1416708e6 100644
--- a/source/text/schart/01/0503.xhp
+++ b/source/text/schart/01/0503.xhp
@@ -31,7 +31,7 @@
   
 
 
-
+
 
 
 Display
diff --git a/source/text/schart/01/0506.xhp 
b/source/text/schart/01/0506.xhp
index a8feea474..a6be31e3b 100644
--- a/source/text/schart/01/0506.xhp
+++ b/source/text/schart/01/0506.xhp
@@ -38,7 +38,7 @@
   
 
   

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/shared/01/01010300.xhp |2 +-
 source/text/shared/01/01010302.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit efac120187d863d4598b507eda8cceb5870e0f2e
Author: Johnny_M 
AuthorDate: Tue Oct 27 11:40:13 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:01:50 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I455e562ddb4a157beb2e985675189db87678ee95
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104872
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/01010300.xhp 
b/source/text/shared/01/01010300.xhp
index c32b209b1..02870cd04 100644
--- a/source/text/shared/01/01010300.xhp
+++ b/source/text/shared/01/01010300.xhp
@@ -37,7 +37,7 @@
   
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/01010302.xhp 
b/source/text/shared/01/01010302.xhp
index 722f8a905..5bce06dcf 100644
--- a/source/text/shared/01/01010302.xhp
+++ b/source/text/shared/01/01010302.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 
 Business 
Cards
   Define the appearance of your business 
cards.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4e6e360485de990c446ba480a3b1c81a8681dd5b
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:01:50 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:01:50 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to efac120187d863d4598b507eda8cceb5870e0f2e
  - tdf#132643 Translate German section IDs

Change-Id: I455e562ddb4a157beb2e985675189db87678ee95
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104872
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index a7381ac50a77..efac120187d8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a7381ac50a77e80b08f77c1ee2527fbc28ba720e
+Subproject commit efac120187d863d4598b507eda8cceb5870e0f2e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/scalc/01/0502.xhp|2 +-
 source/text/scalc/01/cell_styles.xhp |2 +-
 source/text/scalc/main0105.xhp   |4 ++--
 source/text/schart/01/05020201.xhp   |2 +-
 source/text/schart/01/05040100.xhp   |2 +-
 source/text/schart/01/05040200.xhp   |2 +-
 source/text/shared/00/00040501.xhp   |2 +-
 source/text/shared/01/02100300.xhp   |2 +-
 source/text/shared/01/0503.xhp   |2 +-
 source/text/shared/01/05030700.xhp   |2 +-
 source/text/shared/01/0507.xhp   |4 ++--
 source/text/shared/01/0508.xhp   |4 ++--
 source/text/shared/01/05340300.xhp   |2 +-
 source/text/shared/01/05340405.xhp   |2 +-
 source/text/simpress/main0113.xhp|2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 3dff4c970ef5c91ccf33e46742ee9c6778563472
Author: Johnny_M 
AuthorDate: Tue Oct 27 11:51:05 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:04:05 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I2ac3ce76e1a8f6f6f4937687041f817848183a7b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104873
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/0502.xhp 
b/source/text/scalc/01/0502.xhp
index 914bdf834..0a8fe717b 100644
--- a/source/text/scalc/01/0502.xhp
+++ b/source/text/scalc/01/0502.xhp
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/scalc/01/cell_styles.xhp 
b/source/text/scalc/01/cell_styles.xhp
index cf8471849..2cdc22340 100644
--- a/source/text/scalc/01/cell_styles.xhp
+++ b/source/text/scalc/01/cell_styles.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/scalc/main0105.xhp b/source/text/scalc/main0105.xhp
index acf3471d6..dfd268799 100644
--- a/source/text/scalc/main0105.xhp
+++ b/source/text/scalc/main0105.xhp
@@ -60,8 +60,8 @@
 Conditional Formatting
 
 
-
-
+
+
 
 
 
diff --git a/source/text/schart/01/05020201.xhp 
b/source/text/schart/01/05020201.xhp
index 4441312f4..50c9e9295 100644
--- a/source/text/schart/01/05020201.xhp
+++ b/source/text/schart/01/05020201.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/schart/01/05040100.xhp 
b/source/text/schart/01/05040100.xhp
index 6b2ad0bdf..b9c1f17ff 100644
--- a/source/text/schart/01/05040100.xhp
+++ b/source/text/schart/01/05040100.xhp
@@ -38,6 +38,6 @@
 Scaling the X axis is only possible in the X-Y chart 
type.
 
 
-
+
 
 
diff --git a/source/text/schart/01/05040200.xhp 
b/source/text/schart/01/05040200.xhp
index fc5bdef01..3980711ff 100644
--- a/source/text/schart/01/05040200.xhp
+++ b/source/text/schart/01/05040200.xhp
@@ -41,6 +41,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 789bd8d29..97d3f9a63 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -310,7 +310,7 @@
 
 
 
-
+
 Choose Format - 
Align ($[officename] Writer, $[officename] Calc).
 Choose Shape - 
Align (objects selected) ($[officename] Draw).
 Open context menu - 
choose Align (objects selected) ($[officename] Impress, 
$[officename] Draw).
diff --git a/source/text/shared/01/02100300.xhp 
b/source/text/shared/01/02100300.xhp
index db1c72598..7ff733d87 100644
--- a/source/text/shared/01/02100300.xhp
+++ b/source/text/shared/01/02100300.xhp
@@ -38,7 +38,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/0503.xhp 
b/source/text/shared/01/0503.xhp
index b307746b7..99ef847a9 100644
--- a/source/text/shared/01/0503.xhp
+++ b/source/text/shared/01/0503.xhp
@@ -38,7 +38,7 @@
 The paragraph style for the current 
paragraph is displayed at the Formatting toolbar, and is 
highlighted in the Styles window.
 UFI: changed name of 
bar
 
-
+
 
 
 
diff --git a/source/text/shared/01/05030700.xhp 
b/source/text/shared/01/05030700.xhp
index 9e4e5b7ef..616a63eff 100644
--- a/source/text/shared/01/05030700.xhp
+++ b/source/text/shared/01/05030700.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 aligning; paragraphs
 paragraphs; alignment
 lines of text; alignment
diff --git a/source/text/shared/01/0507.xhp 
b/source/text/shared/01/0507.xhp
index 2933e0339..4e84ea707 100644
--- a/source/text/shared/01/0507.xhp
+++ b/source/text/shared/01/0507.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 aligning; objects
 positioning; objects
 ordering; objects
@@ -38,7 +38,7 @@
 
 If one of the 
selected objects is anchored as a character, some of the alignment options do 
not work.
 
-
+
 
 Not all types of 
objects can be selected together. Not all modules (Writer, Calc, Impress, Draw) 
support all types of alignment.
 
diff --git a/source/text/shared/01/0508.xhp 
b/source/text/shared/01/0508.xhp
index 5c71f6681..3dcee3e3e 100644
--- a/source/text/shared/01/0508.xhp
+++ b/source/text/shared/01/0508.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 aligning; text objects
 text objects; alignment
 
@@ -38,7 +38,7 @@
 Set

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6552a8253c4c3e227160a40fd461cc5eb5714371
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:04:05 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:04:05 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 3dff4c970ef5c91ccf33e46742ee9c6778563472
  - tdf#132643 Translate German section IDs

Change-Id: I2ac3ce76e1a8f6f6f4937687041f817848183a7b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104873
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index efac120187d8..3dff4c970ef5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit efac120187d863d4598b507eda8cceb5870e0f2e
+Subproject commit 3dff4c970ef5c91ccf33e46742ee9c6778563472
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 832a7d1f37ae006cb2510c689aa46d1f82525c7c
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:05:11 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:05:11 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1dda9b622337bc3cacc2a690ed44a3e86e8ab3cf
  - tdf#132643 Translate German section IDs

Change-Id: I0c78485c62bf9c7ee440f19259628c1af63b0a45
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104874
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 3dff4c970ef5..1dda9b622337 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3dff4c970ef5c91ccf33e46742ee9c6778563472
+Subproject commit 1dda9b622337bc3cacc2a690ed44a3e86e8ab3cf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/sdraw/main0101.xhp |2 +-
 source/text/shared/00/0401.xhp |2 +-
 source/text/shared/01/0117.xhp |4 +---
 source/text/smath/main0101.xhp |2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 1dda9b622337bc3cacc2a690ed44a3e86e8ab3cf
Author: Johnny_M 
AuthorDate: Tue Oct 27 11:55:33 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:05:11 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I0c78485c62bf9c7ee440f19259628c1af63b0a45
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104874
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdraw/main0101.xhp b/source/text/sdraw/main0101.xhp
index 9fbb9951f..dc00fa9c6 100644
--- a/source/text/sdraw/main0101.xhp
+++ b/source/text/sdraw/main0101.xhp
@@ -54,6 +54,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index a07198099..07ba7f9d5 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -329,7 +329,7 @@
 
 
 
-
+
 Choose 
File - Exit %PRODUCTNAME.
 CommandCtrl+Q
 
diff --git a/source/text/shared/01/0117.xhp 
b/source/text/shared/01/0117.xhp
index 4380f7afa..e1cb9ae68 100644
--- a/source/text/shared/01/0117.xhp
+++ b/source/text/shared/01/0117.xhp
@@ -26,16 +26,14 @@
 
 
 
-  Can we remove this?
 exiting;$[officename]
 mw made "exiting..." a two level entry
 
 Exit %PRODUCTNAME
   Closes all %PRODUCTNAME programs and prompts you to save your 
changes. This command does not exist on macOS systems.
-  
 
 
-  
+  
 
 
 Close the 
current document
diff --git a/source/text/smath/main0101.xhp b/source/text/smath/main0101.xhp
index 44637af01..03eeaee46 100644
--- a/source/text/smath/main0101.xhp
+++ b/source/text/smath/main0101.xhp
@@ -49,6 +49,6 @@
 
 
 
-
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/scalc/main0203.xhp   |4 ++--
 source/text/scalc/main0214.xhp   |4 ++--
 source/text/shared/00/00040501.xhp   |4 ++--
 source/text/shared/01/0525.xhp   |2 +-
 source/text/shared/01/05250400.xhp   |4 ++--
 source/text/shared/main0226.xhp  |4 ++--
 source/text/simpress/01/0525.xhp |2 +-
 source/text/swriter/main0205.xhp |4 ++--
 source/text/swriter/main0215.xhp |4 ++--
 source/text/swriter/main0216.xhp |4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 7b8b3bf81202cf0c383a56a1a18e6f6b143bb942
Author: Johnny_M 
AuthorDate: Tue Oct 27 11:38:16 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:06:28 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I368e64b51c820d66104fde7cbbec80ba93ef813c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104871
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/main0203.xhp b/source/text/scalc/main0203.xhp
index 113a02a78..c76ad74e5 100644
--- a/source/text/scalc/main0203.xhp
+++ b/source/text/scalc/main0203.xhp
@@ -60,8 +60,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/scalc/main0214.xhp b/source/text/scalc/main0214.xhp
index e238de046..91758b6a2 100644
--- a/source/text/scalc/main0214.xhp
+++ b/source/text/scalc/main0214.xhp
@@ -48,8 +48,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/shared/00/00040501.xhp 
b/source/text/shared/00/00040501.xhp
index 97d3f9a63..7d6266b04 100644
--- a/source/text/shared/00/00040501.xhp
+++ b/source/text/shared/00/00040501.xhp
@@ -262,12 +262,12 @@
 
 
 
-
+
 Choose Format - 
Arrange - Send to Back ($[officename] Writer, $[officename] 
Calc).
 Choose Shape - 
Arrange - Send to Back ($[officename] Draw).
 Shift+CommandCtrl+minus
 sign ($[officename] Impress, $[officename] Draw)
 Open context menu - 
choose Arrange - Send to Back ($[officename] Impress).
-
+
 
 
 
diff --git a/source/text/shared/01/0525.xhp 
b/source/text/shared/01/0525.xhp
index 33d8470cf..cbab58b49 100644
--- a/source/text/shared/01/0525.xhp
+++ b/source/text/shared/01/0525.xhp
@@ -54,7 +54,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/05250400.xhp 
b/source/text/shared/01/05250400.xhp
index eeb66cb62..8af4f5e36 100644
--- a/source/text/shared/01/05250400.xhp
+++ b/source/text/shared/01/05250400.xhp
@@ -32,13 +32,13 @@
 
   
   
-  
+  
 
 Send to 
Back
   Moves the selected object to the 
bottom of the stacking order, so that it is behind the other 
objects.
   
   
-  
+  
 
   
   Layer
diff --git a/source/text/shared/main0226.xhp b/source/text/shared/main0226.xhp
index ea4a33d13..2655b6628 100644
--- a/source/text/shared/main0226.xhp
+++ b/source/text/shared/main0226.xhp
@@ -53,8 +53,8 @@
 
 
 
-
-
+
+
 Group
 
 
diff --git a/source/text/simpress/01/0525.xhp 
b/source/text/simpress/01/0525.xhp
index 54b2d33e0..fc0666408 100644
--- a/source/text/simpress/01/0525.xhp
+++ b/source/text/simpress/01/0525.xhp
@@ -39,7 +39,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/main0205.xhp b/source/text/swriter/main0205.xhp
index 07fb36643..637598587 100644
--- a/source/text/swriter/main0205.xhp
+++ b/source/text/swriter/main0205.xhp
@@ -62,8 +62,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0215.xhp b/source/text/swriter/main0215.xhp
index e52761570..8584bbd8d 100644
--- a/source/text/swriter/main0215.xhp
+++ b/source/text/swriter/main0215.xhp
@@ -72,8 +72,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/swriter/main0216.xhp b/source/text/swriter/main0216.xhp
index f39df1599..34216fe5d 100644
--- a/source/text/swriter/main0216.xhp
+++ b/source/text/swriter/main0216.xhp
@@ -72,8 +72,8 @@
 
 
 
-
-
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b34fdeeb8e8732b7e3554e01c8e0c0dea34d1d9
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:06:28 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:06:28 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7b8b3bf81202cf0c383a56a1a18e6f6b143bb942
  - tdf#132643 Translate German section IDs

Change-Id: I368e64b51c820d66104fde7cbbec80ba93ef813c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104871
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 1dda9b622337..7b8b3bf81202 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1dda9b622337bc3cacc2a690ed44a3e86e8ab3cf
+Subproject commit 7b8b3bf81202cf0c383a56a1a18e6f6b143bb942
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/sdraw/main_edit.xhp|2 +-
 source/text/shared/01/0209.xhp |2 --
 source/text/smath/main0102.xhp |2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6a019e4df3209fe86ba616bad0e26795c1a5fbca
Author: Johnny_M 
AuthorDate: Tue Oct 27 11:58:45 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:07:14 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I36736eab7aaa3ac5e0db6dfa51cccd57938565e7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104875
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sdraw/main_edit.xhp b/source/text/sdraw/main_edit.xhp
index 43493980e..03fe8996e 100644
--- a/source/text/sdraw/main_edit.xhp
+++ b/source/text/sdraw/main_edit.xhp
@@ -37,7 +37,7 @@
 
 
 
-
+
 Find & Replace
 
 Points
diff --git a/source/text/shared/01/0209.xhp 
b/source/text/shared/01/0209.xhp
index 70f33659a..ff2edac24 100644
--- a/source/text/shared/01/0209.xhp
+++ b/source/text/shared/01/0209.xhp
@@ -29,12 +29,10 @@
 
 
 
-  
 
 
 Select 
All
   Selects the entire content of the current file, 
frame, or text object.
-  
 
 To select all of the cells on a sheet, 
click the button at the intersection of the column and row header in the top 
left corner of the 
sheet.
 
diff --git a/source/text/smath/main0102.xhp b/source/text/smath/main0102.xhp
index 6d4405fbb..bdc2e3b6e 100644
--- a/source/text/smath/main0102.xhp
+++ b/source/text/smath/main0102.xhp
@@ -46,7 +46,7 @@
   
   
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18f551f7332b8cc1082b03292c9f9df1a7c2bcd4
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:07:14 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:07:14 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6a019e4df3209fe86ba616bad0e26795c1a5fbca
  - tdf#132643 Translate German section IDs

Change-Id: I36736eab7aaa3ac5e0db6dfa51cccd57938565e7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104875
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7b8b3bf81202..6a019e4df320 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7b8b3bf81202cf0c383a56a1a18e6f6b143bb942
+Subproject commit 6a019e4df3209fe86ba616bad0e26795c1a5fbca
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ac2855d36d4471951a5444f1fad0428d9acfe7f
Author: Johnny_M 
AuthorDate: Wed Oct 28 20:07:52 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Oct 28 20:07:52 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 453fe4e3d1dbbe4d19c60351dd7612551fd5ffc4
  - tdf#132643 Translate German section IDs

Change-Id: I5eee85ae5ca7c17c7ababc09c44e9f56870971a1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104876
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 6a019e4df320..453fe4e3d1db 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6a019e4df3209fe86ba616bad0e26795c1a5fbca
+Subproject commit 453fe4e3d1dbbe4d19c60351dd7612551fd5ffc4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Johnny_M (via logerrit)]

 source/text/shared/01/0526.xhp |2 +-
 source/text/shared/01/05260400.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 453fe4e3d1dbbe4d19c60351dd7612551fd5ffc4
Author: Johnny_M 
AuthorDate: Tue Oct 27 12:01:52 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Oct 28 20:07:52 2020 +0100

tdf#132643 Translate German section IDs

Change-Id: I5eee85ae5ca7c17c7ababc09c44e9f56870971a1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/104876
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0526.xhp 
b/source/text/shared/01/0526.xhp
index ffe633156..9cf9686ae 100644
--- a/source/text/shared/01/0526.xhp
+++ b/source/text/shared/01/0526.xhp
@@ -51,7 +51,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/shared/01/05260400.xhp 
b/source/text/shared/01/05260400.xhp
index 16b784f58..04096fc65 100644
--- a/source/text/shared/01/05260400.xhp
+++ b/source/text/shared/01/05260400.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
 
 To Cell
   Anchors the selected item to a 
cell. The anchor icon is displayed in the upper left corner of the 
cell.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source

[Noel Grandin (via logerrit)]

 editeng/source/editeng/impedit3.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 27ae083f7e5fce97c73498698d855cdcaac7737d
Author: Noel Grandin 
AuthorDate: Wed Oct 28 17:27:30 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 28 20:32:11 2020 +0100

std::set->o3tl::sorted_vector in ImpEditEngine

Change-Id: Ia78b986c28e2d8e3655d5c8f56d3cb5cd7a5ee1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104944
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 4ffaeec6afaa..2925183e9cf7 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2390,7 +2391,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* 
pParaPortion, sal_Int32& rS
 ContentNode* pNode = pParaPortion->GetNode();
 DBG_ASSERT( pNode->Len(), "CreateTextPortions should not be used for empty 
paragraphs!" );
 
-std::set< sal_Int32 > aPositions;
+o3tl::sorted_vector< sal_Int32 > aPositions;
 aPositions.insert( 0 );
 
 sal_uInt16 nAttr = 0;
@@ -2463,10 +2464,10 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* 
pParaPortion, sal_Int32& rS
 // A portion may also have been formed by a line break:
 aPositions.insert( nPortionStart );
 
-std::set< sal_Int32 >::iterator nInvPos = aPositions.find(  nPortionStart 
);
+auto nInvPos = aPositions.find(  nPortionStart );
 DBG_ASSERT( (nInvPos != aPositions.end()), "InvPos ?!" );
 
-std::set< sal_Int32 >::iterator i = nInvPos;
+auto i = nInvPos;
 ++i;
 while ( i != aPositions.end() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Noel Grandin (via logerrit)]

 filter/source/msfilter/svdfppt.cxx |   39 ++---
 1 file changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 1503f3a25bc185a0f7afafad40db57325f778c21
Author: Noel Grandin 
AuthorDate: Wed Oct 28 17:28:28 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 28 20:31:44 2020 +0100

std::set->o3tl::sorted_vector in filter

Change-Id: Ie616aa97cea31607c74ec596ef9116f2291615d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104945
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index e63d8eb588b7..42e171ce3fb0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -121,6 +121,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -7108,15 +7109,15 @@ static bool IsLine( const SdrObject* pObj )
 return pSdrPathObj && pSdrPathObj->IsLine() && 
pSdrPathObj->GetPointCount() == 2;
 }
 
-static bool GetCellPosition( const SdrObject* pObj, const std::set< sal_Int32 
>& rRows, const std::set< sal_Int32 >& rColumns,
+static bool GetCellPosition( const SdrObject* pObj, const o3tl::sorted_vector< 
sal_Int32 >& rRows, const o3tl::sorted_vector< sal_Int32 >& rColumns,
 sal_Int32& nTableIndex, sal_Int32& nRow, 
sal_Int32& nRowCount, sal_Int32& nColumn, sal_Int32& nColumnCount )
 {
 tools::Rectangle aSnapRect( pObj->GetSnapRect() );
 bool bCellObject = ( aSnapRect.GetWidth() > 1 ) && ( aSnapRect.GetHeight() 
> 1 );
 if ( bCellObject )
 {
-std::set< sal_Int32 >::const_iterator aRowIter( rRows.find( 
aSnapRect.Top() ) );
-std::set< sal_Int32 >::const_iterator aColumnIter( rColumns.find( 
aSnapRect.Left() ) );
+auto aRowIter = rRows.find( aSnapRect.Top() );
+auto aColumnIter = rColumns.find( aSnapRect.Left() );
 if ( ( aRowIter == rRows.end() ) || ( aColumnIter == rColumns.end() ) )
 bCellObject = false;
 else
@@ -7151,10 +7152,10 @@ static bool GetCellPosition( const SdrObject* pObj, 
const std::set< sal_Int32 >&
 #define LinePositionBLTR0x2000
 
 
-static void GetRowPositions( const tools::Rectangle& rSnapRect, const 
std::set< sal_Int32 >& rRows,
-const std::set< sal_Int32 >& rColumns, std::vector< 
sal_Int32 >& rPositions, sal_Int32 nColumn, sal_Int32 nFlags )
+static void GetRowPositions( const tools::Rectangle& rSnapRect, const 
o3tl::sorted_vector< sal_Int32 >& rRows,
+const o3tl::sorted_vector< sal_Int32 >& rColumns, 
std::vector< sal_Int32 >& rPositions, sal_Int32 nColumn, sal_Int32 nFlags )
 {
-std::set< sal_Int32 >::const_iterator aRow( rRows.find( rSnapRect.Top() ) 
);
+auto aRow = rRows.find( rSnapRect.Top() );
 if ( aRow == rRows.end() )
 return;
 
@@ -7173,9 +7174,9 @@ static void GetRowPositions( const tools::Rectangle& 
rSnapRect, const std::set<
 
 
 static void GetColumnPositions( const tools::Rectangle& rSnapRect,
-const std::set< sal_Int32 >& rColumns, std::vector< 
sal_Int32 >& rPositions, sal_Int32 nRow, sal_Int32 nFlags )
+const o3tl::sorted_vector< sal_Int32 >& rColumns, 
std::vector< sal_Int32 >& rPositions, sal_Int32 nRow, sal_Int32 nFlags )
 {
-std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( 
rSnapRect.Left() ) );
+auto aColumn = rColumns.find( rSnapRect.Left() );
 if ( aColumn == rColumns.end() )
 return;
 
@@ -7192,13 +7193,13 @@ static void GetColumnPositions( const tools::Rectangle& 
rSnapRect,
 }
 }
 
-static void GetLinePositions( const SdrObject* pObj, const std::set< sal_Int32 
>& rRows, const std::set< sal_Int32 >& rColumns,
+static void GetLinePositions( const SdrObject* pObj, const 
o3tl::sorted_vector< sal_Int32 >& rRows, const o3tl::sorted_vector< sal_Int32 
>& rColumns,
 std::vector< sal_Int32 >& rPositions, const 
tools::Rectangle& rGroupSnap )
 {
 tools::Rectangle aSnapRect( pObj->GetSnapRect() );
 if ( aSnapRect.Left() == aSnapRect.Right() )
 {
-std::set< sal_Int32 >::const_iterator aColumn( rColumns.find( 
aSnapRect.Left() ) );
+auto aColumn = rColumns.find( aSnapRect.Left() );
 if ( ( aColumn != rColumns.end() ) || ( aSnapRect.Left() == 
rGroupSnap.Right() ) )
 {
 sal_Int32 nColumn, nFlags;
@@ -7219,7 +7220,7 @@ static void GetLinePositions( const SdrObject* pObj, 
const std::set< sal_Int32 >
 }
 else if ( aSnapRect.Top() == aSnapRect.Bottom() )
 {
-std::set< sal_Int32 >::const_iterator aRow( rRows.find( 
aSnapRect.Top() ) );
+auto aRow = rRows.find( aSnapRect.Top() );
 if ( ( aRow != rRows.end() ) || ( aSnapRect.Top() == 
rGroupSnap.Bottom() ) )
 {
 sal_Int32 nRow, nFlags;
@@ -7248,8 +7249,8 @@ static void GetLinePositions( const SdrObject* pObj, 
const std::set< 

[Libreoffice-commits] core.git: sw/source

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/doc/notxtfrm.cxx |   13 -
 sw/source/core/inc/notxtfrm.hxx |2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 6e38f611a3d98156505b9937f30e94605381156c
Author: Bjoern Michaelsen 
AuthorDate: Mon Oct 26 07:22:29 2020 +0100
Commit: Bjoern Michaelsen 
CommitDate: Wed Oct 28 20:34:31 2020 +0100

NoTextFrame: Modify no more ...

Change-Id: I2816fae99fc9774ab1728d20e1de215322a2de8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104791
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen 

diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 2fcf84602d62..7d8c50238ae1 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -720,9 +720,12 @@ void SwNoTextFrame::ClearCache()
 }
 }
 
-void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
+void SwNoTextFrame::SwClientNotify(const SwModify& rModify, const SfxHint& 
rHint)
 {
-sal_uInt16 nWhich = pNew ? pNew->Which() : pOld ? pOld->Which() : 0;
+auto pLegacy = dynamic_cast(&rHint);
+if(!pLegacy)
+return;
+sal_uInt16 nWhich = pLegacy->GetWhich();
 
 // #i73788#
 // no  for RES_LINKED_GRAPHIC_STREAM_ARRIVED
@@ -731,7 +734,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem* pNew )
  RES_GRF_REREAD_AND_INCACHE != nWhich &&
  RES_LINKED_GRAPHIC_STREAM_ARRIVED != nWhich )
 {
-SwContentFrame::Modify( pOld, pNew );
+SwContentFrame::SwClientNotify(rModify, rHint);
 }
 
 bool bComplete = true;
@@ -762,7 +765,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem* pNew )
 {
 sal_uInt16 n;
 for( n = RES_GRFATR_BEGIN; n < RES_GRFATR_END; ++n )
-if( SfxItemState::SET == static_cast(pOld)->GetChgSet()->
+if( SfxItemState::SET == static_cast(pLegacy->m_pOld)->GetChgSet()->
 GetItemState( n, false ))
 {
 ClearCache();
@@ -841,7 +844,7 @@ void SwNoTextFrame::Modify( const SfxPoolItem* pOld, const 
SfxPoolItem* pNew )
 break;
 
 default:
-if ( !pNew || !isGRFATR(nWhich) )
+if ( !pLegacy->m_pNew || !isGRFATR(nWhich) )
 return;
 }
 
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index d36f359eaba6..9300639ad6d2 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -58,7 +58,7 @@ private:
 
 protected:
 virtual void MakeAll(vcl::RenderContext* pRenderContext) override;
-virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
+virtual void SwClientNotify(const SwModify&, const SfxHint&) override;
 
 public:
 SwNoTextFrame( SwNoTextNode * const, SwFrame* );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit a25acac2a6c7770bb07ced4c29b3b9009ad7ff14
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 12:29:52 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 20:37:19 2020 +0100

Related: tdf#137620 focus-in IMHandler on grab_focus

Change-Id: I9fa980f500cd11b34e349866e62f9f2399279e5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104932
Reviewed-by: Justin Luth 
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index c540105d03f0..1df0240c868d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2567,7 +2567,11 @@ void GtkSalFrame::GrabFocus()
 if (!gtk_widget_get_can_focus(pGrabWidget) && m_nSetFocusSignalId)
 gtk_widget_set_can_focus(pGrabWidget, true);
 if (!gtk_widget_has_focus(pGrabWidget))
+{
 gtk_widget_grab_focus(pGrabWidget);
+if (m_pIMHandler)
+m_pIMHandler->focusChanged(true);
+}
 }
 
 gboolean GtkSalFrame::signalButton(GtkWidget*, GdkEventButton* pEvent, 
gpointer frame)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl sfx2/source vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx  |3 ---
 include/vcl/svapp.hxx   |   11 ---
 sfx2/source/doc/objstor.cxx |4 
 vcl/inc/svdata.hxx  |3 ---
 vcl/source/app/svapp.cxx|5 -
 vcl/source/outdev/font.cxx  |   32 +---
 6 files changed, 1 insertion(+), 57 deletions(-)

New commits:
commit f34c304638258eb1d30a7fab942313199c65cc3f
Author: Caolán McNamara 
AuthorDate: Wed Oct 28 15:16:17 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Oct 28 20:40:45 2020 +0100

tdf#137643 Revert "lock refreshing font data when loading a document"

from tdf#69060, to replace with an alternative solution

This reverts commit 98d71c4e0847797a4ba9229a8e6d832a8a3d5e0f.
and
This reverts commit 64d8e5f8db70f4f913abb902b41f4cff8dd1cdad.

Change-Id: I384e994b54aa1bfc735c6ab591b9b1410058451f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 60664ce3de02..ea8292909a39 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1292,9 +1292,6 @@ public:
 //If bNewFontLists is true then drop and refetch lists of system fonts
 SAL_DLLPRIVATE static void  ImplUpdateAllFontData( bool bNewFontLists );
 
-// Lock font updates for all output devices
-static void LockFontUpdates(bool bLock);
-
 protected:
 SAL_DLLPRIVATE const LogicalFontInstance* GetFontInstance() const;
 SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return 
mnEmphasisAscent; }
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index e5ecc5cb499d..b1d7759765c3 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1307,17 +1307,6 @@ public:
 
 ///@}
 
-/** Lock font updates for all output devices
-
- @remark When performing operations that might involve multiple 
registration of fonts, such as
-opening/closing documents with multiple embedded fonts, then each font 
addition/removal
-might cause an event that initiates a rebuild of each OutputDevice's 
font lists.
-
-Locking font updates disables processing such events, and unlocking 
causes a single such
-processing for all OutputDevices.
-*/
-static void LockFontUpdates(bool bLock);
-
 // For vclbootstrapprotector:
 static void setDeInitHook(Link const & hook);
 
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 2f8a2c5f7779..d5803e1b0029 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -567,10 +567,6 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl(
 bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 {
 ModifyBlocker_Impl aBlock( this );
-struct FontLockGuard {
-FontLockGuard() { Application::LockFontUpdates(true); }
-~FontLockGuard() { Application::LockFontUpdates(false); }
-} aFontLockGuard;
 
 pMedium = pMed;
 pMedium->CanDisposeStorage_Impl( true );
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index b8a7a54f35b7..e7a423234043 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -383,9 +383,6 @@ struct ImplSVData
 VclPtr  mpDefaultWin;   // Default-Window
 boolmbDeInit = false;   // Is VCL 
deinitializing
 std::unique_ptr mpSalSystem; // SalSystem 
interface
-int mnFontUpdatesLockCount = 0; // avoid repeated 
font updates
-boolmbFontUpdatesPending = false;   // need to update 
font data after unlock
-boolmbFontUpdatesNewLists = false;  // generate new 
font lists
 boolmbResLocaleSet = false; // 
SV-Resource-Manager
 std::locale maResLocale;// Resource locale
 ImplSchedulerContextmaSchedCtx; // Data for class 
Scheduler
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 150caea518ee..3ee9413edf7f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1038,11 +1038,6 @@ void Application::RemoveUserEvent( ImplSVEvent * 
nUserEvent )
 }
 }
 
-void Application::LockFontUpdates(bool bLock)
-{
-OutputDevice::LockFontUpdates(bLock);
-}
-
 vcl::Window* Application::GetFocusWindow()
 {
 return ImplGetSVData()->mpWinData->mpFocusWin;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index a5301e3a594a..faaff5682df5 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -543,16 +543,7 @@ void OutputDevice::ImplClearAllFontData(bool bNewFontLists)
 
 void OutputDevice::ImplRefreshAllFontData(bool bNewFontLists)
 {
-auto svdata = ImplGetSVData();
-DBG_TESTSOLARMUTEX();
-if (!svdata->mnFontUpdatesLockCount)
-ImplUpdateFontDataForAllFrames(&OutputDevice::ImplRefreshFontData, 
bNewFontLists);
-else
-{
-  

Re: Crash test update

[Noel Grandin]

fix in progress here
https://gerrit.libreoffice.org/c/core/+/104975
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a6c2ba4746a0ca94b3060be714e424f4be8667bf
Author: Noel Grandin 
AuthorDate: Wed Oct 28 17:54:46 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 28 20:46:11 2020 +0100

std::set->o3tl::sorted_vector in LocaleNode

Change-Id: I633d396bb2cbeaa6829de543fab6ce3726ad11ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104968
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 93c6b461e77f..aeceec1a5d25 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -37,8 +38,8 @@
 // NOTE: MUST match the Locale versionDTD attribute defined in data/locale.dtd
 #define LOCALE_VERSION_DTD "2.0.3"
 
-typedef ::std::set< OUString > NameSet;
-typedef ::std::set< sal_Int16 > ValueSet;
+typedef ::o3tl::sorted_vector< OUString > NameSet;
+typedef ::o3tl::sorted_vector< sal_Int16 > ValueSet;
 
 namespace cssi = ::com::sun::star::i18n;
 
@@ -827,7 +828,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 if (bShowNextFreeFormatIndex)
 {
 sal_Int16 nNext = i18npool::nFirstFreeFormatIndex;
-std::set::const_iterator it( aFormatIndexSet.find( nNext));
+auto it = aFormatIndexSet.find( nNext);
 if (it != aFormatIndexSet.end())
 {
 // nFirstFreeFormatIndex already used, find next free including 
gaps.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna (via logerrit)]

 sw/inc/undobj.hxx   |1 +
 sw/source/core/undo/undobj.cxx  |5 +
 sw/source/core/undo/undobj1.cxx |1 +
 3 files changed, 7 insertions(+)

New commits:
commit e8bd718d0aa4c96a8709c8c8df97d577c9e1add2
Author: Miklos Vajna 
AuthorDate: Wed Oct 28 17:48:06 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Oct 28 21:07:35 2020 +0100

sw: add an xml dumper for SwUndoSaveSection

With this, if I have an sw image in a draw+fly format combo and cut
these, then all the 3 formats are visible in the undo xml dump.

Change-Id: I2abc54ca8d4fb3b00b8da60bcb9dea5e07d20d4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104970
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index d89ff20a0b57..4eae5cddaf3f 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -219,6 +219,7 @@ public:
 
 const SwHistory* GetHistory() const { return m_pHistory.get(); }
   SwHistory* GetHistory()   { return m_pHistory.get(); }
+virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 // This class saves the PaM as sal_uInt16's and is able to restore it
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 0ef36bd5f6e7..dcc49e905bf9 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1308,6 +1308,11 @@ void SwUndoSaveSection::RestoreSection(
 }
 }
 
+void SwUndoSaveSection::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+SwUndoSaveContent::dumpAsXml(pWriter);
+}
+
 // save and set the RedlineData
 SwRedlineSaveData::SwRedlineSaveData(
 SwComparePosition eCmpPos,
diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx
index 051161319a8c..7e9233759240 100644
--- a/sw/source/core/undo/undobj1.cxx
+++ b/sw/source/core/undo/undobj1.cxx
@@ -76,6 +76,7 @@ void SwUndoFlyBase::dumpAsXml(xmlTextWriterPtr pWriter) const
 
BAD_CAST(OString::boolean(m_bDelFormat).getStr()));
 
 SwUndo::dumpAsXml(pWriter);
+SwUndoSaveSection::dumpAsXml(pWriter);
 
 if (m_pFrameFormat)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits