[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 3 commits - sw/CppunitTest_sw_uibase_shells.mk sw/inc sw/qa sw/sdi sw/source

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_uibase_shells.mk  |1 
 sw/inc/cmdid.h  |1 
 sw/inc/txtrfmrk.hxx |2 +
 sw/qa/uibase/shells/textsh.cxx  |   64 
 sw/sdi/_textsh.sdi  |6 +++
 sw/sdi/swriter.sdi  |   14 +++
 sw/source/core/crsr/bookmark.cxx|   21 +++
 sw/source/core/doc/docbm.cxx|   18 ++
 sw/source/core/inc/bookmark.hxx |1 
 sw/source/core/txtnode/atrref.cxx   |   26 ++
 sw/source/uibase/shells/textsh1.cxx |   50 
 11 files changed, 204 insertions(+)

New commits:
commit dee8500395dd1b8814f8c8835092125e06eb37f6
Author: Miklos Vajna 
AuthorDate: Fri Jan 20 09:50:11 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 9 09:14:59 2023 +0100

sw: add a new .uno:DeleteSections UNO command

This is similiar to commit 1d6593dd799ff4eb931ffbb5338e4856fb87f77f (sw:
add a new .uno:DeleteFields UNO command, 2023-01-16), but that deleted
refmarks (used for e.g. Zotero citations), while this deletes sections
(used for e.g. Zotero bibliography).

Implement the section "unlinking" (delete the section, but not its data)
by deleting the section format: that will remove the matching section
node as well, but not the content nodes.

(cherry picked from commit a5a1ea2f7d784c5c6c33f332ba61aceb7af3eca4)

Change-Id: Ib00a8f592ddbb77c5e8e08ff94bb0eebfcf7cea8

diff --git a/sw/CppunitTest_sw_uibase_shells.mk 
b/sw/CppunitTest_sw_uibase_shells.mk
index 932769a421e6..2affe0205e7d 100644
--- a/sw/CppunitTest_sw_uibase_shells.mk
+++ b/sw/CppunitTest_sw_uibase_shells.mk
@@ -15,6 +15,7 @@ $(eval $(call 
gb_CppunitTest_use_common_precompiled_header,sw_uibase_shells))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_shells, \
 sw/qa/uibase/shells/textfld \
+sw/qa/uibase/shells/textsh \
 sw/qa/uibase/shells/shells \
 ))
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index c44745a0e861..634290ebd8c5 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -329,6 +329,7 @@ class SwUINumRuleItem;
 #define FN_UPDATE_FIELD (FN_INSERT2 + 38)
 #define FN_DELETE_BOOKMARKS (FN_INSERT2 + 39)
 #define FN_DELETE_FIELDS (FN_INSERT2 + 40)
+#define FN_DELETE_SECTIONS (FN_INSERT2 + 41)
 
 // Region: Format
 #define FN_AUTOFORMAT_APPLY (FN_FORMAT + 1 ) /* apply autoformat options */
diff --git a/sw/qa/uibase/shells/textsh.cxx b/sw/qa/uibase/shells/textsh.cxx
new file mode 100644
index ..a97fc8bd7f5f
--- /dev/null
+++ b/sw/qa/uibase/shells/textsh.cxx
@@ -0,0 +1,64 @@
+/* -*- 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/.
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+namespace
+{
+/// Covers sw/source/uibase/shells/textsh.cxx fixes.
+class Test : public SwModelTestBase
+{
+public:
+Test()
+: SwModelTestBase("/sw/qa/uibase/shells/data/")
+{
+}
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testDeleteSections)
+{
+// Given a document with a section:
+createSwDoc();
+SwDoc* pDoc = getSwDoc();
+uno::Sequence aArgs = {
+comphelper::makePropertyValue("RegionName",
+  uno::Any(OUString("ZOTERO_BIBL {} 
CSL_BIBLIOGRAPHY RND"))),
+comphelper::makePropertyValue("Content", uno::Any(OUString("old 
content"))),
+};
+dispatchCommand(mxComponent, ".uno:InsertSection", aArgs);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pDoc->GetSections().size());
+
+// When deleting sections:
+std::vector aArgsVec = 
comphelper::JsonToPropertyValues(R"json(
+{
+"SectionNamePrefix": {
+"type": "string",
+"value": "ZOTERO_BIBL"
+}
+}
+)json");
+aArgs = comphelper::containerToSequence(aArgsVec);
+dispatchCommand(mxComponent, ".uno:DeleteSections", aArgs);
+
+// Then make sure that the section is deleted:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual  : 1
+// i.e. the section was not deleted.
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pDoc->GetSections().size());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 88c77215fc40..38cb24682d33 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1843,6 +1843,12 @@ interface BaseText
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+FN_DELETE_SECTIONS
+[
+ExecMethod = Execute ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 FN_DELETE_FIELDS
 [
 ExecMethod = Execute ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/itrform2.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 25a16e7543965565a4227506003adc916deea500
Author: Miklos Vajna 
AuthorDate: Thu Feb 9 08:22:16 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 9 08:18:32 2023 +

sw floattable: fix cid#1520804

GetFrameRstHeight() already assumes the m_pFrame is non-nullptr, so no
need to check for this.

The logic in the block will be necessary elsewhere as well, I'll extract
that to a function in a follow-up change, so let's just do a minimal fix
here.

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

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e65468d62d4c..03ce7666c911 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1933,7 +1933,6 @@ TextFrameIndex SwTextFormatter::FormatLine(TextFrameIndex 
const nStartPos)
 m_pCurr->Height( GetFrameRstHeight() + 1, false );
 m_pCurr->SetRealHeight( GetFrameRstHeight() + 1 );
 
-if (m_pFrame)
 {
 // Don't oversize the line in case of split flys, so we don't 
try to move the anchor
 // of a precede fly forward, next to its follow.

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

[Miklos Vajna (via logerrit)]

 sw/source/core/attr/formatflysplit.cxx |   12 
 sw/source/core/inc/txtfrm.hxx  |8 ++--
 sw/source/core/text/frmform.cxx|   20 ++--
 sw/source/core/text/frmpaint.cxx   |3 ++-
 sw/source/core/text/itratr.cxx |   17 +++--
 sw/source/core/text/itrform2.cxx   |   11 +--
 sw/source/core/text/porrst.cxx |4 +++-
 7 files changed, 53 insertions(+), 22 deletions(-)

New commits:
commit 00b9b4791079c2dc26b1ed4c123450cabf7d
Author: Miklos Vajna 
AuthorDate: Thu Feb 9 08:26:21 2023 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 9 08:25:07 2023 +

sw: call FormatEmpty() in SwTextFrame::Format() for split fly masters

The problem was that the text in the anchor frame of a split fly frame
was duplicated on the old page and the new page as well. The reason for
this seems to be that the master has no content and the follow has all
the content (this is wanted), but then there is no code to explicitly
clear the master.

In other cases the master always gets some new content where portion
building for that new content starts by throwing away the old portions.

Once SwTextFrame::Format() and SwTextFrame::FormatEmpty() explicitly
checks for these master anchors, the unwanted text in the master anchor
disappears.

An extra tweak is needed in SwTextFrame::PaintEmpty() to even hide the
paragraph marker: this frame is empty but has a follow frame, so we
should not show a paragraph marker there.

Finally introduce a SwTextFrame::HasNonLastSplitFlyDrawObj() to be able
to check for this "empty master anchor for split fly" case at a single
place.

With this 
from  gets
laid out reasonably: the position is not perfect but we detect that only
1 para of the text frame fits page 1, we create a 2nd page and we
correctly move exactly the text frame's 2nd para to page 2.

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

diff --git a/sw/source/core/attr/formatflysplit.cxx 
b/sw/source/core/attr/formatflysplit.cxx
index bcbfcc2d5e96..904fd9a8bb5c 100644
--- a/sw/source/core/attr/formatflysplit.cxx
+++ b/sw/source/core/attr/formatflysplit.cxx
@@ -24,6 +24,18 @@
 SwFormatFlySplit::SwFormatFlySplit(bool bSplit)
 : SfxBoolItem(RES_FLY_SPLIT, bSplit)
 {
+// Once this pool item is true, a floating table (text frame + table 
inside it) is meant to
+// split across multiple pages.
+//
+// The layout representation is the following:
+//
+// - We assume that the anchor type is at-para for such fly frames, and 
SwFlyAtContentFrame
+// derives from SwFlowFrame to be able to split in general.
+//
+// - Both the master fly and the follow flys need an anchor. At the same 
time, we want all text
+// of the anchor frame to be wrapped around the last follow fly frame, for 
Word compatibility.
+// These are solved by splitting the anchor frame as many times as needed, 
always at text
+// TextFrameIndex 0.
 if (getenv("SW_FORCE_FLY_SPLIT"))
 {
 SetValue(true);
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index cb22ebc439f8..942867882626 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -332,6 +332,9 @@ class SW_DLLPUBLIC SwTextFrame final : public SwContentFrame
 
 virtual void SwClientNotify(SwModify const& rModify, SfxHint const& rHint) 
override;
 
+/// Like GetDrawObjs(), but limit to fly frames which are allowed to split.
+std::vector GetSplitFlyDrawObjs() const;
+
 public:
 
 virtual const SvxFormatBreakItem& GetBreakItem() const override;
@@ -784,8 +787,9 @@ public:
 OUString GetCurWord(SwPosition const&) const;
 sal_uInt16 GetScalingOfSelectedText(TextFrameIndex nStt, TextFrameIndex 
nEnd);
 
-/// Like GetDrawObjs(), but limit to fly frames which are allowed to split.
-std::vector GetSplitFlyDrawObjs();
+/// This text frame may have a split fly frames anchored to it. Is any of 
them a frame that has
+/// a follow, i.e. not the last in a master -> follow 1 -> ... -> last 
follow chain?
+bool HasNonLastSplitFlyDrawObj() const;
 
 virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override;
 };
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index f36d27e68ac5..329f9d784ed1 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -581,14 +581,11 @@ void SwTextFrame::AdjustFollow_( SwTextFormatter &rLine,
 if (GetFollow()->IsDeleteForbidden())
 return;
 
-for (const auto& pFlyFrame : GetSplitFlyDraw

Re: LO Viewer for Android: failures in make install

[Michael Weghorn]

Hi Terry,

On 08/02/2023 20.05, Terrence Enger wrote:

I am trying to follow the instructions at
"Development/BuildingForAndroid"
;.
The step `make install` failed with messages (lines rewrapped).

 * Where:

 Build file
 '/home/terry/lo_hacking/git/android/android/source/build.gradle'
 line: 3

 * What went wrong:
 A problem occurred evaluating root project 'source'.
 Could not read script
 '/home/terry/lo_hacking/git/android/android/source/liboSettings.gradle'
 as it does not exist.

and

 Task failed with an exception.
 ---
 * What went wrong:
 A problem occurred configuring root project 'source'.
 compileSdkVersion is not specified. Please add it to build.gradle

Christian Lohmaier has written

that a toplevel make will create the file.  I had just done a toplevel
make, but after another one, 'make install` failed similarly.

In build.gradle, line 3 is

 apply from: 'liboSettings.gradle'


The mentioned 'liboSettings.gradle' should actually be generated during 
the top-level make, so that sounds like that one isn't doing what it 
should in your case.



I am building on debian-sid, and my autogen.input, minus comments, is

 --enable-option-checking=fatal
 --with-vendor=Terrence Enger
 --with-external-tar=/home/terry/lo_hacking/git/src
 --build=x86_64-pc-linux-gnu
 --host=i686-linux-android
 --with-android-sdk=/home/terry/Android/Sdk
 --with-android-ndk=/home/terry/Android/Sdk/ndk/25.2.9519653
 --with-android-api-level=21
 --enable-dbgutil
 --with-theme=colibre
 --disable-zxing

and I have set envvar ANDROID_HOME=/home/terry/Android/Sdk


This is using NDK 25.2.9519653. From what commit are your trying to 
build? Does the top-level make succeed for you?


In my experience, building with NDK 25 required changes, s. 
https://gerrit.libreoffice.org/c/core/+/146135 (and change further down 
in the relation chain).


If you haven't applied these changes yet, I'd suggest to either do that 
or build with an older NDK until these changes have been merged to 
master (currently waiting for the new NDK to become availabe on Jenkins 
builders).


FYI, my autogen.input on Debian testing for master as of commit 
b2bd60b8c1937502857e12b0eea42323fd2353c8 currently looks like this:


--build=x86_64-unknown-linux-gnu
--with-android-ndk=/home/michi/Android/Sdk/ndk/20.0.5594570/
--with-android-sdk=/home/michi/Android/Sdk
--with-distro=LibreOfficeAndroidX86
--enable-sal-log
--with-external-tar=/home/michi/development/libreoffice-external
--enable-ccache
--enable-dbgutil
--with-jdk-home=/usr/lib/jvm/java-17-openjdk-amd64/

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

[Caolán McNamara (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9850aed84b8aa0a47eb89c7b547f1b90420db9a3
Author: Caolán McNamara 
AuthorDate: Wed Feb 8 20:27:09 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 9 08:57:45 2023 +

cid#1401328 suppress Uncaught exception

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 32870f0a236a..d048d600f496 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -84,6 +84,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -451,7 +452,7 @@ DomainMapper_Impl::~DomainMapper_Impl()
 if (m_bIsNewDoc)
 {
 RemoveLastParagraph();
-GetStyleSheetTable()->ApplyClonedTOCStyles();
+
suppress_fun_call_w_exception(GetStyleSheetTable()->ApplyClonedTOCStyles());
 }
 if (hasTableManager())
 {

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/optviewpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f121b890f8f70fe2a0e633d3b4ad59c27ebba9b3
Author: Caolán McNamara 
AuthorDate: Wed Feb 8 19:42:14 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 9 08:58:39 2023 +

tdf#153229 add an extended tip for this new widget

and fix mnemonic target

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

diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index c0ea6b0f2bef..92fa9be49851 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -506,7 +506,7 @@
 
 
   
-Specifies the icon style 
for icons in toolbars and dialogs.
+Specifies whether to 
follow the system appearance mode or override Dark or Light.
   
 
   
@@ -521,7 +521,7 @@
 False
 Mode:
 True
-iconstyle
+appearance
 0
   
   

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

[Justin Luth (via logerrit)]

 dev/null  |binary
 sw/qa/extras/ww8export/ww8export4.cxx |   11 ---
 sw/source/filter/ww8/ww8par.cxx   |1 -
 3 files changed, 12 deletions(-)

New commits:
commit d34ffd5bbc6ecf1e98a834c31af6d87653213dda
Author: Justin Luth 
AuthorDate: Wed Feb 8 11:55:42 2023 -0500
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 09:09:41 2023 +

Revert "tdf#148360 doc import: add NO_NUMBERING_SHOW_FOLLOWBY(true)"

This reverts commit 2405a36f3bcd43f80371ccaed47f7523ff0d8757
which was backported to 7.4.1.

This solves the regression report for DOC in tdf#153042.

The problem is that the tab-without-numbering is displaying in
cases where it shouldn't (i.e. when the tabstop position matches
the first line indent).

Although the patch itself is fine (DOC should do the same thing as DOCX)
the feature is incomplete, even for DOCX/RTF. So just remove DOC
from this mix - especially since there seem to be a LOT more instances
of DOC files that need the incomplete aspect.

Once it is proven to work OK for DOCX, we can add DOC back in.

Change-Id: I3c550fc2ca29cf1490ec0a5e3979a6acbd102385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146670
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
(cherry picked from commit 7b3e0639962bab6e757381ad2b3e4868c61ed3b7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146625
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ww8export/data/tdf148360.doc 
b/sw/qa/extras/ww8export/data/tdf148360.doc
deleted file mode 100644
index 3969a560999f..
Binary files a/sw/qa/extras/ww8export/data/tdf148360.doc and /dev/null differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx 
b/sw/qa/extras/ww8export/ww8export4.cxx
index f409c8e8dfa8..69596ded0303 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -32,17 +32,6 @@ public:
 }
 };
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf148360)
-{
-loadAndReload("tdf148360.doc");
-const auto& pLayout = parseLayoutDump();
-
-// Ensure first element is a tab
-assertXPath(pLayout, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[1]", "type", 
"PortionType::TabLeft");
-// and only then goes content
-assertXPath(pLayout, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[2]", "type", 
"PortionType::Text");
-}
-
 CPPUNIT_TEST_FIXTURE(Test, testTdf77964)
 {
 loadAndReload("tdf77964.doc");
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 448057636fab..48ad05bc1681 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1890,7 +1890,6 @@ void SwWW8ImplReader::ImportDop()
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::SURROUND_TEXT_WRAP_SMALL,
 true);
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROP_LINE_SPACING_SHRINKS_FIRST_LINE,
 true);
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::CONTINUOUS_ENDNOTES, 
true);
-
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::NO_NUMBERING_SHOW_FOLLOWBY,
 true);
 // rely on default for HYPHENATE_URLS=false
 
 // COMPATIBILITY FLAGS END

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 5 commits - desktop/source sw/inc sw/qa sw/source

[Aron Budea (via logerrit)]

 desktop/source/lib/init.cxx |2 
 sw/inc/IDocumentMarkAccess.hxx  |7 
 sw/inc/crsrsh.hxx   |6 
 sw/inc/textcontentcontrol.hxx   |1 
 sw/qa/extras/uiwriter/data/tdf151548_tabNavigation.docm |binary
 sw/qa/extras/uiwriter/uiwriter4.cxx |   42 +
 sw/source/core/crsr/bookmark.cxx|4 
 sw/source/core/crsr/crbm.cxx|8 -
 sw/source/core/crsr/crstrvl.cxx |  126 
 sw/source/core/doc/docbm.cxx|   29 ++-
 sw/source/core/docnode/nodes.cxx|   21 ++
 sw/source/core/inc/MarkManager.hxx  |5 
 sw/source/core/txtnode/atrref.cxx   |3 
 sw/source/core/txtnode/attrcontentcontrol.cxx   |6 
 sw/source/ui/vba/vbaformfield.cxx   |   10 -
 sw/source/uibase/docvw/edtwin.cxx   |   37 +++-
 sw/source/uibase/wrtsh/wrtsh1.cxx   |4 
 17 files changed, 275 insertions(+), 36 deletions(-)

New commits:
commit 0799de843c8fa27569f88be1cf60ad6e7a9577cf
Author: Aron Budea 
AuthorDate: Sat Dec 17 13:16:21 2022 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 9 10:27:20 2023 +0100

LanguageTool: don't crash if REST protocol isn't set

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9e36d464b75f..aab552b1c192 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7188,7 +7188,7 @@ void setLanguageToolConfig()
 if (aEnabled != "true")
 return;
 OUString aBaseUrl = OStringToOUString(pBaseUrlString, 
RTL_TEXTENCODING_UTF8);
-OUString aRestProtocol = OStringToOUString(pRestProtocol, 
RTL_TEXTENCODING_UTF8);
+OUString aRestProtocol = pRestProtocol ? 
OStringToOUString(pRestProtocol, RTL_TEXTENCODING_UTF8) : "";
 try
 {
 SvxLanguageToolOptions& rLanguageOpts = 
SvxLanguageToolOptions::Get();
commit 0a57e6c25d6bcf6e93ab2da03a0bf560ac7fb560
Author: Justin Luth 
AuthorDate: Thu Jan 26 14:50:19 2023 -0500
Commit: Andras Timar 
CommitDate: Thu Feb 9 10:26:33 2023 +0100

tdf#151548 sw content controls: keyboard navigation with tab key

Combine content controls with legacy formfield controls
in keyboard tab navigation.

MS Word (I tested 2010) is extremely irrational and inconsistent
in its behaviour, so I modeled my implementation on the specification
and general logic, and not at all on "compatible misbehaviour".

There is a third category of form control (activeX rich content),
but these are mapped to internal LO controls that are only exposed
at VCL level, and don't pass the keystrokes back to SW.
Plus, they are not inline, but fly controls.

However, it is still a TODO to handle these if reasonably possible.

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

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 3dc7baf696ab..42e7ba71b7d1 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -325,6 +325,9 @@ class IDocumentMarkAccess
 */
 virtual const_iterator_t getFieldmarksEnd() const =0;
 
+/// returns the number of IFieldmarks.
+virtual sal_Int32 getFieldmarksCount() const = 0;
+
 /// get Fieldmark for CH_TXT_ATR_FIELDSTART/CH_TXT_ATR_FIELDEND at rPos
 virtual ::sw::mark::IFieldmark* getFieldmarkAt(const SwPosition& rPos) 
const =0;
 virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& pos) 
const =0;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 31cad2cd6e71..e4d00fd4a6bb 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -717,6 +717,8 @@ public:
 
 bool GotoFormatContentControl(const SwFormatContentControl& 
rContentControl);
 
+void GotoFormControl(bool bNext);
+
 static SwTextField* GetTextFieldAtPos(
 const SwPosition* pPos,
 ::sw::GetTextAttrMode eMode);
