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

[Miklos Vajna (via logerrit)]

 sw/qa/core/text/text.cxx |   32 
 sw/source/core/text/itrform2.cxx |   31 ++-
 2 files changed, 58 insertions(+), 5 deletions(-)

New commits:
commit d5135d4eb2b10e6ceb78c64c298076827f1863eb
Author: Miklos Vajna 
AuthorDate: Fri Oct 7 13:51:55 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 10 09:21:36 2022 +0200

sw content controls: emit only one PDF widget for multiple text portions

If the content control's text is like "XXXYYY", then we used to
create two PDF form widgets, while only one is wanted. This is
especially annoying since the widget's width is defined by the Writer
text, so tab portions would be a natural tool to nicely increase the
width if wanted.

The problem is that in case the content is rich text, then we break up
that content into multiple portions, and each portion will be handled in
SwContentControlPortion::DescribePDFControl() separately.

Fix the problem by checking if the current text portion is the first one
for a content control, handling the entire content control there and
then silently not doing anything (no form widget, no plain text
fallback) for the rest of the content.

This also helps in case the content control has a linebreak to extend
its height. Note that this can't be perfect in case the content control
has multiple lines but the starting/ending line has text outside the
content control. This is a restriction on the PDF side, since the form
widget's area must be a rectangle.

(cherry picked from commit a70f5f141c1e6013abb4c1b3219e017b2eea40a8)

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

diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index b5b9476cd236..7c3077c8cdae 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -688,6 +689,37 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, 
testComboContentControlPDF)
 CPPUNIT_ASSERT(pAnnotation->getFormFieldFlags(pPdfDocument.get()) & 
0x0004);
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testRichContentControlPDF)
+{
+// Given a file with a rich content control, its value set to 
"xxxyyy":
+SwDoc* pDoc = createSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->InsertContentControl(SwContentControlType::RICH_TEXT);
+pWrtShell->SttEndDoc(/*bStt=*/true);
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+sal_Int32 nPlaceHolderLen = 
SwResId(STR_CONTENT_CONTROL_PLACEHOLDER).getLength();
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, nPlaceHolderLen,
+ /*bBasicCall=*/false);
+pWrtShell->Insert("xxxyyy");
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, 
/*bBasicCall=*/false);
+SfxItemSetFixed 
aSet(pWrtShell->GetAttrPool());
+SvxWeightItem aItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
+aSet.Put(aItem);
+pWrtShell->SetAttrSet(aSet);
+
+// When exporting to PDF:
+StoreToTempFile("writer_pdf_Export");
+
+// Then make sure that a single fillable form widget is emitted:
+std::unique_ptr pPdfDocument = 
LoadPdfFromTempFile();
+std::unique_ptr pPage = pPdfDocument->openPage(0);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : 2
+// i.e. "xxxyyy" was exported as 2 widgets, not 1.
+CPPUNIT_ASSERT_EQUAL(1, pPage->getAnnotationCount());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 35548fe00217..3d9ed4edebfe 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -924,6 +924,19 @@ bool SwContentControlPortion::DescribePDFControl(const 
SwTextPaintInfo& rInf) co
 return false;
 }
 
+// Check if this is the first content control portion of this content 
control.
+SwTextNode* pTextNode = pContentControl->GetTextNode();
+sal_Int32 nStart = m_pTextContentControl->GetStart();
+sal_Int32 nEnd = *m_pTextContentControl->GetEnd();
+TextFrameIndex nViewStart = rInf.GetTextFrame()->MapModelToView(pTextNode, 
nStart);
+TextFrameIndex nViewEnd = rInf.GetTextFrame()->MapModelToView(pTextNode, 
nEnd);
+// The content control portion starts 1 char after the starting dummy 
character.
+if (rInf.GetIdx() != nViewStart + TextFrameIndex(1))
+{
+// Ignore: don't process and also don't emit plain text fallback.
+return true;
+}
+
 std::unique_ptr pDescriptor;
 switch (pContentControl->GetType())
 {
@@ -990,10 +1003,8 @@ bool SwContentContro

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 5f6596bd125aa8309875d970318f18d4d9704705
Author: Caolán McNamara 
AuthorDate: Sun Oct 9 20:40:41 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 10 10:26:44 2022 +0200

Resolves: tdf#151441 queries don't show any content

Change-Id: I66ec14c7cb8816bc2181cc25f7d7f31fdc7d1604
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141146
Tested-by: Jenkins
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 24c9a83d2190..be900d650f63 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -187,8 +187,16 @@ TreeListBox::~TreeListBox()
 std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_view aName, const weld::TreeIter* 
pStart, const IEntryFilter* _pFilter) const
 {
 auto xEntry(m_xTreeView->make_iterator(pStart));
-if (!pStart && !m_xTreeView->get_iter_first(*xEntry))
-return nullptr;
+if (pStart)
+{
+if (!m_xTreeView->iter_children(*xEntry))
+return nullptr;
+}
+else
+{
+if (!m_xTreeView->get_iter_first(*xEntry))
+return nullptr;
+}
 
 do
 {

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf151370.rtf  |3 +++
 sw/qa/extras/rtfexport/rtfexport5.cxx  |   18 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 564ec69c3d2cf591c80dbb561bf04fe3c6180f31
Author: Vasily Melenchuk 
AuthorDate: Thu Oct 6 12:37:31 2022 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Oct 10 10:39:02 2022 +0200

tdf#151370: RTF import: docvar name/value can have several sequences

In case of unicode used there can be tokens, replacements, etc.
So it is better to collect and join all received strings, not
overwrite with just last received.

Change-Id: I2b6ce465d87db4ee30987cbe0ecce1470386242f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141007
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit fb7da82cac17f05fce13cdd0094bbd5159f5404d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141058
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/rtfexport/data/tdf151370.rtf 
b/sw/qa/extras/rtfexport/data/tdf151370.rtf
new file mode 100644
index ..e555d5c58cd2
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf151370.rtf
@@ -0,0 +1,3 @@
+{\rtf1\adeflang1025\ansi\ansicpg1250
+{\*\docvar 
{LocalChars\'c1rv\'edzturoT\'fck\'f6rf\'far\'f3g\'e9p}{\'e1rv\'edzturot\'fck\'f6rf\'far\'f3g\'e9p}}
+}
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx 
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 1dbacde70bea..6c3d6c6c8471 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -848,6 +848,24 @@ DECLARE_RTFEXPORT_TEST(testTdf150267, "tdf150267.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("Hello World"), 
getProperty(xFieldMaster, "Content"));
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf151370, "tdf151370.rtf")
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xSupplier(xModel, 
uno::UNO_QUERY);
+uno::Reference xTextFieldMasters = 
xSupplier->getTextFieldMasters();
+// Here we try to read/write docvar having non-ascii name and value. So it 
is encoded in Unicode
+OUString sFieldName(u"com.sun.star.text.fieldmaster.User."
+
"LocalChars\u00c1\u0072\u0076\u00ed\u007a\u0074\u0075\u0072\u006f\u0054"
+
"\u00fc\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070");
+CPPUNIT_ASSERT_EQUAL(sal_True, xTextFieldMasters->hasByName(sFieldName));
+
+auto xFieldMaster = xTextFieldMasters->getByName(sFieldName);
+CPPUNIT_ASSERT_EQUAL(
+
OUString(u"\u00e1\u0072\u0076\u00ed\u007a\u0074\u0075\u0072\u006f\u0074\u00fc"
+ 
"\u006b\u00f6\u0072\u0066\u00fa\u0072\u00f3\u0067\u00e9\u0070"),
+getProperty(xFieldMaster, "Content"));
+}
+
 DECLARE_RTFEXPORT_TEST(testTdf108416, "tdf108416.rtf")
 {
 uno::Reference 
xCharacterStyles(getStyles("CharacterStyles"));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f4844765fc68..4011a17d5ecb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1502,7 +1502,7 @@ void RTFDocumentImpl::text(OUString& rString)
 break;
 case Destination::DOCVAR:
 {
-m_aStates.top().setDocVar(rString);
+m_aStates.top().appendDocVar(rString);
 }
 break;
 case Destination::FONTTABLE:
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3e1caf7d0322..e859c01c9992 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -524,7 +524,7 @@ public:
 RTFInternalState getInternalState() const { return m_nInternalState; }
 RTFDocumentImpl* getDocumentImpl() { return m_pDocumentImpl; }
 OUString getDocVar() { return m_aDocVar; }
-void setDocVar(OUString& aDocVar) { m_aDocVar = aDocVar; };
+void appendDocVar(OUString& aDocVar) { m_aDocVar += aDocVar; };
 OUString getDocVarName() { return m_aDocVarName; }
 void setDocVarName(OUString& aDocVarName) { m_aDocVarName = aDocVarName; }
 void clearDocVarName() { m_aDocVarName = ""; }

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

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

 sw/qa/extras/ooxmlexport/data/tdf136617.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |   12 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   12 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|2 +-
 writerfilter/source/dmapper/PropertyMap.hxx  |1 -
 5 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit f9d34f1498404f74310a81b2dcf322867fa28e9c
Author: László Németh 
AuthorDate: Fri Oct 7 12:37:53 2022 +0200
Commit: László Németh 
CommitDate: Mon Oct 10 11:01:30 2022 +0200

tdf#136617 DOCX import: fix empty table paragraphs with direct formatting

Table paragraph styles applied on paragraphs without runs, i.e.
on empty paragraphs, despite their direct formatting, resulting
e.g. different font size, and after that different paragraph
i.e. cell height, breaking the original table layout.

Regression from commit bf3124cdf61b40c94ba117a76f1b63dabdfd528e
"tdf#135187 DOCX import: fix table style at character formatting".

Also clean-up commit 498d2b82187ec3ff58f076e0d15741e64c0505ba
"tdf#131546 DOCX import: fix performance regression at tables".

Change-Id: I41f8da61d49902c8c1683bd01632cce6d58aebd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141052
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit a1e31341f42a1b7f990928c0d95278bb18adaf89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141060

diff --git a/sw/qa/extras/ooxmlexport/data/tdf136617.docx 
b/sw/qa/extras/ooxmlexport/data/tdf136617.docx
new file mode 100644
index ..e7b35aa295cb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf136617.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index a2103113c2ff..87b1824ed93d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -1862,6 +1862,18 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135187)
 "false");
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf136617)
+{
+loadAndSave("tdf136617.docx");
+
+// This was 2
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[2]/w:tc[2]/w:p[2]/w:pPr/w:rPr/w:sz", "val",
+"16");
+}
+
 CPPUNIT_TEST_FIXTURE(Test, testTdf121597TrackedDeletionOfMultipleParagraphs)
 {
 loadAndSave("tdf121597.odt");
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index d0c42576202e..0f0f3c5d1d1a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1107,14 +1107,6 @@ void 
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
 
 OUString sPropertyName = getPropertyName(eId);
 
-if ( bIsParaLevel && ( 
rParaProp.m_aParaOverrideApplied.find(sPropertyName) != 
rParaProp.m_aParaOverrideApplied.end() ||
-sPropertyName.startsWith("CharFontName") ) )
-{
-// don't apply table style, if this character property was 
applied on paragraph level
-// (or in the case of paragraph level font name settings to 
avoid regressions)
-continue;
-}
-
 auto pCellProp = std::find_if(rCellProperties.begin(), 
rCellProperties.end(),
 [&](const beans::PropertyValue& rProp) { return rProp.Name == 
sPropertyName; });
 // this cell applies the table style property
@@ -1174,6 +1166,10 @@ void 
DomainMapperTableHandler::ApplyParagraphPropertiesFromTableStyle(TableParag
 uno::Reference< beans::XPropertyState > xParaProperties( 
xParagraph, uno::UNO_QUERY_THROW );
 if ( xParaProperties->getPropertyState(sPropertyName) == 
css::beans::PropertyState_DEFAULT_VALUE )
 {
+// don't overwrite empty paragraph with table style, 
if it has a direct paragraph formatting
+if ( bIsParaLevel && 
xParagraph->getString().getLength() == 0 )
+continue;
+
 if ( eId != PROP_FILL_COLOR )
 {
 // apply style setting when the paragraph doesn't 
modify it
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3f765b272b81..990f854268a2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2431,7 +2431,7 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 xParaCursor->gotoStartOfParagraph(false);
 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - cui/source

[Xisco Fauli (via logerrit)]

 cui/source/tabpages/numpages.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e155c38e75dff41d7e80ade3c7aa9e8e69572ad4
Author: Xisco Fauli 
AuthorDate: Mon Oct 3 19:40:22 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 11:34:42 2022 +0200

cui: avoid divide by zero in SvxNumberingPreview::Paint

Just check for pActNum->GetLevelCount() > 1 as done later for nYStep

See 
https://crashreport.libreoffice.org/stats/signature/SvxNumberingPreview::Paint(OutputDevice%20&,tools::Rectangle%20const%20&)

Change-Id: I0e9518dafe50b2b10a83487e9247e2fd46f9decd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140888
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f171d9af9bb13ec037841d7c8aa11fcc628c303c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141056
Reviewed-by: Xisco Fauli 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7d2683ab3ed4..1195417a95ce 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2212,7 +2212,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& 
rRenderContext, const ::tool
 tools::Long nWidthRelation = 30; // chapter dialog
 
 // height per level
-tools::Long nXStep = aSize.Width() / (3 * pActNum->GetLevelCount());
+tools::Long nXStep = aSize.Width() / (pActNum->GetLevelCount() > 1 ? 3 
* pActNum->GetLevelCount() : 3);
 if (pActNum->GetLevelCount() < 10)
 nXStep /= 2;
 tools::Long nYStart = 4;

[Libreoffice-commits] core.git: sw/CppunitTest_sw_core_text.mk

[Stephan Bergmann (via logerrit)]

 sw/CppunitTest_sw_core_text.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7f231cde1b54f73f2d1d9e916e4721fffa48472b
Author: Stephan Bergmann 
AuthorDate: Mon Oct 10 08:17:28 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 10 11:44:13 2022 +0200

Missing test dependencies

> warn:vcl.builder:608521:608521:vcl/source/window/builder.cxx:480: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/svt/ui/scrollbars.ui at 
xmlreader/source/xmlreader.cxx:67"
> warn:sfx.view:608521:608521:sfx2/source/view/frmload.cxx:494: 
DBG_UNHANDLED_EXCEPTION in impl_handleCaughtError_nothrow exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/svt/ui/scrollbars.ui at 
xmlreader/source/xmlreader.cxx:67"

and

> warn:vcl.builder:609394:609394:vcl/source/window/builder.cxx:480: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/sfx/ui/tabbar.ui at 
xmlreader/source/xmlreader.cxx:67"
> warn:sfx.view:609394:609394:sfx2/source/view/frmload.cxx:494: 
DBG_UNHANDLED_EXCEPTION in impl_handleCaughtError_nothrow exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/sfx/ui/tabbar.ui at 
xmlreader/source/xmlreader.cxx:67"

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

diff --git a/sw/CppunitTest_sw_core_text.mk b/sw/CppunitTest_sw_core_text.mk
index c3025f007a9a..efaa5c7bc59a 100644
--- a/sw/CppunitTest_sw_core_text.mk
+++ b/sw/CppunitTest_sw_core_text.mk
@@ -67,6 +67,8 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_core_text))
 
 $(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_text, \
 modules/swriter \
+sfx \
+svt \
 ))
 
 $(eval $(call gb_CppunitTest_use_more_fonts,sw_core_text))

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

[Miklos Vajna (via logerrit)]

 sw/source/ui/index/cnttab.cxx   |  106 ++--
 sw/source/ui/misc/outline.cxx   |   70 +++
 sw/source/ui/table/splittbl.cxx |4 -
 sw/source/uibase/inc/outline.hxx|   14 ++--
 sw/source/uibase/inc/splittbl.hxx   |2 
 sw/source/uibase/inc/swuicnttab.hxx |   26 
 6 files changed, 111 insertions(+), 111 deletions(-)

New commits:
commit 82c6e059c2ad864c943087704fd95fa72fc2d949
Author: Miklos Vajna 
AuthorDate: Mon Oct 10 08:56:38 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 10 11:55:35 2022 +0200

sw: prefix members of SwOutlineTabDialog, SwSplitTableDlg, ...

... SwTOXEntryTabPage and SwTOXSelectTabPage

See tdf#94879 for motivation.

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

diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 37c5438d83b7..588acbc48f3e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -749,7 +749,7 @@ void SwAddStylesDlg_Impl::ToggleOn(int nEntry, int 
nToggleColumn)
 
 SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet& rAttrSet)
 : SfxTabPage(pPage, pController, "modules/swriter/ui/tocindexpage.ui", 
"TocIndexPage", &rAttrSet)
-, sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
+, m_sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
 , m_bWaitingInitialSettings(true)
 , m_xTitleED(m_xBuilder->weld_entry("title"))
 , m_xTypeFT(m_xBuilder->weld_label("typeft"))
@@ -794,8 +794,8 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* 
pPage, weld::DialogContr
 , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
 , m_xSortAlgorithmLB(m_xBuilder->weld_combo_box("keytype"))
 {
-sAddStyleUser = m_xStylesCB->get_label();
-pIndexEntryWrapper.reset(new IndexEntrySupplierWrapper());
+m_sAddStyleUser = m_xStylesCB->get_label();
+m_pIndexEntryWrapper.reset(new IndexEntrySupplierWrapper());
 
 m_xLanguageLB->SetLanguageList( SvxLanguageListFlags::ALL | 
SvxLanguageListFlags::ONLY_KNOWN,
  false );
@@ -806,7 +806,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* 
pPage, weld::DialogContr
 Size aPrefSize(m_xContainer->get_preferred_size());
 m_xContainer->set_size_request(aPrefSize.Width(), aPrefSize.Height());
 
-sAddStyleContent = m_xAddStylesCB->get_label();
+m_sAddStyleContent = m_xAddStylesCB->get_label();
 
 m_xFromObjCLB->enable_toggle_buttons(weld::ColumnToggleType::Check);
 
@@ -856,8 +856,8 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* 
pPage, weld::DialogContr
 
 SwTOXSelectTabPage::~SwTOXSelectTabPage()
 {
-pIndexRes.reset();
-pIndexEntryWrapper.reset();
+m_pIndexRes.reset();
+m_pIndexEntryWrapper.reset();
 m_xLanguageLB.reset();
 }
 
@@ -989,7 +989,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
 if(TOX_CONTENT == aCurType.eType)
 {
 m_xFromHeadingsCB->set_active( bool(nCreateType & 
SwTOXElement::OutlineLevel) );
-m_xAddStylesCB->set_label(sAddStyleContent);
+m_xAddStylesCB->set_label(m_sAddStyleContent);
 m_xAddStylesPB->set_sensitive(m_xAddStylesCB->get_active());
 }
 //index only
@@ -1043,7 +1043,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
 m_xAutoMarkPB->set_sensitive(m_xFromFileCB->get_active());
 
 for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
-aStyleArr[i] = rDesc.GetStyleNames(i);
+m_aStyleArr[i] = rDesc.GetStyleNames(i);
 
 m_xLanguageLB->set_active_id(rDesc.GetLanguage());
 LanguageHdl(nullptr);
@@ -1107,7 +1107,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
 if(m_xKeyAsEntryCB->get_active())
 nIndexOptions |= SwTOIOptions::KeyAsEntry;
 if(m_xFromFileCB->get_active())
-rDesc.SetAutoMarkURL(sAutoMarkURL);
+rDesc.SetAutoMarkURL(m_sAutoMarkURL);
 else
 rDesc.SetAutoMarkURL(OUString());
 }
@@ -1162,7 +1162,7 @@ void SwTOXSelectTabPage::FillTOXDescription()
 rDesc.SetReadonly(m_xReadOnlyCB->get_active());
 
 for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
-rDesc.SetStyleNames(aStyleArr[i], i);
+rDesc.SetStyleNames(m_aStyleArr[i], i);
 
 rDesc.SetLanguage(m_xLanguageLB->get_active_id());
 const OUString& rEntryData = m_xSortAlgorithmLB->get_active_id();
@@ -1177,9 +1177,9 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet* )
 sal_uInt32 nData = lcl_TOXTypesToUserData(aCurType);
 m_xTypeLB->set_active_id(OUString::number(nData));
 
-sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),
+m_sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),

INetURLObject::Decod

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4' - source/ast source/bg source/ca source/da source/de source/dsb source/es source/eu source/fi source/gl source/gug source/hsb source/hu

[Xisco Fauli (via logerrit)]

 source/ast/helpcontent2/source/text/sbasic/shared/03.po  |6 
 source/bg/helpcontent2/source/text/scalc.po  |8 
 source/ca/cui/messages.po|   44 
 source/ca/helpcontent2/source/text/sbasic/shared/03.po   |6 
 source/ca/helpcontent2/source/text/scalc/01.po   |4 
 source/ca/helpcontent2/source/text/shared/06.po  |4 
 source/da/helpcontent2/source/text/sbasic/shared/03.po   |8 
 source/da/helpcontent2/source/text/sdatabase.po  |   36 
 source/de/chart2/messages.po |   38 
 source/de/cui/messages.po|   64 
 source/de/helpcontent2/source/text/sbasic/python.po  |   34 
 source/de/helpcontent2/source/text/sbasic/shared.po  |   86 
 source/de/helpcontent2/source/text/scalc/01.po   |6 
 source/de/helpcontent2/source/text/scalc/04.po   |   14 
 source/de/helpcontent2/source/text/scalc/05.po   |   10 
 source/de/helpcontent2/source/text/scalc/guide.po|   32 
 source/de/helpcontent2/source/text/sdatabase.po  |   28 
 source/de/helpcontent2/source/text/sdraw/guide.po|   10 
 source/de/helpcontent2/source/text/shared.po |   78 
 source/de/helpcontent2/source/text/shared/00.po  |   38 
 source/de/helpcontent2/source/text/shared/01.po  |   10 
 source/de/helpcontent2/source/text/shared/02.po  |  120 
 source/de/helpcontent2/source/text/shared/04.po  |4 
 source/de/helpcontent2/source/text/shared/autopi.po  |   60 
 source/de/helpcontent2/source/text/shared/guide.po   |   48 
 source/de/helpcontent2/source/text/shared/optionen.po|   22 
 source/de/helpcontent2/source/text/simpress/02.po|   34 
 source/de/helpcontent2/source/text/simpress/04.po|6 
 source/de/helpcontent2/source/text/smath/01.po   |8 
 source/de/helpcontent2/source/text/swriter.po|4 
 source/de/helpcontent2/source/text/swriter/00.po |   34 
 source/de/helpcontent2/source/text/swriter/01.po |8 
 source/de/helpcontent2/source/text/swriter/02.po |4 
 source/de/helpcontent2/source/text/swriter/04.po |   40 
 source/de/helpcontent2/source/text/swriter/guide.po  |   56 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po|   28 
 source/de/sc/messages.po |   14 
 source/de/sd/messages.po |8 
 source/de/starmath/messages.po   |8 
 source/de/svx/messages.po|   12 
 source/de/sw/messages.po |   80 
 source/dsb/officecfg/registry/data/org/openoffice/Office/UI.po   |   10 
 source/dsb/sfx2/messages.po  |8 
 source/es/helpcontent2/source/text/sbasic/guide.po   |8 
 source/es/helpcontent2/source/text/sbasic/python.po  |8 
 source/es/helpcontent2/source/text/sbasic/shared/03.po   |   86 
 source/es/helpcontent2/source/text/scalc/01.po   |8 
 source/es/helpcontent2/source/text/shared/06.po  |6 
 source/es/helpcontent2/source/text/simpress/01.po|6 
 source/es/sd/messages.po |8 
 source/es/sw/messages.po |   12 
 source/eu/helpcontent2/source/text/sbasic/shared.po  |6 
 source/eu/helpcontent2/source/text/scalc/04.po   |4 
 source/eu/helpcontent2/source/text/scalc/guide.po|8 
 source/eu/helpcontent2/source/text/shared/02.po  |   18 
 source/eu/helpcontent2/source/text/shared/04.po  |4 
 source/eu/helpcontent2/source/text/shared/optionen.po|4 
 source/eu/helpcontent2/source/text/swriter/guide.po  |4 
 source/fi/helpcontent2/source/text/swriter/menu.po   |   10 
 source/gl/helpcontent2/source/text/sbasic/shared.po  |   12 
 source/gl/helpcontent2/source/text/scalc/01.po   |6 
 source/gl/helpcontent2/source/text/scalc/02.po   |8 
 source/gl/helpcontent2/source/text/shared/00.po  |6 
 source/gl/helpcontent2/source/text/shared/01.po  |   26 
 source/gl/helpcontent2/source/text/shared/02.po  |8 
 source/gl/helpcontent2/source/text/shared/optionen.po|   12 
 source/gl/helpcontent2/source/text/swriter/01.po |8 
 source/gl/helpcontent2/source/text/swrit

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 5ee3e705f8d2403d5166ebb15e6edcb12e8db795
Author: Xisco Fauli 
AuthorDate: Mon Oct 10 11:57:18 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 11:57:18 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4'
  to 6c6f533fc042e93f846ab46f148607f19adc1f88
  - update translations for 7.4.2 rc3

Change-Id: I750a52f16dcf8f084d0a969ab454d714f2adeb7c

diff --git a/translations b/translations
index 4015ebc81b12..6c6f533fc042 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4015ebc81b125b4b0aebe9e688b56c2fd27fbaad
+Subproject commit 6c6f533fc042e93f846ab46f148607f19adc1f88

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4-2' - source/ast source/bg source/ca source/da source/de source/dsb source/es source/eu source/fi source/gl source/gug source/hsb source/

[Xisco Fauli (via logerrit)]

 source/ast/helpcontent2/source/text/sbasic/shared/03.po  |6 
 source/bg/helpcontent2/source/text/scalc.po  |8 
 source/ca/cui/messages.po|   44 
 source/ca/helpcontent2/source/text/sbasic/shared/03.po   |6 
 source/ca/helpcontent2/source/text/scalc/01.po   |4 
 source/ca/helpcontent2/source/text/shared/06.po  |4 
 source/da/helpcontent2/source/text/sbasic/shared/03.po   |8 
 source/da/helpcontent2/source/text/sdatabase.po  |   36 
 source/de/chart2/messages.po |   38 
 source/de/cui/messages.po|   64 
 source/de/helpcontent2/source/text/sbasic/python.po  |   34 
 source/de/helpcontent2/source/text/sbasic/shared.po  |   86 
 source/de/helpcontent2/source/text/scalc/01.po   |6 
 source/de/helpcontent2/source/text/scalc/04.po   |   14 
 source/de/helpcontent2/source/text/scalc/05.po   |   10 
 source/de/helpcontent2/source/text/scalc/guide.po|   32 
 source/de/helpcontent2/source/text/sdatabase.po  |   28 
 source/de/helpcontent2/source/text/sdraw/guide.po|   10 
 source/de/helpcontent2/source/text/shared.po |   78 
 source/de/helpcontent2/source/text/shared/00.po  |   38 
 source/de/helpcontent2/source/text/shared/01.po  |   10 
 source/de/helpcontent2/source/text/shared/02.po  |  120 
 source/de/helpcontent2/source/text/shared/04.po  |4 
 source/de/helpcontent2/source/text/shared/autopi.po  |   60 
 source/de/helpcontent2/source/text/shared/guide.po   |   48 
 source/de/helpcontent2/source/text/shared/optionen.po|   22 
 source/de/helpcontent2/source/text/simpress/02.po|   34 
 source/de/helpcontent2/source/text/simpress/04.po|6 
 source/de/helpcontent2/source/text/smath/01.po   |8 
 source/de/helpcontent2/source/text/swriter.po|4 
 source/de/helpcontent2/source/text/swriter/00.po |   34 
 source/de/helpcontent2/source/text/swriter/01.po |8 
 source/de/helpcontent2/source/text/swriter/02.po |4 
 source/de/helpcontent2/source/text/swriter/04.po |   40 
 source/de/helpcontent2/source/text/swriter/guide.po  |   56 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po|   28 
 source/de/sc/messages.po |   14 
 source/de/sd/messages.po |8 
 source/de/starmath/messages.po   |8 
 source/de/svx/messages.po|   12 
 source/de/sw/messages.po |   80 
 source/dsb/officecfg/registry/data/org/openoffice/Office/UI.po   |   10 
 source/dsb/sfx2/messages.po  |8 
 source/es/helpcontent2/source/text/sbasic/guide.po   |8 
 source/es/helpcontent2/source/text/sbasic/python.po  |8 
 source/es/helpcontent2/source/text/sbasic/shared/03.po   |   86 
 source/es/helpcontent2/source/text/scalc/01.po   |8 
 source/es/helpcontent2/source/text/shared/06.po  |6 
 source/es/helpcontent2/source/text/simpress/01.po|6 
 source/es/sd/messages.po |8 
 source/es/sw/messages.po |   12 
 source/eu/helpcontent2/source/text/sbasic/shared.po  |6 
 source/eu/helpcontent2/source/text/scalc/04.po   |4 
 source/eu/helpcontent2/source/text/scalc/guide.po|8 
 source/eu/helpcontent2/source/text/shared/02.po  |   18 
 source/eu/helpcontent2/source/text/shared/04.po  |4 
 source/eu/helpcontent2/source/text/shared/optionen.po|4 
 source/eu/helpcontent2/source/text/swriter/guide.po  |4 
 source/fi/helpcontent2/source/text/swriter/menu.po   |   10 
 source/gl/helpcontent2/source/text/sbasic/shared.po  |   12 
 source/gl/helpcontent2/source/text/scalc/01.po   |6 
 source/gl/helpcontent2/source/text/scalc/02.po   |8 
 source/gl/helpcontent2/source/text/shared/00.po  |6 
 source/gl/helpcontent2/source/text/shared/01.po  |   26 
 source/gl/helpcontent2/source/text/shared/02.po  |8 
 source/gl/helpcontent2/source/text/shared/optionen.po|   12 
 source/gl/helpcontent2/source/text/swriter/01.po |8 
 source/gl/helpcontent2/source/text/swrit

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 68d7fab97c43c9ca12ae0889c0cc74eb1b9ba6bb
Author: Xisco Fauli 
AuthorDate: Mon Oct 10 12:03:25 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 12:03:25 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4-2'
  to 29b6c6265c353036330bf5a09c97d79e7fa93d5a
  - update translations for 7.4.2 rc3

Change-Id: I750a52f16dcf8f084d0a969ab454d714f2adeb7c
(cherry picked from commit 6c6f533fc042e93f846ab46f148607f19adc1f88)

diff --git a/translations b/translations
index 7642e6dab65b..29b6c6265c35 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7642e6dab65b2338a39834ab42c91970163539b2
+Subproject commit 29b6c6265c353036330bf5a09c97d79e7fa93d5a

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c69b3cec33267db9bd6e71ddb2f38e57bc1ceff1
Author: Caolán McNamara 
AuthorDate: Sun Oct 9 20:40:41 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 12:08:32 2022 +0200

Resolves: tdf#151441 queries don't show any content

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

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 8ad535edb185..a9b9e582fcba 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -186,8 +186,16 @@ TreeListBox::~TreeListBox()
 std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_view aName, const weld::TreeIter* 