diff --git a/sw/inc/textcontentcontrol.hxx b/sw/inc/textcontentcontrol.hxx
index 3fb7ea124b99..b3926bd25ce9 100644
--- a/sw/inc/textcontentcontrol.hxx
+++ b/sw/inc/textcontentcontrol.hxx
@@ -64,6 +64,7 @@ public:
 size_t GetCount() const { return m_aContentControls.size(); }
 bool IsEmpty() const { return m_aContentControls.empty(); }
 SwTextContentControl* Get(size_t nIndex);
+SwTextContentControl* UnsortedGet(size_t nIndex);
 void dump

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 2 commits - sc/source solenv/bin

[Tor Lillqvist (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   17 ++---
 solenv/bin/ooinstall   |5 -
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit 90608ef9d3644cb9795f977fedbe74e442a652c9
Author: Tor Lillqvist 
AuthorDate: Wed Nov 22 21:05:48 2017 +0200
Commit: Andras Timar 
CommitDate: Thu Feb 9 11:07:15 2023 +0100

Use the same solenv/bin/ooinstall as in the cp-5.3 branch

Specifically, pass the correct product name and not a hardcoded
"LibreOffice" for the make_installer.pl script's -p option.

As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
name as "CollaboraOffice" so we could as well do that also in
ooinstall.

(cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)

Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 12d1b08aac8cc8c3176040efc7290377e380f0c4)
Reviewed-on: https://gerrit.libreoffice.org/79128
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit 0069417b55c99166aec5489ccef803eba25d2b4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136842
Tested-by: Jenkins CollaboraOffice 

diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index efb1f28de824..71f10c739036 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -88,11 +88,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d 
"$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 "perl " .
 (scalar keys(%DB::sub) ? "-d " : "") .
 "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$PRODUCTNAME_no_spaces " .
 "-u $tmp_dir " .
 "-buildid $BUILD $destdir $strip $msi " .
 "-simple $path") && die "Failed to install: $!";
commit 4a9728089606787c87f5c3dbf14c2ce57711fad6
Author: Dennis Francis 
AuthorDate: Fri May 6 10:56:38 2022 +0530
Commit: Andras Timar 
CommitDate: Thu Feb 9 11:05:10 2023 +0100

lok: do not recreate lok-drawview for every tile paint

This lets the ScLOKDrawView live long enough for non-tile painting
related invocation of its methods and hopefully those of its member objects.

This is a blind fix for the following crash:

/opt/collaboraoffice/program/../program/libsclo.so
(anonymous 
namespace)::ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact(basegfx::B2DVector&,
 sdr::contact::ViewObjectContact const&) const
...
/opt/collaboraoffice/program/libmergedlo.so

SdrTextObj::NbcSetOutlinerParaObjectForText(std::unique_ptr >, SdrText*)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/svdraw/svdotext.cxx:1379
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::TextProperties::ItemSetChanged(SfxItemSet const&)

/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:360
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::RectangleProperties::ItemSetChanged(SfxItemSet 
const&)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/sdr/properties/rectangleproperties.cxx:54
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::DefaultProperties::SetObjectItem(SfxPoolItem 
const&)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/sdr/properties/defaultproperties.cxx:120
/opt/collaboraoffice/program/libscfiltlo.so
XclTxo::XclTxo(XclExpRoot const&, EditTextObject const&, SdrObject*)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/include/svl/cenumitm.hxx:26
/opt/collaboraoffice/program/libscfiltlo.so
XclObjComment::XclObjComment(XclExpObjectManager&, tools::Rectangle 
const&, EditTextObject const&, SdrCaptionObj*, bool, ScAddress const&, 
tools::Rectangle const&, tools::Rectangle const&)

/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:179
/opt/collaboraoffice/program/libscfiltlo.so
XclExpNote::XclExpNote(XclExpRoot const&, ScAddress const&, 
ScPostIt const*, rtl::OUString const&)
/opt/rh/devtoolset-10/root/usr/include/c++/10/tuple:137
/opt/collaboraoffice/program/libscfiltlo.so
ExcTable::FillAsTableXml()

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/include/rtl/ref.hxx:65
/opt/collaboraoffice/program/

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - 19 commits - basctl/source comphelper/source hwpfilter/source include/comphelper lingucomponent/source offapi/com sc/source sd/uico

[Justin Luth (via logerrit)]

 basctl/source/basicide/macrodlg.cxx |   35 ++-
 comphelper/source/misc/configuration.cxx|  105 ++
 dev/null|binary
 hwpfilter/source/hbox.cxx   |   15 -
 include/comphelper/configuration.hxx|   22 --
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |   14 +
 offapi/com/sun/star/text/IllustrationsIndex.idl |6 
 offapi/com/sun/star/text/ObjectIndex.idl|6 
 offapi/com/sun/star/text/TableIndex.idl |6 
 sc/source/ui/app/inputwin.cxx   |   27 +-
 sc/source/ui/inc/inputwin.hxx   |2 
 sd/uiconfig/simpress/ui/pmsummarypage.ui|1 
 svx/uiconfig/ui/dockingcolorreplace.ui  |   11 -
 sw/inc/unomap.hxx   |1 
 sw/inc/unoprnms.hxx |1 
 sw/qa/extras/odfexport/odfexport.cxx|4 
 sw/qa/extras/ooxmlexport/data/chart.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx  |8 
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx  |   13 +
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx   |   13 +
 sw/qa/extras/ww8export/ww8export4.cxx   |   11 -
 sw/source/core/edit/autofmt.cxx |5 
 sw/source/core/unocore/unoidx.cxx   |   41 
 sw/source/core/unocore/unomap.cxx   |3 
 sw/source/core/unocore/unosrch.cxx  |   10 
 sw/source/filter/html/parcss1.cxx   |   33 ++-
 sw/source/filter/ww8/docxattributeoutput.cxx|   54 +++--
 sw/source/filter/ww8/ww8atr.cxx |   10 
 sw/source/filter/ww8/ww8par.cxx |1 
 vcl/skia/skia_denylist_vulkan.xml   |3 
 vcl/source/control/button.cxx   |2 
 vcl/source/font/fontmetric.cxx  |2 
 vcl/source/window/decoview.cxx  |   18 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   79 +++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx   |2 
 writerfilter/source/dmapper/GraphicImport.cxx   |1 
 writerfilter/source/dmapper/StyleSheetTable.cxx |  121 +---
 writerfilter/source/dmapper/StyleSheetTable.hxx |5 
 38 files changed, 469 insertions(+), 222 deletions(-)

New commits:
commit adb2f691d4352df13751963171fcbd5750440b88
Author: Justin Luth 
AuthorDate: Wed Feb 8 11:55:42 2023 -0500
Commit: Andras Timar 
CommitDate: Thu Feb 9 11:22:24 2023 +0100

Revert "tdf#148360 doc import: add NO_NUMBERING_SHOW_FOLLOWBY(true)"

This reverts commit 2405a36f3bcd43f80371ccaed47f7523ff0d8757
which was backported to 7.4.1.

This solves the regression report for DOC in tdf#153042.

The problem is that the tab-without-numbering is displaying in
cases where it shouldn't (i.e. when the tabstop position matches
the first line indent).

Although the patch itself is fine (DOC should do the same thing as DOCX)
the feature is incomplete, even for DOCX/RTF. So just remove DOC
from this mix - especially since there seem to be a LOT more instances
of DOC files that need the incomplete aspect.

Once it is proven to work OK for DOCX, we can add DOC back in.

Change-Id: I3c550fc2ca29cf1490ec0a5e3979a6acbd102385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146670
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
(cherry picked from commit 7b3e0639962bab6e757381ad2b3e4868c61ed3b7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146625
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ww8export/data/tdf148360.doc 
b/sw/qa/extras/ww8export/data/tdf148360.doc
deleted file mode 100644
index 3969a560999f..
Binary files a/sw/qa/extras/ww8export/data/tdf148360.doc and /dev/null differ
diff --git a/sw/qa/extras/ww8export/ww8export4.cxx 
b/sw/qa/extras/ww8export/ww8export4.cxx
index 1910178d0ac8..5ee7253ffd5e 100644
--- a/sw/qa/extras/ww8export/ww8export4.cxx
+++ b/sw/qa/extras/ww8export/ww8export4.cxx
@@ -33,17 +33,6 @@ public:
 }
 };
 
-CPPUNIT_TEST_FIXTURE(Test, testTdf148360)
-{
-loadAndReload("tdf148360.doc");
-const auto& pLayout = parseLayoutDump();
-
-// Ensure first element is a tab
-assertXPath(pLayout, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[1]", "type", 
"PortionType::TabLeft");
-// and only then goes content
-assertXPath(pLayout, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/child::*[2]", "type", 

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

[Michael Weghorn (via logerrit)]

 android/source/build.gradle |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4aa73a298f4849e222aa3c6111d8b5c57e417e4b
Author: Michael Weghorn 
AuthorDate: Thu Feb 9 10:47:08 2023 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 9 10:50:15 2023 +

android: Update Android Gradle Plugin to 7.4.1

Change-Id: I2a709e27d3ba42f0d1c2ae9510d2cbf1f38c484d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146682
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 113b62b4b09c..3f97fca4497e 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 google()
 }
 dependencies {
-classpath 'com.android.tools.build:gradle:7.4.0'
+classpath 'com.android.tools.build:gradle:7.4.1'
 }
 }
 

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

[Noel Grandin (via logerrit)]

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

New commits:
commit 6d289be1f5ef530eaa1fc32e1fd2518ab177eeeb
Author: Noel Grandin 
AuthorDate: Fri Jan 27 08:50:04 2023 +0200
Commit: Michael Stahl 
CommitDate: Thu Feb 9 10:57:27 2023 +

fix online crash in WIndow::IsTracking

/opt/collaboraoffice/program/libmergedlo.so
  vcl::Window::IsTracking() const
  
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/vcl/source/window/window2.cxx:340
/opt/collaboraoffice/program/libmergedlo.so
  (anonymous namespace)::LOKPostAsyncEvent(void*, void*)
  
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/sfx2/source/view/lokhelper.cxx:812
/opt/collaboraoffice/program/libmergedlo.so
  LokChartHelper::postMouseEvent(int, int, int, int, int, int, double, 
double)
  
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/include/rtl/ref.hxx:128

Change-Id: I204bac7d8f595054abe9b6e8e631c02b26e20361
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146231
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Noel Grandin 
(cherry picked from commit d037ad98ca75ae857a566b62e2e86a1a5e7c3590)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146631
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 978dc0b6ecf8..87db8e470e21 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -339,6 +339,8 @@ void Window::EndTracking( TrackingEventFlags nFlags )
 
 bool Window::IsTracking() const
 {
+if (!mpWindowImpl)
+return false;
 return (mpWindowImpl->mbUseFrameData ?
 mpWindowImpl->mpFrameData->mpTrackWin == this :
 ImplGetSVData()->mpWinData->mpTrackWin == this);

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

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/ftnfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 59d37768321e2975efa2c8be5513d178de899eba
Author: Caolán McNamara 
AuthorDate: Mon Feb 6 21:04:23 2023 +
Commit: Michael Stahl 
CommitDate: Thu Feb 9 10:59:17 2023 +

Related: tdf#153319 don't destroy frame with IsDeleteForbidden set

not sufficient on its own to fix this crash.

Change-Id: Ibd8b68d7e007d8a22770b3d73f0d17a1869cf279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit df2ad816288a4729c9cea8d14b7d590ac271d18b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146627
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index db4c4f9213d9..652436eb4548 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2420,7 +2420,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const 
SwTwips nDeadLine, const boo
 if ( !bLock && bUnlockLastFootnoteFrame &&
  !pLastFootnoteFrame->GetLower() &&
  !pLastFootnoteFrame->IsColLocked() &&
- !pLastFootnoteFrame->IsBackMoveLocked() )
+ !pLastFootnoteFrame->IsBackMoveLocked() &&
+ !pLastFootnoteFrame->IsDeleteForbidden() )
 {
 pLastFootnoteFrame->Cut();
 SwFrame::DestroyFrame(pLastFootnoteFrame);

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

[Caolán McNamara (via logerrit)]

 sw/source/core/layout/ftnfrm.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 51512d7bce52002ca29c0e6c5264ac34166ede85
Author: Caolán McNamara 
AuthorDate: Mon Feb 6 21:04:23 2023 +
Commit: Michael Stahl 
CommitDate: Thu Feb 9 10:59:11 2023 +

Related: tdf#153319 don't destroy frame with IsDeleteForbidden set

not sufficient on its own to fix this crash.

Change-Id: Ibd8b68d7e007d8a22770b3d73f0d17a1869cf279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit df2ad816288a4729c9cea8d14b7d590ac271d18b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146626
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 9cc83c1bfc18..6fb88185a6f2 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -2420,7 +2420,8 @@ void SwFootnoteBossFrame::RearrangeFootnotes( const 
SwTwips nDeadLine, const boo
 if ( !bLock && bUnlockLastFootnoteFrame &&
  !pLastFootnoteFrame->GetLower() &&
  !pLastFootnoteFrame->IsColLocked() &&
- !pLastFootnoteFrame->IsBackMoveLocked() )
+ !pLastFootnoteFrame->IsBackMoveLocked() &&
+ !pLastFootnoteFrame->IsDeleteForbidden() )
 {
 pLastFootnoteFrame->Cut();
 SwFrame::DestroyFrame(pLastFootnoteFrame);

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - external/python3

[Andras Timar (via logerrit)]

 external/python3/ExternalPackage_python3.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 72ac7b4f3508a2275f896ab5da046d2464d615d4
Author: Andras Timar 
AuthorDate: Tue May 31 07:37:20 2022 +
Commit: Andras Timar 
CommitDate: Thu Feb 9 12:17:54 2023 +0100

fix internal python build on powerpc64le-unknown-linux-gnu

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

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 9987ab138792..e84b5394a277 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -143,6 +143,11 @@ endif
 endif
 
 # that one is generated...
+ifeq ($(HOST_PLATFORM),powerpc64le-unknown-linux-gnu)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+LO_lib/_sysconfigdata_$(if 
$(ENABLE_DBGUTIL),d)_linux_powerpc64le-linux-gnu.py \
+))
+else
 # note: python configure overrides config.guess with something that doesn't
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
@@ -156,6 +161,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 ))
 endif
 endif
+endif
 
 
 # packages not shipped:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 6934bc29419283bc8e38a971733e5750468c807a
Author: Christian Lohmaier 
AuthorDate: Thu Feb 9 12:37:52 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 9 11:37:52 2023 +

Update git submodules

* Update translations from branch 'libreoffice-7-5'
  to 0ff4697f8c21bd0861758caa4ae509e58967fe1a
  - update translations for 7.5.1 rc1/master

and force-fix errors using pocheck

Change-Id: Ic13a9cd6a7a1e31a54af71cca958781b6b663f86
(cherry picked from commit 579a868ba956eb78425da0c2510df67a12654c7e)

diff --git a/translations b/translations
index 63328f442472..0ff4697f8c21 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 63328f44247211dd07daf4c61a83a7addb934bd7
+Subproject commit 0ff4697f8c21bd0861758caa4ae509e58967fe1a

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 8c3a48700d02f3977e855062358bd04f2ffbecf7
Author: Christian Lohmaier 
AuthorDate: Thu Feb 9 12:37:05 2023 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 9 11:37:05 2023 +

Update git submodules

* Update translations from branch 'master'
  to 579a868ba956eb78425da0c2510df67a12654c7e
  - update translations for 7.5.1 rc1/master

and force-fix errors using pocheck

Change-Id: Ic13a9cd6a7a1e31a54af71cca958781b6b663f86

diff --git a/translations b/translations
index b4907d3a23fe..579a868ba956 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b4907d3a23fe5b27877fbf12fcc39c18790524a9
+Subproject commit 579a868ba956eb78425da0c2510df67a12654c7e

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - download.lst external/openssl

[Michael Stahl (via logerrit)]

 download.lst  |4 -
 external/openssl/0001-x509-fix-double-locking-problem.patch.1 |   39 --
 external/openssl/UnpackedTarball_openssl.mk   |1 
 external/openssl/system-cannot-find-path-for-move.patch.0 |   11 --
 4 files changed, 2 insertions(+), 53 deletions(-)

New commits:
commit bcbd386fef0e8300a510fe5ac7cd476e48107fd1
Author: Michael Stahl 
AuthorDate: Wed Feb 8 12:36:16 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 11:39:38 2023 +

openssl: upgrade to release 3.0.8

Fixes CVE-2023-0401 CVE-2023-0286 CVE-2023-0217 CVE-2023-0216
CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 CVE-2022-4203 CVE-2022-3996

Remove the patch that fixed CVE-2022-3996.

Change-Id: I8587d780ea7dc07637278643dc1c49b577e3ae56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146657
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit 80dd2ce29413809ca337618e313795bd9610cf80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146623
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index eb47d84258e5..253fefbf919d 100644
--- a/download.lst
+++ b/download.lst
@@ -419,8 +419,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
-OPENSSL_TARBALL := openssl-3.0.7.tar.gz
+OPENSSL_SHA256SUM := 
6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
+OPENSSL_TARBALL := openssl-3.0.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openssl/0001-x509-fix-double-locking-problem.patch.1 
b/external/openssl/0001-x509-fix-double-locking-problem.patch.1
deleted file mode 100644
index ec289215e1a5..
--- a/external/openssl/0001-x509-fix-double-locking-problem.patch.1
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7725e7bfe6f2ce8146b6552b44e0d226be7638e7 Mon Sep 17 00:00:00 2001
-From: Pauli 
-Date: Fri, 11 Nov 2022 09:40:19 +1100
-Subject: [PATCH] x509: fix double locking problem
-
-This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the
-redundant flag setting.
-
-Fixes #19643
-
-Fixes LOW CVE-2022-3996
-
-Reviewed-by: Dmitry Belyavskiy 
-Reviewed-by: Tomas Mraz 
-(Merged from https://github.com/openssl/openssl/pull/19652)
-
-(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)

- crypto/x509/pcy_map.c | 4 
- 1 file changed, 4 deletions(-)
-
-diff --git a/crypto/x509/pcy_map.c b/crypto/x509/pcy_map.c
-index 05406c6493..60dfd1e320 100644
 a/crypto/x509/pcy_map.c
-+++ b/crypto/x509/pcy_map.c
-@@ -73,10 +73,6 @@ int ossl_policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS 
*maps)
- 
- ret = 1;
-  bad_mapping:
--if (ret == -1 && CRYPTO_THREAD_write_lock(x->lock)) {
--x->ex_flags |= EXFLAG_INVALID_POLICY;
--CRYPTO_THREAD_unlock(x->lock);
--}
- sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
- return ret;
- 
--- 
-2.39.0
-
diff --git a/external/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
index 7ee91bb43425..2a8f3bb3f905 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-   external/openssl/0001-x509-fix-double-locking-problem.patch.1 \
external/openssl/openssl-no-multilib.patch.0 \
external/openssl/configurable-z-option.patch.0 \
external/openssl/openssl-no-ipc-cmd.patch.0 \
diff --git a/external/openssl/system-cannot-find-path-for-move.patch.0 
b/external/openssl/system-cannot-find-path-for-move.patch.0
index 7d08dd636730..421d6b8df2be 100644
--- a/external/openssl/system-cannot-find-path-for-move.patch.0
+++ b/external/openssl/system-cannot-find-path-for-move.patch.0
@@ -1,16 +1,5 @@
 --- Configurations/windows-makefile.tmpl   2022-09-09 15:18:35.849924899 
+0100
 +++ Configurations/windows-makefile.tmpl   2022-09-09 15:20:28.895825331 
+0100
-@@ -777,8 +777,8 @@
- $target: "$gen0" $deps
-   cmd /C "set "ASM=\$(AS)" & $generator \$@.S"
-   \$(CPP) $incs $cppflags $defs \$@.S > \$@.i
--  move /Y \$@.i \$@
--del /Q \$@.S
-+  mv -f \$@.i \$@
-+rm -f \$@.S
- EOF
-   }
-   # Otherwise
 @@ -790,7 +790,7 @@
return <<"EOF";
  $target: "$gen0" $deps

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sd/source

[Tünde Tóth (via logerrit)]

 sd/source/ui/docshell/sdclient.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit e553620ceb3bdef3cfa6d1e9fc18ca30c74fe9f7
Author: Tünde Tóth 
AuthorDate: Fri Jan 13 09:54:00 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 11:41:30 2023 +

tdf#152991 sd: fix oversized rectangle of edited embedded object

The embedded object became unusably oversized after editing,
because it was not possible to minimize it by the mouse. Now
the object keeps its original size to avoid of the UX problem.

Note: losing the original zoom of the OLE content is still a problem.

Change-Id: I8b7a2f2a84324bf4de2358ecb5fec5c1f7349155
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145454
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit fdf95de18ef1891862bdce26669d1ce2c6f24764)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145583
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sd/source/ui/docshell/sdclient.cxx 
b/sd/source/ui/docshell/sdclient.cxx
index 02521c2575ad..c7f79c3ea813 100644
--- a/sd/source/ui/docshell/sdclient.cxx
+++ b/sd/source/ui/docshell/sdclient.cxx
@@ -143,6 +143,13 @@ void Client::ViewChanged()
 if (!pView)
 return;
 
+// Do not recalculate the visareasize if the embedded object is opening in 
a new window.
+if (!IsObjectInPlaceActive())
+{
+pSdrOle2Obj->BroadcastObjectChange();
+return;
+}
+
 ::tools::Rectangle aLogicRect( pSdrOle2Obj->GetLogicRect() );
 Size aLogicSize( aLogicRect.GetWidth(), aLogicRect.GetHeight() );
 

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

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

 sw/qa/uitest/writer_tests7/tdf152964.py |   50 
 sw/source/core/docnode/ndtbl1.cxx   |1 
 2 files changed, 51 insertions(+)

New commits:
commit 6d47b8a09f51357851cdfa752f231ed10328b8f2
Author: László Németh 
AuthorDate: Wed Jan 18 12:26:11 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 11:42:38 2023 +

tdf#152964 sw: fix crash of Undo of tracked deletion of empty table rows

In Hide Changes mode, Undo of insertion of CH_TXT_TRACKED_DUMMY_CHAR
(workaround of the deletion of empty table rows), resulted a crash
because of inconsistency of table and redline nodes. As a workaround,
skip that insertion from the Undo.

Regression from commit a74c51025fa4519caaf461492e4ed8e68bd34885
"tdf#146962 sw: hide deleted row at deletion in Hide Changes".

Change-Id: I0666d7bcbbf08d84386cea64c1807f69f751479d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145737
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 4e72e646255624eda698da750383a5725e8f6c4c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145718
Reviewed-by: Christian Lohmaier 

diff --git a/sw/qa/uitest/writer_tests7/tdf152964.py 
b/sw/qa/uitest/writer_tests7/tdf152964.py
new file mode 100644
index ..abbf25434668
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf152964.py
@@ -0,0 +1,50 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+
+# Bug 152964 - Undo of tracked deletion of an empty table row crashed Writer
+
+
+class tdf152964(UITestCase):
+def test_tdf152964(self):
+with self.ui_test.create_doc_in_start_center("writer"):
+
+# redlining should be on
+self.xUITest.executeCommand(".uno:TrackChanges")
+# hide changes
+self.xUITest.executeCommand(".uno:ShowTrackedChanges")
+
+# insert a table
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"RETURN"}))
+with 
self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
+formatlbinstable = xDialog.getChild("formatlbinstable")
+entry = formatlbinstable.getChild("1")
+entry.executeAction("SELECT", tuple())
+
+# delete its second and first rows
+self.xUITest.executeCommand(".uno:GoDown")
+self.xUITest.executeCommand(".uno:DeleteRows")
+self.xUITest.executeCommand(".uno:DeleteRows")
+
+# This crashed Writer
+self.xUITest.executeCommand(".uno:Undo")
+
+# test other Undos and Redos
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Redo")
+self.xUITest.executeCommand(".uno:Redo")
+self.xUITest.executeCommand(".uno:Redo")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index e1888bab015b..7fa9dd53e2d9 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -640,6 +640,7 @@ void SwDoc::SetRowNotTracked( const SwCursor& rCursor,
 // new redline can cause a problem)
 if ( bInsertDummy && (pLn->IsEmpty() || bDeletionOfOwnRowInsertion ) )
 {
+::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 SwNodeIndex aInsPos( *(pLn->GetTabBoxes()[0]->GetSttNd()), 1 );
 RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags();
 
getIDocumentRedlineAccess().SetRedlineFlags_intern(RedlineFlags::NONE);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source

[Tünde Tóth (via logerrit)]

 sc/source/ui/app/client.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit bdbeff654038921943658a5bf6e7faf21f5776da
Author: Tünde Tóth 
AuthorDate: Fri Jan 13 09:31:38 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 11:43:02 2023 +

tdf#152989 sc: fix oversized rectangle of edited embedded object

Editing resulted unusably oversized OLE objects. Keep
its original size to fix the UX problem.

Note: lost zoom is still a problem.

See also commit fdf95de18ef1891862bdce26669d1ce2c6f24764
"tdf#152991 sd: fix oversized rectangle of edited embedded object"

Change-Id: I6b73d1aea76ea4addc24ff978403893c3cbd3dac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145432
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit a1f16b4603bffddb2f6380874d63f928289de85a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145588
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 2c7fea5ab376..ea9ffa9ade9c 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -202,6 +202,12 @@ void ScClient::ViewChanged()
 if (!pDrawObj)
 return;
 
+if (!IsObjectInPlaceActive())
+{
+pDrawObj->ActionChanged();
+return;
+}
+
 tools::Rectangle aLogicRect = pDrawObj->GetLogicRect();
 Fraction aFractX = GetScaleWidth() * aVisSize.Width();
 Fraction aFractY = GetScaleHeight() * aVisSize.Height();

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

[Dennis Francis (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit b9516ea478b7df97cd97c48d5462f0e544b6b584
Author: Dennis Francis 
AuthorDate: Fri May 6 10:56:38 2022 +0530
Commit: Andras Timar 
CommitDate: Thu Feb 9 11:44:42 2023 +

lok: do not recreate lok-drawview for every tile paint

This lets the ScLOKDrawView live long enough for non-tile painting
related invocation of its methods and hopefully those of its member objects.

This is a blind fix for the following crash:

/opt/collaboraoffice/program/../program/libsclo.so
(anonymous 
namespace)::ScLOKProxyObjectContact::calculateGridOffsetForViewOjectContact(basegfx::B2DVector&,
 sdr::contact::ViewObjectContact const&) const
...
/opt/collaboraoffice/program/libmergedlo.so

SdrTextObj::NbcSetOutlinerParaObjectForText(std::unique_ptr >, SdrText*)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/svdraw/svdotext.cxx:1379
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::TextProperties::ItemSetChanged(SfxItemSet const&)

/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:360
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::RectangleProperties::ItemSetChanged(SfxItemSet 
const&)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/sdr/properties/rectangleproperties.cxx:54
/opt/collaboraoffice/program/libmergedlo.so
sdr::properties::DefaultProperties::SetObjectItem(SfxPoolItem 
const&)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/svx/source/sdr/properties/defaultproperties.cxx:120
/opt/collaboraoffice/program/libscfiltlo.so
XclTxo::XclTxo(XclExpRoot const&, EditTextObject const&, SdrObject*)

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/include/svl/cenumitm.hxx:26
/opt/collaboraoffice/program/libscfiltlo.so
XclObjComment::XclObjComment(XclExpObjectManager&, tools::Rectangle 
const&, EditTextObject const&, SdrCaptionObj*, bool, ScAddress const&, 
tools::Rectangle const&, tools::Rectangle const&)

/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:179
/opt/collaboraoffice/program/libscfiltlo.so
XclExpNote::XclExpNote(XclExpRoot const&, ScAddress const&, 
ScPostIt const*, rtl::OUString const&)
/opt/rh/devtoolset-10/root/usr/include/c++/10/tuple:137
/opt/collaboraoffice/program/libscfiltlo.so
ExcTable::FillAsTableXml()

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/include/rtl/ref.hxx:65
/opt/collaboraoffice/program/libscfiltlo.so
ExcDocument::ReadDoc()

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/sc/source/filter/excel/excdoc.cxx:747
/opt/collaboraoffice/program/libscfiltlo.so
XclExpXmlStream::exportDocument()

/home/collabora/jenkins/workspace/build_linux_co-2021_online_snapshot/sc/source/filter/excel/xestream.cxx:1107
/opt/collaboraoffice/program/libooxlo.so

Change-Id: I248395cca1e2da37208fc449aca731175a5aa368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133914
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
(cherry picked from commit c17c410706eab6e4d449b2a20a51bf3702329341)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143583
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146683
Tested-by: Jenkins

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a7b814c233fb..6c9c2a7b1819 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1657,13 +1657,16 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice,
 {
 bool bPrintTwipsMsgs = comphelper::LibreOfficeKit::isCompatFlagSet(
 comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs);
-mpLOKDrawView.reset(bPrintTwipsMsgs ?
-new ScLOKDrawView(
-&rDevice,
-mrViewData) :
-new FmFormView(
-*pModel,
-&rDevice));
+if (!mpLOKDrawView)
+{
+mpLOKDrawView.reset(bPrintTwipsMsgs ?
+new ScLOKDrawView(
+&rDevice,
+mrViewData) :
+new FmFormView(
+*pModel,
+&rDevice));
+}
 
 mpLOKDrawView->SetNegativeX(bLayoutRTL);
 mpLOKDrawView->ShowSdrPage(mpLOKDrawView->GetModel().GetPage(nTab));

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

[Szymon Kłos (via logerrit)]

 vcl/source/control/PriorityMergedHBox.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit db1c7c55fe0cd35ead3174b3eb7f0cdad1a475f3
Author: Szymon Kłos 
AuthorDate: Mon Feb 6 14:39:56 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 11:46:20 2023 +

tdf#147740 fix disappearing icons in groupbar

Change-Id: Ia67b90d05bccbd4d2c2553109ea7372574ee21d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146584
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit 1e23e26d48eabb829c39304a78fad26b10f76d7f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146629
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/source/control/PriorityMergedHBox.cxx 
b/vcl/source/control/PriorityMergedHBox.cxx
index 75a26daa52c1..65d51cce378c 100644
--- a/vcl/source/control/PriorityMergedHBox.cxx
+++ b/vcl/source/control/PriorityMergedHBox.cxx
@@ -155,6 +155,15 @@ Size PriorityMergedHBox::calculateRequisition() const
 accumulateMaxes(aChildSize, aSize);
 }
 
+// find max height
+for (vcl::Window* pChild = GetWindow(GetWindowType::FirstChild); pChild;
+ pChild = pChild->GetWindow(GetWindowType::Next))
+{
+Size aChildSize = getLayoutRequisition(*pChild);
+setPrimaryDimension(aChildSize, getPrimaryDimension(aSize));
+accumulateMaxes(aChildSize, aSize);
+}
+
 setPrimaryDimension(aSize, 200);
 return finalizeMaxes(aSize, nVisibleChildren);
 }

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-5-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-1' available with the following commits:
commit 6584d5f16fc163e9a223835cc2cca1034e5b6656
Author: Christian Lohmaier 
Date:   Thu Feb 9 12:53:56 2023 +0100

Branch libreoffice-7-5-1

This is 'libreoffice-7-5-1' - the stable branch for the 7.5.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I63f44fdb8fe9442b0f9ef1e20afaae6da538358d

[Libreoffice-commits] help.git: Changes to 'libreoffice-7-5-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-1' available with the following commits:
commit 6827db241394a3ebcead25df77f1f3ff8734a947
Author: Christian Lohmaier 
Date:   Thu Feb 9 12:53:56 2023 +0100

Branch libreoffice-7-5-1

This is 'libreoffice-7-5-1' - the stable branch for the 7.5.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Iffeef1a80e31915a4e272bba38d5a2ac868d63d6

[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-5-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-1' available with the following commits:
commit c5bb1df1e3411f9bed57ee29e3e3e10e9ac4deaa
Author: Christian Lohmaier 
Date:   Thu Feb 9 12:53:57 2023 +0100

Branch libreoffice-7-5-1

This is 'libreoffice-7-5-1' - the stable branch for the 7.5.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I2e8e65e95b14acfcaef036663bf7b8b31b4c39b8

[Libreoffice-commits] core.git: Changes to 'libreoffice-7-5-1'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-5-1' available with the following commits:
commit f811c325a88009ce9ca8a56798d4c63b46c5714d
Author: Christian Lohmaier 
Date:   Thu Feb 9 12:54:20 2023 +0100

Branch libreoffice-7-5-1

This is 'libreoffice-7-5-1' - the stable branch for the 7.5.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.5.x release,
please use the 'libreoffice-7-5' branch.

If you want to build something cool, unstable, and risky, use master.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit f7f465eab1aee31e3cd1f863208becec0c288106
Author: Christian Lohmaier 
AuthorDate: Thu Feb 9 12:55:35 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 12:55:35 2023 +0100

bump product version to 7.5.2.0.0+

Change-Id: I1563ddc2f963bda30df7276f4dcbaff653790ee3

diff --git a/configure.ac b/configure.ac
index e40051e2c616..04e0e0b08afb 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([LibreOffice],[7.5.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.2.0.0+],[],[],[http://documentfoundation.org/])
 
 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] core.git: Branch 'libreoffice-7-5-1' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit a6c9f0de4ac8bf68eebc05d12a8aef6922184df2
Author: Christian Lohmaier 
AuthorDate: Thu Feb 9 12:59:38 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 9 12:59:38 2023 +0100

bump product version to 7.5.1.1.0+

Change-Id: I9f036effd0524565b339f7373930d8fff069a135

diff --git a/configure.ac b/configure.ac
index e40051e2c616..734149364bbd 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([LibreOffice],[7.5.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.5.1.1.0+],[],[],[http://documentfoundation.org/])
 
 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] dictionaries.git: Changes to 'refs/tags/libreoffice-7.5.1.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.1.1' created by Christian Lohmaier 
 at 2023-02-09 11:59 +

Tag libreoffice-7.5.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPk4AkACgkQ9DSh76/u
rqPXzg//TQhMilmUSvmFySocsac1a8bXXeAj0JpyyBl6/Uw8yQKluGmtO91R3AWe
yw/NGxXTQzb2jl8C8XxeSCuEhpHyckvPMZ8XU7c+ZmAPgCPunCPQjOwlSexoYhgu
ahKhqNgfzW67ooBHMzvYdoIPvy8KuxBu++heEZHx3IbxOFwk0dgLzIzF0sqdwVSU
IkDvLp9gcdU0BxlpLAQL/q8v4261xOaAVYlZhTP0rQS531iaJu/tX/eFV2IdR/c2
PASvSfFDVZqVFFHRInpludg03XWhmeW55WTOdusi44Q6w/r5RvKPIfY3AH4jNM3K
03UQbssqfqSQqA9GAfGN/+2307ZrG+ZuLQCvHfZhyEGN2D+ltMsaQajBRNb2NYtG
ik/4LaTvnUI5JyRdLpx/kPQcd8XMRJPaq+OMrbgZRYA814OzXMX9/kQO1hY5NG+J
lpMh065DVTjj03wpEewQ8mwiT++NjDyi+ixg8G5N/e/rAV/2NsnxSMLoV+kj2MrD
Qef72QMOF+BNWj3pF15cvrThDeYKBipIku3GAq90T+4jxvjcmCgPynLcEc0b7hJy
G3UmMYTr6SKuX+a6cTHZIG13lr5sXl6f6GgZB3I8o+iM36d/KrGMdiTNYPfH5GB2
chVCw7/fz5Mzda6CUhnJlNoSRm9vyATK5ZWPPpSYdlqrwaGV+9k=
=zg1G
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-1:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.5.1.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.1.1' created by Christian Lohmaier 
 at 2023-02-09 11:59 +

Tag libreoffice-7.5.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPk4A0ACgkQ9DSh76/u
rqP+1Q/6Av7CzzRkUvKlftVuymzhqytVzkqgy/vDpt7TP1GbUW1/9soh+AJ4twmm
ZgpIOfqw4tomCQ4enliXGIUytYvBnHWc1HT+H0H9rNwAAvbCW1ZGMeWq4+D8Zfu2
+VOxqhZijDK8XSObR+SwT4lTCU5qOZMhD/uYszSP6BANjOEFMokL+bhfuSyvRvfw
W5G0vKeIFwDnDOx42oCt4yD2nydnMsa7ZB/64YZ2Tm2Tt8Nn2AP8XfjoAt6fE4P9
QUn9w2nmEZZGfWd/bo9qPkDPgryxP3141cT4szzR/0R0K/WUfD1K4wk4d2G7/gDe
ylt/pXTxJ2Tj1kANclSu3GYbbjjJNxHpWWerkEhuoPUDpn7RDWNhRw67NtsmDVd0
1dB6HNPNlNrqXnoo3wn9lx+ZdURTNJuzovCP3ge5fxuU8p2pf3xMkCsqHSbaKPJC
0FRCinOmmX+bQLHw0U04F15P+vQCEb+6GetozyEBvAr7KpgVL64IRly1AmSUjMvX
iqPzwCMiybiXnk5+ksd4ZpTQwbwRNywdAeEnudkDczl7PtRbDECMW7aQyxb54VMw
ed6EiaNY6jhe5VX+MAym8SkL2GjTCVwDbQf4FRg0RZPs2xf42D1pbx6rEWzgBqFm
tljr9cMZG05iMlbNHePAc5AJ9pPfG5NRJ3MkWrRlqquZh/NnN9U=
=pTa+
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-2:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.5.1.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.1.1' created by Christian Lohmaier 
 at 2023-02-09 11:59 +

Tag libreoffice-7.5.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPk4A0ACgkQ9DSh76/u
rqO9fA//QJk84701ZbEurEOa/mhxhQHTdQT41cGn8IJz93m1TAt+RTg6TiCWIEdJ
RtLg3DSalCS7xRl3HVU0EjcxYHM7ssUgDRX6jZ4a52ouvcm7Cs0C3D6xo0W/x0L4
7qdXQvUxfMVPtESwCJKeV2bBn2g3znJfr8nnw+Mrg06Glu6Zru9WYDQBJMmIaMY7
D0xZmG/CwNj0HavohmyjPREP8TgFSBjEdsMW15ZiTmCtJWP1FM5uz0cK69mzcBVd
jDE2KZKVl/vb2bRlOCNZwiDmIs6/iGEMgDaDm2XLzvEApu12QuqBLCCmA9vpg7na
+TpSoEgTvA1bQWuIBche0ofEe6T3o1FGFp7fqtJix7unrNNeB8Smz8Pqm9gl5HrB
/olY/Qjk639b15jC4zQHWXgaAieX2DwD//0F2WWMglDhI3mr/jCy3Ny5qK3hFBDC
KK+K+/mYMA+0Y7B5Z8uI2tHwjO1DgtJOJADWwQe0/8GU8RdetYJQ1NBd/J/g4Ggx
Z++IgPC47QUg1iejfaq7yHphpxZbV5bQk3KBWWeGLtayncIsLh8tPvyHGZivO+E5
VvbN8ol+HeOYh/YeHRWeRZ3Ik/CX1w5Wnsnl8ENtt5+1wwrkUaha4Au2wAq5ZcI3
Gf/NyT8lqLV6fuJS86/UGbCLLY3q+OulJ7B1PgBHJQ9WAKqsPAU=
=XTfA
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.5.1.1'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.5.1.1' created by Christian Lohmaier 
 at 2023-02-09 11:59 +

Tag libreoffice-7.5.1.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmPk4A0ACgkQ9DSh76/u
rqMOyA//UtV3eWcM74G7+rY2YPX7u1FARlrIU92Isc0IdgUuTtlWW4h4RPOwd0cX
5c6rFsIIvPd4AuV9CKxRy2ghG6wrlxfSgYa4KO/tS25n98SPAOW9ZXaORihuwBm2
VYY07dZwH+td2TKCWHJYa6ply7cTAIirbev+dyBaZYqNMNx8vTsaUshwtLwXSdb6
jtBIT4KX/UvJObQvxB3f1ixSMplddOFUf+04WgzPBl1swf89QdgIiyoKPIqcSShk
ZRTwGNUyycnpPL9KM/O4SA1rca3R9IzN5l5X+bfa88FKNwG8X/RQmgny5Vt8kvZN
O3AsfyGkVtuiHlPhHd+85QaqzF+qzeBKM1Tw1Ux3wyVOeMP1d0RSypW2x91F9pdd
i0ASwwirUVk68mOIW5J7w8wUU8IORfMcC46b/xG/23wfGPm0Sf3FW+dq1Ya3/qDd
wHmVnqizL65RE16rYxFoSFKodYpRiqe/WrarWFmtJH2v1MnfKaMUIgY5t/BxN4xS
EvwtDFi+OPJVhwLr6GUJuc8npb1hmnEbQYAHTKXXuZBVMIJs9CQl9JJrXkfWY+V4
pMrh2tAoSxR1bRwHWCDzkeFSLWUhLvrQoCspwOE0R2eCoj42h88eTD8f4OnZ9v/X
mqc0WEuXNDAupPEnr0xM2VamNt2mBxAr006YdmEEtZUFUfUltbA=
=OxCM
-END PGP SIGNATURE-

Changes since co-23.05-branch-point-144:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

 external/python3/ExternalPackage_python3.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 86c53eb59a6ada104358c9dbe3b50dac71af2dcc
Author: Andras Timar 
AuthorDate: Tue May 31 07:37:20 2022 +
Commit: Andras Timar 
CommitDate: Thu Feb 9 12:08:24 2023 +

fix internal python build on powerpc64le-unknown-linux-gnu

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

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index ee97cb341505..1f29c9efbebb 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -141,6 +141,11 @@ endif
 endif
 
 # that one is generated...
+ifeq ($(HOST_PLATFORM),powerpc64le-unknown-linux-gnu)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+LO_lib/_sysconfigdata_$(if 
$(ENABLE_DBGUTIL),d)_linux_powerpc64le-linux-gnu.py \
+))
+else
 # note: python configure overrides config.guess with something that doesn't
 # put -pc in its linux platform triplets, so filter that...
 ifneq ($(OS),WNT)
@@ -154,6 +159,7 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 ))
 endif
 endif
+endif
 
 
 # packages not shipped:

[Libreoffice-commits] core.git: Branch 'private/tvajngerl/staging' - include/svx svx/source

[Tomaž Vajngerl (via logerrit)]

 include/svx/svdtrans.hxx|6 ++-
 svx/source/svdraw/svdoashp.cxx  |4 +-
 svx/source/svdraw/svdotxtr.cxx  |8 ++--
 svx/source/svdraw/svdtrans.cxx  |   73 
 svx/source/unodraw/unoshap2.cxx |4 +-
 5 files changed, 58 insertions(+), 37 deletions(-)

New commits:
commit b070e8c0da60c4d9f27ca95847e31d8f2e1ab336
Author: Tomaž Vajngerl 
AuthorDate: Thu Feb 9 21:16:55 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Feb 9 21:16:55 2023 +0900

svx: change Poly2Rect to return a rectangle, also clean-up the code

There is no need to pass the rectangle by reference and to change
it inside the function, better to return a new instance.

Also clean-up the code of Poly2Rect and rename the function to
svx::polygonToRectangle.

Change-Id: I25e77c8abd12e2075939f55e06f40343ac23ca97

diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 0087f5407f81..dea845a26bc1 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -212,7 +212,11 @@ public:
 };
 
 tools::Polygon Rect2Poly(const tools::Rectangle& rRect, const GeoStat& rGeo);
-void Poly2Rect(const tools::Polygon& rPol, tools::Rectangle& rRect, GeoStat& 
rGeo);
+
+namespace svx
+{
+tools::Rectangle polygonToRectangle(const tools::Polygon& rPolygon, GeoStat& 
rGeo);
+}
 
 void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho);
 void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho);
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index a6a56f417e6d..63a987e172ff 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -3146,7 +3146,7 @@ bool 
SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf
 aPol[2]=aPol0[3];
 aPol[3]=aPol0[2];
 aPol[4]=aPol0[1];