pStart, const IEntryFilter* _pFilter) const
 {
 auto xEntry(m_xTreeView->make_iterator(pStart));
-if (!pStart && !m_xTreeView->get_iter_first(*xEntry))
-return nullptr;
+if (pStart)
+{
+if (!m_xTreeView->iter_children(*xEntry))
+return nullptr;
+}
+else
+{
+if (!m_xTreeView->get_iter_first(*xEntry))
+return nullptr;
+}
 
 do
 {

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 26f7d989b7cee0843eaa36862d15a02a7060556c
Author: Caolán McNamara 
AuthorDate: Sun Oct 9 20:40:41 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 12:08:45 2022 +0200

Resolves: tdf#151441 queries don't show any content

Change-Id: I66ec14c7cb8816bc2181cc25f7d7f31fdc7d1604
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141069
Reviewed-by: Xisco Fauli 
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 09ca5b466715..eb89e1fdb307 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -186,8 +186,16 @@ TreeListBox::~TreeListBox()
 std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_view aName, const weld::TreeIter* 
pStart, const IEntryFilter* _pFilter) const
 {
 auto xEntry(m_xTreeView->make_iterator(pStart));
-if (!pStart && !m_xTreeView->get_iter_first(*xEntry))
-return nullptr;
+if (pStart)
+{
+if (!m_xTreeView->iter_children(*xEntry))
+return nullptr;
+}
+else
+{
+if (!m_xTreeView->get_iter_first(*xEntry))
+return nullptr;
+}
 
 do
 {

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 493c01a4690ccc3dfbf8d66cd2023fa20687232e
Author: Xisco Fauli 
AuthorDate: Mon Oct 10 12:18:19 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 12:18:19 2022 +0200

bump product version to 7.4.2.3.0+

Change-Id: I50c373f258e5a8069cdd22dba78e856ade61a602

diff --git a/configure.ac b/configure.ac
index 1fb68fde28f0..3c65ee29594d 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.4.2.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.4.2.3.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.4.2.3'

[Xisco Fauli (via logerrit)]

Tag 'libreoffice-7.4.2.3' created by Xisco Fauli  
at 2022-10-10 10:16 +

Tag libreoffice-7.4.2.3
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmND8PEACgkQ9DSh76/u
rqOq3hAAuDhOuTAN/gbnWZfQKosfQNaCB7cOp8+mz3EyskFbTJTaUvyuLh+6zFqE
1BtTPwk01KzaTWAlviWJN23VDhe6f49F/3/TxIiAt2UoYAOfrPxm4pVectW8jhvX
BaXFySRzcDs7EQnv7khcsJ6oC55HZmZ/zUdtVQvAMuwKcphyblyx2W5mCN0hcml3
p/GoWxUup5cWHYKB8bZbB3EHXgjShxQev0NvjlMH6zObO61ruw71Ds1UrfrQm+Bj
rHwwsuyB7nP8NJGH9H1YpbF6sD676iL+2J8y6RSMHbBQEhHXmVUeSh0EwwU5VSCO
jCbPqcjZ0HfRS4283DwW+Ym8Mhcsk9NT2Z5YoDh+eNw/IFIX6aTHcGWGnGKqC7o0
nNIND0lUS7Yrxtit1dU920R3B30kW50aJbe2o+p6JrDLn8x7nJsza16LqVWlX0fd
kzCVDN3JyCC9g8dmN6UjItjeYDqLLEVec/EP8SDHkLnQ7VwAX+9KfnbNogK70jRj
kzqiCDuhTjRriFCZbLkiyj39z7yhxblSb1B353X4RoOVe5LE+RiqsH/rZwQi4bv2
8zoaedBKd2M6U9CmKdNJ432nef+/G7ctv4i5xp4vBcQxz3+gAm9DZHSt98+MLFpd
yd3OLirptlIwlzGhu4/ipc2FhL7e/I421iyw6k1wnyNHdb3lYLI=
=Tfya
-END PGP SIGNATURE-

Changes since libreoffice-7-4-branch-point-5:
---
 0 files changed
---

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

[Xisco Fauli (via logerrit)]

Tag 'libreoffice-7.4.2.3' created by Xisco Fauli  
at 2022-10-10 10:16 +

Tag libreoffice-7.4.2.3
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmND8PMACgkQ9DSh76/u
rqMuxBAAly1KlRwxw5w7sywCKXDXYgg0extmN0rwVgOwQTLxhgvSEyKbR0ZLiTMM
2/GvLQUPqhskYgtKfOnsox12/9dfRpSUQXA/J2O0Nt5zo/ozNB4Ysu9bdV88dYP9
qHSRJIyS82c7cjUGp1bOc8CjkhP3GrUcBCd5VvzGemp9Us8HxjJW9j433m/qgxpI
RUafnagCXMES8RdStX166kyCWWWYkUI9VmNtSB1R3jHZfiswai3cj9tD86gWIKbN
VCrfyLRxydtW0uSA5tvhpqIG+E4CINi+9aOivKfQ5wL+DGfx00ATlZScBjW7/4ep
mEHjVo+Kcpasl7sj2cw92c7YttuGHR/jm4OW9yUdfYVZmc+cgWdXDXb3WVSG31LB
w4XScQa6p4VskcUVgTua3pHI95bIRKrNr7/zrDy/X+xf02w8M6o3qM5nzV041SQ6
6HB/Pbtc7k22RaqLkXSPRDr7Byk8ygFBV3i6IOJqw2y1mQjTDXlzr0SQS/V3ErEn
ieTd+gB+w+pGFsa4hzirjqs0caflxESFV3nsXD9J8+hAjuJRsXw/1ikvdtVE3M83
6jU6rSwdkzUPzSoVq8jdLVCaT8wJoSI802+lGgOrofyk/UJPaI8W0vH0yriEsLmK
LlmlsC6SwlfmKXocOyAmxvX+UJqJ41T1i/WjW6uBfKaqWjJY9gU=
=CKKn
-END PGP SIGNATURE-

Changes since libreoffice-7-4-branch-point-54:
---
 0 files changed
---

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

[Xisco Fauli (via logerrit)]

Tag 'libreoffice-7.4.2.3' created by Xisco Fauli  
at 2022-10-10 10:16 +

Tag libreoffice-7.4.2.3
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmND8PMACgkQ9DSh76/u
rqMYvw/+Jg8uDrGSDg7VbXDP3810QXbDmD0Zr+d7OqsNaB1iNJi8XrzRJVHM9/pR
Z2DBWq84ANZI+C+2CfZo81jWkwji0l4Qz+yw0a4lueL2B1oY3NESa5a4pDy/pxgC
p8D5QCb/LH0od809gBjjIAs1T9EPZhTaWJeywvamzsLMVnSUeqVnsau83SdY9/lc
Vr3GsD8Ssx76M1JixLeUUE7Tervl/nXiI2uUU1gkEYu8nNMjA7a8SQmZFd8tlUMk
oUlV7hEZ6sPPw76QuwkA9+SVGP+YhPsLnX9k6499rYwxcRQBKiYQYsD0bLD26XfH
pw31thKYxdPvhTN2axCwtpCSsjnz8B8ABnGW4aoKhj/FqoU/nY3xTxyDULKLoyvk
bto9B60qxTwafccqQ8v0HPF9OUY3P6zDlDd/msvJv8LjbwTt7zmUGCgjMvvno+IL
ljOpxMCvV9emkLcLdT8FVsYufWqSGzi7ImGqx3RpIKSK9sLDVLRmmsl0C/AWhPoL
XsBw8qeS7Vlr091aVC5AEnE5aBUvmK6V9Kz4H/VEhLm8CGn+7OC+c5RLwjC3SBAi
b1WPNkvLZj2oIFutzi/H0DfykVyGO3UdpS8AO2TCeX+H4SxrxHsWJtkjUl3Tfkji
LHTmHcrgTEq/l3CfZ/BJqg7pmwlmoc2isNfZyrT9JJEKkZKQBCI=
=GmGS
-END PGP SIGNATURE-

Changes since libreoffice-7-4-branch-point-21:
---
 0 files changed
---

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

[Xisco Fauli (via logerrit)]

Tag 'libreoffice-7.4.2.3' created by Xisco Fauli  
at 2022-10-10 10:16 +

Tag libreoffice-7.4.2.3
-BEGIN PGP SIGNATURE-

iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmND8PMACgkQ9DSh76/u
rqPvaA//a0HujnNWe7AqDvghfAiAJdKz3hKDOGb+3fZl15feS/Uo7PRUlMaMZSfQ
0jkSxa5BkJPuzoCiwDzVI7LywtC0Kl91qw/+u9YSS/yWhyxzTTxswM6jN2MG2MT9
S3Kg7WGibpQgVk+7q6eK04+Rlhd0ksVFcGaOQgapmZaKUeQFFXlYsqN5H9IZbiHY
MqfJ6H1bVCNULDmSrETYCotMNfeJODbkTlLSUtPqHBTZTIh0gcdxz4DbujZBU2RU
AwJg+NfZhcbrCBdDBRG/0lEdRt25jCRa4iYPe08WgTjZ/b77j3vDsKwSDpl9YIGH
/Yjx6bO2BbDRtwlWnNJeBXwvMRPT0C5EeDxEpcpdrbWL3hQv8zSZgvriZZJVR4zI
vT0+OPbVCC9OcojA+5eXUJqshaK96/oefsYffbBwK15xAstoPfpNF/v+nnSkPrCr
+AGIdahyfzyi2RJNqNIvrFnNrslKAOWAVY42P7tiBKs5Wc+cqIG3kj63f2sWtiHk
Io89vMDuKAJuU9yC2rsIpxzJSyad9RSaumGjAmswafApwct1lgAi9jaUASgBKA71
mJL6a2lSVFD6U7S1noTuILb0RJhRFR/UGSaifsVSNWIbar8j7dUdS12lx3i3SKek
M+TP2QXH93tDeorWQvDeQpK0zk7+dp/bCinhEf68ChZKAit3X70=
=LYhP
-END PGP SIGNATURE-

Changes since libreoffice-7-4-branch-point-661:
---
 0 files changed
---

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/cmd/32/extrusiontoggle.png  |binary
 icon-themes/sifr/cmd/32/splitcell.png|binary
 icon-themes/sifr/cmd/lc_extrusiontoggle.png  |binary
 icon-themes/sifr/cmd/lc_splitcell.png|binary
 icon-themes/sifr/cmd/sc_extrusiontoggle.png  |binary
 icon-themes/sifr/cmd/sc_splitcell.png|binary
 icon-themes/sifr/sd/res/displaymode_slide.png|binary
 icon-themes/sifr/sd/res/displaymode_slidemaster.png  |binary
 icon-themes/sifr_dark/cmd/32/extrusiontoggle.png |binary
 icon-themes/sifr_dark/cmd/32/splitcell.png   |binary
 icon-themes/sifr_dark/cmd/lc_extrusiontoggle.png |binary
 icon-themes/sifr_dark/cmd/lc_splitcell.png   |binary
 icon-themes/sifr_dark/cmd/sc_extrusiontoggle.png |binary
 icon-themes/sifr_dark/cmd/sc_splitcell.png   |binary
 icon-themes/sifr_dark/sd/res/displaymode_slide.png   |binary
 icon-themes/sifr_dark/sd/res/displaymode_slidemaster.png |binary
 icon-themes/sifr_dark_svg/cmd/32/extrusiontoggle.svg |2 +-
 icon-themes/sifr_dark_svg/cmd/32/splitcell.svg   |2 +-
 icon-themes/sifr_dark_svg/cmd/lc_extrusiontoggle.svg |2 +-
 icon-themes/sifr_dark_svg/cmd/lc_splitcell.svg   |2 +-
 icon-themes/sifr_dark_svg/cmd/sc_extrusiontoggle.svg |2 +-
 icon-themes/sifr_dark_svg/cmd/sc_splitcell.svg   |2 +-
 icon-themes/sifr_dark_svg/sd/res/displaymode_slide.svg   |2 +-
 icon-themes/sifr_dark_svg/sd/res/displaymode_slidemaster.svg |2 +-
 icon-themes/sifr_svg/cmd/32/extrusiontoggle.svg  |2 +-
 icon-themes/sifr_svg/cmd/32/splitcell.svg|2 +-
 icon-themes/sifr_svg/cmd/lc_extrusiontoggle.svg  |2 +-
 icon-themes/sifr_svg/cmd/lc_splitcell.svg|2 +-
 icon-themes/sifr_svg/cmd/sc_extrusiontoggle.svg  |2 +-
 icon-themes/sifr_svg/cmd/sc_splitcell.svg|2 +-
 icon-themes/sifr_svg/sd/res/displaymode_slide.svg|2 +-
 icon-themes/sifr_svg/sd/res/displaymode_slidemaster.svg  |2 +-
 32 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 8e8523018d7824aeefe654926c62b2fd49429e41
Author: Rizal Muttaqin 
AuthorDate: Mon Oct 10 13:48:03 2022 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Oct 10 13:47:52 2022 +0200

tdf#151071 Revise Sifr

Change-Id: I47e286b1327ea8c34a11f05735bae087ced21dab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141149
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/cmd/32/extrusiontoggle.png 
b/icon-themes/sifr/cmd/32/extrusiontoggle.png
index bfb704449593..3c0c38a60f77 100644
Binary files a/icon-themes/sifr/cmd/32/extrusiontoggle.png and 
b/icon-themes/sifr/cmd/32/extrusiontoggle.png differ
diff --git a/icon-themes/sifr/cmd/32/splitcell.png 
b/icon-themes/sifr/cmd/32/splitcell.png
index 0fe3b9f5a134..78842ffaf1c0 100644
Binary files a/icon-themes/sifr/cmd/32/splitcell.png and 
b/icon-themes/sifr/cmd/32/splitcell.png differ
diff --git a/icon-themes/sifr/cmd/lc_extrusiontoggle.png 
b/icon-themes/sifr/cmd/lc_extrusiontoggle.png
index ffb6c7717bc7..2ce7a82f5cba 100644
Binary files a/icon-themes/sifr/cmd/lc_extrusiontoggle.png and 
b/icon-themes/sifr/cmd/lc_extrusiontoggle.png differ
diff --git a/icon-themes/sifr/cmd/lc_splitcell.png 
b/icon-themes/sifr/cmd/lc_splitcell.png
index 664d3d4c5d54..35a2816ee67b 100644
Binary files a/icon-themes/sifr/cmd/lc_splitcell.png and 
b/icon-themes/sifr/cmd/lc_splitcell.png differ
diff --git a/icon-themes/sifr/cmd/sc_extrusiontoggle.png 
b/icon-themes/sifr/cmd/sc_extrusiontoggle.png
index fe52b6502242..8c07929aef77 100644
Binary files a/icon-themes/sifr/cmd/sc_extrusiontoggle.png and 
b/icon-themes/sifr/cmd/sc_extrusiontoggle.png differ
diff --git a/icon-themes/sifr/cmd/sc_splitcell.png 
b/icon-themes/sifr/cmd/sc_splitcell.png
index fc84eb1cb130..8a9fea9f1655 100644
Binary files a/icon-themes/sifr/cmd/sc_splitcell.png and 
b/icon-themes/sifr/cmd/sc_splitcell.png differ
diff --git a/icon-themes/sifr/sd/res/displaymode_slide.png 
b/icon-themes/sifr/sd/res/displaymode_slide.png
index 63ecfb9c3f55..3dcdbbcb9d88 100644
Binary files a/icon-themes/sifr/sd/res/displaymode_slide.png and 
b/icon-themes/sifr/sd/res/displaymode_slide.png differ
diff --git a/icon-themes/sifr/sd/res/displaymode_slidemaster.png 
b/icon-themes/sifr/sd/res/displaymode_slidemaster.png
index bbcda48ef168..35852ebb9f4e 100644
Binary files a/icon-themes/sifr/sd/res/displaymode_slidemaster.png and 
b/icon-themes/sifr/sd/res/displaymode_slidemaster.png differ
diff --git a/icon-themes/sifr_dark/cmd/32/extrusiontoggle.png 
b/icon-themes/sifr_dark/cmd/32/extrusiontoggle.png
index 28cc0ec52c75..1aa829774777 100644
Binary files a/icon-themes/sifr_dark/cmd/32/extru

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - filter/qa filter/source

[Miklos Vajna (via logerrit)]

 filter/qa/unit/svg.cxx  |   39 +++
 filter/source/svg/svgwriter.cxx |6 ++
 2 files changed, 45 insertions(+)

New commits:
commit 074c5b90f71e589d3e531f8606ac0e0c6ff12af2
Author: Miklos Vajna 
AuthorDate: Thu Oct 6 15:27:24 2022 +0200
Commit: Andras Timar 
CommitDate: Mon Oct 10 14:04:06 2022 +0200

SVG export: don't loose tab portions

Impress slides are exported to SVG via a metafile. In case shape text
has a string like "A\tB", that was exported as "AB", loosing the tab
character.

The relevant shape is exported as a metafile, with two text array
metafile actions (one for "A", one for "B") and the tab needs no
explicit action as both "A" and "B" has an explicit position. The SVG
contained no explicit position for "B", so the tab was lost visually.

Fix the problem by detecting when the doc model has a "\t" without a
matching metafile action and emitting the explicit position in that
case.

An alternative would be to use implWriteTextPortion() to write a 
for the tab, but that doesn't guarantee that the width of the tab in the
SVG is the same as in Impress.

(cherry picked from commit e7ca10a35fd665722c67eea85e15f71c11c66248)

Change-Id: Ie21bffce9d09194159e460fb28ab23fbefd52102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141026
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Marco Cecchetti 
(cherry picked from commit cd04f3973c33e081fb0feb176e7c5e4f11759d77)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141065
Reviewed-by: Andras Timar 

diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index 31c8076637a8..4a2f5df57c80 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -14,6 +14,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 #include 
@@ -248,6 +252,41 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, attributeRedefinedTest)
 assertXPath(pXmlDoc, xPath + "[4]", "id", "id7");
 }
 
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, testTab)
+{
+// Given a shape with "A\tB" text:
+getComponent() = loadFromDesktop("private:factory/simpress",
+ 
"com.sun.star.presentation.PresentationDocument");
+uno::Reference xFactory(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.TextShape"), 
uno::UNO_QUERY);
+uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+   uno::UNO_QUERY);
+xDrawPage->add(xShape);
+xShape->setSize(awt::Size(1, 1));
+uno::Reference xShapeText(xShape, uno::UNO_QUERY);
+xShapeText->setString("A\tB");
+
+// When exporting that document to SVG:
+uno::Reference xStorable(getComponent(), 
uno::UNO_QUERY_THROW);
+SvMemoryStream aStream;
+uno::Reference xOut = new 
utl::OOutputStreamWrapper(aStream);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("impress_svg_Export");
+aMediaDescriptor["OutputStream"] <<= xOut;
+xStorable->storeToURL("private:stream", 
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Then make sure the the tab is not lost:
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 2
+// - Actual  : 1
+// i.e. the 2nd text portion was not positioned, which looked as if the 
tab is lost.
+assertXPath(pXmlDoc, 
"//svg:g[@class='TextShape']//svg:tspan[@class='TextPosition']", 2);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 4da018fa8f9b..71286a082c42 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1636,6 +1636,12 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
 continue;
 if( sContent == "\n" )
 mbLineBreak = true;
+else if (sContent == "\t")
+{
+// Need to emit position for the next text portion after a 
tab, otherwise the tab
+// would appear as if it has 0 width.
+mbPositioningNeeded = true;
+}
 if( sContent.match( rText, nStartPos ) )
 bNotSync = false;
 }

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2d1faa3dbf3cf5f7aa2e26e728de709842da2e12
Author: Caolán McNamara 
AuthorDate: Sun Oct 9 20:40:41 2022 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 14:15:53 2022 +0200