-Poly2Rect(aPol,aRectangle,aNewGeo);
+aRectangle = svx::polygonToRectangle(aPol, aNewGeo);
 }
 if ( bMirroredY )
 {
@@ -3169,7 +3169,7 @@ bool 
SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf
 aPol[2]=aPol0[3]; // it was *not* wrong even when the reordering
 aPol[3]=aPol0[2]; // *seems* to be specific for X-Mirrorings. Oh
 aPol[4]=aPol0[1]; // will I be happy when this old stuff is |gone| 
with aw080 (!)
-Poly2Rect(aPol, aRectangle, aNewGeo);
+aRectangle = svx::polygonToRectangle(aPol, aNewGeo);
 }
 }
 
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 8ac600e3a02c..e2a83be5cb9d 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -154,7 +154,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const 
Fraction& xFact, const Fract
 aPol[3] = aPol0[2];
 aPol[4] = aPol0[1];
 }
-Poly2Rect(aPol, aRectangle, maGeo);
+aRectangle = svx::polygonToRectangle(aPol, maGeo);
 setRectangle(aRectangle);
 }
 
@@ -224,7 +224,8 @@ void SdrTextObj::NbcShear(const Point& rRef, Degree100 
/*nAngle*/, double tn, bo
 for (sal_uInt16 i=0; i9000_deg100) {
-nShW=NormAngle18000(nShW+18000_deg100);
+
+nShearAngle = NormAngle18000(nShearAngle);
+if (nShearAngle < -9000_deg100 || nShearAngle > 9000_deg100)
+{
+nShearAngle = NormAngle18000(nShearAngle + 18000_deg100);
 }
-if (nShW<-SDRMAXSHEAR) nShW=-SDRMAXSHEAR; // limit ShearWinkel (shear 
angle) to +/- 89.00 deg
-if (nShW>SDRMAXSHEAR)  nShW=SDRMAXSHEAR;
-rGeo.nShearAngle=nShW;
+
+if (nShearAngle < -SDRMAXSHEAR)
+nShearAngle = -SDRMAXSHEAR; // limit ShearWinkel (shear angle) to +/- 
89.00 deg
+
+if (nShearAngle > SDRMAXSHEAR)
+nShearAngle = SDRMAXSHEAR;
+
+rGeo.nShearAngle = nShearAngle;
 rGeo.RecalcTan();
-Point aRU(aPt0);
-aRU.AdjustX(nWdt );
-aRU.AdjustY(nHgt );
-rRect=tools::Rectangle(aPt0,aRU);
+
+Point aRU(aPoint0);
+aRU.AdjustX(nWidth);
+aRU.AdjustY(nHeight);
+
+return tools::Rectangle(aPoint0, aRU);
 }
 
+} // end svx
 
 void OrthoDistance8(const Point& rPt0, Point& rPt, bool bBigOrtho)
 {
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index e4ff92bc3bed..4bf65c5e364b 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1644,7 +1644,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition()
 aPol[2]=aPol0[3];
 aPol[3]=aPol0[2];
 aPol[4]=aPol0[1];
-Poly2Rect(aPol,aRectangle,aNewGeo);
+aRectangle = svx::polygonToRectangle(aPol, aNewGeo);
 }
 if ( bMirroredY )
 {
@@ -1666,7 +1666,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition()
 aPol[2]=aPol0[3];
 aPol[3]=aPol0[2];
 aPol[4]=aPol0[1];
-Poly2Rect( aPol, aRectangle,

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

[Caolán McNamara (via logerrit)]

 include/svtools/svparser.hxx  |1 +
 svtools/source/svhtml/parhtml.cxx |4 
 svtools/source/svrtf/svparser.cxx |2 ++
 3 files changed, 7 insertions(+)

New commits:
commit ead9ff420989c7991108428a21eef5c3f0e9c362
Author: Caolán McNamara 
AuthorDate: Thu Feb 9 10:16:21 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 9 12:30:04 2023 +

ofz#55798 Timeout

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

diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index afa4ccdeb034..e1a74840add0 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -56,6 +56,7 @@ protected:
 tools::Longm_nTokenIndex;  // current token index to 
detect loops for seeking backwards
 tools::LongnTokenValue;// additional value (RTF)
 boolbTokenHasValue; // indicates whether nTokenValue 
is valid
+boolbFuzzing;   // indicates we are in Fuzzing mode
 SvParserState   eState; // status also in derived classes
 
 rtl_TextEncodingeSrcEnc;// Source encoding
diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index e705c98013e4..7031b443344e 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -1054,7 +1054,11 @@ HtmlTokenId HTMLParser::GetNextToken_()
 sTmpBuffer.appendUtf32( nNextCh );
 nNextCh = GetNextChar();
 if (std::u16string_view(sTmpBuffer) == u"![CDATA[")
+break;
+if (bFuzzing && sTmpBuffer.getLength() > 1024)
 {
+SAL_WARN("svtools", "abandoning import for 
performance reasons with long tokens");
+eState = SvParserState::Error;
 break;
 }
 } while( '>' != nNextCh && '/' != nNextCh && 
!rtl::isAsciiWhiteSpace( nNextCh ) &&
diff --git a/svtools/source/svrtf/svparser.cxx 
b/svtools/source/svrtf/svparser.cxx
index d4b22fe13f67..1a8e73d0edb6 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -81,6 +82,7 @@ SvParser::SvParser( SvStream& rIn, sal_uInt8 nStackSize )
 , m_nTokenIndex(0)
 , nTokenValue( 0 )
 , bTokenHasValue( false )
+, bFuzzing(utl::ConfigManager::IsFuzzing())
 , eState( SvParserState::NotStarted )
 , eSrcEnc( RTL_TEXTENCODING_DONTKNOW )
 , nNextChPos(0)

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

[Stephan Bergmann (via logerrit)]

 vcl/osx/salframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6031935412efbd610486af11561b8818d3e4d1bf
Author: Stephan Bergmann 
AuthorDate: Thu Feb 9 09:12:47 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 9 12:41:46 2023 +

loplugin:staticaccess

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

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index dd3b9fa1d411..bf2257be9fac 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1262,7 +1262,7 @@ void AquaSalFrame::UpdateDarkMode()
 {
 if (@available(macOS 10.14, iOS 13, *))
 {
-switch (Application::GetSettings().GetMiscSettings().GetDarkMode())
+switch (MiscSettings::GetDarkMode())
 {
 case 0: // auto
 default:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Szymon Kłos (via logerrit)]

 sw/source/ui/frmdlg/cption.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 4f1527e066d440f2a15c595a38a8fcfe7d8bcfec
Author: Szymon Kłos 
AuthorDate: Mon Feb 6 17:27:50 2023 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 9 12:59:19 2023 +

tdf#153244 apply caption options

Change-Id: I2aa53a85ab9f38ddf74caac85047235ea85a40af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146590
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit 6a7b3d59d790cb8ea55353fe4173d71a13931d50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146694
Tested-by: Szymon Kłos 

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ab23c1f09987..e6b387a42910 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -72,14 +72,6 @@ public:
 
 void  SetCharacterStyle(const OUString& rStyle);
 OUString  GetCharacterStyle() const;
-
-virtual short run() override
-{
-int nRet = GenericDialogController::run();
-if (nRet == RET_OK)
-Apply();
-return nRet;
-}
 };
 
 }
@@ -319,6 +311,7 @@ IMPL_LINK_NOARG(SwCaptionDialog, OptionHdl, weld::Button&, 
void)
 
 GenericDialogController::runAsync(pDlg, [pDlg, this](sal_Int32 nResult){
 if (nResult == RET_OK) {
+pDlg->Apply();
 m_bCopyAttributes = pDlg->IsApplyBorderAndShadow();
 m_sCharacterStyle = pDlg->GetCharacterStyle();
 //#i61007# order of captions

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

[Szymon Kłos (via logerrit)]

 sw/source/ui/frmdlg/cption.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit efbf1fad61882a52e92b9c4d9d277a5e8c7750ab
Author: Szymon Kłos 
AuthorDate: Mon Feb 6 17:27:50 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 13:04:01 2023 +

tdf#153244 apply caption options

Change-Id: I2aa53a85ab9f38ddf74caac85047235ea85a40af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146590
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit 6a7b3d59d790cb8ea55353fe4173d71a13931d50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146630
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ab23c1f09987..e6b387a42910 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -72,14 +72,6 @@ public:
 
 void  SetCharacterStyle(const OUString& rStyle);
 OUString  GetCharacterStyle() const;
-
-virtual short run() override
-{
-int nRet = GenericDialogController::run();
-if (nRet == RET_OK)
-Apply();
-return nRet;
-}
 };
 
 }
@@ -319,6 +311,7 @@ IMPL_LINK_NOARG(SwCaptionDialog, OptionHdl, weld::Button&, 
void)
 
 GenericDialogController::runAsync(pDlg, [pDlg, this](sal_Int32 nResult){
 if (nResult == RET_OK) {
+pDlg->Apply();
 m_bCopyAttributes = pDlg->IsApplyBorderAndShadow();
 m_sCharacterStyle = pDlg->GetCharacterStyle();
 //#i61007# order of captions

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

[Henry Castro (via logerrit)]

 sc/source/ui/docshell/docsh.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1854f8ae2cf5966db1b51968dafc27785d3b7a11
Author: Henry Castro 
AuthorDate: Thu Jan 5 11:32:32 2023 -0400
Commit: Andras Timar 
CommitDate: Thu Feb 9 13:06:14 2023 +

lok: sc: avoid the shared spreadsheet dialog

It is not needed the LO core shared spreadsheet
because the online has collaborative functionality turns on
by default.

Signed-off-by: Henry Castro 
Change-Id: I57ab83eae2913522d55704ae5a115e30c9d10034
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145091
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145613
Tested-by: Andras Timar 
(cherry picked from commit 7137fa5158530c0f6adb1f80f82203b43213187f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146632
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1f58bf43f1b7..9d7b77b888e5 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -726,7 +726,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 #endif
 
 #if HAVE_FEATURE_MULTIUSER_ENVIRONMENT
-if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading() )
+if ( IsDocShared() && !SC_MOD()->IsInSharedDocLoading()
+ && !comphelper::LibreOfficeKit::isActive() )
 {
 ScAppOptions aAppOptions = SC_MOD()->GetAppOptions();
 if ( aAppOptions.GetShowSharedDocumentWarning() )

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

[Noel Grandin (via logerrit)]

 vcl/source/app/salvtables.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7192448a9caa2b578db8e70cee73976b91e9d1e2
Author: Noel Grandin 
AuthorDate: Mon Jan 30 15:50:31 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 13:09:17 2023 +

tdf#150380 Calc crash clicking on the title of the Border Color toolbar 
popdown

There is probably a better fix for this, but we have a popup inside a
popup here, so some weirdness is to be expected.

At least it doesn't crash now.

Change-Id: Ifaa928c47c3cbfaec8379f01f007b0c1daf4e5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146359
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 
(cherry picked from commit f4a24366dd111c7c7434f4a887d7097ced6b5f55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146330
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c998bd6d0a2..0c2f229d5d92 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1282,7 +1282,13 @@ void SalInstanceContainer::move(weld::Widget* pWidget, 
weld::Container* pNewPare
 assert(!pNewParent || pNewVclParent);
 vcl::Window* pVclWindow = pVclWidget->getWidget();
 if (pNewVclParent)
-pVclWindow->SetParent(pNewVclParent->getWidget());
+{
+vcl::Window* pNew = pNewVclParent->getWidget();
+if (!pNew->isDisposed())
+pVclWindow->SetParent(pNewVclParent->getWidget());
+else
+SAL_WARN("vcl", "ignoring move because new parent is already 
disposed");
+}
 else
 {
 pVclWindow->Hide();

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

[Noel Grandin (via logerrit)]

 vcl/source/app/salvtables.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4262e6cca32952ec3d2d130b1c86dc757977d54b
Author: Noel Grandin 
AuthorDate: Mon Jan 30 15:50:31 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 13:09:11 2023 +

tdf#150380 Calc crash clicking on the title of the Border Color toolbar 
popdown

There is probably a better fix for this, but we have a popup inside a
popup here, so some weirdness is to be expected.

At least it doesn't crash now.

Change-Id: Ifaa928c47c3cbfaec8379f01f007b0c1daf4e5a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146359
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 
(cherry picked from commit f4a24366dd111c7c7434f4a887d7097ced6b5f55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146329
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 733d78179500..259192c854cb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1322,7 +1322,13 @@ void SalInstanceContainer::move(weld::Widget* pWidget, 
weld::Container* pNewPare
 assert(!pNewParent || pNewVclParent);
 vcl::Window* pVclWindow = pVclWidget->getWidget();
 if (pNewVclParent)
-pVclWindow->SetParent(pNewVclParent->getWidget());
+{
+vcl::Window* pNew = pNewVclParent->getWidget();
+if (!pNew->isDisposed())
+pVclWindow->SetParent(pNewVclParent->getWidget());
+else
+SAL_WARN("vcl", "ignoring move because new parent is already 
disposed");
+}
 else
 {
 pVclWindow->Hide();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/oox/workbookfragment.cxx |4 
 sc/source/filter/oox/worksheethelper.cxx  |3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a1f175f01ffa6102b9fdc54177ca53940a43897c
Author: Caolán McNamara 
AuthorDate: Wed Feb 1 09:40:52 2023 +
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 13:11:10 2023 +

crashtesting: threaded import crash seen in forum-mso-en4-802501.xlsx

sporadically reproducible with tsan and
./instdir/program/soffice.bin --headless --convert-to pdf 
~/forum-mso-en4-802501.xlsx

move getTables().applyAutoFilters(), which wants to query tab 1 while
tab 1 is still getting imported, until after the threaded import has
completed.

This call was moved before in:

commit edd51b813005c2159426d8f2917eede5b14a4577
Date:   Thu Aug 15 16:23:46 2013 +0100

fix for bnc#834705 missing drop downs for autofilter

==
WARNING: ThreadSanitizer: data race (pid=3791886)
  Read of size 8 at 0x7b540f20 by thread T7 (mutexes: write M0, write 
M1):
#0 __gnu_cxx::__normal_iterator>>::__normal_iterator(unsigned long const* const&) 
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_iterator.h:1073:20
 (libsclo.so+0x3d31c4) (BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#1 std::vector>::cend() 
const 
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/stl_vector.h:960:16
 (libsclo.so+0x3d31c4)
#2 
mdds::mtv::soa::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell>>, sc::CellStoreTrait>::cbegin() const 
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3771:34
 (libsclo.so+0x3d31c4)
#3 
mdds::mtv::soa::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell>>, sc::CellStoreTrait>::begin() const 
core/workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector/soa/main_def.inl:3753:12
 (libsclo.so+0x3d31c4)
#4 ScColumn::InitBlockPosition(sc::ColumnBlockConstPosition&) const 
core/sc/source/core/data/column3.cxx:1135:35 (libsclo.so+0x3d31c4)
#5 ScTable::GetDataArea(short&, int&, short&, int&, bool, bool) const 
core/sc/source/core/data/table1.cxx:908:19 (libsclo.so+0x637b39) (BuildId: 
4582437348063bd1c461478348ce37a0dbd28def)
#6 ScDocument::GetDataArea(short, short&, int&, short&, int&, bool, 
bool) const core/sc/source/core/data/document.cxx:1104:23 (libsclo.so+0x49b696) 
(BuildId: 4582437348063bd1c461478348ce37a0dbd28def)
#7 ScDBData::ExtendDataArea(ScDocument const&) 
core/sc/source/core/tool/dbdata.cxx:654:10 (libsclo.so+0x741e77) (BuildId: 
4582437348063bd1c461478348ce37a0dbd28def)
#8 ScDocument::GetFilterEntries(short, int, short, ScFilterEntries&) 
core/sc/source/core/data/documen3.cxx:1577:14 (libsclo.so+0x46e7a6) (BuildId: 
4582437348063bd1c461478348ce37a0dbd28def)
#9 (anonymous namespace)::fillQueryParam(ScQueryParam&, ScDocument*, 
com::sun::star::uno::Sequence const&) 
core/sc/source/ui/unoobj/datauno.cxx:1164:27 (libsclo.so+0xf7dd72) (BuildId: 
4582437348063bd1c461478348ce37a0dbd28def)
#10 
ScFilterDescriptorBase::setFilterFields3(com::sun::star::uno::Sequence
 const&) core/sc/source/ui/unoobj/datauno.cxx:1380:5 (libsclo.so+0xf7dd72)
#11 non-virtual thunk to 
ScFilterDescriptorBase::setFilterFields3(com::sun::star::uno::Sequence
 const&) core/sc/source/ui/unoobj/datauno.cxx (libsclo.so+0xf7e2c2) (BuildId: 
4582437348063bd1c461478348ce37a0dbd28def)
#12 
oox::xls::AutoFilter::finalizeImport(com::sun::star::uno::Reference
 const&, short) core/sc/source/filter/oox/autofilterbuffer.cxx:803:22 
(libscfiltlo.so+0x3cca2c) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#13 
oox::xls::AutoFilterBuffer::finalizeImport(com::sun::star::uno::Reference
 const&, short) core/sc/source/filter/oox/autofilterbuffer.cxx:950:22 
(libscfiltlo.so+0x3cdc0b) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#14 oox::xls::Table::applyAutoFilters() 
core/sc/source/filter/oox/tablebuffer.cxx:143:23 (libscfiltlo.so+0x4b9268) 
(BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#15 void std::__invoke_impl(std::__invoke_memfun_ref, void (oox::xls::Table::*&)(), 
oox::xls::Table&) 
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/invoke.h:67:14
 (libscfiltlo.so+0x4b9d96) (BuildId: 798032f9cb60957d86e47827d9e882b8931326ba)
#16 std::__invoke_result::type std::__invoke(void (oox::xls::Table::*&)(), oox::xls::Table&) 
/usr/bin/../lib/gcc/x86_64-redhat-linux/12/../../../../include/c++/12/bits/invoke.h:96:14
 (libscfiltlo.so+0x4b9d96)
#17 void std::_Bind))()>::__call(std::tuple&&, std::_Index_tuple<0ul>) 
/usr/bin/../lib/gcc/x86_64-redhat-

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

[Balazs Varga (via logerrit)]

 sc/qa/uitest/validity/tdf150098.py |   47 +
 sc/source/core/data/validat.cxx|  175 +
 2 files changed, 205 insertions(+), 17 deletions(-)

New commits:
commit d86aa3a0711a09aeae752086f8fdf5e89b552ec5
Author: Balazs Varga 
AuthorDate: Mon Jan 23 16:48:04 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 13:11:38 2023 +

tdf#150098 sc validation: allowing formulas for validity test

Calculate the formula results, before checking the validity test.

Change-Id: I7420982a8cbcd2df6ab0adea6e3cf61aaccb1600
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146011
Tested-by: Jenkins
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 
Reviewed-by: Balazs Varga 
(cherry picked from commit 5f2d7db094fc0f4e7ae40987c3c6762b11184419)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146084
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/validity/tdf150098.py 
b/sc/qa/uitest/validity/tdf150098.py
new file mode 100644
index ..5d29a4afaadf
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf150098.py
@@ -0,0 +1,47 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from uitest.uihelper.common import select_by_text, select_pos
+
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+
+class EvaluateFormulaInputs(UITestCase):
+
+def test_inputs_with_formula(self):
+with self.ui_test.create_doc_in_start_center("calc") as document:
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+enter_text_to_cell(gridwin, "A1", "5")
+enter_text_to_cell(gridwin, "A2", "7")
+enter_text_to_cell(gridwin, "A3", "12")
+
+#Select the cells to be validated
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A4"}))
+#Apply Data > Validity ... > Whole Numbers
+with 
self.ui_test.execute_dialog_through_command(".uno:Validation") as xDialog:
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")
+xallow = xDialog.getChild("allow")
+xallowempty = xDialog.getChild("allowempty")
+xdata = xDialog.getChild("data")
+xmin = xDialog.getChild("min")
+
+select_by_text(xallow, "Whole Numbers")
+xallowempty.executeAction("CLICK", tuple())
+select_by_text(xdata, "equal")
+xmin.executeAction("TYPE", mkPropertyValues({"TEXT":"A3"}))
+
+enter_text_to_cell(gridwin, "A4", "=SUM(A1:A2)")
+# without the fix in place, an error message would have appeared
+self.assertEqual(get_cell_by_position(document, 0, 0, 
3).getValue(), 12.0)
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 79f21d8de202..2d6194baf588 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -51,6 +51,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -435,15 +436,85 @@ bool ScValidationData::IsDataValidCustom(
 if (rTest.isEmpty())  // check whether empty cells are allowed
 return IsIgnoreBlank();
 
-if (rTest[0] == '=')   // formulas do not pass the validity test
-return false;
+SvNumberFormatter* pFormatter = nullptr;
+sal_uInt32 nFormat = 0;
+double nVal = 0.0;
+OUString rStrResult = "";
+bool bIsVal = false;
 
-SvNumberFormatter* pFormatter = GetDocument()->GetFormatTable();
+if (rTest[0] == '=')
+{
+std::optional pFCell(std::in_place, *mpDoc, 
rPos, rTest, true);
+pFCell->SetLimitString(true);
 
-// get the value if any
-sal_uInt32 nFormat = rPattern.GetNumberFormat( pFormatter );
-double nVal;
-bool bIsVal = pFormatter->IsNumberFormat( rTest, nFormat, nVal );
+bool bColRowName = pFCell->HasColRowName();
+if (bColRowName)
+{
+// ColRowName from RPN-Code?
+if (pFCell->GetCode()->GetCodeLen() <= 1)
+{   // ==1: area
+// ==0: would be an area if...
+OUString aBraced = "(" + rTest + ")";
+pFCell.emplace(*mpDoc, rPos, aBraced, true);
+pFCell->SetLimitString(true);
+}
+else
+bColRowName = false;
+}
+
+FormulaError nErrCode = pFCell->GetErrCode();
+if (n

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

[Michael Stahl (via logerrit)]

 sw/inc/crsrsh.hxx |5 -
 sw/qa/extras/uiwriter/data/tdf114973.fodt |  144 ++
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   34 +++
 sw/source/core/crsr/callnk.cxx|2 
 sw/source/core/crsr/crsrsh.cxx|   26 -
 sw/source/core/edit/eddel.cxx |2 
 sw/source/core/edit/edglss.cxx|2 
 sw/source/core/frmedt/fetab.cxx   |2 
 sw/source/core/text/frmcrsr.cxx   |2 
 sw/source/uibase/shells/tabsh.cxx |2 
 sw/source/uibase/wrtsh/select.cxx |2 
 11 files changed, 208 insertions(+), 15 deletions(-)

New commits:
commit 0590cd2857f68f48b8847071a9c1a7dbef135721
Author: Michael Stahl 
AuthorDate: Fri Jan 27 16:06:08 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 9 13:43:19 2023 +

tdf#114973 sw: enable SelectAll with hidden para at start/end

If there's a hidden para the shell cursor can't be positioned in it
ordinarily, so SelectAll will exclude these at the start or end of the
document.

There is already special code to handle a table at the start of the
document body, and it's relatively simple to adapt it to handle hidden
paragraphs as well.

This appears to work surprisingly well, the point is at the start of the
first node of the document, and moving it right immediately puts it to
the first non-hidden paragraph.

But it only works for paragraphs hidden by character formatting or
hidden paragraph field, not if there's a hidden section - there are no
(not even 0-height) SwTextFrames in hidden sections.

Change-Id: Ifd3c11f4169a037fdae2c2b376d0138bec46774f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146257
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit bb733957dd39e6f0b9d80bb59eb0177188794797)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146206
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 2e9a9f0f1e62..c7148020bc2b 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -332,8 +332,9 @@ public:
 void ExtendedSelectAll(bool bFootnotes = true);
 /// If ExtendedSelectAll() was called and selection didn't change since 
then.
 bool ExtendedSelectedAll();
-/// If document body starts with a table.
-bool StartsWithTable();
+enum class StartsWith { None, Table, HiddenPara };
+/// If document body starts with a table or starts/ends with hidden 
paragraph.
+StartsWith StartsWith_();
 
 SwCursor* GetCursor( bool bMakeTableCursor = true ) const;
 // return only the current cursor
diff --git a/sw/qa/extras/uiwriter/data/tdf114973.fodt 
b/sw/qa/extras/uiwriter/data/tdf114973.fodt
new file mode 100644
index ..8638cbbb6b4a
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf114973.fodt
@@ -0,0 +1,144 @@
+
+http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta: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:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:dc="http://purl.org/dc/eleme
 nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office: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:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 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

[Libreoffice-commits] core.git: configure.ac desktop/source external/cairo external/fontconfig external/freetype external/harfbuzz vcl/source vcl/unx

[Tor Lillqvist (via logerrit)]

 configure.ac |   13 +-
 desktop/source/lib/init.cxx  |   20 +++
 external/cairo/ExternalPackage_cairo.mk  |3 
 external/cairo/UnpackedTarball_cairo.mk  |2 
 external/cairo/cairo/cairo-fd-hack.patch.0   |   15 ++
 external/cairo/cairo/libcairo-bundled-soname.patch.0 |   12 ++
 external/fontconfig/ExternalPackage_fontconfig.mk|   16 ++
 external/fontconfig/ExternalProject_fontconfig.mk|   15 ++
 external/fontconfig/Module_fontconfig.mk |1 
 external/fontconfig/UnpackedTarball_fontconfig.mk|1 
 external/fontconfig/libfontconfig-bundled-soname.patch.0 |   11 +
 external/freetype/ExternalProject_freetype.mk|2 
 external/freetype/UnpackedTarball_freetype.mk|1 
 external/freetype/freetype-fd-hack.patch.0   |   53 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk|3 
 external/harfbuzz/harfbuzz-fd-hack.patch.0   |   24 
 vcl/source/fontsubset/sft.cxx|   23 +++
 vcl/unx/generic/fontmanager/fontmanager.cxx  |   90 ---
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx   |   13 ++
 19 files changed, 270 insertions(+), 48 deletions(-)

New commits:
commit d552b4a549d614a03aa9328e017dec27bd3ff41e
Author: Tor Lillqvist 
AuthorDate: Tue Sep 20 16:07:14 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 13:47:02 2023 +

Enable opening of downloaded fonts only in ForKit in Online

We want that only the ForKit process needs to have access to new font
files added to a Collabora Online instance dynamically by downloading
from a server. There are however many locations in the Kit process, in
core and in external libraries like harfbuzz, where the code wants to
open a font file.

Handle this so that the ForKit process opens such a downloaded font
file and doesn't close it. The file descriptor is thus inherited by
Kit processes.  The font file pathname passed on to other code is a
fake on in the format "/:FD:/%d" where the %d is the file descriptor
of the opened font file. Add checks in all places where font files are
opened, look for this special pathname format, and modify the code to
just dup() the already open file descriptor in that case.

All this is relevant for Linux only, as Collabora Online runs on
Linux.

Do the above for harfbuzz, cairo, fontconfig, and freetype.

In addition make sure that these libraries (except harfbuzz which
needs to be a static library and freetype) when bundled, on Linux, are
built as shared libraries, and won't be confused with the
corresponding system libraries by making sure their sonames are
different.

Change-Id: Ib059cb27e1637d07bb709249abd0d984f948caa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140714
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146341
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 86896f3c4c80..c232686dc696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10823,11 +10823,18 @@ dnl 
===
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
+case "$_os" in
+Linux)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42],,,TRUE)
+;;
+*)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42])
+;;
+esac
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d0eda23e0eb8..d0c67bda098f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -26,6 +26,10 @@
 #include 
 #endif
 
+#ifdef LINUX
+#include 
+#endif
+
 #ifdef ANDROID
 #include 
 #endif
@@ -4554,13 +4558,27 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, 
const char *pOption, const c
 else
 sal_detail_set_log_selector(pCurrentSalLogOverride);
 }
+#ifdef LINUX
 else if (strcmp(pOption, "addfont") == 0)
 {
+if (memcmp(pValue, "file://", 7) == 0)
+

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmldrawreader.cxx |2 +-
 sw/source/filter/html/htmlgrin.cxx   |2 +-
 sw/source/filter/html/swhtml.cxx |   16 +++-
 sw/source/filter/html/swhtml.hxx |1 -
 4 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit c440d1ef3d31d41c94a6d59372bbec16d9f5dc5d
Author: Caolán McNamara 
AuthorDate: Thu Feb 9 10:19:47 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Feb 9 14:27:47 2023 +

use new baseclass member instead

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

diff --git a/sw/source/filter/html/htmldrawreader.cxx 
b/sw/source/filter/html/htmldrawreader.cxx
index b57b4e4b2cf0..4c5ea2dbcb9f 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -538,7 +538,7 @@ void SwHTMLParser::EndMarquee()
 static_cast(m_pMarquee.get())->SetText( m_aContents );
 m_pMarquee->SetMergedItemSetAndBroadcast( m_pMarquee->GetMergedItemSet() );
 
-if (m_bFixMarqueeWidth && !m_bFuzzing)
+if (m_bFixMarqueeWidth && !bFuzzing)
 {
 // adjust the size to the text
 static_cast(m_pMarquee.get())->FitFrameToTextSize();
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 840a80962293..daf90faff773 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -672,7 +672,7 @@ IMAGE_SETEVENT:
 bool bNeedWidth = (!bPercentWidth && !nWidth) || bRelWidthScale;
 bool bRelHeightScale = bPercentHeight && nHeight == 
SwFormatFrameSize::SYNCED;
 bool bNeedHeight = (!bPercentHeight && !nHeight) || bRelHeightScale;
-if ((bNeedWidth || bNeedHeight) && !m_bFuzzing && allowAccessLink(*m_xDoc))
+if ((bNeedWidth || bNeedHeight) && !bFuzzing && allowAccessLink(*m_xDoc))
 {
 GraphicDescriptor aDescriptor(aGraphicURL);
 if (aDescriptor.Detect(/*bExtendedInfo=*/true))
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 99db72f38518..fbd5eadd1028 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -310,7 +309,6 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bBodySeen( false ),
 m_bReadingHeaderOrFooter( false ),
 m_bNotifyMacroEventRead( false ),
-m_bFuzzing(utl::ConfigManager::IsFuzzing()),
 m_isInTableStructure(false),
 m_nTableDepth( 0 ),
 m_nFloatingFrames( 0 ),
@@ -318,7 +316,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_pTempViewFrame(nullptr)
 {
 // If requested explicitly, then force ignoring of comments (don't create 
postits for them).
-if (!m_bFuzzing)
+if (!bFuzzing)
 {
 if 
(officecfg::Office::Writer::Filter::Import::HTML::IgnoreComments::get())
 m_bIgnoreHTMLComments = true;
@@ -335,7 +333,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 memset(m_xAttrTab.get(), 0, sizeof(HTMLAttrTable));
 
 // Read the font sizes 1-7 from the INI file
-if (!m_bFuzzing)
+if (!bFuzzing)
 {
 m_aFontHeights[0] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_1::get() * 20;
 m_aFontHeights[1] = 
officecfg::Office::Common::Filter::HTML::Import::FontSize::Size_2::get() * 20;
@@ -372,7 +370,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, 
true);
 
 m_pCSS1Parser.reset(new SwCSS1Parser(m_xDoc.get(), *this, m_aFontHeights, 
m_sBaseURL, IsNewDoc()));
-if (!m_bFuzzing)
+if (!bFuzzing)
 m_pCSS1Parser->SetIgnoreFontFamily( 
officecfg::Office::Common::Filter::HTML::Import::FontSetting::get() );
 
 if( bReadUTF8 )
@@ -888,7 +886,7 @@ void SwHTMLParser::Continue( HtmlTokenId nToken )
 }
 
 // adjust AutoLoad in DocumentProperties
-if (!m_bFuzzing && IsNewDoc())
+if (!bFuzzing && IsNewDoc())
 {
 SwDocShell *pDocShell(m_xDoc->GetDocShell());
 OSL_ENSURE(pDocShell, "no SwDocShell");
@@ -1467,7 +1465,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 break;
 
 case HtmlTokenId::IFRAME_ON:
-if (m_bFuzzing && m_nFloatingFrames > 64)
+if (bFuzzing && m_nFloatingFrames > 64)
 SAL_WARN("sw.html", "Not importing any more FloatingFrames for 
fuzzing performance");
 else
 {
@@ -1831,7 +1829,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 EndPara();
 }
 
-if (m_bFuzzing && m_nListItems > 1024)
+if (bFuzzing && m_nListItems > 1024)
 {
 SAL_WARN("sw.html", "skipping remaining bullet import f

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

[Tor Lillqvist (via logerrit)]

 external/cairo/ExternalProject_pixman.mk |2 
 external/cairo/UnpackedTarball_pixman.mk |1 
 external/cairo/pixman/pixman-wasm.patch  |  108 +++
 3 files changed, 110 insertions(+), 1 deletion(-)

New commits:
commit d5f5f0984510d6c1b453e31c1ad58fb29fed278b
Author: Tor Lillqvist 
AuthorDate: Thu Feb 9 14:24:07 2023 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 14:55:26 2023 +

Use SIMD in pixman for WASM

Emscripten and WASM do have some support for SSSE3, so let's try to
use it, with -msimd128. See
https://emscripten.org/docs/porting/simd.html.

WASM is not x86, though, so avoid use of inline x86 assembly, like the
CPUID instruction.

Emscripten does not have  but does have ,
, and .

Change-Id: Ic3a47291f6c6dee6843e93ccecc92a643b269cb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146691
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/external/cairo/ExternalProject_pixman.mk 
b/external/cairo/ExternalProject_pixman.mk
index ac78b23d5c9e..29902b4c1f5c 100644
--- a/external/cairo/ExternalProject_pixman.mk
+++ b/external/cairo/ExternalProject_pixman.mk
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
$(if $(filter ANDROID,$(OS)),--disable-arm-simd 
--disable-arm-neon --disable-arm-a64-neon --disable-arm-iwmmxt) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(CROSS_COMPILING),$(if $(filter INTEL 
ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
-   $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS="-O3 -pthread") \
+   $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS="-O3 -pthread 
-msimd128") \
&& $(MAKE) \
)
$(call gb_Trace_EndRange,pixman,EXTERNAL)
diff --git a/external/cairo/UnpackedTarball_pixman.mk 
b/external/cairo/UnpackedTarball_pixman.mk
index 3f1f75616611..922ed9f24f22 100644
--- a/external/cairo/UnpackedTarball_pixman.mk
+++ b/external/cairo/UnpackedTarball_pixman.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
 $(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \
external/cairo/pixman/pixman-ubsan.patch \
+   external/cairo/pixman/pixman-wasm.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/pixman/pixman-wasm.patch 
b/external/cairo/pixman/pixman-wasm.patch
new file mode 100644
index ..c76af875cd51
--- /dev/null
+++ b/external/cairo/pixman/pixman-wasm.patch
@@ -0,0 +1,108 @@
+--- a/pixman/pixman/pixman-x86.c
 b/pixman/pixman/pixman-x86.c
+@@ -77,13 +77,20 @@
+ 
+ #else
+ 
+-#define _PIXMAN_X86_64
\
+-(defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64))
++#if (defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64))
++#define _PIXMAN_X86_64 1
++#else
++#define _PIXMAN_X86_64 0
++#endif
+ 
+ static pixman_bool_t
+ have_cpuid (void)
+ {
+-#if _PIXMAN_X86_64 || defined (_MSC_VER)
++#if defined(__EMSCRIPTEN__)
++
++return FALSE;
++
++#elif _PIXMAN_X86_64 || defined (_MSC_VER)
+ 
+ return TRUE;
+ 
+@@ -109,6 +109,8 @@
+ #endif
+ }
+ 
++#if !defined(__EMSCRIPTEN__)
++
+ static void
+ pixman_cpuid (uint32_t feature,
+ uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)
+@@ -156,10 +156,17 @@
+ #error Unknown compiler
+ #endif
+ }
++ 
++#endif // !__EMSCRIPTEN__
+ 
+ static cpu_features_t
+ detect_cpu_features (void)
+ {
++#if defined(__EMSCRIPTEN__)
++
++return X86_SSE | X86_SSE2 | X86_SSSE3;
++
++#else
+ uint32_t a, b, c, d;
+ cpu_features_t features = 0;
+ 
+@@ -202,6 +202,8 @@
+ }
+ 
+ return features;
++
++#endif // !__EMSCRIPTEN__
+ }
+ 
+ #endif
+--- a/pixman/pixman/pixman-ssse3.c
 b/pixman/pixman/pixman-ssse3.c
+@@ -28,7 +28,9 @@
+ #endif
+ 
+ #include 
++#if !defined(__EMSCRIPTEN__)
+ #include 
++#endif
+ #include 
+ #include 
+ #include 
+--- a/pixman/configure
 b/pixman/configure
+@@ -14207,7 +14207,11 @@
+ #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 
4))
+ #error "Need GCC >= 3.4 for MMX intrinsics"
+ #endif
++#if !defined(__EMSCRIPTEN__)
+ #include 
++#else
++#include 
++#endif
+ #include 
+ 
+ /* Check support for block expressions */
+@@ -14308,7 +14308,9 @@
+ #  error "Need GCC >= 4.2 for SSE2 intrinsics on x86"
+ #   endif
+ #endif
++#if !defined(__EMSCRIPTEN__)
+ #include 
++#endif
+ #include 
+ #include 
+ int param;
+@@ -14380,7 +14380,9 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#if !defined(__EMSCRIPTEN__)
+ #include 
++#endif
+ #include 
+ #include 
+ #include 

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

[Samuel Mehrbrodt (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs |  124 
+-
 1 file changed, 62 insertions(+), 62 deletions(-)

New commits:
commit cd559b38043c5572465b130cd8c9a5e9da563cbf
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 9 14:52:06 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 9 15:03:10 2023 +

Remove trailing whitespace

Change-Id: Iec7704a23bb9397bca1e0ee610707803c4b836b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146714
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs 
b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
index f1162324e699..979c0d65eb00 100644
--- a/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
@@ -19,7 +19,7 @@
 
 http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; oor:name="OptionsDialog" 
oor:package="org.openoffice.Office" xml:lang="en-US">
   
-Contains general structures used to hide a single option or an 
option 
+Contains general structures used to hide a single option or an option
   tabpage or a whole option group.
   
   
@@ -59,7 +59,7 @@
   
   
 
-  An optional set to allow to hide single options tabpages of 
this 
+  An optional set to allow to hide single options tabpages of 
this
group.
 
   
@@ -67,26 +67,26 @@
 
   
 Defines a Module. The options dialog displays entries in its tree
- view only if they are defined to belong to the Module for which the 
- options dialog is being displayed. The exception is the options 
dialog 
- which is invoked from the Extension Manager, where the Module is 
+ view only if they are defined to belong to the Module for which the
+ options dialog is being displayed. The exception is the options dialog
+ which is invoked from the Extension Manager, where the Module is
  irrelevant.
   
   
 
-  A set member contains a Node (see type Node) which has been 
-   assigned to this Module. Also entities which do not own the Module 
-   may add members to the set. Please look at the specification for 
+  A set member contains a Node (see type Node) which has been
+   assigned to this Module. Also entities which do not own the Module
+   may add members to the set. Please look at the specification for
applying restrictions

(http://specs.openoffice.org/appwide/packagemanager/options_dialog_for_extensions.odt)
The actual Node|s are kept in a separate set (OptionsDialog/Nodes),
-   to prevent redundancy, because a Node can be assigned to several 
-   Module|s. The position of a node (the tree view element) within the 
-   tree view of the options dialog is determined by the property Index 
-   of each set member. The position can be different dependent on the 
-   Module. Therefore the order is determined per Module. Only the 
owner 
+   to prevent redundancy, because a Node can be assigned to several
+   Module|s. The position of a node (the tree view element) within the
+   tree view of the options dialog is determined by the property Index
+   of each set member. The position can be different dependent on the
+   Module. Therefore the order is determined per Module. Only the owner
of the Module should set the position (property Index).
-   The order is undefined if two or more members have the same value 
for 
+   The order is undefined if two or more members have the same value 
for
the Index property.
See also the description for OrderedNode.
  
@@ -95,32 +95,32 @@
 
 
   
-Defines a node (the tree view element) which can be displayed in 
+Defines a node (the tree view element) which can be displayed in
  the tree view of the options dialog.
   
   
 
-  The localized name which is displayed next to the node in the 
-   options dialog. If two different nodes (the tree view element) 
happen 
+  The localized name which is displayed next to the node in the
+   options dialog. If two different nodes (the tree view element) 
happen
to have the same localized name then both are displayed.
 
   
   
 
-  URL which references the dialog editor resource. This options 
- page should only contain information for the user and should not 
+  URL which references the dialog editor resource. This options
+ page should only contain information for the user and should not
  accep

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

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/doc/docmacromode.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8d8d01140c299e49afd188a9b7e1ac2860099e8c
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 30 14:36:25 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 9 15:21:38 2023 +

Remove unused field

Change-Id: I6eda3b236c5b270c75947ca3313987e467d05982
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146693
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index b7bdd816f79e..a231daba348f 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -72,12 +72,10 @@ namespace sfx2
 struct DocumentMacroMode_Data
 {
 IMacroDocumentAccess&   m_rDocumentAccess;
-boolm_bDocMacroDisabledMessageShown;
 bool m_bHasUnsignedContentError;
 
 explicit DocumentMacroMode_Data( IMacroDocumentAccess& rDocumentAccess 
)
 :m_rDocumentAccess( rDocumentAccess )
-,m_bDocMacroDisabledMessageShown( false )
 ,m_bHasUnsignedContentError( false )
 {
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - external/fontconfig

[Tor Lillqvist (via logerrit)]

 external/fontconfig/ExternalProject_fontconfig.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6a0e3532ff2c152813ee1557969d5b24c698d379
Author: Tor Lillqvist 
AuthorDate: Tue Dec 13 15:08:26 2022 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 15:26:25 2023 +

Use libxml2 instead of expat in bundled fontconfig in the Emscripten case

For just running LO itdelf as WASM it presumably does not matter. But,
when building Collabora Online as WASM, using expat in fontconfig
turns out to be problematic.

The Poco library that Online uses includes a bundled expat
library. For some reason the function signatures in that expat are
different from those in the bundled expat library from LO core. Thus
you get "RuntimeError: null function or function signature mismatch"
as only the Poco copy of expat gets linked in in the WASM binary and
when code in fontconfig tries to call expat code the signatures don't
match.

Change-Id: Ic035bb7aab06564ad0050519a2d7a0975ad3a14d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144049
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146716
Tested-by: Tor Lillqvist 

diff --git a/external/fontconfig/ExternalProject_fontconfig.mk 
b/external/fontconfig/ExternalProject_fontconfig.mk
index 9f85faa393e4..f3675258fdea 100644
--- a/external/fontconfig/ExternalProject_fontconfig.mk
+++ b/external/fontconfig/ExternalProject_fontconfig.mk
@@ -27,6 +27,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
$(if $(filter EMSCRIPTEN,$(OS)),-pthread)" \
$(if $(filter ANDROID,$(OS)),LIBS="-lm") \
LDFLAGS="$(call gb_ExternalProject_get_link_flags,fontconfig)" \
+   $(if $(filter 
EMSCRIPTEN,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" 
LIBXML2_LIBS="$(LIBXML_LIBS)") \
$(gb_RUN_CONFIGURE) ./configure \
--disable-shared \
--disable-silent-rules \
@@ -39,6 +40,7 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) :
--with-baseconfigdir=/instdir/share/fontconfig \
--with-cache-dir=/instdir/share/fontconfig/cache \
--with-add-fonts=/instdir/share/fonts \
+   --enable-libxml2 \
ac_cv_func_fstatfs=no ac_cv_func_fstatvfs=no \
) \
&& $(MAKE) -C src && $(MAKE) fonts.conf \

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

[Juergen Funk (via logerrit)]

 cui/source/customize/acccfg.cxx |9 +
 framework/inc/properties.h  |2 ++
 framework/source/layoutmanager/layoutmanager.cxx|9 -
 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   14 ++
 framework/source/layoutmanager/toolbarlayoutmanager.hxx |2 ++
 5 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 7a851c5b2da723ca618061c12a14f11479748dfd
Author: Juergen Funk 
AuthorDate: Wed Feb 8 12:15:44 2023 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 9 15:26:48 2023 +

tdf#95936: Tooltip not updated in Toolbars after change Shortcut

The update of all toobars after change the shortcut was missing,
this patch update the toolbars now

Change-Id: Ibc896dc48c9143307b028a3c271476482111c2c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146678
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1a37964fb8c8..70ec1764fc5e 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -63,6 +63,8 @@
 #include 
 #include 
 
+#include 
+
 // namespaces
 
 using namespace css;
@@ -1480,6 +1482,13 @@ bool SfxAcceleratorConfigPage::FillItemSet(SfxItemSet*)
 try
 {
 m_xAct->store();
+css::uno::Reference xFrameProps(m_xFrame,
+  
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xLayoutManager;
+xFrameProps->getPropertyValue("LayoutManager") >>= xLayoutManager;
+css::uno::Reference 
xLayoutProps(xLayoutManager,
+   
css::uno::UNO_QUERY_THROW);
+xLayoutProps->setPropertyValue("RefreshContextToolbarToolTip", 
css::uno::Any(true));
 }
 catch (const uno::RuntimeException&)
 {
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index fead8e3e1fad..b11a5b2e9d71 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -49,6 +49,7 @@ inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY
 inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI = 
u"HideCurrentUI";
 inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT = 
u"LockCount";
 inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE = u"PreserveContentSize";
+inline constexpr OUStringLiteral LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP = 
u"RefreshContextToolbarToolTip";
 
 #define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER
LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER
 
@@ -58,6 +59,7 @@ inline constexpr OUStringLiteral 
LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_S
 #define LAYOUTMANAGER_PROPHANDLE_HIDECURRENTUI  3
 #define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT  4
 #define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE  5
+#define LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP 6
 
 /** properties for "UICommandDescription" class */
 inline constexpr OUStringLiteral 
UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST = 
u"private:resource/image/commandimagelist";
diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index ec6ed5572d94..652521fdf6aa 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -130,6 +130,7 @@ LayoutManager::LayoutManager( const Reference< 
XComponentContext >& xContext ) :
 registerProperty( LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, 
LAYOUTMANAGER_PROPHANDLE_MENUBARCLOSER, beans::PropertyAttribute::TRANSIENT, 
&m_bMenuBarCloseButton, cppu::UnoType::get() );
 registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY, 
LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY, 
beans::PropertyAttribute::TRANSIENT, cppu::UnoType::get(), 
css::uno::Any(false) );
 registerProperty( LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE, 
LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE, 
beans::PropertyAttribute::TRANSIENT, &m_bPreserveContentSize, 
cppu::UnoType::get() );
+registerPropertyNoMember( LAYOUTMANAGER_PROPNAME_ASCII_REFRESHTOOLTIP, 
LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP, beans::PropertyAttribute::TRANSIENT, 
cppu::UnoType::get(), css::uno::Any(false) );
 }
 
 LayoutManager::~LayoutManager()
@@ -3001,7 +3002,7 @@ void SAL_CALL LayoutManager::elementReplaced( const 
ui::ConfigurationEvent& Even
 void SAL_CALL LayoutManager::setFastPropertyValue_NoBroadcast( sal_Int32   
nHandle,
const uno::Any& 
aValue  )
 {
-if ( nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY )
+if ( (nHandle != LAYOUTMANAGER_PROPHANDLE_REFRESHVISIBILITY) && (nHandle 
!= LAYOUTMANAGER_PROPHANDLE_REFRESHTOOLTIP) )
 LayoutManager_PB

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

[Henry Castro (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 665964c2d36791df4a6586f54167bbd1563cb4e0
Author: Henry Castro 
AuthorDate: Wed Dec 14 11:40:16 2022 -0400
Commit: Andras Timar 
CommitDate: Thu Feb 9 15:27:55 2023 +

lok:sc: do not generate extra mouseup events

In tiled rendering case, the client side always will
send the pair mousedown/mouseup events to server side,
it is not necessary to generate extra mouseup events
when the mouse tracking has ended, otherwise the selection
engine will receive two mouseup events and wrong selection
states.

Signed-off-by: Henry Castro 
Change-Id: I99983de9591e26f6e5327fff63c45e682cbf1999
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144168
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145611
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 78568d4baac8b84b5d9cb50704b3e62b67ab1178)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146633
Tested-by: Jenkins

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3b6cdae18b55..ade27511ab69 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2879,11 +2879,14 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt 
)
 }
 else if ( rTEvt.IsTrackingEnded() )
 {
-// MouseButtonUp always with matching buttons (eg for test tool, # 
63148 #)
-// The tracking event will indicate if it was completed and not 
canceled.
-MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
-rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() 
);
-MouseButtonUp( aUpEvt );
+if (!comphelper::LibreOfficeKit::isActive())
+{
+// MouseButtonUp always with matching buttons (eg for test tool, # 
63148 #)
+// The tracking event will indicate if it was completed and not 
canceled.
+MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(),
+   rMEvt.GetMode(), nButtonDown, 
rMEvt.GetModifier() );
+MouseButtonUp( aUpEvt );
+}
 }
 else
 MouseMove( rMEvt );

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - configure.ac desktop/source external/cairo external/fontconfig external/freetype external/harfbuzz vcl/source vcl/unx

[Tor Lillqvist (via logerrit)]

 configure.ac |   13 +-
 desktop/source/lib/init.cxx  |   20 +++
 external/cairo/ExternalPackage_cairo.mk  |3 
 external/cairo/UnpackedTarball_cairo.mk  |2 
 external/cairo/cairo/cairo-fd-hack.patch.0   |   15 ++
 external/cairo/cairo/libcairo-bundled-soname.patch.0 |   12 ++
 external/fontconfig/ExternalPackage_fontconfig.mk|   16 ++
 external/fontconfig/ExternalProject_fontconfig.mk|   15 ++
 external/fontconfig/Module_fontconfig.mk |1 
 external/fontconfig/UnpackedTarball_fontconfig.mk|1 
 external/fontconfig/libfontconfig-bundled-soname.patch.0 |   11 +
 external/freetype/ExternalProject_freetype.mk|2 
 external/freetype/UnpackedTarball_freetype.mk|1 
 external/freetype/freetype-fd-hack.patch.0   |   53 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk|3 
 external/harfbuzz/harfbuzz-fd-hack.patch.0   |   24 
 vcl/source/fontsubset/sft.cxx|   23 +++
 vcl/unx/generic/fontmanager/fontmanager.cxx  |   90 ---
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx   |   13 ++
 19 files changed, 270 insertions(+), 48 deletions(-)

New commits:
commit 1ab01e0467809b366c5cb690f10266e19ff75119
Author: Tor Lillqvist 
AuthorDate: Tue Sep 20 16:07:14 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 15:34:39 2023 +

Enable opening of downloaded fonts only in ForKit in Online

We want that only the ForKit process needs to have access to new font
files added to a Collabora Online instance dynamically by downloading
from a server. There are however many locations in the Kit process, in
core and in external libraries like harfbuzz, where the code wants to
open a font file.

Handle this so that the ForKit process opens such a downloaded font
file and doesn't close it. The file descriptor is thus inherited by
Kit processes.  The font file pathname passed on to other code is a
fake on in the format "/:FD:/%d" where the %d is the file descriptor
of the opened font file. Add checks in all places where font files are
opened, look for this special pathname format, and modify the code to
just dup() the already open file descriptor in that case.

All this is relevant for Linux only, as Collabora Online runs on
Linux.

Do the above for harfbuzz, cairo, fontconfig, and freetype.

In addition make sure that these libraries (except harfbuzz which
needs to be a static library and freetype) when bundled, on Linux, are
built as shared libraries, and won't be confused with the
corresponding system libraries by making sure their sonames are
different.

Change-Id: Ib059cb27e1637d07bb709249abd0d984f948caa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140714
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146341
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146717
Tested-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 97f69bbdc9ad..b026c2ed552b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10850,11 +10850,18 @@ dnl 
===
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
-libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
+case "$_os" in
+Linux)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42],,,TRUE)
+;;
+*)
+libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42])
+;;
+esac
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index aab552b1c192..3304b4468409 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -26,6 +26,10 @@
 #include 
 #endif
 
+#ifdef LINUX
+#include 
+#endif
+
 #ifdef ANDROID
 #include 
 #endif
@@ -4548,13 +4552,27 @@ static void lo_setOption(LibreOfficeKit* /*pThis*/, 
const char *pOption, const c
 else
 sal_detail_set_log_selector(pCurrentSalLogOverride);
 }
+#ifdef LINUX
 else

ESC meeting minutes: 2023-02-09

[Miklos Vajna]

* Present:
+ Michael W, Michael S, Cloph, Xisco, Ilmari, Heiko, Stephan, Hossein, 
Miklos, Gabriel, Caolán, Eike, Kendy, Thorsten

* Completed Action Items:

* Pending Action Items:
+ install newer NDK on Jenkins to be able to build 
https://gerrit.libreoffice.org/c/core/+/146118 (Cloph)
+ deploy https://gerrit.libreoffice.org/c/lode/+/143788  "Extend kill-wrapper to 
also run on macOS" on the Jenkins slaves (Cloph)

* Release Engineering update (Cloph)
+ 7.5 status: 7.5.1 rc1 was tagged earlier today
  + 7.5.1 rc2 in 2 weeks
+ 7.4 status: 7.4.6 rc1 in 1 week

* Documentation (Olivier)
+ Missing Olivier
+ Bugzilla Documentation statistics
260(260) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 5(-6)40(-4) 95(-8) 300(-2)
 commented 9(-9)69(-7)286(-20)   1011(-33)
  resolved 1(-2)13(-2) 42(-6) 180(-2)
+ top 10 contributors:
  Stéphane Guillou made 58 changes in 1 month, and 124 changes in 1 year
  Seth Chaiklin made 29 changes in 1 month, and 340 changes in 1 year
  Olivier Hallot made 19 changes in 1 month, and 387 changes in 1 year
  Heiko Tietze made 13 changes in 1 month, and 98 changes in 1 year
  Ilmari Lauhakangas made 12 changes in 1 month, and 92 changes in 1 
year
  Rafael Lima made 11 changes in 1 month, and 122 changes in 1 year
  Roman Kuznetsov made 10 changes in 1 month, and 63 changes in 1 year
  Kaganski, Mike made 9 changes in 1 month, and 117 changes in 1 year
  Vernon, Stuart Foote made 7 changes in 1 month, and 23 changes in 1 
year
  Adolfo Jayme Barrientos made 6 changes in 1 month, and 43 changes in 
1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
278(278) (topicUI) bugs open, 72(72) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
 added  7(-2)18(3) 26(3)   60(0)
 commented 85(30)   267(33)   566(16)2211(29)
   removed  1(1)  1(1)  6(-1)  32(0)
  resolved 10(5) 35(1) 79(-3) 292(-1)
+ top 10 contributors:
  Heiko Tietze made 183 changes in 1 month, and 1457 changes in 1 year
  Ilmari Lauhakangas made 53 changes in 1 month, and 209 changes in 1 
year
  Stéphane Guillou made 53 changes in 1 month, and 143 changes in 1 year
  Vernon, Stuart Foote made 52 changes in 1 month, and 188 changes in 1 
year
  Dieter made 34 changes in 1 month, and 220 changes in 1 year
  Rafael Lima made 29 changes in 1 month, and 226 changes in 1 year
  Eyal Rozenberg made 26 changes in 1 month, and 245 changes in 1 year
  Kaganski, Mike made 20 changes in 1 month, and 139 changes in 1 year
  Seth Chaiklin made 17 changes in 1 month, and 180 changes in 1 year
  ady made 13 changes in 1 month, and 13 changes in 1 year
+ [Bug 153474] Add a property to control text's breaks as it exists in
   graphical terminal emulator
+ [Bug 89841] [Calc] Autofilter - weak indication that autofilter was set
 -> + [Bug 153396] LibreOffice Writer: Bibliography reference: Link to 
bibliography
   entry, not associated URL address
  + will give it a go, the patch has to be still reviewed (Heiko)
+ [Bug 153106] Revert commit of Bug 91415 - Scale Calc's comment indicator
   with zoom level (please, do not)
+ [Bug 153344] The size of icons in the status bar should be increased to 
at least
   16px and the height of the status bar adjusted to allow this.
 -> + [Bug 153334] Support/default to a non-white background in Dark Mode
  + suggest: cherry-pick for 7.5.1 without l10n, because of the high number 
of requests
  + no problem with the backport (Caolan), but there are new strings for 
l10n
+ will do the work
+ Heiko to update l10n people
+ [Bug 153321] Notebook Bar (MUFFIN) separator color inconsistent in dark 
mode
+ [Bug 149497] CALC Enhancement. Permit "No User Input" as a data validation
   which would then permit filter sorting
+ [Bug 153322] RFE: Add Macro Security Settings button to macro infobar


* Crash Testing (Caolan)
+ 95(-7) import failure, 4(-1) export failures
  - making a little progress, some more fixes in next run
  - under 100 failures, finally
+ 2 coverity issues
  - next run should include fixes
+ 4 ossfuzz issues, no crashes

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.3.7.2
 + (-101) 884 985 901 840 606 533 431 460 855 217 0
   + https://crashreport.libreoffice.org/stats/version/7.4.4.2
 + (-469) 725 1194 1343 832 0
   + https://crashreport.libreoffice.org/stats/version/7.4.5.1
 + (-72) 573 645 0
   + https://crashrepor

Minutes from the UX/design meeting 2023-Feb-09

[Heiko Tietze]

Present: Cor, Heiko
Comments: Stephane, Andre

Tickets/Topics

 * Format->Text menu name is confusing in Calc
   + https://bugs.documentfoundation.org/show_bug.cgi?id=153300
   + rename Format > Text to Format > Character in Calc (and maybe also
 other modules too)
   + menu items consist of Font and Font Effects from the dialog (Stephane)
 + Font Effects might fit but font weight wouldn't be included
   + Writer has a menu item "Character..." (Heiko)
   + "Text formatting", not a better solution though (Cor)
   => no good solution, this has to be learned; WF

 * Enhancement Request: Exclude some pages from field "Page Count"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=153259
   + flag on page break to exclude single pages from counting (Andre)
 + very impractical since the hard page break is assigned to
   the 1st paragraph (Cor)
   One would need to add extra hard page breaks for each ..
   + page style attribute to suppress counting pages (Heiko)
 + bug 71583 requests individual counting and should be closed
 + has probably a use case (Cor) but should be realized as document
   information and not taken into a variable (Heiko)
   + requires a new flag in ODF
   => do it as page style

 * Insert Caption and Caption Options dialogs have a mix of settings
   affecting the whole category or only current caption
   + https://bugs.documentfoundation.org/show_bug.cgi?id=153248
   + "local" and "global" settings is one dialog is very
 confusing (Stéphane)
 + Yes - clearly indicating is a must. (Cor)
   but it may prevent the need of extra dialogs
   + discussed with Stephane and we clarified the issues;
 have to work on it (Heiko)
   => comment later

 * LO should retain selection on first document when interacting with
   second document
   + https://bugs.documentfoundation.org/show_bug.cgi?id=152744
   + selection color needs to be dimmed (Cor)
 + maybe the reason why it is not shown at all (Heiko)
   => worth to do

 * Revert commit of Bug 91415 - Scale Calc's comment indicator with
   zoom level (please, do not)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=153106
   + want to ponder over it (Cor)
 asking a question for clarification - don't get the real problem
   + wild idea: draw text/numbers with background; that would cover
 the comment indicator; but we seem to not have this option on
 a quick glance (Heiko)
   => keep open for now


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: solenv/clang-format

[Ilmari Lauhakangas (via logerrit)]

 solenv/clang-format/check-last-commit |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit f59d449ecfc078765dfaa2e150a21a7e4b330932
Author: Ilmari Lauhakangas 
AuthorDate: Thu Feb 9 12:45:37 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu Feb 9 15:44:41 2023 +

check-last-commit: more detailed advice on using clang-format

Change-Id: I7e25acd02573c3e173eccefe9326dc42e2940f05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146688
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/solenv/clang-format/check-last-commit 
b/solenv/clang-format/check-last-commit
index 0de5ac4b0783..bd26258c5ad4 100755
--- a/solenv/clang-format/check-last-commit
+++ b/solenv/clang-format/check-last-commit
@@ -65,7 +65,11 @@ sub check_style()
 {
 print("\nERROR: The above differences were found between the code to 
commit \n");
 print("and the clang-format rules. Tips:\n");
-print("\n- You may run '/opt/lo/bin/clang-format -i ' to fix up style automatically.\n");
+print("\n- On your local machine you may check how clang-format would 
modify the problematic file by saying\n");
+print("  diff --unified  <(/opt/lo/bin/clang-format 
)\n");
+print("- NOTE: you should only correct the lines that you changed. Do 
not add unrelated formatting to your patch.\n");
+print("- If the suggested corrections only apply to the lines you 
changed, you may run\n");
+print("  '/opt/lo/bin/clang-format -i ' to fix up 
style automatically.\n");
 print("- See solenv/clang-format/README on where to get the required 
version of clang-format binaries.\n");
 print("- If you renamed an excluded file, update 
solenv/clang-format/excludelist accordingly to keep it excluded.\n");
 print("\nsolenv/clang-format/check-last-commit: KO\n");

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/interpr3.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a6582c10f73242b74d127caca987b9144bc402f9
Author: Caolán McNamara 
AuthorDate: Thu Jan 26 20:55:57 2023 +
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 15:50:40 2023 +

crashtesting: crash on forum-mso-en4-719754.xlsx with fPercentile ~== 1

input is fPercentile of near 1 where approxFloor would give nIndex of
nSize-1 resulting in a non-zero tiny negative fDiff, when the assumption
is fDiff will be 0 or some positive value.

Change-Id: I8fe5520f2b3c68f3204d435337df527185dcb0d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146218
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 1371ba2bcbcce57ba5cbd7a199ae8feceb22d0d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146204
Reviewed-by: Xisco Fauli 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index c0ac25b257e5..e169a87f6542 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3409,8 +3409,13 @@ double ScInterpreter::GetPercentile( vector & 
rArray, double fPercentile
 OSL_ENSURE(nIndex < nSize, "GetPercentile: wrong index(1)");
 vector::iterator iter = rArray.begin() + nIndex;
 ::std::nth_element( rArray.begin(), iter, rArray.end());
-if (fDiff == 0.0)
+if (fDiff <= 0.0)
+{
+// Note: neg fDiff seen with forum-mso-en4-719754.xlsx with
+// fPercentile of near 1 where approxFloor gave nIndex of nSize-1
+// resulting in a non-zero tiny negative fDiff.
 return *iter;
+}
 else
 {
 OSL_ENSURE(nIndex < nSize-1, "GetPercentile: wrong index(2)");

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - RepositoryExternal.mk

[Tor Lillqvist (via logerrit)]

 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit a30eb16d62188b55fc60fd91220c1c0b3fd46d7f
Author: Tor Lillqvist 
AuthorDate: Thu Oct 20 11:20:12 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Feb 9 15:53:46 2023 +

Get the shared object of a bundled fontconfig into rpm and deb packages

Change-Id: I9630fa25178637bba189c263605a2198ef5c6064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141550
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146720
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c1949cb9b7f5..3b8d10d31933 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1284,6 +1284,14 @@ gb_ExternalProject__use_fontconfig :=
 
 else # SYSTEM_FONTCONFIG
 
+ifneq ($(filter-out MACOSX WNT,$(OS)),)
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   fontconfig \
+))
+
+endif
+
 define gb_LinkTarget__use_fontconfig
 $(call gb_LinkTarget_use_external_project,$(1),fontconfig)
 $(call gb_LinkTarget_set_include,$(1),\

[Libreoffice-commits] core.git: configure.ac vcl/inc vcl/source

[Khaled Hosny (via logerrit)]

 configure.ac|5 +++--
 vcl/inc/font/LogicalFontInstance.hxx|2 --
 vcl/source/font/LogicalFontInstance.cxx |   13 +
 vcl/source/gdi/CommonSalLayout.cxx  |9 ++---
 4 files changed, 6 insertions(+), 23 deletions(-)

New commits:
commit cbdcc18778f9736ca6f186e2bbb9f0db456b1cee
Author: Khaled Hosny 
AuthorDate: Wed Feb 8 21:27:50 2023 +0200
Commit: خالد حسني 
CommitDate: Thu Feb 9 16:42:46 2023 +

Require HarfBuzz 5.1.0

This is the minimal version to provide the functionality we currently
check for. Some important LO functionality currently depend on idfdef'd
HarfBuzz code, and some distributions build against old system HarfBuzz
leading to user bug reports that are tricky to track down, e.g:
tdf#153048 and tdf#153470.

Change-Id: I7d58ec46f8fd340d2592887c0088876d71351771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146674
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/configure.ac b/configure.ac
index c232686dc696..ed0e05d6a7b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10820,6 +10820,7 @@ AC_SUBST(SYSTEM_LIBORCUS)
 dnl ===
 dnl HarfBuzz
 dnl ===
+harfbuzz_required_version=5.1.0
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
@@ -10828,11 +10829,11 @@ 
HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs -lharfbu
 case "$_os" in
 Linux)
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 
0.9.3],,,TRUE)
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42],,,TRUE)
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version],,,TRUE)
 ;;
 *)
 libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.42])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])
 ;;
 esac
 
diff --git a/vcl/inc/font/LogicalFontInstance.hxx 
b/vcl/inc/font/LogicalFontInstance.hxx
index 6f4645c82c0c..c9e837d540f1 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -156,10 +156,8 @@ private:
 // The value is initialized and used in NeedOffsetCorrection().
 std::optional m_xeFontFamilyEnum;
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 mutable hb_draw_funcs_t* m_pHbDrawFuncs = nullptr;
 basegfx::B2DPolygon m_aDrawPolygon;
-#endif
 };
 
 inline hb_font_t* LogicalFontInstance::GetHbFont()
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 277edec2d96c..58b291d04bdf 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -54,10 +54,8 @@ LogicalFontInstance::~LogicalFontInstance()
 if (m_pHbFontUntransformed)
 hb_font_destroy(m_pHbFontUntransformed);
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if (m_pHbDrawFuncs)
 hb_draw_funcs_destroy(m_pHbDrawFuncs);
-#endif
 }
 
 hb_font_t* LogicalFontInstance::InitHbFont()
@@ -75,12 +73,10 @@ hb_font_t* LogicalFontInstance::InitHbFont()
 if (!aVariations.empty())
 hb_font_set_variations(pHbFont, aVariations.data(), 
aVariations.size());
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 // If we are applying artificial italic, instruct HarfBuzz to do the same
 // so that mark positioning is also transformed.
 if (NeedsArtificialItalic())
 hb_font_set_synthetic_slant(pHbFont, ARTIFICIAL_ITALIC_SKEW);
-#endif
 
 ImplInitHbFont(pHbFont);
 
@@ -91,7 +87,6 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() const
 {
 auto* pHbFont = const_cast(this)->GetHbFont();
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 if (NeedsArtificialItalic()) // || NeedsArtificialBold()
 {
 if (!m_pHbFontUntransformed)
@@ -103,7 +98,7 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() 
const
 }
 return m_pHbFontUntransformed;
 }
-#endif
+
 return pHbFont;
 }
 
@@ -259,7 +254,6 @@ bool LogicalFontInstance::NeedsArtificialItalic() const
 return m_aFontSelData.GetItalic() != ITALIC_NONE && 
m_pFontFace->GetItalic() == ITALIC_NONE;
 }
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 namespace
 {
 void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, 
float to_x, float to_y,
@@ -294,12 +288,10 @@ void close_path_func(hb_draw_funcs_t*, void* pDrawData, 
hb_draw_state_t*, void*
 pPoly->clear();
 }
 }
-#endif
 
 bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,

basegfx::B2DPolyPolygon& rPolyPoly) const
 {
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if (!m_

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - basic/source desktop/source emfio/source extensions/source filter/source hwpfilter/source i18npool/source lotuswordpro/source sal/q

[Patrick Luby (via logerrit)]

 basic/source/sbx/sbxform.cxx|4 
 desktop/source/deployment/misc/lockfile.cxx |2 
 emfio/source/reader/emfreader.cxx   |2 
 emfio/source/reader/wmfreader.cxx   |2 
 extensions/source/scanner/grid.cxx  |4 
 extensions/source/scanner/sanedlg.cxx   |   14 +++
 filter/source/t602/t602filter.cxx   |4 
 hwpfilter/source/hbox.cxx   |   22 +
 hwpfilter/source/hcode.cxx  |4 
 hwpfilter/source/hwpreader.cxx  |   50 
 hwpfilter/source/mzstring.cxx   |4 
 i18npool/source/calendar/calendar_gregorian.cxx |   26 +-
 lotuswordpro/source/filter/bencont.cxx  |2 
 lotuswordpro/source/filter/lwpgrfobj.cxx|4 
 lotuswordpro/source/filter/xfilter/xfcolor.cxx  |2 
 sal/qa/rtl/process/rtl_Process.cxx  |4 
 sc/source/filter/excel/xestream.cxx |2 
 sc/source/filter/xcl97/xcl97rec.cxx |2 
 sfx2/source/doc/objstor.cxx |2 
 shell/source/tools/lngconvex/lngconvex.cxx  |4 
 solenv/bin/native-code.py   |1 
 svl/source/misc/lockfilecommon.cxx  |2 
 svl/source/numbers/zformat.cxx  |2 
 sw/secmod.db|binary
 sw/source/core/doc/dbgoutsw.cxx |8 +
 sw/source/filter/ww8/WW8TableInfo.cxx   |2 
 sw/source/ui/vba/vbacontentcontrollistentry.cxx |   10 +-
 tools/source/inet/inetmsg.cxx   |2 
 tools/source/misc/json_writer.cxx   |2 
 tools/source/ref/globname.cxx   |   10 ++
 tools/source/stream/stream.cxx  |4 
 vcl/ios/iosinst.cxx |2 
 vcl/source/fontsubset/cff.cxx   |   97 +---
 xmlsecurity/source/helper/xsecsign.cxx  |2 
 34 files changed, 287 insertions(+), 17 deletions(-)

New commits:
commit 88e1e8fb06180fe070aaf0065d9c3403b477cfd7
Author: Patrick Luby 
AuthorDate: Thu Feb 2 17:21:56 2023 -0500
Commit: Michael Meeks 
CommitDate: Thu Feb 9 17:58:53 2023 +

Fix build errors by suppressing warnings when building with Xcode 14.2

Apple started marking sprintf as deprecated in Xcode 14 so we need to
suppress the deprecated warnings in order to build on iOS and macOS
with Xcode 14 and higher.

This also fixes the inability to open documents in the iOS app. Loading
a document would fail to load the following symbols:

  com_sun_star_xml_crypto_SEInitializer_get_implementation
  com_sun_star_security_DocumentDigitalSignatures_get_implementation

The problem was that these symbols are within an #if HAVE_FEATURE_NSS
block in the generated workdir/CustomTarget/ios/native-code.h so we need
to add an #include  in solenv/bin/native-code.py like
was added in commit fa5db38ae5bbe9abfd41b6765074ca1200b8def2.

Change-Id: I541279eb307e5a9d589e3b39c684a49bf8cca14d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146536
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Patrick Luby 
Reviewed-by: Michael Meeks 

diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index 0123dd076d02..93fea94d4c29 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -232,7 +232,9 @@ void SbxBasicFormater::InitScan( double _dNum )
 dNum = _dNum;
 InitExp( get_number_of_digits( dNum ) );
 // maximum of 15 positions behind the decimal point, example: 
-1.234E-001
+SAL_WNODEPRECATED_DECLARATIONS_PUSH // sprintf (macOS 13 SDK)
 /*int nCount =*/ sprintf( sBuffer,"%+22.15lE",dNum );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 sSciNumStrg = OUString::createFromAscii( sBuffer );
 }
 
@@ -241,7 +243,9 @@ void SbxBasicFormater::InitExp( double _dNewExp )
 {
 char sBuffer[ MAX_DOUBLE_BUFFER_LENGTH ];
 nNumExp = static_cast(_dNewExp);
+SAL_WNODEPRECATED_DECLARATIONS_PUSH // sprintf (macOS 13 SDK)
 /*int nCount =*/ sprintf( sBuffer,"%+i",nNumExp );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 sNumExpStrg = OUString::createFromAscii( sBuffer );
 nExpExp = static_cast(get_number_of_digits( 
static_cast(nNumExp) ));
 }
diff --git a/desktop/source/deployment/misc/lockfile.cxx 
b/desktop/source/deployment/misc/lockfile.cxx
index 206da8286d76..a46eedc62a3a 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -91,7 +91,9 @@ namespace desktop {
 time_t t = time(nullptr);
 for (int i = 0; i mfMax )
 fValue = mfMax;
+SAL_WNODEPRECATED_DECLARATIONS_PUSH // sprintf (macOS 13 SDK)
 sprintf( pBuf, "%g", fValue );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 mxNumericEdit->set_text( OUString( pBuf, strlen(pB

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

[Khaled Hosny (via logerrit)]

 vcl/inc/font/LogicalFontInstance.hxx|2 +-
 vcl/source/font/LogicalFontInstance.cxx |8 
 vcl/source/gdi/pdfwriter_impl.cxx   |6 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 182e85aef036f30e8c6f32de5516a0286aaf0320
Author: Khaled Hosny 
AuthorDate: Wed Feb 8 21:57:07 2023 +0200
Commit: خالد حسني 
CommitDate: Thu Feb 9 18:22:41 2023 +

vcl: GetGlyphOutlineUntransformed() always returns true now

Change-Id: I98eff6f138b57e249d8ce951c1b3747c773330ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146718
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/vcl/inc/font/LogicalFontInstance.hxx 
b/vcl/inc/font/LogicalFontInstance.hxx
index c9e837d540f1..a5e8a6d3249e 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -103,7 +103,7 @@ public: // TODO: make data members private
 
 bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, bool) const;
 virtual bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) 
const = 0;
-bool GetGlyphOutlineUntransformed(sal_GlyphId, basegfx::B2DPolyPolygon&) 
const;
+basegfx::B2DPolyPolygon GetGlyphOutlineUntransformed(sal_GlyphId) const;
 
 sal_GlyphId GetGlyphIndex(uint32_t, uint32_t = 0) const;
 
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 58b291d04bdf..385fe5ccd624 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -289,8 +289,7 @@ void close_path_func(hb_draw_funcs_t*, void* pDrawData, 
hb_draw_state_t*, void*
 }
 }
 
-bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,
-   
basegfx::B2DPolyPolygon& rPolyPoly) const
+basegfx::B2DPolyPolygon 
LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph) const
 {
 if (!m_pHbDrawFuncs)
 {
@@ -306,8 +305,9 @@ bool 
LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,
 hb_draw_funcs_set_close_path_func(m_pHbDrawFuncs, close_path_func, 
pUserData, nullptr);
 }
 
-hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
&rPolyPoly);
-return true;
+basegfx::B2DPolyPolygon aPolyPoly;
+hb_font_get_glyph_shape(GetHbFontUntransformed(), nGlyph, m_pHbDrawFuncs, 
&aPolyPoly);
+return aPolyPoly;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index e4807abfaae8..8b1a8b6287da 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6257,11 +6257,7 @@ void PDFWriterImpl::registerGlyph(const sal_GlyphId 
nFontGlyphId,
 else if (!aBitmap.empty())
 rNewGlyphEmit.setColorBitmap(aBitmap, aRect);
 else if (bVariations)
-{
-basegfx::B2DPolyPolygon aOutline;
-if (pFont->GetGlyphOutlineUntransformed(nFontGlyphId, 
aOutline))
-rNewGlyphEmit.setOutline(aOutline);
-}
+
rNewGlyphEmit.setOutline(pFont->GetGlyphOutlineUntransformed(nFontGlyphId));
 
 // add new glyph to font mapping
 Glyph& rNewGlyph = rSubset.m_aMapping[nFontGlyphId];

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

[Mert Tumer (via logerrit)]

 sw/source/ui/table/instable.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 8620b204b51a9e0552a0002f7f06292bdfad37a7
Author: Mert Tumer 
AuthorDate: Fri Mar 25 17:56:30 2022 +0300
Commit: Szymon Kłos 
CommitDate: Thu Feb 9 19:11:09 2023 +

make default selected table style to Default Table Style for only online

unfortunately when the table has a style 
sw/qa/uitest/writer_tests4/tdf115573.py fails
because tables that have pre-applied style resets the style of the elements 
in their cells
when a new row is inserted and the ui test above relies on that. For now 
this is LOK only

Signed-off-by: Mert Tumer 
Change-Id: I2f60376fc2d929498aef45259a5ef291922ccdcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132124
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gökay ŞATIR 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146723
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 7383da93bdef..a5aa4cd83853 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -148,8 +148,13 @@ void SwInsTableDlg::InitAutoTableFormat()
 // Change this min variable if you add autotable manually.
 minTableIndexInLb = 1;
 maxTableIndexInLb = minTableIndexInLb + 
static_cast(m_xTableTable->size());
-m_xLbFormat->select( minTableIndexInLb );
-m_tbIndex = lbIndexToTableIndex( minTableIndexInLb );
+// 1 means default table style
+// unfortunately when the table has a style 
sw/qa/uitest/writer_tests4/tdf115573.py fails
+// because tables that have pre-applied style resets the style of the 
elements in their cells
+// when a new row is inserted and the ui test above relies on that. For 
now this is LOK only
+m_lbIndex = comphelper::LibreOfficeKit::isActive() ? 1 : 0;
+m_xLbFormat->select(m_lbIndex);
+m_tbIndex = lbIndexToTableIndex(m_lbIndex);
 
 SelFormatHdl( *m_xLbFormat );
 }
commit ef46afe71751929b8b17d278d83c8e3ceefc862f
Author: Mert Tumer 
AuthorDate: Wed Mar 23 14:23:23 2022 +0300
Commit: Szymon Kłos 
CommitDate: Thu Feb 9 19:10:58 2023 +

sw: change inserttable style option default to 1

Right now it is default to NONE in the list
if the user explicitly choses otherwise but that
does not align with inserttable option on the toolbar
there it is defaulted to "Default Table Style"
1 means "Default Table Style"

Signed-off-by: Mert Tumer 
Change-Id: I1db19f0292ac6775653b0db3f2860fea9e3b0adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131971
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146722
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e10279add315..7383da93bdef 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -148,9 +148,8 @@ void SwInsTableDlg::InitAutoTableFormat()
 // Change this min variable if you add autotable manually.
 minTableIndexInLb = 1;
 maxTableIndexInLb = minTableIndexInLb + 
static_cast(m_xTableTable->size());
-m_lbIndex = 0;
-m_xLbFormat->select( m_lbIndex );
-m_tbIndex = lbIndexToTableIndex(m_lbIndex);
+m_xLbFormat->select( minTableIndexInLb );
+m_tbIndex = lbIndexToTableIndex( minTableIndexInLb );
 
 SelFormatHdl( *m_xLbFormat );
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Mert Tumer (via logerrit)]

 sw/source/ui/table/instable.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 51cea0559c373d54f65e0630c0eda1eaf0ac2fe2