Resolves: tdf#151441 queries don't show any content

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

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 09ca5b466715..eb89e1fdb307 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -186,8 +186,16 @@ TreeListBox::~TreeListBox()
 std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_view aName, const weld::TreeIter* 
pStart, const IEntryFilter* _pFilter) const
 {
 auto xEntry(m_xTreeView->make_iterator(pStart));
-if (!pStart && !m_xTreeView->get_iter_first(*xEntry))
-return nullptr;
+if (pStart)
+{
+if (!m_xTreeView->iter_children(*xEntry))
+return nullptr;
+}
+else
+{
+if (!m_xTreeView->get_iter_first(*xEntry))
+return nullptr;
+}
 
 do
 {

[Libreoffice-commits] core.git: 2 commits - helpcontent2 translations

[Olivier Hallot (via logerrit)]

 helpcontent2 |2 +-
 translations |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aba47d363b8cdaea65245be2c4c06dc614401753
Author: Olivier Hallot 
AuthorDate: Mon Oct 10 09:34:38 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 14:34:38 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 44ae617cb4f7eaae3eb4b06f5a61fdb1f751e061
  - Update list of conversion filters Help page

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

diff --git a/helpcontent2 b/helpcontent2
index 3f8c722ac252..44ae617cb4f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3f8c722ac252de3078e0137501e8fdaecc888c91
+Subproject commit 44ae617cb4f7eaae3eb4b06f5a61fdb1f751e061
commit 302fb7e73e00e18b91b7a7bcc418e42e6e41d049
Author: Christian Lohmaier 
AuthorDate: Mon Oct 10 14:30:05 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 14:30:05 2022 +0200

Update git submodules

* Update translations from branch 'master'
  to df57c0c6513ed1118cc9a199c9d0f19625766e20
  - update translations for master

and force-fix errors using pocheck

Change-Id: I3b188be653b6e7bbd18d9c8e6d5cd1c33e0c6890

diff --git a/translations b/translations
index a5f80090f50b..df57c0c6513e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a5f80090f50b6d1e06f579d12a22eb1ad805c99c
+Subproject commit df57c0c6513ed1118cc9a199c9d0f19625766e20

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

[Michael Stahl (via logerrit)]

 sw/source/core/table/swnewtable.cxx |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 2f52d9abd5c08e0fb31faa25db20906349c17df1
Author: Michael Stahl 
AuthorDate: Fri Oct 7 16:13:05 2022 +0200
Commit: Caolán McNamara 
CommitDate: Mon Oct 10 14:34:58 2022 +0200

tdf#145871 sw: ODF import: don't convert subtables if outer row ...

... has fixed or min height.

The code had 2 obvious problems: the fixed height on the outer row
wasn't cleared if the inner row didn't have a fixed height, and the code
to set lastSize on the last row erroneously set the first row's height
as well due to sharing the row format.

But it turns out that this doesn't work anyway in case any of the inner
rows are variable sized, because without layout it's not possible to
determine the height of these rows, and so the lastSize is going to be
too large in many cases.

(regression from commit e366c928819c44b5c253c45dca6dae40b71c9808)

Change-Id: I42ac7c14236562f9cae228efc0e98dc2fa8c2a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141079
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4757dfc2a520f63fba0b27cc161fe732231dbd0e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141061
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/table/swnewtable.cxx 
b/sw/source/core/table/swnewtable.cxx
index f3bcc71f48f9..c632f86b693b 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -2133,6 +2133,11 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, 
sal_uInt16 const nBox)
 assert(!pSubTableBox->GetTabLines().empty());
 // are relative (%) heights possible? apparently not
 SwFormatFrameSize const 
outerSize(pSourceLine->GetFrameFormat()->GetFrameSize());
+if (outerSize.GetHeightSizeType() != SwFrameSize::Variable)
+{   // tdf#145871 clear fixed size in first row
+pSourceLine->ClaimFrameFormat();
+pSourceLine->GetFrameFormat()->ResetFormatAttr(RES_FRM_SIZE);
+}
 tools::Long minHeights(0);
 {
 SwFrameFormat const& 
rSubLineFormat(*pSubTableBox->GetTabLines()[0]->GetFrameFormat());
@@ -2171,12 +2176,14 @@ void SwTable::ConvertSubtableBox(sal_uInt16 const nRow, 
sal_uInt16 const nBox)
 && outerSize.GetHeightSizeType() != SwFrameSize::Variable
 && minHeights < outerSize.GetHeight())
 {
+assert(false); // this should be impossible currently, such 
subtable isn't converted because layout is needed to determine how much space 
is taken up by variable height rows
 SwFormatFrameSize 
lastSize(pNewLine->GetFrameFormat()->GetFrameSize());
 lastSize.SetHeight(lastSize.GetHeight() + outerSize.GetHeight() - 
minHeights);
 if (lastSize.GetHeightSizeType() == SwFrameSize::Variable)
 {
 lastSize.SetHeightSizeType(SwFrameSize::Minimum);
 }
+pNewLine->ClaimFrameFormat();
 pNewLine->GetFrameFormat()->SetFormatAttr(lastSize);
 }
 SfxPoolItem const* pRowBrush(nullptr);
@@ -2295,6 +2302,7 @@ bool SwTable::CanConvertSubtables() const
 return false;
 }
 haveSubtable = true;
+bool haveNonFixedInnerLine(false);
 for (SwTableLine const*const pInnerLine : pBox->GetTabLines())
 {
 // bitmap row background will look different
@@ -2311,6 +2319,13 @@ bool SwTable::CanConvertSubtables() const
 return false;
 }
 }
+if (SwFormatFrameSize const* pSize = 
rRowFormat.GetItemIfSet(RES_FRM_SIZE))
+{
+if (pSize->GetHeightSizeType() != SwFrameSize::Fixed)
+{
+haveNonFixedInnerLine = true;
+}
+}
 for (SwTableBox const*const pInnerBox : 
pInnerLine->GetTabBoxes())
 {
 if (!pInnerBox->GetTabLines().empty())
@@ -2319,6 +2334,17 @@ bool SwTable::CanConvertSubtables() const
 }
 }
 }
+if (haveNonFixedInnerLine)
+{
+if (SwFormatFrameSize const* pSize = 
pLine->GetFrameFormat()->GetItemIfSet(RES_FRM_SIZE))
+{
+if (pSize->GetHeightSizeType() != 
SwFrameSize::Variable)
+{
+// not possible to distribute fixed outer row 
height on rows without layout
+return false;
+}
+}
+}
 }
 }
 }

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

[Olivier Hallot (via logerrit)]

 source/text/shared/guide/convertfilters.xhp |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 44ae617cb4f7eaae3eb4b06f5a61fdb1f751e061
Author: Olivier Hallot 
AuthorDate: Mon Oct 10 09:28:11 2022 -0300
Commit: Olivier Hallot 
CommitDate: Mon Oct 10 14:34:20 2022 +0200

Update list of conversion filters Help page

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

diff --git a/source/text/shared/guide/convertfilters.xhp 
b/source/text/shared/guide/convertfilters.xhp
index c7008777c..a599646e1 100644
--- a/source/text/shared/guide/convertfilters.xhp
+++ b/source/text/shared/guide/convertfilters.xhp
@@ -1745,7 +1745,18 @@
 "writer_svg_Export"
 
 
-image/svg+xml (svg 
svgz)
+image/svg+xml 
(svg)
+
+
+
+
+WEBP - WebP Image
+
+
+"writer_webp_Export"
+
+
+image/webp (webp)
 
 
 

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/0110.xhp |4 
 source/text/shared/01/01100200.xhp |   17 +++--
 2 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 01be581e707e83a5aaefd2174dc363c1b410ec08
Author: Olivier Hallot 
AuthorDate: Thu Oct 6 12:33:05 2022 -0300
Commit: Olivier Hallot 
CommitDate: Mon Oct 10 14:38:26 2022 +0200

tdf#151386 - Add preferred resolution for images in file properties

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

diff --git a/source/text/shared/01/0110.xhp 
b/source/text/shared/01/0110.xhp
index 6190e023b..776b21080 100644
--- a/source/text/shared/01/0110.xhp
+++ b/source/text/shared/01/0110.xhp
@@ -27,6 +27,10 @@
 
 
 
+
+  file;properties
+  document;properties
+
 
 
 Properties
diff --git a/source/text/shared/01/01100200.xhp 
b/source/text/shared/01/01100200.xhp
index 698047c09..6caca3d77 100644
--- a/source/text/shared/01/01100200.xhp
+++ b/source/text/shared/01/01100200.xhp
@@ -32,6 +32,15 @@
 files; version numbers
 editing time of documents
 documents; editing time
+documents; template applied
+documents; preferred image resolution
+documents; last printed
+documents; preview image
+documents; number of modifications
+documents; location
+documents; size
+documents; apply user data to
+documents; reset properties
 
 
 
@@ -75,8 +84,12 @@
 
 Reset Properties
   Resets the editing time to zero, the 
creation date to the current date and time, and the version number to 1. The 
modification and printing dates are also deleted.
-  Save preview image with this document
-  Saves a thumbnail 
preview .png inside the document. This image may be used by a file manager 
under certain conditions.
+
+Save preview image with this document
+  Saves a thumbnail 
preview in PNG format inside the document. This image may be used by a file 
manager under certain conditions.
   To disable generating thumbnails in general, 
choose %PRODUCTNAME - 
PreferencesTools - 
Options
 - %PRODUCTNAME - Advanced. Click the Open Expert 
Configuration button, and search for GenerateThumbnail. 
If this property has the value true, then double-click on it 
to set its value to false.
+
+Preferred resolution for images
+  Check this box to 
select the preferred image resolution in points per inch, which is used as 
default when an image is inserted into a Writer, Impress or a Draw document and 
resize it according to the value in the list box.
 
 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit dae54fc666c8ac97445fb8470a502c92f1f5d800
Author: Olivier Hallot 
AuthorDate: Mon Oct 10 09:38:33 2022 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 14:38:33 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 01be581e707e83a5aaefd2174dc363c1b410ec08
  - tdf#151386 - Add preferred resolution for images in file properties

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

diff --git a/helpcontent2 b/helpcontent2
index 44ae617cb4f7..01be581e707e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 44ae617cb4f7eaae3eb4b06f5a61fdb1f751e061
+Subproject commit 01be581e707e83a5aaefd2174dc363c1b410ec08

[Libreoffice-commits] translations.git: source/dsb source/hsb

[Christian Lohmaier (via logerrit)]

 source/dsb/helpcontent2/source/auxiliary.po  | 1114 
 source/dsb/helpcontent2/source/text/sbasic/guide.po  | 2176 
 source/dsb/helpcontent2/source/text/sbasic/python.po | 3677 
 source/dsb/helpcontent2/source/text/sbasic/shared.po |42251 
 source/dsb/helpcontent2/source/text/sbasic/shared/01.po  |  619 
 source/dsb/helpcontent2/source/text/sbasic/shared/02.po  | 1852 
 source/dsb/helpcontent2/source/text/sbasic/shared/03.po  |30623 ++
 source/dsb/helpcontent2/source/text/scalc.po | 1663 
 source/dsb/helpcontent2/source/text/scalc/00.po  | 2365 
 source/dsb/helpcontent2/source/text/scalc/01.po  |73256 +++
 source/dsb/helpcontent2/source/text/scalc/02.po  | 1195 
 source/dsb/helpcontent2/source/text/scalc/04.po  | 1906 
 source/dsb/helpcontent2/source/text/scalc/05.po  | 1204 
 source/dsb/helpcontent2/source/text/scalc/06.po  |   25 
 source/dsb/helpcontent2/source/text/scalc/guide.po   |13955 ++
 source/dsb/helpcontent2/source/text/schart.po|  880 
 source/dsb/helpcontent2/source/text/schart/00.po |  556 
 source/dsb/helpcontent2/source/text/schart/01.po | 8825 +
 source/dsb/helpcontent2/source/text/schart/02.po |  241 
 source/dsb/helpcontent2/source/text/schart/04.po |  304 
 source/dsb/helpcontent2/source/text/sdatabase.po |15386 +++
 source/dsb/helpcontent2/source/text/sdraw.po | 1285 
 source/dsb/helpcontent2/source/text/sdraw/00.po  |  178 
 source/dsb/helpcontent2/source/text/sdraw/01.po  | 1123 
 source/dsb/helpcontent2/source/text/sdraw/04.po  |  943 
 source/dsb/helpcontent2/source/text/sdraw/guide.po   | 3029 
 source/dsb/helpcontent2/source/text/shared.po| 2896 
 source/dsb/helpcontent2/source/text/shared/00.po |15521 +++
 source/dsb/helpcontent2/source/text/shared/01.po |54734 +++
 source/dsb/helpcontent2/source/text/shared/02.po |19904 
 source/dsb/helpcontent2/source/text/shared/04.po | 2896 
 source/dsb/helpcontent2/source/text/shared/05.po | 1798 
 source/dsb/helpcontent2/source/text/shared/06.po |  475 
 source/dsb/helpcontent2/source/text/shared/07.po |   79 
 source/dsb/helpcontent2/source/text/shared/autokorr.po   |  448 
 source/dsb/helpcontent2/source/text/shared/autopi.po | 7970 +
 source/dsb/helpcontent2/source/text/shared/guide.po  |28805 +
 source/dsb/helpcontent2/source/text/shared/help.po   |  898 
 source/dsb/helpcontent2/source/text/shared/menu.po   |  295 
 source/dsb/helpcontent2/source/text/shared/optionen.po   |18050 +++
 source/dsb/helpcontent2/source/text/simpress.po  | 2167 
 source/dsb/helpcontent2/source/text/simpress/00.po   | 1483 
 source/dsb/helpcontent2/source/text/simpress/01.po   | 9410 +
 source/dsb/helpcontent2/source/text/simpress/02.po   | 5918 +
 source/dsb/helpcontent2/source/text/simpress/04.po   | 2293 
 source/dsb/helpcontent2/source/text/simpress/guide.po| 6188 +
 source/dsb/helpcontent2/source/text/smath.po |  556 
 source/dsb/helpcontent2/source/text/smath/00.po  |  610 
 source/dsb/helpcontent2/source/text/smath/01.po  |13883 ++
 source/dsb/helpcontent2/source/text/smath/02.po  |   70 
 source/dsb/helpcontent2/source/text/smath/04.po  |  250 
 source/dsb/helpcontent2/source/text/smath/06.po  |   79 
 source/dsb/helpcontent2/source/text/smath/guide.po   | 1294 
 source/dsb/helpcontent2/source/text/swriter.po   | 3452 
 source/dsb/helpcontent2/source/text/swriter/00.po| 2878 
 source/dsb/helpcontent2/source/text/swriter/01.po|32531 ++
 source/dsb/helpcontent2/source/text/swriter/02.po| 4190 
 source/dsb/helpcontent2/source/text/swriter/04.po| 2347 
 source/dsb/helpcontent2/source/text/swriter/guide.po |19823 
 source/dsb/helpcontent2/source/text/swriter/librelogo.po | 2950 
 source/dsb/helpcontent2/source/text/swriter/menu.po  |  259 
 source/hsb/helpcontent2/source/auxiliary.po  | 1114 
 source/hsb/helpcontent2/source/text/sbasic/guide.po  | 2176 
 source/hsb/helpcontent2/source/text/sbasic/python.po | 3679 
 source/hsb/helpcontent2/source/text/sbasic/shared.po |42253 
 source/hsb/helpcontent2/source/text/sbasic/shared/01.po  |  619 
 source/hsb/helpcontent2/source/text/sbasic/shared/02.po  | 1852 
 source/hsb/helpcontent2/source/text/sbasic/shared/03.po  |30625 ++
 source/hsb/helpcontent2/source/text/scalc.po | 1663 
 source/hsb/helpcontent2/source/text/scalc/00.po  | 2365 
 source/hsb/helpcontent2/source/text/scalc/01.po  |73256 +++
 source/hsb/helpcontent2/source/text/scalc/02.po  | 1195 
 source/hsb/helpcontent2/source/text/scalc/04.po  | 1906 
 source/hsb/helpcontent2/source/text/scalc/05.po  | 1204 
 source/h

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit ff18bb9fe16c1cd1690c7e5c25ed479aac5897f8
Author: Christian Lohmaier 
AuthorDate: Mon Oct 10 14:43:38 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 14:43:38 2022 +0200