Author: Mert Tumer 
AuthorDate: Wed Mar 23 14:23:23 2022 +0300
Commit: Szymon Kłos 
CommitDate: Thu Feb 9 19:12:05 2023 +

sw: change inserttable style option default to 1

Right now it is default to NONE in the list
if the user explicitly choses otherwise but that
does not align with inserttable option on the toolbar
there it is defaulted to "Default Table Style"
1 means "Default Table Style"

Signed-off-by: Mert Tumer 
Change-Id: I1db19f0292ac6775653b0db3f2860fea9e3b0adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131971
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146722
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 
(cherry picked from commit ef46afe71751929b8b17d278d83c8e3ceefc862f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146701

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index e10279add315..7383da93bdef 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -148,9 +148,8 @@ void SwInsTableDlg::InitAutoTableFormat()
 // Change this min variable if you add autotable manually.
 minTableIndexInLb = 1;
 maxTableIndexInLb = minTableIndexInLb + 
static_cast(m_xTableTable->size());
-m_lbIndex = 0;
-m_xLbFormat->select( m_lbIndex );
-m_tbIndex = lbIndexToTableIndex(m_lbIndex);
+m_xLbFormat->select( minTableIndexInLb );
+m_tbIndex = lbIndexToTableIndex( minTableIndexInLb );
 
 SelFormatHdl( *m_xLbFormat );
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sw/source

[Mert Tumer (via logerrit)]

 sw/source/ui/table/instable.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1e472f9b0191bbde8f63b26b4d739cc97293a99b
Author: Mert Tumer 
AuthorDate: Fri Mar 25 17:56:30 2022 +0300
Commit: Szymon Kłos 
CommitDate: Thu Feb 9 19:12:34 2023 +

make default selected table style to Default Table Style for only online

unfortunately when the table has a style 
sw/qa/uitest/writer_tests4/tdf115573.py fails
because tables that have pre-applied style resets the style of the elements 
in their cells
when a new row is inserted and the ui test above relies on that. For now 
this is LOK only

Signed-off-by: Mert Tumer 
Change-Id: I2f60376fc2d929498aef45259a5ef291922ccdcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132124
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gökay ŞATIR 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146723
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit 8620b204b51a9e0552a0002f7f06292bdfad37a7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146702
Tested-by: Szymon Kłos 

diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 7383da93bdef..a5aa4cd83853 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -148,8 +148,13 @@ void SwInsTableDlg::InitAutoTableFormat()
 // Change this min variable if you add autotable manually.
 minTableIndexInLb = 1;
 maxTableIndexInLb = minTableIndexInLb + 
static_cast(m_xTableTable->size());
-m_xLbFormat->select( minTableIndexInLb );
-m_tbIndex = lbIndexToTableIndex( minTableIndexInLb );
+// 1 means default table style
+// unfortunately when the table has a style 
sw/qa/uitest/writer_tests4/tdf115573.py fails
+// because tables that have pre-applied style resets the style of the 
elements in their cells
+// when a new row is inserted and the ui test above relies on that. For 
now this is LOK only
+m_lbIndex = comphelper::LibreOfficeKit::isActive() ? 1 : 0;
+m_xLbFormat->select(m_lbIndex);
+m_tbIndex = lbIndexToTableIndex(m_lbIndex);
 
 SelFormatHdl( *m_xLbFormat );
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - configure.ac vcl/inc vcl/source

[Khaled Hosny (via logerrit)]

 configure.ac|3 ++-
 vcl/inc/font/LogicalFontInstance.hxx|2 --
 vcl/source/font/LogicalFontInstance.cxx |   13 +
 vcl/source/gdi/CommonSalLayout.cxx  |9 ++---
 4 files changed, 5 insertions(+), 22 deletions(-)

New commits:
commit a29c338fe8689924328cf56c59d36ed561a702b9
Author: Khaled Hosny 
AuthorDate: Wed Feb 8 21:27:50 2023 +0200
Commit: Xisco Fauli 
CommitDate: Thu Feb 9 19:41:05 2023 +

Require HarfBuzz 5.1.0

This is the minimal version to provide the functionality we currently
check for. Some important LO functionality currently depend on idfdef'd
HarfBuzz code, and some distributions build against old system HarfBuzz
leading to user bug reports that are tricky to track down, e.g:
tdf#153048 and tdf#153470.

Change-Id: I7d58ec46f8fd340d2592887c0088876d71351771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146674
Tested-by: Jenkins
Reviewed-by: خالد حسني 
(cherry picked from commit 8c1e91444c78db1093c3db54d98efb16294f82ea)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146699
Reviewed-by: Xisco Fauli 

diff --git a/configure.ac b/configure.ac
index 04e0e0b08afb..c30780562d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10848,6 +10848,7 @@ AC_SUBST(SYSTEM_LIBORCUS)
 dnl ===
 dnl HarfBuzz
 dnl ===
+harfbuzz_required_version=5.1.0
 
 GRAPHITE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/graphite/include 
-DGRAPHITE2_STATIC"
 GRAPHITE_LIBS_internal="-L${WORKDIR}/LinkTarget/StaticLibrary -lgraphite"
@@ -10855,7 +10856,7 @@ 
libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
 
 HARFBUZZ_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/harfbuzz/src"
 HARFBUZZ_LIBS_internal="-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs 
-lharfbuzz"
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 2.6.8])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
$harfbuzz_required_version])
 
 if test "$COM" = "MSC"; then # override the above
 GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib"