Update git submodules

* Update translations from branch 'master'
  to a06c7f55db473a521b3318327ada335be99a0a0d
  - add helpcontent2 for hsb and dsb

Change-Id: Ifac433cf11a7f18f68f8235f014b51951d5408f1

diff --git a/translations b/translations
index df57c0c6513e..a06c7f55db47 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit df57c0c6513ed1118cc9a199c9d0f19625766e20
+Subproject commit a06c7f55db473a521b3318327ada335be99a0a0d

Re: Minimum system version of ICU

[Stephan Bergmann]

On 08/10/2022 19:57, Chris Sherlock wrote:
What is the minimum version of ICU that a system must run if the distro 
decides not to use our internal ICU?


At least the relevant configure.ac check appears to be still effectively 
at 
 
"Require icu 4.6 or later with system icu" (however rotten that may be 
in practice).

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

[Stephan Bergmann (via logerrit)]

 external/pdfium/gcc-c++20-comparison.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68f4da7fff44c1bbb7922be536f496b38e457252
Author: Stephan Bergmann 
AuthorDate: Mon Oct 10 12:54:09 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Oct 10 15:00:02 2022 +0200

Adapt external/pdfium/gcc-c++20-comparison.patch to P2468R2

( 
"The
Equality Operator You Are Looking For"), as now implemented by Clang 16 
trunk
since


"[C++20][Clang] P2468R2 The Equality Operator You Are Looking For", and 
which
started to make my --with-latest-c++ build fail with

> 
workdir/UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_interactiveform.cpp:189:22: 
error: invalid operands to binary expression ('const CPDF_Dictionary *' and 
'RetainPtr')
>   if (pAnnotDict == pDict)
>   ~~ ^  ~
> workdir/UnpackedTarball/pdfium/core/fxcrt/bytestring.h:227:13: note: 
candidate function not viable: no known conversion from 'const CPDF_Dictionary 
*' to 'const char *' for 1st argument
> inline bool operator==(const char* lhs, const ByteString& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/bytestring.h:227:13: note: 
candidate function (with reversed parameter order) not viable: no known 
conversion from 'const CPDF_Dictionary *' to 'const ByteString' for 1st argument
> workdir/UnpackedTarball/pdfium/core/fxcrt/bytestring.h:230:13: note: 
candidate function not viable: no known conversion from 'const CPDF_Dictionary 
*' to 'ByteStringView' (aka 'StringViewTemplate') for 1st argument
> inline bool operator==(ByteStringView lhs, const ByteString& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/bytestring.h:230:13: note: 
candidate function (with reversed parameter order) not viable: no known 
conversion from 'const CPDF_Dictionary *' to 'const ByteString' for 1st argument
> workdir/UnpackedTarball/pdfium/core/fxcrt/widestring.h:285:13: note: 
candidate function not viable: no known conversion from 'const CPDF_Dictionary 
*' to 'const wchar_t *' for 1st argument
> inline bool operator==(const wchar_t* lhs, const WideString& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/widestring.h:285:13: note: 
candidate function (with reversed parameter order) not viable: no known 
conversion from 'const CPDF_Dictionary *' to 'const WideString' for 1st argument
> workdir/UnpackedTarball/pdfium/core/fxcrt/widestring.h:288:13: note: 
candidate function not viable: no known conversion from 'const CPDF_Dictionary 
*' to 'WideStringView' (aka 'StringViewTemplate') for 1st argument
> inline bool operator==(WideStringView lhs, const WideString& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/widestring.h:288:13: note: 
candidate function (with reversed parameter order) not viable: no known 
conversion from 'const CPDF_Dictionary *' to 'const WideString' for 1st argument
> workdir/UnpackedTarball/pdfium/core/fxge/cfx_color.h:61:13: note: 
candidate function not viable: no known conversion from 'const CPDF_Dictionary 
*' to 'const CFX_Color' for 1st argument
> inline bool operator==(const CFX_Color& c1, const CFX_Color& c2) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/string_view_template.h:277:13: 
note: candidate template ignored: could not match 'StringViewTemplate' against 
'RetainPtr'
> inline bool operator==(const T* lhs, const StringViewTemplate& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/string_view_template.h:277:13: 
note: candidate template ignored: could not match 'const T *' against 
'RetainPtr'
> workdir/UnpackedTarball/pdfium/core/fxcrt/observed_ptr.h:98:13: note: 
candidate template ignored: could not match 'ObservedPtr' against 'RetainPtr'
> inline bool operator==(const U* lhs, const ObservedPtr& rhs) {
> ^
> workdir/UnpackedTarball/pdfium/core/fxcrt/observed_ptr.h:98:13: note: 
candidate template ignored: could not match 'const U *' against 
'RetainPtr'

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

diff --git a/external/pdfium/gcc-c++20-comparison.patch 
b/external/pdfium/gcc-c++20-comparison.patch
index 0895ea8b5f9d..bc7f2ed9538b 100644
--- a/external/pdfium/gcc-c++20-comparison.patch
+++ b/external/pdfium/gcc-c++20-comparison.patch
@@ -4,7 +4,7 @@
mutable intptr_t m_nRefCount = 0;
  };
  
-+#if __cplusplus < 202002L
++#if __cplusplus < 202002L || (defined __clang__ && __clang_major__ >= 16)
  template 
  inline bool operator==(const U* lhs, const RetainPtr& rhs) {
return rhs == lhs;

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - ucb/source

[Michael Stahl (via logerrit)]

 ucb/source/ucp/webdav-curl/CurlSession.cxx |   58 ++---
 1 file changed, 20 insertions(+), 38 deletions(-)

New commits:
commit ecf5156e53878fb19d8921af64a54a8b4e6ddf4c
Author: Michael Stahl 
AuthorDate: Mon Oct 10 15:01:08 2022 +0200
Commit: Michael Stahl 
CommitDate: Mon Oct 10 15:01:08 2022 +0200

Revert "ucb: webdav-curl: try fallback authentication on 403 error"

This reverts commit cc77bc0e5273c6cf404851624ce5b127cdd839f4.

diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx 
b/ucb/source/ucp/webdav-curl/CurlSession.cxx
index 5b2479fb1f88..cc0a2368784f 100644
--- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
@@ -1380,38 +1380,29 @@ auto CurlProcessor::ProcessRequest(
 ProcessHeaders(headers.HeaderFields.back().first));
 // X-MSDAVEXT_Error see [MS-WEBDAVE] 2.2.3.1.9
 auto const it(headerMap.find("x-msdavext_error"));
-if (it == headerMap.end() || 
!it->second.startsWith("917656;"))
-{
-break;
-}
 if (cookies.isEmpty() // retry only once - could be 
expired...
-&& rSession.m_URI.GetScheme() == "https") // only 
encrypted
+&& rSession.m_URI.GetScheme() == "https" // only 
encrypted
+&& it != headerMap.end()
+&& it->second.startsWith("917656;"))
 {
-cookies
-= TryImportCookies(rSession.m_xContext, 
rSession.m_URI.GetHost());
+cookies = TryImportCookies(rSession.m_xContext, 
rSession.m_URI.GetHost());
 if (!cookies.isEmpty())
 {
-CURLcode rc = 
curl_easy_setopt(rSession.m_pCurl.get(),
-   
CURLOPT_COOKIEFILE, "");
+CURLcode rc = 
curl_easy_setopt(rSession.m_pCurl.get(), CURLOPT_COOKIEFILE, "");
 assert(rc == CURLE_OK);
-rc = curl_easy_setopt(rSession.m_pCurl.get(), 
CURLOPT_COOKIE,
-  cookies.getStr());
+rc = curl_easy_setopt(rSession.m_pCurl.get(), 
CURLOPT_COOKIE, cookies.getStr());
 assert(rc == CURLE_OK);
 (void)rc;
 isRetry = true;
-SAL_INFO("ucb.ucp.webdav.curl", "FedAuth 
cookie set");
-break; // try cookie once
 }
 }
-SAL_INFO("ucb.ucp.webdav.curl", "403 fallback 
authentication hack");
+break;
 }
-[[fallthrough]]; // SP, no cookie, or cookie failed: 
try NTLM
 case SC_UNAUTHORIZED:
 case SC_PROXY_AUTHENTICATION_REQUIRED:
 {
-auto& rnAuthRequests(statusCode != 
SC_PROXY_AUTHENTICATION_REQUIRED
- ? nAuthRequests
- : nAuthRequestsProxy);
+auto& rnAuthRequests(statusCode == SC_UNAUTHORIZED ? 
nAuthRequests
+   : 
nAuthRequestsProxy);
 if (rnAuthRequests == 10)
 {
 SAL_INFO("ucb.ucp.webdav.curl", "aborting 
authentication after "
@@ -1419,30 +1410,22 @@ auto CurlProcessor::ProcessRequest(
 }
 else if (pEnv && pEnv->m_xAuthListener)
 {
-::std::optional const oRealm(
-ExtractRealm(headers, statusCode != 
SC_PROXY_AUTHENTICATION_REQUIRED
-  ? "WWW-Authenticate"
-  : 
"Proxy-Authenticate"));
+::std::optional const 
oRealm(ExtractRealm(
+headers, statusCode == SC_UNAUTHORIZED ? 
"WWW-Authenticate"
+   : 
"Proxy-Authenticate"));
 
 ::std::optional& roAuth(
-statusCode != SC_PROXY_AUTHENTICATION_REQUIRED 
? oAuth
-   
: oAuthProxy);
+statusCode == SC_UNAUTHORIZED ? oAuth : 
oAuthProxy);
   

Re: Minimum system version of ICU

[Chris Sherlock]

> On 10 Oct 2022, at 11:56 pm, Stephan Bergmann  wrote:
> 
> On 08/10/2022 19:57, Chris Sherlock wrote:
>> What is the minimum version of ICU that a system must run if the distro 
>> decides not to use our internal ICU?
> 
> At least the relevant configure.ac check appears to be still effectively at 
> 
>  "Require icu 4.6 or later with system icu" (however rotten that may be in 
> practice).

Thanks Stephan. Is it maybe time to increase the minimum version from this? 
That was released in 2010!

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

[Olivier Hallot (via logerrit)]

 source/text/shared/help/browserhelp.xhp |   38 
 1 file changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 0a4e56a9fa89c9a6ae13b3520b7a5f46c2793e53
Author: Olivier Hallot 
AuthorDate: Fri Sep 30 15:14:30 2022 +0200
Commit: Olivier Hallot 
CommitDate: Mon Oct 10 15:44:25 2022 +0200

Add Upper  and Lower Sorbian to Online Help language selector
(part 2 is in core/ )

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

diff --git a/source/text/shared/help/browserhelp.xhp 
b/source/text/shared/help/browserhelp.xhp
index c14ea4a62..59ef651b5 100644
--- a/source/text/shared/help/browserhelp.xhp
+++ b/source/text/shared/help/browserhelp.xhp
@@ -32,70 +32,72 @@
 
 
 English (USA)
+Albanian
 Amharic
 Arabic
 Asturian
-Bulgarian
 Bengali
 Bengali (India)
-Tibetan
 Bosnian
+Bulgarian
 Catalan
-Valencian 
Catalan
+Catalan 
(Valencia)
+Chinese 
(Simplified)
+Chinese 
(Traditional)
+Croatian  
 Czech
 Danish
-German
-Dzongkha
-Greek
+Dutch  
+Dzongkha  
 English (UK)
 English (SA)
 Esperanto
-Spanish
 Estonian
 Basque
 Finnish
 French
 Galician
+Georgian
+German
+Greek  
 Gujarati
 Hebrew
 Hindi
-Croatian
 Hungarian
 Indonesian
 Icelandic
 Italian
 Japanese
-Georgian
 Khmer
 Korean
 Lao
-Lithuanian
 Latvian
+Lithuanian
 Macedonian
-Norwegian Bokmål
 Nepali
-Dutch
 Norwegian Nynorsk
+Norwegian Bokmål  
 Oromo
 Polish
 Portuguese
-Brazilian 
Portuguese
+Portuguese (Brazil)
 Romanian
 Russian
+Sidama  
 Sinhala
-Sidama
 Slovak
 Slovenian
-Albanian
+Sorbian (Lower)
+Sorbian (Upper)
+Spanish
 Swedish
+Tajik  
 Tamil
-Tajik
+Tibetan  
 Turkish
 Uyghur
 Ukrainian
 Vietnamese
-Chinese 
(Simplified)
-Chinese 
(Traditional)
 
 Next
 Previous

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 3e8bed6709e3a580445488b7e878001b2c2c6be9
Author: Olivier Hallot 
AuthorDate: Mon Oct 10 15:44:35 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 15:44:35 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0a4e56a9fa89c9a6ae13b3520b7a5f46c2793e53
  - Add Upper  and Lower Sorbian to Online Help language selector
(part 2 is in core/ )

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

diff --git a/helpcontent2 b/helpcontent2
index 01be581e707e..0a4e56a9fa89 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 01be581e707e83a5aaefd2174dc363c1b410ec08
+Subproject commit 0a4e56a9fa89c9a6ae13b3520b7a5f46c2793e53

Martin F. Schumann license statement

[Martin F. Schumann]

  All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.

Re: Minimum system version of ICU

[Michael Stahl]

On 10.10.22 15:17, Chris Sherlock wrote:




On 10 Oct 2022, at 11:56 pm, Stephan Bergmann  wrote:

On 08/10/2022 19:57, Chris Sherlock wrote:

What is the minimum version of ICU that a system must run if the distro decides 
not to use our internal ICU?


At least the relevant configure.ac check appears to be still effectively at 
 
"Require icu 4.6 or later with system icu" (however rotten that may be in practice).


Thanks Stephan. Is it maybe time to increase the minimum version from this? 
That was released in 2010!


apparently our current baseline CentOS7 released with ICU version 50 (in 
2014), so i guess everything older than that is obsolete.


https://git.centos.org/rpms/icu/c/d9fa16f2a5dab6f9fb0a324dbfb71a46a8b743eb?branch=c7

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

[Miklos Vajna (via logerrit)]

 writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx   |  
 34 ++
 writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx 
|binary
 writerfilter/source/dmapper/DomainMapper.cxx|  
 15 
 3 files changed, 49 insertions(+)

New commits:
commit f726fbc2699b05199a8dec3055710a7131e0aad6
Author: Miklos Vajna 
AuthorDate: Mon Oct 10 10:07:10 2022 +0200
Commit: Miklos Vajna 
CommitDate: Mon Oct 10 16:05:53 2022 +0200

tdf#151261 DOCX import: fix dropdown SDT when the item display text is 
missing

Dropdown content controls have list items, and each list item can have a
display text and a value. These are optional, and the bugdoc has a list
item where the value is set, but not the display text.

The trouble is that later in DomainMapper_Impl::PopSdt() we check if the
length of the display texts and values array match and if not, then we
throw away these arrays to avoid creating an inconsistent document
model.

Fix the problem by checking what display text and value we got at the end
of each list item; if any of them is missing, we add an empty string,
which matches the internal representation in SwContentControlListItem.

This also helps in case these array sizes matched by accident, but
display texts and values from different list items were mixed
previously.

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

diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
index 21d5c84cae4e..639c8e9e0303 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -95,6 +96,39 @@ CPPUNIT_TEST_FIXTURE(Test, testSdtRunInPara)
 // i.e. the block-SDT-only string was lost.
 CPPUNIT_ASSERT_EQUAL(OUString("first-second"), xPara->getString());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testSdtDropdownNoDisplayText)
+{
+// Given a document with  (no display text):
+OUString aURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"sdt-dropdown-no-display-text.docx";
+
+// When loading that document:
+getComponent() = loadFromDesktop(aURL);
+
+// Then make sure we create a dropdown content control, not a rich text 
one:
+uno::Reference xTextDocument(getComponent(), 
uno::UNO_QUERY);
+uno::Reference 
xParagraphsAccess(xTextDocument->getText(),
+
uno::UNO_QUERY);
+uno::Reference xParagraphs = 
xParagraphsAccess->createEnumeration();
+uno::Reference 
xParagraph(xParagraphs->nextElement(),
+ uno::UNO_QUERY);
+uno::Reference xPortions = 
xParagraph->createEnumeration();
+uno::Reference xTextPortion(xPortions->nextElement(), 
uno::UNO_QUERY);
+OUString aPortionType;
+xTextPortion->getPropertyValue("TextPortionType") >>= aPortionType;
+CPPUNIT_ASSERT_EQUAL(OUString("ContentControl"), aPortionType);
+uno::Reference xContentControl;
+xTextPortion->getPropertyValue("ContentControl") >>= xContentControl;
+uno::Reference xContentControlProps(xContentControl, 
uno::UNO_QUERY);
+uno::Sequence aListItems;
+xContentControlProps->getPropertyValue("ListItems") >>= aListItems;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : 0
+// i.e. the list item was lost on import.
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aListItems.getLength());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git 
a/writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx 
b/writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx
new file mode 100644
index ..ed6d7ac54052
Binary files /dev/null and 
b/writerfilter/qa/cppunittests/dmapper/data/sdt-dropdown-no-display-text.docx 
differ
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 94e273a0fdcd..95694c270a8e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2744,8 +2744,23 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 case NS_ooxml::LN_CT_SdtDropDownList_listItem:
 {
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
+
+size_t nDropDownDisplayTexts = 
m_pImpl->m_pSdtHelper->getDropDownDisplayTexts().size();
+size_t nDropDownItems = 
m_pImpl->m_pSdtHelper->getDropDownItems().size();
+
 if (pProperties)
 pProperties->resolve(*this);
+
+if (m_

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

[Martin Schumann (via logerrit)]

 shell/source/unix/misc/senddoc.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42fe257fa4d970f58543ca40f5158c04f607bc61
Author: Martin Schumann 
AuthorDate: Mon Oct 10 15:13:23 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 10 16:55:54 2022 +0200

tdf#151314 add Betterbird to Thunderbird-like mail clients in senddoc.sh

Change-Id: Ie145aba936138968b31f1f89d85ad23ad937a367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141158
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index d4f9b08de89c..c37a2dcf8ed0 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -80,7 +80,7 @@ fi
 # autodetect mail client from executable name
 case $(basename "$MAILER" | sed 's/-.*$//') in
 
-iceape | mozilla | netscape | seamonkey | icedove | thunderbird)
+iceape | mozilla | netscape | seamonkey | icedove | thunderbird | 
betterbird)
 
 while [ "$1" != "" ]; do
 case $1 in
@@ -361,7 +361,7 @@ case $(basename "$MAILER" | sed 's/-.*$//') in
  ${MAILER} ${TO:+--compose} ${TO:-} ${ATTACH:+--attach} ${ATTACH:-}
 ;;
 
-Mail | Thunderbird | *.app )
+Mail | Thunderbird | Betterbird | *.app )
 
 while [ "$1" != "" ]; do
 case $1 in

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

[Eike Rathke (via logerrit)]

 source/text/shared/01/0211.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 00a07b02f82b2177c6d1ad90168528ca9eb73be8
Author: Eike Rathke 
AuthorDate: Mon Oct 10 17:04:22 2022 +0200
Commit: Eike Rathke 
CommitDate: Mon Oct 10 17:07:56 2022 +0200

Related: tdf#43107 Clarify \n in Find and Replace

Change-Id: I676879173b1c48c665402a6c677a3c94cb97c66c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141161
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index b7caadd4a..26b06353b 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -121,9 +121,9 @@
 \n
 
 
-A 
line break that was inserted with the Shift+Enter key 
combination when in the Find text box. 
-A paragraph 
break that can be entered with the Enter or 
Return key when in the Replace text box in 
Writer. Has no special meaning in Calc, and is treated literally 
there.
-To change 
line breaks into paragraph breaks, enter \n in both the Find 
and Replace boxes, and then perform a search and 
replace.
+When entered in the Find text box, finds a 
line break that was inserted with the Shift+Enter key 
combination in Writer, or the Ctrl+Enter key combination in 
a Calc cell. 
+When entered 
in the Replace text box in Writer, inserts a paragraph break 
as can be inserted with the Enter or 
Return key. Has no special meaning in Calc, and is treated 
literally there.
+To change 
line breaks into paragraph breaks in Writer, enter \n in both the 
Find and Replace boxes, and then perform a 
search and replace.
 
   
   

[Libreoffice-commits] core.git: helpcontent2

[Eike Rathke (via logerrit)]

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

New commits:
commit f4d021e664f140b0c331a91e15887417d0924ee5
Author: Eike Rathke 
AuthorDate: Mon Oct 10 17:07:58 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 10 17:07:58 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 00a07b02f82b2177c6d1ad90168528ca9eb73be8
  - Related: tdf#43107 Clarify \n in Find and Replace

Change-Id: I676879173b1c48c665402a6c677a3c94cb97c66c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141161
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 0a4e56a9fa89..00a07b02f82b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0a4e56a9fa89c9a6ae13b3520b7a5f46c2793e53
+Subproject commit 00a07b02f82b2177c6d1ad90168528ca9eb73be8

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

[Noel Grandin (via logerrit)]

 sc/qa/extras/vba-macro-test.cxx |  156 +++-
 1 file changed, 75 insertions(+), 81 deletions(-)

New commits:
commit 8b4ac8c35d5e4efe3c0b83e15543a35213e786f2
Author: Noel Grandin 
AuthorDate: Mon Oct 10 13:42:22 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 10 17:10:31 2022 +0200

improve setup/teardown handling in VBAMacrosTest

do the same thing that the other UnoApiTest subclasses are doing,
seems to fix the problem for me

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

diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx
index dd887fe86528..53228328f88e 100644
--- a/sc/qa/extras/vba-macro-test.cxx
+++ b/sc/qa/extras/vba-macro-test.cxx
@@ -42,6 +42,8 @@ public:
 {
 }
 
+virtual void tearDown() override;
+
 void testSimpleCopyAndPaste();
 void testMultiDocumentCopyAndPaste();
 void testSheetAndColumnSelectAndHide();
@@ -85,8 +87,17 @@ public:
 CPPUNIT_TEST(testTdf149531);
 CPPUNIT_TEST(testTdf118247);
 CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference mxComponent;
 };
 
+void VBAMacroTest::tearDown()
+{
+closeDocument(mxComponent);
+UnoApiTest::tearDown();
+}
+
 void VBAMacroTest::testSimpleCopyAndPaste()
 {
 // Copy-paste values in the same sheet
@@ -97,15 +108,14 @@ void VBAMacroTest::testSimpleCopyAndPaste()
 
 OUString aFileName;
 createFileURL(u"SimpleCopyPaste.xlsm", aFileName);
-uno::Reference xComponent
-= loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+mxComponent = loadFromDesktop(aFileName, 
"com.sun.star.sheet.SpreadsheetDocument");
 
 uno::Any aRet;
 uno::Sequence aOutParamIndex;
 uno::Sequence aOutParam;
 uno::Sequence aParams;
 
-SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(mxComponent);
 
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 ScDocShell* pDocSh = static_cast(pFoundShell);
@@ -121,7 +131,7 @@ void VBAMacroTest::testSimpleCopyAndPaste()
 CPPUNIT_ASSERT_EQUAL(0.0, rDoc.GetValue(ScAddress(1, 5, 0)));
 
 SfxObjectShell::CallXScript(
-xComponent, 
"vnd.sun.Star.script:VBAProject.Module1.test?language=Basic&location=document",
+mxComponent, 
"vnd.sun.Star.script:VBAProject.Module1.test?language=Basic&location=document",
 aParams, aRet, aOutParamIndex, aOutParam);
 
 // Copy from C4-C6
@@ -155,15 +165,14 @@ void VBAMacroTest::testMultiDocumentCopyAndPaste()
 
 OUString aFileName;
 createFileURL(u"MultiDocumentCopyPaste.xlsm", aFileName);
-uno::Reference xComponent
-= loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+mxComponent = loadFromDesktop(aFileName, 
"com.sun.star.sheet.SpreadsheetDocument");
 
 uno::Any aRet;
 uno::Sequence aOutParamIndex;
 uno::Sequence aOutParam;
 uno::Sequence aParams;
 
-SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(mxComponent);
 
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 ScDocShell* pDocSh = static_cast(pFoundShell);
@@ -174,7 +183,7 @@ void VBAMacroTest::testMultiDocumentCopyAndPaste()
 CPPUNIT_ASSERT_EQUAL(0.0, rDoc.GetValue(ScAddress(1, 3, 0)));
 
 SfxObjectShell::CallXScript(
-xComponent, 
"vnd.sun.Star.script:VBAProject.Module1.test?language=Basic&location=document",
+mxComponent, 
"vnd.sun.Star.script:VBAProject.Module1.test?language=Basic&location=document",
 aParams, aRet, aOutParamIndex, aOutParam);
 
 CPPUNIT_ASSERT_EQUAL(200.0, rDoc.GetValue(ScAddress(1, 1, 0)));
@@ -188,10 +197,9 @@ void VBAMacroTest::testSheetAndColumnSelectAndHide()
 {
 OUString aFileName;
 createFileURL(u"SheetAndColumnSelectAndHide.xlsm", aFileName);
-uno::Reference xComponent
-= loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
+mxComponent = loadFromDesktop(aFileName, 
"com.sun.star.sheet.SpreadsheetDocument");
 
-SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(mxComponent);
 
 CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
 ScDocShell* pDocSh = static_cast(pFoundShell);
@@ -219,7 +227,7 @@ void VBAMacroTest::testSheetAndColumnSelectAndHide()
 uno::Sequence aParams;
 
 SfxObjectShell::CallXScript(
-xComponent,
+mxComponent,
 
"vnd.sun.Star.script:VBAProject.ThisWorkbook.testHide?language=Basic&location=document",
 aParams, aRet, aOutParamIndex, aOutParam);
 
@@ -238,7 +246,7 @@ voi

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

[Xisco Fauli (via logerrit)]

 reportdesign/source/ui/report/ReportController.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5e29b084eb0bfcfbc82622df5c445a6148531989
Author: Xisco Fauli 
AuthorDate: Tue Oct 4 16:28:14 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 17:41:55 2022 +0200

tdf#151260, tdf#84930: Use static_assert to check contiguous item ids

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

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 38034ffb81f0..fb389172985e 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -154,6 +154,8 @@
 /// the static defaults.
 #define RPTUI_ID_METRIC XATTR_FILL_LAST
 
+static_assert((RPTUI_ID_METRIC - RPTUI_ID_LRSPACE) == 28, "Item ids are not 
contiguous");
+
 using namespace ::com::sun::star;
 using namespace uno;
 using namespace io;

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

[Noel Grandin (via logerrit)]

 sw/source/filter/html/htmlgrin.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 696d5c865c75c0a16f7367a9f9103684d764f75c
Author: Noel Grandin 
AuthorDate: Sun Oct 9 20:16:44 2022 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 10 17:58:45 2022 +0200

re-arrange logic to avoid touch SwPosition::nContent

part of the process of hiding the internals of SwPosition

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

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index c29a9ae8e1ca..492319a598bb 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -1515,11 +1515,11 @@ void SwHTMLParser::StripTrailingPara()
 break;
 }
 
-m_pPam->GetPoint()->nContent.Assign( nullptr, 0 );
+SwNode& rDelNode = m_pPam->GetPoint()->GetNode();
+m_pPam->Move( fnMoveBackward, GoInNode );
 m_pPam->SetMark();
 m_pPam->DeleteMark();
-m_xDoc->GetNodes().Delete( m_pPam->GetPoint()->GetNode() );
-m_pPam->Move( fnMoveBackward, GoInNode );
+m_xDoc->GetNodes().Delete( rDelNode );
 }
 else if (pCNd && pCNd->IsTextNode() && m_xTable)
 {

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

[Hossein (via logerrit)]

 sw/qa/uitest/chart/tdf149718.py |   40 
 sw/source/core/unocore/unochart.cxx |8 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit d1707bc31261d16893c1f5240c803d283e293ec1
Author: Hossein 
AuthorDate: Mon Oct 10 15:48:02 2022 +0200
Commit: Hossein 
CommitDate: Mon Oct 10 18:27:03 2022 +0200

tdf#149718 Fix crash on insert chart for tables with merged cells

Previously inserting charts for tables with merged cells lead to crash.
This was because a wrong assumption in unochart.cxx, specifically
SwChartDataProvider::Impl_createDataSource() that every row has the same
number of columns. Therefore the code was using the number of columns in
the first row as the number of columns for all the rows, which is wrong.

For example, inserting a chart for the second column of this table leads
to a crash:

[  ]
[1 ][ 2]

In this way, an assertion failure was created because the number of
columns where counted from the first row, which has merged cells, and
therefore fewer number of columns compared to the last column of the
selected part.

To solve tdf#149718, now we use the maximum number of columns calculated
across all the rows. In this way, the remainder of the function does not
need a fix, although a cleanup for the whole function can be interesting
and help avoid using tiny extra memory space.

A UITest is provided to avoid this bug in the future. To run the test:

cd sw && make -srj1 UITest_sw_chart \

UITEST_TEST_NAME="tdf149718.tdf149718.test_chart_from_table_with_merged_cells" \
SAL_USE_VCLPLUGIN=gen

Change-Id: I3c1000d7f177417e98d3a8ceae7886824c1053a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140092
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/sw/qa/uitest/chart/tdf149718.py b/sw/qa/uitest/chart/tdf149718.py
new file mode 100644
index ..873379a36909
--- /dev/null
+++ b/sw/qa/uitest/chart/tdf149718.py
@@ -0,0 +1,40 @@
+# -*- 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 libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+
+class tdf149718( UITestCase ):
+
+def test_chart_from_table_with_merged_cells( self ):
+with self.ui_test.create_doc_in_start_center("writer") as document:
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+with 
self.ui_test.execute_dialog_through_command(".uno:InsertTable") as xDialog:
+formatlbinstable = xDialog.getChild("formatlbinstable")
+entry = formatlbinstable.getChild("1")
+entry.executeAction("SELECT", tuple())
+xWriterEdit.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"RETURN"}))
+
+self.xUITest.executeCommand(".uno:GoDown")
+self.xUITest.executeCommand(".uno:CharRightSel")
+self.xUITest.executeCommand(".uno:MergeCells")
+
+self.xUITest.executeCommand(".uno:GoDown")
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": "1"}))
+self.xUITest.executeCommand(".uno:GoLeft")
+self.xUITest.executeCommand(".uno:GoLeft")
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"TEXT": "1"}))
+self.xUITest.executeCommand(".uno:CharRightSel")
+with 
self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", 
close_button="finish") as xDialog:
+ xWizard = xDialog.getChild('Wizard')
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/core/unocore/unochart.cxx 
b/sw/source/core/unocore/unochart.cxx
index dfbe2a78c44a..ec750133684e 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -644,7 +644,13 @@ uno::Reference< chart2::data::XDataSource > 
SwChartDataProvider::Impl_createData
 // get a character map in the size of the table to mark
 // all the ranges to use in
 sal_Int32 nRows = pTable->GetTabLines().size();
-sal_Int32 nCols = pTable->GetTabLines().front()->GetTabBoxes().size();
+sal_Int32 nCols = 0;
+// As per tdf#149718 one should know that some cells can be merged 
together.
+// Therefore, the number of columns (boxes in each row) are not necessarily
+// equal. Here, we calculate the maximum number of columns in all rows.
+for (sal_Int32 i = 0; i < nRows; ++i)
+ 

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

[Martin Schumann (via logerrit)]

 shell/source/unix/misc/senddoc.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b96613ad50488d2d2346d02630cb9f08bdcee73
Author: Martin Schumann 
AuthorDate: Mon Oct 10 15:13:23 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 10 19:12:35 2022 +0200

tdf#151314 add Betterbird to Thunderbird-like mail clients in senddoc.sh

Change-Id: Ie145aba936138968b31f1f89d85ad23ad937a367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141158
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 42fe257fa4d970f58543ca40f5158c04f607bc61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141174

diff --git a/shell/source/unix/misc/senddoc.sh 
b/shell/source/unix/misc/senddoc.sh
index d4f9b08de89c..c37a2dcf8ed0 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -80,7 +80,7 @@ fi
 # autodetect mail client from executable name
 case $(basename "$MAILER" | sed 's/-.*$//') in
 
-iceape | mozilla | netscape | seamonkey | icedove | thunderbird)
+iceape | mozilla | netscape | seamonkey | icedove | thunderbird | 
betterbird)
 
 while [ "$1" != "" ]; do
 case $1 in
@@ -361,7 +361,7 @@ case $(basename "$MAILER" | sed 's/-.*$//') in
  ${MAILER} ${TO:+--compose} ${TO:-} ${ATTACH:+--attach} ${ATTACH:-}
 ;;
 
-Mail | Thunderbird | *.app )
+Mail | Thunderbird | Betterbird | *.app )
 
 while [ "$1" != "" ]; do
 case $1 in

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

[Noel Grandin (via logerrit)]

 chart2/source/inc/ChartType.hxx|6 +++---
 chart2/source/model/main/BaseCoordinateSystem.cxx  |2 ++
 chart2/source/model/template/BubbleChartType.cxx   |4 ++--
 chart2/source/model/template/BubbleChartType.hxx   |5 +++--
 chart2/source/model/template/ChartTypeTemplate.cxx |2 +-
 chart2/source/model/template/NetChartType.cxx  |4 ++--
 chart2/source/model/template/NetChartType.hxx  |7 +++
 chart2/source/model/template/PieChartType.cxx  |4 ++--
 chart2/source/model/template/PieChartType.hxx  |5 +++--
 chart2/source/model/template/ScatterChartType.cxx  |4 ++--
 chart2/source/model/template/ScatterChartType.hxx  |5 +++--
 11 files changed, 26 insertions(+), 22 deletions(-)