diff --git a/vcl/inc/font/LogicalFontInstance.hxx 
b/vcl/inc/font/LogicalFontInstance.hxx
index 6f4645c82c0c..c9e837d540f1 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -156,10 +156,8 @@ private:
 // The value is initialized and used in NeedOffsetCorrection().
 std::optional m_xeFontFamilyEnum;
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 mutable hb_draw_funcs_t* m_pHbDrawFuncs = nullptr;
 basegfx::B2DPolygon m_aDrawPolygon;
-#endif
 };
 
 inline hb_font_t* LogicalFontInstance::GetHbFont()
diff --git a/vcl/source/font/LogicalFontInstance.cxx 
b/vcl/source/font/LogicalFontInstance.cxx
index 277edec2d96c..58b291d04bdf 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -54,10 +54,8 @@ LogicalFontInstance::~LogicalFontInstance()
 if (m_pHbFontUntransformed)
 hb_font_destroy(m_pHbFontUntransformed);
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if (m_pHbDrawFuncs)
 hb_draw_funcs_destroy(m_pHbDrawFuncs);
-#endif
 }
 
 hb_font_t* LogicalFontInstance::InitHbFont()
@@ -75,12 +73,10 @@ hb_font_t* LogicalFontInstance::InitHbFont()
 if (!aVariations.empty())
 hb_font_set_variations(pHbFont, aVariations.data(), 
aVariations.size());
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 // If we are applying artificial italic, instruct HarfBuzz to do the same
 // so that mark positioning is also transformed.
 if (NeedsArtificialItalic())
 hb_font_set_synthetic_slant(pHbFont, ARTIFICIAL_ITALIC_SKEW);