New commits:
commit aafe006e20c8101e3dad85b4e1373c2061b23e32
Author: Noel Grandin 
AuthorDate: Sun Oct 9 11:06:15 2022 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 10 20:16:57 2022 +0200

tdf#151424 Spider web chart drawing error

regression from
commit 333ccb081b4ab62adce50ca4c93162b9baf984d0
Author: Noel Grandin 
Date:   Sat Feb 5 14:58:07 2022 +0200
use more concrete types in chart2, Axis

Change-Id: Ib80bbec9f08b9fafa6ee1c8d0cace8b44fdadabc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141135
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit dfac5bf18b5568bd60b8f85a058010b8ec8d3bf7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141072
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx
index a84d79893d5a..9821fdb6ff0a 100644
--- a/chart2/source/inc/ChartType.hxx
+++ b/chart2/source/inc/ChartType.hxx
@@ -69,7 +69,7 @@ public:
 // still abstract ! implement !
 virtual OUString SAL_CALL getChartType() override = 0;
 virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
+createCoordinateSystem( ::sal_Int32 DimensionCount ) final override;
 virtual css::uno::Sequence< OUString > SAL_CALL
 getSupportedMandatoryRoles() override;
 virtual css::uno::Sequence< OUString > SAL_CALL
@@ -103,8 +103,8 @@ public:
 const std::vector< rtl::Reference< ::chart::DataSeries > >& 
aDataSeries );
 const std::vector< rtl::Reference< ::chart::DataSeries > > & 
getDataSeries2() const { return m_aDataSeries; }
 
-static rtl::Reference< ::chart::BaseCoordinateSystem >
-createCoordinateSystem2( ::sal_Int32 DimensionCount );
+virtual rtl::Reference< ::chart::BaseCoordinateSystem >
+createCoordinateSystem2( sal_Int32 DimensionCount );
 
 protected:
 
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx 
b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 41c7c766840c..98dc9b4e822f 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -201,6 +201,8 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension(
 if( nIndex < 0 )
 throw lang::IndexOutOfBoundsException();
 
+assert(!xAxis || dynamic_cast(xAxis.get()));
+
 if( m_aAllAxis[ nDimensionIndex ].size() < o3tl::make_unsigned( nIndex+1 ))
 {
 m_aAllAxis[ nDimensionIndex ].resize( nIndex+1 );
diff --git a/chart2/source/model/template/BubbleChartType.cxx 
b/chart2/source/model/template/BubbleChartType.cxx
index 8a23388ab336..3521f7909fb7 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -116,8 +116,8 @@ rtl::Reference< ChartType > 
BubbleChartType::cloneChartType() const
 }
 
 //  XChartType 
-Reference< chart2::XCoordinateSystem > SAL_CALL
-BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
+rtl::Reference< ::chart::BaseCoordinateSystem >
+BubbleChartType::createCoordinateSystem2( sal_Int32 DimensionCount )
 {
 rtl::Reference< CartesianCoordinateSystem > xResult =
 new CartesianCoordinateSystem( DimensionCount );
diff --git a/chart2/source/model/template/BubbleChartType.hxx 
b/chart2/source/model/template/BubbleChartType.hxx
index 10e82ae6a662..a2afa7e6941d 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -47,8 +47,6 @@ private:
 getSupportedMandatoryRoles() override;
 virtual css::uno::Sequence< OUString > SAL_CALL
 getSupportedPropertyRoles() override;
-virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL
-createCoordinateSystem( ::sal_Int32 DimensionCount ) override;
 virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override;
 
 //  OPropertySet 
@@ -63,6 +61,9 @@ private:
 
 //  XCloneable 
 virtual css::uno::Reference< css::util::XCloneable > SAL_CALL 
createClone() override;
+
+virtual rtl::Reference< ::cha

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

[Caolán McNamara (via logerrit)]

 desktop/source/splash/splash.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d58dcdae6f6f2367a6713ba7a109923a9c239b12
Author: Caolán McNamara 
AuthorDate: Mon Oct 10 12:49:04 2022 +0100
Commit: Caolán McNamara 
CommitDate: Mon Oct 10 20:43:44 2022 +0200

attempting to load "1920x1080" not "intro_1920x1080"

since...

commit ff953c36ac8f335d6f12d9e22a29deafe90de34d
Date:   Mon Oct 11 11:50:10 2010 +0100

clean cut/paste brand location code

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

diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index fb6b0bfcb804..c3b106cb3b44 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -487,7 +487,7 @@ void SplashScreen::SetScreenBitmap(BitmapEx &rBitmap)
 
 aStrBuf.append( "intro_" );
 aStrBuf.append( aResBuf.getStr() );
-if (Application::LoadBrandBitmap (aResBuf.getStr(), rBitmap))
+if (Application::LoadBrandBitmap (aStrBuf.getStr(), rBitmap))
 return;
 
 (void)Application::LoadBrandBitmap ("intro", rBitmap);

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |6 ++
 vcl/unx/gtk3/gtkinst.cxx   |2 ++
 2 files changed, 8 insertions(+)

New commits:
commit d19d64b6a3e697fdbf7c0d05a318afddbc349bd4
Author: Jim Raykowski 
AuthorDate: Fri Oct 7 02:18:05 2022 -0800
Commit: Caolán McNamara 
CommitDate: Mon Oct 10 20:46:44 2022 +0200

tdf#151387 Fix regression cause by tdf#149279

The gtk_tree_view_expand_to_path function not only expands all parent
rows of path as necessary but also expands the children of the row of
the path. This explains the difference seen between gtk3inst and
salinst when a collapsed row is scrolled to. gtk3inst expands the
collapsed row, salinst does not. The enhancement patch for tdf#149279
removed the gtk_tree_view_expand_to_path function from
gtk_tree_view_scroll_to_row. This caused a regression in the styles
tree. To fix the regression this patch reverts the removed
gtk_tree_view_expand_to_path functions. To make the enhancement patch
behave the same for gtk3 and sal, the scroll to row is collapsed
after scrolling if that was it's state before.

conflicts:
vcl/unx/gtk3/gtkinst.cxx

Change-Id: I3c3975a3f258c6c432eb866a1c712299e2faf5be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141048
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 
(cherry picked from commit 53d5f5e15c005d95fa8c9d24d98e26afd2ca2103)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141095
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index cf2c9eb569cc..851eb0f75dd0 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3933,7 +3933,13 @@ void SwContentTree::UpdateTracking()
 while (!weld::IsEntryVisible(*m_xTreeView, *xIter))
 m_xTreeView->iter_parent(*xIter);
 }
+// Assure the scroll to row is collapsed after 
scrolling if it was collapsed
+// before. This is required here to make gtkinst 
scroll_to_row behave like
+// salinst.
+const bool bRowExpanded = 
m_xTreeView->get_row_expanded(*xIter);
 m_xTreeView->scroll_to_row(*xIter);
+if (!bRowExpanded)
+m_xTreeView->collapse_row(*xIter);
 }
 bRet = true;
 }
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 690f39a50208..cd9bb63ae4ce 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -14946,6 +14946,7 @@ public:
 assert(gtk_tree_view_get_model(m_pTreeView) && "don't select when 
frozen, select after thaw. Note selection doesn't survive a freeze");
 disable_notify_events();
 GtkTreePath* path = gtk_tree_path_new_from_indices(pos, -1);
+gtk_tree_view_expand_to_path(m_pTreeView, path);
 gtk_tree_view_scroll_to_cell(m_pTreeView, path, nullptr, false, 0, 0);
 gtk_tree_path_free(path);
 enable_notify_events();
@@ -15623,6 +15624,7 @@ public:
 disable_notify_events();
 const GtkInstanceTreeIter& rGtkIter = static_cast(rIter);
 GtkTreePath* path = gtk_tree_model_get_path(m_pTreeModel, 
const_cast(&rGtkIter.iter));
+gtk_tree_view_expand_to_path(m_pTreeView, path);
 gtk_tree_view_scroll_to_cell(m_pTreeView, path, nullptr, false, 0, 0);
 gtk_tree_path_free(path);
 enable_notify_events();

high contrast accessibility application guidelines?

[Caolán McNamara]

Is there a set of guidelines as to the intent of high contrast within
documents?

As far as I can see in impress/draw/shapes we ignore/force-highcontrast
text color, line color and fill colors, and there's a certain logic to
that. And in general in documents we use a high contrast text selection
mode.

On the other hand in writer we do show the real text color and fill
color in the normal document content, but do the opposite for shapes
and for the content of frames. If we use the insert, table UI, then we
have forced colors in the preview of what the table will look like, but
the final inserted table then doesn't have forced colors.

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

[Rafael Lima (via logerrit)]

 cui/source/dialogs/cuicharmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ebeb4ce43d04dbbd329f19210c0db86e2b1cf2a0
Author: Rafael Lima 
AuthorDate: Mon Oct 10 19:03:31 2022 +0200
Commit: Rafael Lima 
CommitDate: Mon Oct 10 22:05:31 2022 +0200

Use correct color in cuicharmap.cxx

While fixing bug tdf#151232 (commited as 
3e4697c7675430f5e4e2221c951971caee0bdeb8) I used the wrong color in cuicharmap.

This patch fixes this error.

Change-Id: I1435489424c5a2e343ab009852e51267cbc8eb01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141175
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 684186e25a6b..457b5238ccdd 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1163,7 +1163,7 @@ void SvxShowText::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rectang
 
 Color aTextCol = rRenderContext.GetTextColor();
 Color aFillCol = rRenderContext.GetFillColor();
-Color aLineCol = rRenderContext.GetFillColor();
+Color aLineCol = rRenderContext.GetLineColor();
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 const Color aWindowTextColor(rStyleSettings.GetDialogTextColor());

Re: Reading parquet files in Calc

[Kohei Yoshida]

On 06.10.2022 19:06, Kohei Yoshida wrote:


I would have been very happy to take a closer look at the arrow
library. But right now I'm trying to finish up all the features that
need to go into the next release of orcus, so I won't be able to do
that anytime soon unfortunately.


I've created a reminder ticket for this: 
https://gitlab.com/orcus/orcus/-/issues/167


Kohei

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

[Justin Luth (via logerrit)]

 filter/source/msfilter/msvbahelper.cxx |   16 +++-
 include/filter/msfilter/msvbahelper.hxx|4 +++-
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx |   15 +--
 3 files changed, 27 insertions(+), 8 deletions(-)

New commits:
commit eaa38b0f9d672793af500222348a6cacd28910b0
Author: Justin Luth 
AuthorDate: Sat Oct 8 09:07:53 2022 -0400
Commit: Justin Luth 
CommitDate: Tue Oct 11 03:08:13 2022 +0200

tdf#148806 doc vba: only autoOpen PUBLIC macros

Note: this should NOT apply to Document_Open which normally
is a private subroutine and runs fine as private.

I tested and it DOES apply to all three version of AutoOpen:
-ThisDocument.AutoOpen,
-.AutoOpen,
-AutoOpen.Main

Note: this is different from Excel.
Private Auto_Open runs just fine there.

Change-Id: If10c8c90c35275c2b14dc2e15fb357674fc580b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141114
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index 674530d1cbb1..a4e954531155 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -171,13 +171,15 @@ static SfxObjectShell* findShellForUrl( const OUString& 
sMacroURLOrPath )
 // sMod can be empty ( but we really need the library to search in )
 // if sMod is empty and a macro is found then sMod is updated
 // if sMod is empty, only standard modules will be searched (no class, 
document, form modules)
-static bool hasMacro( SfxObjectShell const * pShell, const OUString& sLibrary, 
OUString& sMod, const OUString& sMacro )
+static bool hasMacro(SfxObjectShell const* pShell, const OUString& sLibrary, 
OUString& sMod,
+ const OUString& sMacro, bool bOnlyPublic)
 {
 #if !HAVE_FEATURE_SCRIPTING
 (void) pShell;
 (void) sLibrary;
 (void) sMod;
 (void) sMacro;
+(void) bOnlyPublic;
 #else
 if (sLibrary.isEmpty() || sMacro.isEmpty())
 return false;
@@ -202,7 +204,7 @@ static bool hasMacro( SfxObjectShell const * pShell, const 
OUString& sLibrary, O
 if (!pModule)
 return false;
 SbMethod* pMeth = pModule->FindMethod(sMacro, SbxClassType::Method);
-return pMeth;
+return pMeth && (!bOnlyPublic || !pMeth->IsSet(SbxFlagBits::Private));
 }
 
 for (auto const& rModuleRef : pBasic->GetModules())
@@ -210,6 +212,8 @@ static bool hasMacro( SfxObjectShell const * pShell, const 
OUString& sLibrary, O
 SbMethod* pMeth = rModuleRef->FindMethod(sMacro, SbxClassType::Method);
 if (pMeth)
 {
+if (bOnlyPublic && pMeth->IsSet(SbxFlagBits::Private))
+continue;
 sMod = rModuleRef->GetName();
 return true;
 }
@@ -257,7 +261,9 @@ static void parseMacro( const OUString& sMacro, OUString& 
sContainer, OUString&
 
 #endif
 
-OUString resolveVBAMacro( SfxObjectShell const * pShell, const OUString& 
rLibName, const OUString& rModuleName, const OUString& rMacroName )
+OUString resolveVBAMacro(SfxObjectShell const* pShell, const OUString& 
rLibName,
+ const OUString& rModuleName, const OUString& 
rMacroName,
+ bool bOnlyPublic)
 {
 #if !HAVE_FEATURE_SCRIPTING
 (void) pShell;
@@ -269,7 +275,7 @@ OUString resolveVBAMacro( SfxObjectShell const * pShell, 
const OUString& rLibNam
 {
 OUString aLibName = rLibName.isEmpty() ?  getDefaultProjectName( 
pShell ) : rLibName ;
 OUString aModuleName = rModuleName;
-if( hasMacro( pShell, aLibName, aModuleName, rMacroName ) )
+if (hasMacro( pShell, aLibName, aModuleName, rMacroName, bOnlyPublic))
 return aLibName + "." + aModuleName + "." + rMacroName;
 }
 #endif
@@ -440,7 +446,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, 
const OUString& Macro
 
 for (auto const& search : sSearchList)
 {
-aRes.mbFound = hasMacro( pShell, search, sModule, sProcedure );
+aRes.mbFound = hasMacro(pShell, search, sModule, sProcedure, 
/*bOnlyPublic=*/false);
 if ( aRes.mbFound )
 {
 sContainer = search;
diff --git a/include/filter/msfilter/msvbahelper.hxx 
b/include/filter/msfilter/msvbahelper.hxx
index 1568970eb697..c1ad7fdae3a2 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -58,7 +58,9 @@ struct MSFILTER_DLLPUBLIC MacroResolvedInfo
 MSFILTER_DLLPUBLIC OUString makeMacroURL( std::u16string_view sMacroName );
 MSFILTER_DLLPUBLIC OUString extractMacroName( std::u16string_view rMacroUrl );
 MSFILTER_DLLPUBLIC OUString getDefaultProjectName( SfxObjectShell const * 
pShell );
-MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell const * pShell, 
const OUString& rLibName, const OUString& rModuleName, const OUString& 
rMacroName );
+MSFILTER_DLLPUBLIC 

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

[Rafael Lima (via logerrit)]

 cui/source/dialogs/cuicharmap.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 479ae2da64cb322e58834973743260550d6dfafc
Author: Rafael Lima 
AuthorDate: Mon Oct 10 19:03:31 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Oct 11 03:58:24 2022 +0200

Use correct color in cuicharmap.cxx

While fixing bug tdf#151232 (commited as 
3e4697c7675430f5e4e2221c951971caee0bdeb8) I used the wrong color in cuicharmap.

This patch fixes this error.

Change-Id: I1435489424c5a2e343ab009852e51267cbc8eb01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141175
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Jenkins
(cherry picked from commit ebeb4ce43d04dbbd329f19210c0db86e2b1cf2a0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141178

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 684186e25a6b..457b5238ccdd 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1163,7 +1163,7 @@ void SvxShowText::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rectang
 
 Color aTextCol = rRenderContext.GetTextColor();
 Color aFillCol = rRenderContext.GetFillColor();
-Color aLineCol = rRenderContext.GetFillColor();
+Color aLineCol = rRenderContext.GetLineColor();
 
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 const Color aWindowTextColor(rStyleSettings.GetDialogTextColor());

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/sd/cmd/transition-box.png |binary
 icon-themes/sifr/sd/cmd/transition-checkerboard.png|binary
 icon-themes/sifr/sd/cmd/transition-comb.png|binary
 icon-themes/sifr/sd/cmd/transition-cover.png   |binary
 icon-themes/sifr/sd/cmd/transition-cube-turning.png|binary
 icon-themes/sifr/sd/cmd/transition-cut.png |binary
 icon-themes/sifr/sd/cmd/transition-diagonal-squares.png|binary
 icon-themes/sifr/sd/cmd/transition-dissolve.png|binary
 icon-themes/sifr/sd/cmd/transition-fade.png|binary
 icon-themes/sifr/sd/cmd/transition-fall.png|binary
 icon-themes/sifr/sd/cmd/transition-finedissolve.png|binary
 icon-themes/sifr/sd/cmd/transition-glitter.png |binary
 icon-themes/sifr/sd/cmd/transition-honeycomb.png   |binary
 icon-themes/sifr/sd/cmd/transition-iris.png|binary
 icon-themes/sifr/sd/cmd/transition-newsflash.png   |binary
 icon-themes/sifr/sd/cmd/transition-none.png|binary
 icon-themes/sifr/sd/cmd/transition-push.png|binary
 icon-themes/sifr/sd/cmd/transition-random-bars.png |binary
 icon-themes/sifr/sd/cmd/transition-random.png  |binary
 icon-themes/sifr/sd/cmd/transition-revolving-circles.png   |binary
 icon-themes/sifr/sd/cmd/transition-ripple.png  |binary
 icon-themes/sifr/sd/cmd/transition-rochade.png |binary
 icon-themes/sifr/sd/cmd/transition-shape.png   |binary
 icon-themes/sifr/sd/cmd/transition-split.png   |binary
 icon-themes/sifr/sd/cmd/transition-static.png  |binary
 icon-themes/sifr/sd/cmd/transition-tile-flip.png   |binary
 icon-themes/sifr/sd/cmd/transition-turn-around.png |binary
 icon-themes/sifr/sd/cmd/transition-turn-down.png   |binary
 icon-themes/sifr/sd/cmd/transition-turning-helix.png   |binary
 icon-themes/sifr/sd/cmd/transition-uncover.png |binary
 icon-themes/sifr/sd/cmd/transition-venetian-blinds-3d.png  |binary
 icon-themes/sifr/sd/cmd/transition-venetian-blinds.png |binary
 icon-themes/sifr/sd/cmd/transition-vortex.png  |binary
 icon-themes/sifr/sd/cmd/transition-wedge.png   |binary
 icon-themes/sifr/sd/cmd/transition-wheel.png   |binary
 icon-themes/sifr/sd/cmd/transition-wipe.png|binary
 icon-themes/sifr/sd/res/displaymode_handoutmaster.png  |binary
 icon-themes/sifr/sd/res/displaymode_notes.png  |binary
 icon-themes/sifr/sd/res/displaymode_notesmaster.png|binary
 icon-themes/sifr/sd/res/displaymode_outline.png|binary
 icon-themes/sifr/sd/res/displaymode_slide.png  |binary
 icon-themes/sifr/sd/res/displaymode_slidemaster.png|binary
 icon-themes/sifr/sd/res/displaymode_slidesorter.png|binary
 icon-themes/sifr/sd/res/layout_empty.png   |binary
 icon-themes/sifr/sd/res/layout_head01.png  |binary
 icon-themes/sifr/sd/res/layout_head02.png  |binary
 icon-themes/sifr/sd/res/layout_head02a.png |binary
 icon-themes/sifr/sd/res/layout_head02b.png |binary
 icon-themes/sifr/sd/res/layout_head03.png  |binary
 icon-themes/sifr/sd/res/layout_head03a.png |binary
 icon-themes/sifr/sd/res/layout_head03b.png |binary
 icon-themes/sifr/sd/res/layout_head03c.png |binary
 icon-themes/sifr/sd/res/layout_head04.png  |binary
 icon-themes/sifr/sd/res/layout_head06.png  |binary
 icon-themes/sifr/sd/res/layout_textonly.png|binary
 icon-themes/sifr/sd/res/layout_vertical01.png  |binary
 icon-themes/sifr/sd/res/layout_vertical02.png  |binary
 icon-themes/sifr_dark/sd/cmd/transition-box.png|binary
 icon-themes/sifr_dark/sd/cmd/transition-checkerboard.png   |binary
 icon-themes/sifr_dark/sd/cmd/transition-comb.png   |binary
 icon-themes/sifr_dark/sd/cmd/transition-cover.png  |binary
 icon-themes/sifr_dark/sd/cmd/transition-cube-turning.png   |binary
 icon-themes/sifr_dark/sd/cmd/transition-cut.png|binary
 icon-themes/sifr_dark/sd/cmd/transition-diagonal-squares.png   |binary
 icon-themes/sifr_dark/sd/cmd/transition-dissolve.png   |binary
 icon-themes/sifr_dark/sd/cmd/transition-fade.png  

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

[Miklos Vajna (via logerrit)]

 svx/qa/unit/data/page-view-draw-layer-clip.docx |binary
 svx/qa/unit/svdraw.cxx  |   37 
 svx/source/svdraw/svdpagv.cxx   |2 -
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit bab44a97d21d0ac8a8a06678e71024c1a830943f
Author: Miklos Vajna 
AuthorDate: Mon Oct 10 20:38:40 2022 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 11 08:29:34 2022 +0200

tdf#151060 sw PDF export: don't paint off-page part of drawing object

Reported to be a regression from
c12358166a9bd88fe10feabca45a6ad3f65dff8e (DOCX import: fix lost objects
anchored to an empty linked header, 2020-01-10), the 3rd page of the PDF
export result contains an unexpected line shape.

This was "working" before as all objects anchored to the empty header
were lost.

Fix the problem by clipping the rendering to the page frame when
handling shapes, similar to what
689cead9e0837dc932e3a4cd765f7d319b529018 (tdf#91260 svx, sw: don't paint
off-page part of drawing object, 2016-12-06) did to fix the normal
rendering of the document.

The testcase document just has 2 pages, so there the unexpected shape
was on the 2nd page.

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

diff --git a/svx/qa/unit/data/page-view-draw-layer-clip.docx 
b/svx/qa/unit/data/page-view-draw-layer-clip.docx
new file mode 100644
index ..7136a800f01f
Binary files /dev/null and b/svx/qa/unit/data/page-view-draw-layer-clip.docx 
differ
diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx
index f6ca7fd4b09e..90030296e1c8 100644
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -37,6 +38,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -509,6 +512,40 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testVideoSnapshot)
 // i.e. ~25% crop from left and right should result in half width, but it 
was not reduced.
 CPPUNIT_ASSERT_EQUAL(static_cast(321), 
rBitmap.GetSizePixel().getWidth());
 }
+
+CPPUNIT_TEST_FIXTURE(SvdrawTest, testPageViewDrawLayerClip)
+{
+// Given a document with 2 pages, first page footer has an off-page line 
shape:
+OUString aURL = 
m_directories.getURLFromSrc(u"svx/qa/unit/data/page-view-draw-layer-clip.docx");
+mxComponent = loadFromDesktop(aURL);
+
+// When saving that document to PDF:
+utl::TempFileNamed aTempFile;
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+xStorable->storeToURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Then make sure that line shape gets clipped:
+SvFileStream aFile(aTempFile.GetURL(), StreamMode::READ);
+SvMemoryStream aMemory;
+aMemory.WriteStream(aFile);
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+if (!pPDFium)
+{
+return;
+}
+std::unique_ptr pDoc
+= pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize(), 
OString());
+std::unique_ptr pPage1 = pDoc->openPage(0);
+CPPUNIT_ASSERT_EQUAL(3, pPage1->getObjectCount());
+std::unique_ptr pPage2 = pDoc->openPage(1);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 2
+// - Actual  : 3
+// i.e. the 2nd page had a line shape from the first page's footer.
+CPPUNIT_ASSERT_EQUAL(2, pPage2->getObjectCount());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 0e35d09b080e..60cd8cfe8ca0 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -262,7 +262,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* 
pGivenTarget,
 if(pKnownTarget)
 {
 // paint known target
-pKnownTarget->RedrawLayer(&nID, pRedirector, nullptr);
+pKnownTarget->RedrawLayer(&nID, pRedirector, pPageFrame);
 }
 else
 {

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

[Noel Grandin (via logerrit)]

 sw/inc/ToxWhitespaceStripper.hxx |2 
 sw/inc/calc.hxx  |8 +--
 sw/inc/doc.hxx   |2 
 sw/inc/docufld.hxx   |2 
 sw/inc/fmtmeta.hxx   |2 
 sw/inc/hhcwrp.hxx|2 
 sw/inc/modcfg.hxx|2 
 sw/inc/ndtxt.hxx |2 
 sw/inc/shellio.hxx   |2 
 sw/inc/swtable.hxx   |2 
 sw/inc/tox.hxx   |6 +-
 sw/inc/unocrsrhelper.hxx |4 -
 sw/inc/unotbl.hxx|   10 ++--
 sw/inc/unotextcursor.hxx |2 
 sw/inc/unotextrange.hxx  |2 
 sw/qa/core/test_ToxMiscTest.cxx  |2 
 sw/qa/core/test_ToxWhitespaceStripper.cxx|   22 -
 sw/qa/core/uwriter.cxx   |   58 
 sw/qa/extras/odfexport/odfexport.cxx |   12 ++---
 sw/qa/extras/uiwriter/uiwriter7.cxx  |8 +--
 sw/source/core/access/accpara.cxx|8 +--
 sw/source/core/access/accpara.hxx|4 -
 sw/source/core/doc/docchart.cxx  |   18 +++
 sw/source/core/doc/docnum.cxx|6 +-
 sw/source/core/docnode/ndtbl.cxx |6 +-
 sw/source/core/edit/autofmt.cxx  |   18 +++
 sw/source/core/fields/docufld.cxx|   16 ++
 sw/source/core/fields/reffld.cxx |6 +-
 sw/source/core/inc/UndoCore.hxx  |   16 +++---
 sw/source/core/inc/scriptinfo.hxx|4 -
 sw/source/core/inc/swblocks.hxx  |4 -
 sw/source/core/inc/txtfrm.hxx|2 
 sw/source/core/swg/swblocks.cxx  |   12 ++---
 sw/source/core/text/itratr.hxx   |2 
 sw/source/core/text/porlay.cxx   |6 +-
 sw/source/core/text/redlnitr.cxx |4 -
 sw/source/core/text/txtfrm.cxx   |8 +--
 sw/source/core/tox/ToxWhitespaceStripper.cxx |4 -
 sw/source/core/tox/tox.cxx   |   64 +--
 sw/source/core/txtnode/fmtatr2.cxx   |4 -
 sw/source/core/txtnode/justify.cxx   |   21 
 sw/source/core/txtnode/justify.hxx   |8 +--
 sw/source/core/txtnode/txtedt.cxx|   14 ++---
 sw/source/core/undo/undel.cxx|   16 +++---
 sw/source/core/undo/undobj.cxx   |   10 ++--
 sw/source/core/unocore/unocrsrhelper.cxx |   20 
 sw/source/core/unocore/unoobj.cxx|8 +--
 sw/source/core/unocore/unoobj2.cxx   |   18 +++
 sw/source/core/unocore/unotbl.cxx|   34 +++---
 sw/source/core/unocore/unotext.cxx   |4 -
 sw/source/filter/html/htmlflywriter.cxx  |   28 ++-
 sw/source/filter/html/htmlftn.cxx|   20 
 sw/source/filter/html/swhtml.hxx |4 -
 sw/source/filter/html/wrthtml.hxx|2 
 sw/source/filter/ww8/writerwordglue.cxx  |   30 ++--
 sw/source/filter/ww8/wrtw8sty.cxx|8 +--
 sw/source/filter/ww8/wrtww8.hxx  |2 
 sw/source/filter/ww8/ww8par.cxx  |   18 +++
 sw/source/filter/ww8/ww8par.hxx  |6 +-
 sw/source/filter/ww8/ww8par5.cxx |   46 +--
 sw/source/filter/ww8/ww8scan.cxx |8 +--
 sw/source/ui/dbui/dbinsdlg.cxx   |   15 +++---
 sw/source/ui/dialog/uiregionsw.cxx   |4 -
 sw/source/ui/vba/vbarangehelper.cxx  |   14 ++---
 sw/source/ui/vba/vbarangehelper.hxx  |2 
 sw/source/ui/vba/vbatemplate.cxx |8 +--
 sw/source/uibase/config/modcfg.cxx   |   12 ++---
 sw/source/uibase/dbui/mailmergehelper.cxx|   10 ++--
 sw/source/uibase/dochdl/gloshdl.cxx  |4 -
 sw/source/uibase/docvw/srcedtw.cxx   |   26 +-
 sw/source/uibase/inc/gloshdl.hxx |2 
 sw/source/uibase/inc/mailmergehelper.hxx |2 
 sw/source/uibase/inc/srcedtw.hxx |2 
 sw/source/uibase/lingu/hhcwrp.cxx|6 +-
 sw/source/uibase/misc/glosdoc.cxx|   10 ++--
 sw/source/uibase/uiview/view2.cxx|   26 +-
 76 files changed, 416 insertions(+), 416 deletions(-)

New commits:
commit 71337b4327805b73e92c995153c5746d89793b13
Author: Noel Grandin 
AuthorDate: Mon Oct 10 12:09:44 2022 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 11 08:44:09 2022 +0200

use more string_view in sw

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

diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index 9decbc020bf4..755c3f721af2 100644
-