-#endif
 
 ImplInitHbFont(pHbFont);
 
@@ -91,7 +87,6 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() const
 {
 auto* pHbFont = const_cast(this)->GetHbFont();
 
-#if HB_VERSION_ATLEAST(3, 3, 0)
 if (NeedsArtificialItalic()) // || NeedsArtificialBold()
 {
 if (!m_pHbFontUntransformed)
@@ -103,7 +98,7 @@ hb_font_t* LogicalFontInstance::GetHbFontUntransformed() 
const
 }
 return m_pHbFontUntransformed;
 }
-#endif
+
 return pHbFont;
 }
 
@@ -259,7 +254,6 @@ bool LogicalFontInstance::NeedsArtificialItalic() const
 return m_aFontSelData.GetItalic() != ITALIC_NONE && 
m_pFontFace->GetItalic() == ITALIC_NONE;
 }
 
-#if HB_VERSION_ATLEAST(4, 0, 0)
 namespace
 {
 void move_to_func(hb_draw_funcs_t*, void* /*pDrawData*/, hb_draw_state_t*, 
float to_x, float to_y,
@@ -294,12 +288,10 @@ void close_path_func(hb_draw_funcs_t*, void* pDrawData, 
hb_draw_state_t*, void*
 pPoly->clear();
 }
 }
-#endif
 
 bool LogicalFontInstance::GetGlyphOutlineUntransformed(sal_GlyphId nGlyph,

basegfx::B2DPolyPolygon& rPolyPoly) const
 {
-#if HB_VERSION_ATLEAST(4, 0, 0)
 if (!m_pHbDrawFuncs)
  

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

[Stephan Bergmann (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6ed7a3cc51e560c6b2a6894f6829c0ac9f991ef2
Author: Stephan Bergmann 
AuthorDate: Thu Feb 9 16:37:51 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 9 19:57:41 2023 +

tdf#153501 Fix OString construction from nullptr

(see recent 6028e9fda96d0ed5da266b1c54a7755f7ba3408c "Finally drop 
undocumented
rtl_[u]String_newFromStr null argument support")

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6b8b65c4fbce..16945ee85dd7 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -7695,7 +7695,8 @@ public:
 GtkWidget* pPage = gtk_assistant_get_nth_page(m_pAssistant, nOldIndex);
 
 g_object_ref(pPage);
-OString sTitle(gtk_assistant_get_page_title(m_pAssistant, pPage));
+auto const title = gtk_assistant_get_page_title(m_pAssistant, pPage);
+OString sTitle(title == nullptr ? "" : title);
 gtk_assistant_remove_page(m_pAssistant, nOldIndex);
 gtk_assistant_insert_page(m_pAssistant, pPage, nNewIndex);
 gtk_assistant_set_page_type(m_pAssistant, pPage, 
GTK_ASSISTANT_PAGE_CUSTOM);

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

[Xisco Fauli (via logerrit)]

 sw/source/uibase/app/applab.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 10ed0b5c09eefc53c8e8a6f606faf29dac5f4d80
Author: Xisco Fauli 
AuthorDate: Thu Feb 9 14:36:51 2023 +0100
Commit: Caolán McNamara 
CommitDate: Thu Feb 9 21:05:54 2023 +

sw: fix crash in SwModule::InsertLab

Seen in 
https://crashreport.libreoffice.org/stats/crash_details/e17357e9-d5e2-4eee-868e-ecf72e04dc41

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

diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 786e9bf63d4c..dbcacc997cb2 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -181,6 +181,8 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
 }
 
 SfxViewFrame* pViewFrame = SfxViewFrame::DisplayNewDocument( *xDocSh, rReq 
);
+if (!pViewFrame)
+return;
 
 SwView  *pNewView = static_cast( pViewFrame->GetViewShell());
 pNewView->AttrChangedNotify(nullptr);// So that SelectShell is being 
called.

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf153042_largeTab.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf153042_noTab.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx|   32 ++
 sw/qa/extras/rtfimport/rtfimport.cxx  |8 
 sw/qa/extras/ww8export/ww8export3.cxx |5 ++
 5 files changed, 45 insertions(+)

New commits:
commit ff3440535e786c73237176670372c565ca3421b4
Author: Justin Luth 
AuthorDate: Thu Feb 9 11:05:48 2023 -0500
Commit: Justin Luth 
CommitDate: Thu Feb 9 23:14:46 2023 +

tdf#153042 doc/x/rtf: pre-emptive unit tests for numbering tabstop

These existing unit tests need to have a tabstop in the front.
Although different versions of MS Word can handle similar situations
differently (regardless of compatibility settings - i.e. buggy)
in these cases they are all rendered the same way by Word 2003/2010/2019.

make CppunitTest_sw_rtfimport CPPUNIT_TEST_NAME=testTdf78506
make CppunitTest_sw_rtfimport CPPUNIT_TEST_NAME=testTdf116265

In this one, LO's chapter numbering defaults to none-numbering
followed by a tabstop. The tabstop should not be there/never become visible.
make CppunitTest_sw_ww8export3 CPPUNIT_TEST_NAME=testPresetDash

For this added test, older versions of Word 2010/2003 don't show a tabstop.
According to MS Word 2019 however, this should have a tabstop in the front.
make CppunitTest_sw_ooxmlexport18 CPPUNIT_TEST_NAME=testTdf153042_largeTab

... but this nearly identical file does not display with any tabstop,
and looks the same in all versions of Word.
make CppunitTest_sw_ooxmlexport18 CPPUNIT_TEST_NAME=testTdf153042_noTab

Change-Id: I59d904ef7dd37b694b02f57d6743ee5b232b42a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146731
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf153042_largeTab.docx 
b/sw/qa/extras/ooxmlexport/data/tdf153042_largeTab.docx
new file mode 100644
index ..87730d6d1215
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf153042_largeTab.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf153042_noTab.docx 
b/sw/qa/extras/ooxmlexport/data/tdf153042_noTab.docx
new file mode 100644
index ..38b5208eab44
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf153042_noTab.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
index 2441a7febfd8..8de09d6d3c7c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport18.cxx
@@ -80,6 +80,38 @@ DECLARE_OOXMLEXPORT_TEST(testTdf147646, 
"tdf147646_mergedCellNumbering.docx")
 
CPPUNIT_ASSERT_EQUAL(OUString("2."),parseDump("/root/page/body/tab/row[4]/cell/txt/SwParaPortion/SwLineLayout/child::*[@type='PortionType::Number']","expand"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf153042_largeTab, "tdf153042_largeTab.docx")
+{
+// This is not the greatest test because it is slightly weird, and has a 
different layout
+// in MS Word 2010/2003 than it does in Word 2019. This tests for the 2019 
layout.
+// Additionally (in Word 2019), going to paragraph properties and hitting 
OK changes the layout.
+// It changes back by going to outline numbering properties and hitting OK.
+
+// export does not keep the tabstop when exporting non-numbering. 
(Probably a good thing...)
+if (isExported())
+return;
+
+const auto& pLayout = parseLayoutDump();
+// Ensure a large tabstop is used in the pseudo-numbering (numbering::NONE 
followed by tabstop)
+assertXPath(pLayout, "//SwFixPortion", "width", "1701");
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf153042_noTab, "tdf153042_noTab.docx")
+{
+// This is not the greatest test because it is slightly weird.
+// It is the same as the "largeTab" file, except the paragraph properties 
were viewed
+// and OK'ed, and now it looks like how Word 2010 and 2003 were laying it 
out.
+// Amazingly, LO is handling both documents correctly at the moment, so 
let's unit test that...
+
+// export does not keep the tabstop when exporting non-numbering. 
(Probably a good thing...)
+if (isExported())
+return;
+
+const auto& pLayout = parseLayoutDump();
+// Ensure a miniscule tab is used in the pseudo-numbering (numbering::NONE 
followed by tabstop)
+assertXPath(pLayout, "//SwFixPortion", "width", "10");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf149551_mongolianVert)
 {
 // Given a docx document with a shape with vert="mongolianVert".
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index eb2596e44c44..37acceaa7d6c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -743,6 +743,10 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf116265)
 // matching \fi in list definition (and with 

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

[Mike Kaganski (via logerrit)]

 sc/source/ui/docshell/autostyl.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a80630b6ee6e7636d2c93c42724ce815c991311c
Author: Mike Kaganski 
AuthorDate: Thu Feb 9 16:06:04 2023 +0300
Commit: Mike Kaganski 
CommitDate: Fri Feb 10 06:25:16 2023 +

Related: tdf#153510 Avoid modification of iterated container

A crash is seen when resizing a document locally; the problem is
range-based for loop, which indirectly modifies its range:

  sclo.dll!ScAutoStyleList::AddInitial(const ScRange & rRange, const 
rtl::OUString & rStyle1, unsigned __int64 nTimeout, const rtl::OUString & 
rStyle2) Line 81 C++
  sclo.dll!ScDocShell::Notify(SfxBroadcaster & __formal, const SfxHint & 
rHint) Line 685C++
  svllo.dll!SfxBroadcaster::Broadcast(const SfxHint & rHint) Line 41C++
  sclo.dll!ScInterpreter::ScStyle() Line 2628   C++
  sclo.dll!ScInterpreter::Interpret() Line 4441 C++
  sclo.dll!ScFormulaCell::InterpretTail(ScInterpreterContext & rContext, 
ScFormulaCell::ScInterpretTailParameter eTailParam) Line 1947  C++
  sclo.dll!ScFormulaCell::Interpret(long nStartOffset, long nEndOffset) 
Line 1619   C++
  sclo.dll!ScFormulaCell::MaybeInterpret() Line 470 C++
  sclo.dll!ScFormulaCell::IsValue() Line 2763   C++
  sclo.dll!ScConditionEntry::Interpret(const ScAddress & rPos) Line 670 C++
  sclo.dll!ScConditionEntry::IsCellValid(ScRefCellValue & rCell, const 
ScAddress & rPos) Line 1238  C++
  sclo.dll!ScConditionalFormat::GetData(ScRefCellValue & rCell, const 
ScAddress & rPos) Line 1836   C++
  sclo.dll!`anonymous 
namespace'::handleConditionalFormat(ScConditionalFormatList & rCondFormList, 
const o3tl::sorted_vector,o3tl::find_unique,1> & rCondFormats, ScCellInfo * pInfo, ScTableInfo * 
pTableInfo, ScStyleSheetPool * pStlPool, const ScAddress & rAddr, bool & 
bHidden, bool & bHideFormula, bool bTabProtect) Line 297C++
  sclo.dll!ScDocument::FillInfo(ScTableInfo & rTabInfo, short nCol1, long 
nRow1, short nCol2, long nRow2, short nTab, double fColScale, double fRowScale, 
bool bPageMode, bool bFormulaMode, const ScMarkData * pMarkData) Line 569 
C++
  sclo.dll!ScGridWindow::Draw(short nX1, long nY1, short nX2, long nY2, 
ScUpdateMode eMode) Line 556C++
  sclo.dll!ScGridWindow::Paint(OutputDevice & __formal, const 
tools::Rectangle & rRect) Line 458C++
  vcllo.dll!PaintHelper::DoPaint(const vcl::Region * pRegion) Line 313  C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 617C++
  vcllo.dll!PaintHelper::~PaintHelper() Line 553C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 623C++
  vcllo.dll!PaintHelper::~PaintHelper() Line 553C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 623C++
  vcllo.dll!PaintHelper::~PaintHelper() Line 553C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 623C++
  vcllo.dll!PaintHelper::~PaintHelper() Line 553C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 623C++
  vcllo.dll!PaintHelper::~PaintHelper() Line 553C++
  vcllo.dll!vcl::Window::ImplCallPaint(const vcl::Region * pRegion, 
ImplPaintFlags nPaintFlags) Line 623C++
  vcllo.dll!vcl::Window::ImplCallOverlapPaint() Line 646C++
  vcllo.dll!vcl::Window::ImplHandlePaintHdl(Timer * __formal) Line 668  C++
  vcllo.dll!vcl::Window::LinkStubImplHandlePaintHdl(void * instance, Timer 
* data) Line 648 C++
  vcllo.dll!Link::Call(Timer * data) Line 111 C++
  vcllo.dll!Timer::Invoke(Timer * arg) Line 81  C++
  vcllo.dll!vcl::Window::ImplHandleResizeTimerHdl(Timer * __formal) Line 
684C++
  vcllo.dll!vcl::Window::LinkStubImplHandleResizeTimerHdl(void * instance, 
Timer * data) Line 674   C++
  vcllo.dll!Link::Call(Timer * data) Line 111 C++
  vcllo.dll!Timer::Invoke(Timer * arg) Line 81  C++
  vcllo.dll!vcl::Window::GetSizePixel() Line 2420   C++
  sclo.dll!ScTabView::GetGridWidth(ScHSplitPos eWhich) Line 3032C++
  sclo.dll!ScViewData::CellsAtX(short nPosX, short nDir, ScHSplitPos 
eWhichX, unsigned short nScrSizeX) Line 2634   C++
  sclo.dll!ScViewData::VisibleCellsX(ScHSplitPos eWhichX) Line 2710 C++
  sclo.dll!ScTabView::PaintArea(short nStartCol, long nStartRow, short 
nEndCol, long nEndRow, ScUpdateMode eMode) Line 2386 C++
  sclo.dll!ScTabViewShell::Notify(SfxBroadcaster & rBC, const SfxHint & 
rHint) Line 63  C++
  svllo.dll!SfxBroadcaster::Broadcast(const SfxHint & rHint) Line 41C++
  sclo.dll!ScDocShell::PostPaint(const ScRangeList & rRanges, 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - svx/source

[Tor Lillqvist (via logerrit)]

 svx/source/svdraw/svdomedia.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4023eec345eb210b053a708f3b253c54fdea123c
Author: Tor Lillqvist 
AuthorDate: Tue Oct 25 11:37:42 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Feb 10 07:56:36 2023 +

Guard against no HAVE_FEATURE_AVMEDIA in one more place

This change was said to fix the build of the iOS app in co-22.05,
but I am not sure if it actually is needed for that here in
co-23.05. Still, this seems like the proper thing to do?

Change-Id: I4a9e6f18e7b17664e5aed36233d5ccde44cf1194
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141796
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146736

diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 9b17b7bf278a..c63df5d8b69e 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -474,6 +474,7 @@ void SdrMediaObj::mediaPropertiesChanged( const 
::avmedia::MediaItem& rNewProper
 
 void SdrMediaObj::notifyPropertiesForLOKit()
 {
+#if HAVE_FEATURE_AVMEDIA
 if (!m_xImpl->m_MediaProperties.getTempURL().isEmpty())
 {
 const auto mediaId = reinterpret_cast(this);
@@ -491,6 +492,7 @@ void SdrMediaObj::notifyPropertiesForLOKit()
 
 SfxLokHelper::notifyMediaUpdate(json);
 }
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - solenv/bin vcl/source

[Tor Lillqvist (via logerrit)]

 solenv/bin/native-code.py |2 +-
 vcl/source/treelist/transfer2.cxx |5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 069aae6be68d67b45222740de01467d11f15adfb
Author: Tor Lillqvist 
AuthorDate: Thu Apr 14 14:25:31 2022 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Feb 10 07:57:03 2023 +

Avoid LOKClipboard harder on iOS

Change-Id: I2710a7537594c486878a68c630f762a24ac81c49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133017
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146739

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e2deb0cbd5b0..0309ae09a7ee 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -129,7 +129,7 @@ core_constructor_list = [
 "com_sun_star_comp_dba_ODatabaseSource",
 "com_sun_star_comp_dba_ORowSet_get_implementation",
 # desktop/lokclipboard.component
-"desktop_LOKClipboard_get_implementation",
+("desktop_LOKClipboard_get_implementation", "#ifndef IOS"),
 # drawinglayer/drawinglayer.component
 "drawinglayer_XPrimitive2DRenderer",
 # embeddedobj/util/embobj.component
diff --git a/vcl/source/treelist/transfer2.cxx 
b/vcl/source/treelist/transfer2.cxx
index d0a105554c0f..05183b9c0485 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -484,11 +484,16 @@ Reference GetSystemClipboard()
 Reference xClipboard;
 try
 {
+#ifdef IOS
+if (false)
+;
+#else
 if (comphelper::LibreOfficeKit::isActive())
 {
 xClipboard = css::datatransfer::clipboard::LokClipboard::create(
 comphelper::getProcessComponentContext());
 }
+#endif
 else
 {
 xClipboard = css::datatransfer::clipboard::SystemClipboard::create(