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

[Justin Luth (via logerrit)]

 dev/null  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx |3 ---
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx |   11 ---
 3 files changed, 14 deletions(-)

New commits:
commit 1891061f0b99c8a7c5d9983b925efcf401c958fd
Author: Justin Luth 
AuthorDate: Tue Nov 2 08:56:35 2021 +0200
Commit: Justin Luth 
CommitDate: Wed Nov 3 06:57:16 2021 +0100

prelim tdf#136472: remove implementation specific unit tests

These test documentations are completely pointless.
They test something implementation specific without
anything to actually test for accuracy.

4-test_segfault_while_save.docx: pseudo-preventative test.
8-fdo49940.docx: an empty page with no header/footer enabled.
  Who cares if it is called Default style or First Page.

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

diff --git a/sw/qa/extras/ooxmlexport/data/fdo49940.docx 
b/sw/qa/extras/ooxmlexport/data/fdo49940.docx
deleted file mode 100644
index 242284463632..
Binary files a/sw/qa/extras/ooxmlexport/data/fdo49940.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index c0ed9c95a9e7..5cd8f4a0fe32 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -282,9 +282,6 @@ CPPUNIT_TEST_FIXTURE(Test, testSegFaultWhileSave)
 // fdo#74499
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 CPPUNIT_ASSERT_EQUAL(static_cast(6137), getXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").toInt32());
-
-// tdf#106572 - preventative test matching danger conditions, but imported 
OK anyway
-CPPUNIT_ASSERT_EQUAL(OUString("First Page"), 
getProperty(getParagraphOrTable(1), "PageDescName"));
 }
 
 CPPUNIT_TEST_FIXTURE(Test, fdo69656)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 7cc19abd58b6..d011d695d5a1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -144,17 +144,6 @@ DECLARE_OOXMLEXPORT_TEST(testN751117, "n751117.docx")
 
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.LineShape"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testFdo49940, "fdo49940.docx")
-{
-uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
-uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
-uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
-OUString aValue;
-xPara->getPropertyValue("PageStyleName") >>= aValue;
-CPPUNIT_ASSERT_EQUAL(OUString("First Page"), aValue);
-}
-
 DECLARE_OOXMLEXPORT_TEST(testFdo74745, "fdo74745.docx")
 {
 uno::Reference paragraph = getParagraph(3);

[Libreoffice-bugs] [Bug 145520] New: LODraw: Export dialog forgets last used format

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145520

Bug ID: 145520
   Summary: LODraw: Export dialog forgets last used format
   Product: LibreOffice
   Version: 7.2.2.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Draw
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jamshar...@zoho.com

Description:
After exporting a drawing once to a specific format, exporting the same drawing
again defaults to JPEG format (no matter what format had been chosen before).

Steps to Reproduce:
1. Create a drawing.
2. Export to, say, SVG.
3. Change something in the drawing and export again. The format selector has
flipped back to JPEG.

Actual Results:
The user's previously selected format has been forgotten, and the dialog
reverts to the default.

Expected Results:
The dialog should remember the user's previous format selection.


Reproducible: Always


User Profile Reset: No



Additional Info:
If a user has exported a particular drawing to a specific format once, it's
reasonable to suppose that the export format chosen is the desired final
result.

It's a quite common workflow to edit, export, verify the result, fix problems,
and export again, for an unknown number of cycles. Requiring the user to
reselect the format every time is unnecessary mental static.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145487] UI BASIC - Macro causes infinite sheets to be added

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145487

--- Comment #2 from studog  ---
Created attachment 176086
  --> https://bugs.documentfoundation.org/attachment.cgi?id=176086=edit
valgrind trace from a fresh dev build

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Mike Kaganski (via logerrit)]

 testtools/source/bridgetest/bridgetest.cxx |   14 -
 testtools/source/bridgetest/cppobj.cxx |  213 ++---
 2 files changed, 109 insertions(+), 118 deletions(-)

New commits:
commit e25be4fb3aa5e8ebc25d7685d83abac765f9e644
Author: Mike Kaganski 
AuthorDate: Fri Oct 29 10:17:38 2021 +0300
Commit: Mike Kaganski 
CommitDate: Wed Nov 3 06:29:37 2021 +0100

Prepare for removal of non-const operator[] from Sequence in testtools

Change-Id: If67f845a0350766c7d098a399bd2fae6048c9100
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124400
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/testtools/source/bridgetest/bridgetest.cxx 
b/testtools/source/bridgetest/bridgetest.cxx
index 6228d9423411..bb1c3af497f2 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -56,6 +56,7 @@
 #include "currentcontextchecker.hxx"
 #include "multi.hxx"
 #include 
+#include 
 
 using namespace osl;
 using namespace cppu;
@@ -381,7 +382,7 @@ static bool performTest(
 bRet &= check(aData.Any == xI, "### unexpected any!");
 bRet &= check(!(aData.Any != xI), "### unexpected any!");
 aData.Sequence.realloc(2);
-aData.Sequence[0] = *static_cast();
+aData.Sequence.getArray()[0] = *static_cast();
 // aData.Sequence[1] is empty
 // aSetData is a manually copy of aData for first setting:
 TestData aSetData;
@@ -391,7 +392,7 @@ static bool performTest(
 aData.Hyper, aData.UHyper, aData.Float, aData.Double, aData.Enum,
 aData.String, aData.Byte2, aData.Short2, xI, Any(, 
cppu::UnoType::get()));
 aSetData.Sequence.realloc(2);
-aSetData.Sequence[0] = *static_cast();
+aSetData.Sequence.getArray()[0] = *static_cast();
 // aSetData.Sequence[1] is empty
 xLBT->setValues(
 aSetData.Bool,
@@ -462,9 +463,8 @@ static bool performTest(
 aRet2));
 // Check inout sequence order (=> inout sequence parameter was
 // switched by test objects):
-TestElement temp(aRet.Sequence[0]);
-aRet.Sequence[0] = aRet.Sequence[1];
-aRet.Sequence[1] = temp;
+auto pRetSequence = aRet.Sequence.getArray();
+std::swap(pRetSequence[0], pRetSequence[1]);
 bRet &= check(
 equals(aData, aSV2ret) && equals(aData, aRet2),
 "getValues2 test");
@@ -648,9 +648,7 @@ static bool performTest(
 TestPolyStruct< sal_Int64 > tps1(12345);
 xLBT->transportPolyHyper(tps1);
 bRet &= check(tps1.member == 12345, "transportPolyHyper");
-Sequence< Any > seq(2);
-seq[0] <<= static_cast< sal_uInt32 >(33);
-seq[1] <<= OUString("ABC");
+Sequence< Any > seq{ Any(static_cast< sal_uInt32 >(33)), 
Any(OUString("ABC")) };
 TestPolyStruct< Sequence< Any > > tps2(seq);
 TestPolyStruct< Sequence< Any > > tps3;
 xLBT->transportPolySequence(tps2, tps3);
diff --git a/testtools/source/bridgetest/cppobj.cxx 
b/testtools/source/bridgetest/cppobj.cxx
index e4666c4d22a3..f8cfb521351e 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 
 #include 
 #include 
@@ -631,9 +632,8 @@ void Test_Impl::setValues( sal_Bool bBool,
 eEnum, rStr, nByte2, nShort2, xTest, rAny, rSequence );
 _aStructData = rStruct;
 
-TestElement elem = rSequence[ 0 ];
-rSequence[ 0 ] = rSequence[ 1 ];
-rSequence[ 1 ] = elem;
+auto pSequence = rSequence.getArray();
+std::swap(pSequence[ 0 ], pSequence[ 1 ]);
 
 return _aStructData;
 }
@@ -955,28 +955,26 @@ void SAL_CALL Test_Impl::setSequencesOut( Sequence< 
sal_Bool >& aSeqBoolean,
 void Test_Impl::testConstructorsService(
 Reference< XComponentContext > const & context)
 {
-Sequence< sal_Bool > arg14(1); arg14[0] = true;
-Sequence< sal_Int8 > arg15(1); arg15[0] = SAL_MIN_INT8;
-Sequence< sal_Int16 > arg16(1); arg16[0] = SAL_MIN_INT16;
-Sequence< sal_uInt16 > arg17(1); arg17[0] = SAL_MAX_UINT16;
-Sequence< sal_Int32 > arg18(1); arg18[0] = SAL_MIN_INT32;
-Sequence< sal_uInt32 > arg19(1); arg19[0] = SAL_MAX_UINT32;
-Sequence< sal_Int64 > arg20(1); arg20[0] = SAL_MIN_INT64;
-Sequence< sal_uInt64 > arg21(1); arg21[0] = SAL_MAX_UINT64;
-Sequence< float > arg22(1); arg22[0] = 0.123f;
-Sequence< double > arg23(1); arg23[0] = 0.456;
-Sequence< sal_Unicode > arg24(1); arg24[0] = 'X';
+Sequence< sal_Bool > arg14{ true };
+Sequence< sal_Int8 > arg15{ SAL_MIN_INT8 };
+Sequence< sal_Int16 > arg16{ SAL_MIN_INT16 };
+Sequence< sal_uInt16 > arg17{ SAL_MAX_UINT16 };
+Sequence< sal_Int32 > arg18{ SAL_MIN_INT32 };
+Sequence< sal_uInt32 > arg19{ 

[Libreoffice-bugs] [Bug 86206] Exporting to SVG breaks dashed lines

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=86206

--- Comment #18 from James Harkins  ---
I have just encountered this bug, 2021-November -- therefore it is still a
current bug.

1. New odg.
2. Add a line.
3. Set it to dashed style.
4. Export to SVG.
5. The SVG line is not dashed -- it's solid.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145219] Gmail>>Compose>>Clicking on send application throws server error.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145219

himajin100...@gmail.com changed:

   What|Removed |Added

  Component|General |deletionRequest
Product|Impress Remote  |LibreOffice

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145219] Gmail>>Compose>>Clicking on send application throws server error.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145219

himajin100...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |INVALID

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145223] crash when copy-pasting (specific) heading

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145223

QA Administrators  changed:

   What|Removed |Added

 Whiteboard|| QA:needsComment

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145219] Gmail>>Compose>>Clicking on send application throws server error.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145219

QA Administrators  changed:

   What|Removed |Added

 Whiteboard|| QA:needsComment

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144998] Impress Ubuntu at save us the last modifications disappear from both last versions

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144998

QA Administrators  changed:

   What|Removed |Added

 Ever confirmed|1   |0
 Status|NEEDINFO|UNCONFIRMED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144998] Impress Ubuntu at save us the last modifications disappear from both last versions

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144998

--- Comment #3 from QA Administrators  ---
[Automated Action] NeedInfo-To-Unconfirmed

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 97438] URLs are not escaped by Punycode and are susceptible to IDN attacks

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=97438

--- Comment #4 from QA Administrators  ---
Dear Matthew Jones,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 92569] HTMLOption Radio buttons are not interactive in .docx file

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=92569

--- Comment #10 from QA Administrators  ---
Dear Silviu C.,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 91235] appending nowidth breaking character, corrupts searching in Persian

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=91235

--- Comment #4 from QA Administrators  ---
Dear irancplusplus,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 90920] Dataloss: Calc Search can Clone contents of cell to another sheet

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90920

--- Comment #8 from QA Administrators  ---
Dear Dan Loomis,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 61607] PRINTING: Printing dialog doesn't remember the "Document" value (Slides/Handouts/Notes/Outline)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=61607

--- Comment #9 from QA Administrators  ---
Dear Stephan,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 52577] Right-hand part of vowel signs disappear when reordering numeric diacritics in Graphite font

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=52577

--- Comment #7 from QA Administrators  ---
Dear Shriramana Sharma,

To make sure we're focusing on the bugs that affect our users today,
LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed
bugs which have not been touched for over a year.

There have been thousands of bug fixes and commits since anyone checked on this
bug report. During that time, it's possible that the bug has been fixed, or the
details of the problem have changed. We'd really appreciate your help in
getting confirmation that the bug is still present.

If you have time, please do the following:

Test to see if the bug is still present with the latest version of LibreOffice
from https://www.libreoffice.org/download/

If the bug is present, please leave a comment that includes the information
from Help - About LibreOffice.

If the bug is NOT present, please set the bug's Status field to
RESOLVED-WORKSFORME and leave a comment that includes the information from Help
- About LibreOffice.

Please DO NOT

Update the version field
Reply via email (please reply directly on the bug tracker)
Set the bug's Status field to RESOLVED - FIXED (this status has a particular
meaning that is not 
appropriate in this case)


If you want to do more to help you can test to see if your issue is a
REGRESSION. To do so:
1. Download and install oldest version of LibreOffice (usually 3.3 unless your
bug pertains to a feature added after 3.3) from
https://downloadarchive.documentfoundation.org/libreoffice/old/

2. Test your bug
3. Leave a comment with your results.
4a. If the bug was present with 3.3 - set version to 'inherited from OOo';
4b. If the bug was not present in 3.3 - add 'regression' to keyword


Feel free to come ask questions or to say hello in our QA chat:
https://web.libera.chat/?settings=#libreoffice-qa

Thank you for helping us make LibreOffice even better for everyone!

Warm Regards,
QA Team

MassPing-UntouchedBug

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145519] New: LODraw: Vertical alignment of text anchor, set in a style, does not apply in shapes

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145519

Bug ID: 145519
   Summary: LODraw: Vertical alignment of text anchor, set in a
style, does not apply in shapes
   Product: LibreOffice
   Version: 7.2.2.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Draw
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: jamshar...@zoho.com

Description:
If I define a desired text positioning (anchor) in a graphics style in LO Draw,
and then apply this style to a shape, the shape receives only the horizontal
positioning from the style's anchor. It ignores vertical positioning from the
style.

Steps to Reproduce:
1. Create a new drawing.
2. Create a new graphics style underneath "Object without fill." In this new
style, set the text anchor to top-left.
3. Create a rectangle (not using "text box" -- the drawing shape in the left
toolbar).
4. Hit F2 and type some text. It will appear at the default center anchor.
5. Now assign this rectangle to the new style created in step 2.

Actual Results:
Actual behavior: Only the horizontal alignment from the style applies. The text
is displayed at left, but vertically centered (contrary to the style). (Note
that the standard Object without fill style specifies an H=center, V=top
anchor, but the shape ends up with V=center too. So it isn't only for
user-created styles.)

Expected Results:
Expected behavior: The text in the rectangle should be positioned fully
according to the anchor (top left).


Reproducible: Always


User Profile Reset: No



Additional Info:
If you select the rectangle and go to Format --> Text attributes, here, the
anchor is H=left, V=center.

So I would have to guess that the vertical alignment property is not being
applied properly to the shape.

Note, though, that it does work to set the anchor under Format --> Text
attributes and then create a new style based on the selection. This is a
not-entirely-unacceptable workaround; however, users may reasonably expect the
style definition to be applied, and it isn't.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144922] Navigator still shows items after paste to empty page & undo

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144922

--- Comment #5 from Jim Raykowski  ---
(In reply to Telesto from comment #4)
> @Jim,
> A analysis would be informative. Is this a sidebar issue or exposing a
> problem with the undo-code?
Hi Telesto, I looked at this briefly after you posted but got sidetracked. Just
got back to it today. Here is what I found:

I had to comment out a couple asserts to be able to test:
soffice.bin: /home/lo/Dev/LO1/core/sw/source/core/txtnode/ndtxt.cxx:5225: void
SwTextNode::TriggerNodeUpdate(const sw::LegacyModifyHint&): Assertion
`dynamic_cast(static_cast(pOldValue)->pChangedFormat)' failed.

For me, the gen backend locks up. I repro your results with gtk3 and qt5
backends. After the undo step the Navigator shows the Tables category to have 2
hidden tables, Tabelle1 and Tabelle2. The Images category has 1 hidden entry,
HTTP://WWW.OPENOFFICE.ORG/DE/ and the Fields category has 1 hidden field,
field-DocInformation:Title

On exit I get this assert:
soffice.bin: /home/lo/Dev/LO1/core/svl/source/items/itempool.cxx:686: void
SfxItemPool::Remove(const SfxPoolItem&): Assertion `rItem.GetRefCount() &&
"RefCount == 0, Remove impossible"' failed.

Since I had to remove some inserts to test this using a debug build I would say
the Navigator isn't the cause.

Do you have a less complex file that can be used to test that shows this
behavior?

BTW, your steps involving copying and pasting to a new file have been helpful
to show me something I missed in a patch I am doing to improve when the
Navigator needs to be refreshed. Thanks!

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145518] Feature suggestion -- add Comments field to Styles

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145518

KMM  changed:

   What|Removed |Added

 Attachment #176084|0   |1
is obsolete||

--- Comment #2 from KMM  ---
Created attachment 176085
  --> https://bugs.documentfoundation.org/attachment.cgi?id=176085=edit
More detailed description of enhancement & example custom style names

Adds more details describing the proposed enhancement to LibreOffice Writer and
some example custom style names.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145518] Feature suggestion -- add Comments field to Styles

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145518

--- Comment #1 from KMM  ---
Created attachment 176084
  --> https://bugs.documentfoundation.org/attachment.cgi?id=176084=edit
More detailed description of enhancement & example custom style names

The attachment provides additional detail concerning the proposed enhancement,
as well as some example custom style names.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145487] UI BASIC - Macro causes infinite sheets to be added

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145487

--- Comment #1 from studog  ---
I temporarily removed $HOME/.config/libreoffice/4 and reproduced the bug, so
it's not my user profile.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145518] New: Feature suggestion -- add Comments field to Styles

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145518

Bug ID: 145518
   Summary: Feature suggestion -- add Comments field to Styles
   Product: LibreOffice
   Version: 7.2.2.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: enhancement
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: kevinmmur...@yahoo.com

Description:
Suggestion -- add a Comments field to LibreOffice Styles (i.e., paragraph
styles, character styles, frame styles, page styles, list styles, table
styles). A Comments field enables one to document intended purposes for the
styles (e.g. for a fiction novel template).

Steps to Reproduce:
N/A

Actual Results:
N/A

Expected Results:
N/A


Reproducible: Always


User Profile Reset: No



Additional Info:
N/A

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 143548] 3 dots missing after Select Macro string and Select Module

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=143548

Po-Yen Huang  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |j...@mail.ossii.com.tw
   |desktop.org |

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145376] Separate pages too hard to see in page panel

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145376

--- Comment #9 from Adolfo Jayme  ---
I’m unable to reproduce this on Windows 11 with a trunk daily build. I don’t
recall ever seeing a visual bug like in attachment 175985 either, but I don’t
have a HiDPI screen like the OP.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145487] UI BASIC - Macro causes infinite sheets to be added

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145487

studog  changed:

   What|Removed |Added

Summary|UI BASIC|UI BASIC - Macro causes
   ||infinite sheets to be added

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 127232] [META] QR/barcode generator's problems and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=127232

Adolfo Jayme  changed:

   What|Removed |Added

Summary|[META] QR-code generator's  |[META] QR/barcode
   |problems and enhancements   |generator's problems and
   ||enhancements

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145517] New: Reduce overload of term "style" in Options > View

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145517

Bug ID: 145517
   Summary: Reduce overload of term "style" in Options > View
   Product: LibreOffice
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: trivial
  Priority: medium
 Component: UI
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: fit...@ubuntu.com

"Icon style" should be "icon theme", as everybody calls it, both within this
project and elsewhere.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 128779] Create some APIs for QR Code Generator in LibreOffice BASIC

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=128779
Bug 128779 depends on bug 141193, which changed state.

Bug 141193 Summary: Add barcode support into QR code dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=141193

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 127232] [META] QR-code generator's problems and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=127232
Bug 127232 depends on bug 141193, which changed state.

Bug 141193 Summary: Add barcode support into QR code dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=141193

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145516] New: Copying a column and pasting with the transpose option does not succeed, leaving the destination cell blank

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145516

Bug ID: 145516
   Summary: Copying a column and pasting with the transpose option
does not succeed, leaving the destination cell blank
   Product: LibreOffice
   Version: 7.2.2.2 release
  Hardware: ARM
OS: macOS (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: declark.c...@gmail.com

Description:
The transpose function in cut an paste does not work properly using 7.2.2 on an
older spreadsheet created in 7.1.5.2 that I periodically update. If I create a
new document within 7.2.2, the transpose function seems to work as expected

Steps to Reproduce:
1.Select a column of numbers, copy
2.paste in a single cell in a nearby location with the transpose option
3.

Actual Results:
the selected cell and the one to its left are highlighted, and no numbers are
pasted. The height of the row appears to be slightly increased

Expected Results:
the copied column is pasted as a row, with the topmost number in the selected
cell and the rest filled to the right


Reproducible: Always


User Profile Reset: No



Additional Info:
7.2.2 was a fresh install on a new computer (Apple Silicon MacBook Pro)

This occurs whether the transpose function is used from the dropdown menu, or
chosen with a check box inside the Paste Special dialog

I subsequently installed 7.1.6 and found the expected behavior

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144998] Impress Ubuntu at save us the last modifications disappear from both last versions

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144998

--- Comment #2 from szelev71  ---
Thanks for the answer.

In the meantime I investigated better the situation. It happens "only" if the
focus/cursor stay in a textbox where the last changes was made. In this case
the save does not saving the changes of that textbox.
If I click after the change to another place/object in the document in this
case the save will be correct.
I will try a newer version but for Ubuntu 18.04 the maintained version in
repositories is 6.0.7

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145347] Line wrapping broken in various parts of the UI

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145347

--- Comment #3 from phv  ---
Hi.

Could you confirm this issue is not a duplicate of bug #145496?
If so, it should be fixed by now.

Thank you!

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 111978] fileopen .dotx different text

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=111978

Aron Budea  changed:

   What|Removed |Added

 CC||ba...@caesar.elte.hu
 Attachment #135743|application/zip |application/vnd.openxmlform
  mime type||ats-officedocument.wordproc
   ||essingml.template

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145515] Does LibreOffice alter xls files such that Excel 2004 must be force-quit?

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145515

--- Comment #1 from n6ac  ---
Trying to open one LO-modified xls file in Snow Leopard instead opens multiple
such files recently processed (or attempted) - probably due to force-quit not
emptying job cache of Excel-2004 ?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145515] New: Does LibreOffice alter xls files such that Excel 2004 must be force-quit?

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145515

Bug ID: 145515
   Summary: Does LibreOffice alter xls files such that Excel 2004
must be force-quit?
   Product: LibreOffice
   Version: 7.1.5.2 release
  Hardware: All
OS: macOS (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: n...@arrl.net

Description:
Version: 7.1.5.2 / LibreOffice Community
Build ID: 85f04e9f809797b8199d13c421bd8a2b025d52b5
CPU threads: 8; OS: Mac OS X 10.14.6; UI render: default; VCL: osx
Locale: en-US (en_US.UTF-8); UI: en-US
Calc: threaded

 I have used the LibreOffice spreadsheet function, successfully, to modify
some years-old Excel-2004 xls files, on disk attached to my Mac (Mojave).
 I occasionally open my xls files in a virtualbox instance under Snow
Leopard, and/or in an older iMac also with Snow Leopard.
 Up until now, this has all always worked in all of these environments.

 But, now in those 10.6.8 environments, when I try to operate further on
those xls files (that I had recently modified with LibreOffice) and then save,
Excel locks up requiring a force-quit. If I restart Excel in SL, the files
reopen, and the app freezes again. It’s not a full freeze, sometimes I have
been able to save the file to desktop with a new name. But little confidence in
the result!
 Also I note that the sheets open in a smaller than ordinary size, tucked
up at the upper left corner of the window.
 This is quite frustrating, as LibreOffice is decidely not smooth at
modifying complex charts, so I prefer going to the vintage invironment for
tweaks.
 Is there a way to “clean up” whatever is happening to the files that
causes this behavior, or some setting that I am missing? I’ve been using Excel
on Mac since 1984, and never before encountered this kind of behavior.


Steps to Reproduce:
1. open a MacOS Excel-2004 (v.01) xls file in LibreOffice (in MacOS 10.14.6
Mojave)
2. modify the data, save as xls
3. open the xls file in Excel 2004 (in Snow Leopard), enter data in a cell, try
to save
4. see Excel inoperable, requires force-quit

Actual Results:
Excel will not allow processing the file, becomes non-responsive and must be
force-quit.
Experienced this both in a virtual box instance on Mojave, and on a different
computer.

Expected Results:
be able to operate further on the xls file in Excel 2004.


Reproducible: Always


User Profile Reset: Yes


OpenGL enabled: Yes

Additional Info:
We want the expected behavior, because many graphs in our existing xls files
are difficult/impossible to maintain in LibreOffice.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Caolán McNamara (via logerrit)]

 emfio/source/reader/emfreader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8fbd4a5f6850ed94169f50617dc97c5fb054504b
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 16:12:04 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 22:29:11 2021 +0100

ofz#40625 avoid Integer-overflow

not much else can be done as far as I can see except to saturate

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

diff --git a/emfio/source/reader/emfreader.cxx 
b/emfio/source/reader/emfreader.cxx
index 632dca430a98..83754ace1f2d 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1976,7 +1976,7 @@ namespace emfio
 {
 sal_Int32 nDxTmp = 0;
 mpInputStream->ReadInt32(nDxTmp);
-aDXAry[i] += nDxTmp;
+aDXAry[i] = 
o3tl::saturating_add(aDXAry[i], nDxTmp);
 if (nOptions & ETO_PDY)
 {
 sal_Int32 nDyTmp = 0;

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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7a52e06ea062549d385270b368d549c92fbad841
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 20:09:56 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 22:14:44 2021 +0100

cid#1493241 Wrapper object use after free

unclear if this is the right fix here

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

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3717fdce2c08..c10d8573c1bd 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1473,6 +1473,9 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 delete pOriginal;
 }
 
+// cid#1493241 - Wrapper object use after free
+if (pUndoEditUndoManager == mpLocalTextEditUndoManager.get())
+pUndoEditUndoManager = nullptr;
 mpLocalTextEditUndoManager.reset();
 }
 }

[Libreoffice-bugs] [Bug 145513] German-GUI 'Table of Contents, Index or Bibliography' (edit bibliography index) missing buttons 'Insert', 'Remove' and 'Tab Stop' in GUI-Langugage 'German'

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145513

whg.albre...@web.de changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145513] German-GUI 'Table of Contents, Index or Bibliography' (edit bibliography index) missing buttons 'Insert', 'Remove' and 'Tab Stop' in GUI-Langugage 'German'

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145513

--- Comment #2 from whg.albre...@web.de ---
I use LO 7.0.6 and 7.2.1, both as PortableApps.
V 7.2.1 ist the newest LO on PortableApps.
V 7.1.6 ist the newest LO Still on PortableApps, but crashes at startup

The missung buttons are in both (7.0.6 and 7.2.1) LO-versions (German GUI).

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145514] New: Calc loses header on after saving and reopen (LO 7.2.1.4)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145514

Bug ID: 145514
   Summary: Calc loses header on after saving and reopen (LO
7.2.1.4)
   Product: LibreOffice
   Version: 7.2.1.2 release
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: whg.albre...@web.de

Description:
Calc loses header on state after saving and reopen (LO 7.2.1.4)

Steps to Reproduce:
1. switch header on (e.g. about page styles)
2. save ODS in LO 7.2.1.4 and close LO
3. reopen ODS LO 7.2.1.4 -> header is switches off

Actual Results:
1. switch header in a table (e.g. about page styles)
2. save ODS in LO 7.2.1.4 and close LO
3. reopen ODS in LO 7.2.1.4 -> header is switched off

Expected Results:
header is switched off


Reproducible: Always


User Profile Reset: Yes



Additional Info:
header should remain on

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145310] Copy and paste operations doesn't work

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145310

--- Comment #1 from psidiumcode  ---
I could not reproduce it in ver :

Version: 7.2.2.2 / LibreOffice Community
Build ID: 02b2acce88a210515b4a5bb2e46cbfb63fe97d56
CPU threads: 12; OS: Mac OS X 10.15.7; UI render: default; VCL: osx
Locale: en-GB (en_GB.UTF-8); UI: en-US
Calc: threaded

Version: 7.3.0.0.alpha1+ / LibreOffice Community
Build ID: b8d17d754830ab57099dcdfa72a96bfad404ab1a
CPU threads: 12; OS: Mac OS X 10.15.7; UI render: default; VCL: osx
Locale: en-GB (en_GB.UTF-8); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Tomaž Vajngerl (via logerrit)]

 xmlsecurity/qa/unit/signing/signing.cxx|  209 ++---
 xmlsecurity/source/helper/ooxmlsecexporter.cxx |   53 +++---
 xmlsecurity/source/helper/xsecsign.cxx |   10 -
 3 files changed, 153 insertions(+), 119 deletions(-)

New commits:
commit b8ae4bcd5c642a29202529fc6bf4c3a91a713230
Author: Tomaž Vajngerl 
AuthorDate: Mon Nov 1 21:46:43 2021 +0100
Commit: Xisco Fauli 
CommitDate: Tue Nov 2 21:10:50 2021 +0100

xmlsec: fix OOXML signing with multiple certs, extend the test

Signing OOXML with 3 or more times didn't work as other ids
("idPackageObject", "idOfficeObject", ...) were not uniqe. This
change makes those ids unique by appending the signature id. The
signature ID is now generated for OOXML too, while previously it
was a hardcoded string ("idPackageSignature").

The test for signing multiple OOXML was written before, but didn't
catch the issues because it didn't assert the status of the
document after loading it again. This is which is now fixed (and
also added changed for the ODF test case).

Change-Id: Ifa20ea17498b117a4c57f6eddf82f8e83bc640bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124571
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 5a7030f5cea26019aa8ff921f6035cfa0e3f93db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124480
Reviewed-by: Xisco Fauli 

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 293e938863c4..24101ab74e22 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1061,55 +1062,72 @@ CPPUNIT_TEST_FIXTURE(SigningTest, 
testSigningMultipleTimes_ODT)
 aMediaDescriptor["FilterName"] <<= OUString("writer8");
 xStorable->storeAsURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
 
-DocumentSignatureManager aManager(mxComponentContext, 
DocumentSignatureMode::Content);
-CPPUNIT_ASSERT(aManager.init());
-uno::Reference xStorage
-= comphelper::OStorageHelper::GetStorageOfFormatFromURL(
-ZIP_STORAGE_FORMAT_STRING, aTempFile.GetURL(), 
embed::ElementModes::READWRITE);
-CPPUNIT_ASSERT(xStorage.is());
-aManager.setStore(xStorage);
-aManager.getSignatureHelper().SetStorage(xStorage, "1.2");
-
-// Create a signature.
-uno::Reference xCertificate
-= getCertificate(aManager, svl::crypto::SignatureMethodAlgorithm::RSA);
-if (!xCertificate.is())
-return;
-sal_Int32 nSecurityId;
-aManager.add(xCertificate, mxSecurityContext, /*rDescription=*/OUString(), 
nSecurityId,
- /*bAdESCompliant=*/true);
-
-// Read back the signature and make sure that it's valid.
-aManager.read(/*bUseTempStream=*/true);
 {
-std::vector& rInformations
-= aManager.getCurrentSignatureInformations();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rInformations.size());
-
CPPUNIT_ASSERT_EQUAL(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED,
- rInformations[0].nStatus);
+DocumentSignatureManager aManager(mxComponentContext, 
DocumentSignatureMode::Content);
+CPPUNIT_ASSERT(aManager.init());
+uno::Reference xStorage
+= comphelper::OStorageHelper::GetStorageOfFormatFromURL(
+ZIP_STORAGE_FORMAT_STRING, aTempFile.GetURL(), 
embed::ElementModes::READWRITE);
+CPPUNIT_ASSERT(xStorage.is());
+aManager.setStore(xStorage);
+aManager.getSignatureHelper().SetStorage(xStorage, "1.2");
+
+// Create a signature.
+uno::Reference xCertificate
+= getCertificate(aManager, 
svl::crypto::SignatureMethodAlgorithm::RSA);
+
+if (!xCertificate.is())
+return;
+sal_Int32 nSecurityId;
+aManager.add(xCertificate, mxSecurityContext, 
/*rDescription=*/OUString(), nSecurityId,
+ /*bAdESCompliant=*/true);
+
+// Read back the signature and make sure that it's valid.
+aManager.read(/*bUseTempStream=*/true);
+{
+std::vector& rInformations
+= aManager.getCurrentSignatureInformations();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), 
rInformations.size());
+
CPPUNIT_ASSERT_EQUAL(css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED,
+ rInformations[0].nStatus);
+}
+
+aManager.add(xCertificate, mxSecurityContext, 
/*rDescription=*/OUString(), nSecurityId,
+ /*bAdESCompliant=*/true);
+aManager.read(/*bUseTempStream=*/true);
+{
+std::vector& rInformations
+= aManager.getCurrentSignatureInformations();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 

[Libreoffice-bugs] [Bug 145513] German-GUI 'Table of Contents, Index or Bibliography' (edit bibliography index) missing buttons 'Insert', 'Remove' and 'Tab Stop' in GUI-Langugage 'German'

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145513

Julien Nabet  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 CC||serval2...@yahoo.fr
 Ever confirmed|0   |1

--- Comment #1 from Julien Nabet  ---
Which LO version do you use?
For your information, there are 7.1.6 or brand new 7.2.2
Please, give a try at least one of these.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145508] kf5: Assert hit when starting Impress presentation after e4abf879f4a24258bcc560eb58ca78b147768d46

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145508

Julien Nabet  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Ever confirmed|0   |1
   Keywords||haveBacktrace

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145508] kf5: Assert hit when starting Impress presentation after e4abf879f4a24258bcc560eb58ca78b147768d46

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145508

Julien Nabet  changed:

   What|Removed |Added

 CC||serval2...@yahoo.fr

--- Comment #2 from Julien Nabet  ---
Created attachment 176083
  --> https://bugs.documentfoundation.org/attachment.cgi?id=176083=edit
bt with debug symbols

On pc Debian x86-64 with master sources updated today + kf5 rendering, I could
reproduce this.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145513] New: German-GUI 'Table of Contents, Index or Bibliography' (edit bibliography index) missing buttons 'Insert', 'Remove' and 'Tab Stop' in GUI-Langugage 'German'

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145513

Bug ID: 145513
   Summary: German-GUI 'Table of Contents, Index or Bibliography'
(edit bibliography index) missing buttons 'Insert',
'Remove' and 'Tab Stop' in GUI-Langugage 'German'
   Product: LibreOffice
   Version: unspecified
  Hardware: x86-64 (AMD64)
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: whg.albre...@web.de

Created attachment 176082
  --> https://bugs.documentfoundation.org/attachment.cgi?id=176082=edit
comparison English+German-GUI_TOC_IndexOrBibliography

If the LO-GUI language is English everything is fine, if the LO-GUI language is
German, the buttons 'Insert', 'Remove' and 'Tab Stop' for inserting alternate
entries and for changing the structure of the bibliography and  index in the
GUI are missing' Table of Contents, Index or Bibliography '

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145512] New: Unchecking Automatic beneath First Line Indent setting does not work; still suppresses First Line Indent setting

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145512

Bug ID: 145512
   Summary: Unchecking Automatic beneath First Line Indent setting
does not work; still suppresses First Line Indent
setting
   Product: LibreOffice
   Version: 7.2.2.2 release
  Hardware: Other
OS: macOS (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: dkist...@gmail.com

Description:
I have two styles, used for setting poetry, that involve a Before Text indent
of .30" and a First Line indent of -.30"; this results in the rather infrequent
runover lines being hung. For the paperback version, LibreOffice works
flawlessly to do this. This hanging indentation is also important for books
output to ePub so that, if read on a smaller device or in larger type, the
runover lines will be clear. Runover lines occur far more frequently on
digitally read devices.

According to what I am reading, checking the Automatic box beneath these
settings will result in the First Line setting being ignored. That's not what I
want. But with the Automatic box UNchecked, the negative First Line indent is
still ignored, resulting in all lines starting with a .30" indentation and the
first line not pulled back to the left by -.30".

FORMATTING, EPUB, EXPORT

Steps to Reproduce:
1. Set up a NewLine paragraph style with Before Text .30", After Text .00", and
First Indent -.30"; uncheck Automatic.
2. Apply style to several lines of text that extend past the document margins.
3. Export to ePub (2.0 or 3.0 does not matter) using Page Break segmenting.
4. View the ePub output.


Actual Results:
Title

 First line of poem that extends past the margin
 that should be hung.

Expected Results:
Title

First line of poem that extends past the margin
 that should be hung.


Reproducible: Always


User Profile Reset: No



Additional Info:
It seems this is only due to a failure of the ePub output module to recognize
the status of the Automatic check box; instead of reading First Line indent
when unchecked, it ignores it whether unchecked or not and reads only the
Before Text setting (which, in this example, indents (hangs) all lines, not
just any runovers past the first line).

>From Help - Libre Office:

Indent

Before text

Enter the amount of space that you want to indent the paragraph from the page
margin. If you want the paragraph to extend into the page margin, enter a
negative number. In Left-to-Right languages, the left edge of the paragraph is
indented with respect to the left page margin. In Right-to-Left languages, the
right edge of the paragraph is indented with respect to the right page margin.

After text

Enter the amount of space that you want to indent the paragraph from the page
margin. If you want the paragraph to extend into the page margin, enter a
negative number. In Left-to-Right languages, the right edge of the paragraph is
indented with respect to the right page margin. In Right-to-Left languages, the
left edge of the paragraph is indented with respect to the left page margin.

First line

Indents the first line of a paragraph by the amount that you enter. To
create a hanging indent enter a positive value for "Before text" and a negative
value for "First line". To indent the first line of a paragraph that uses
numbering or bullets, choose "Format - Bullets and Numbering - Position".

Automatic

Automatically indents a paragraph according to the font size and the line
spacing. The setting in the First Line box is ignored.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/implicitboolconversion.cxx  |   92 +++---
 compilerplugins/clang/test/implicitboolconversion.cxx |   38 +++
 2 files changed, 77 insertions(+), 53 deletions(-)

New commits:
commit 6f26a7246456d8989e83d658a211b5d2608568f5
Author: Stephan Bergmann 
AuthorDate: Tue Nov 2 08:41:42 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 2 20:10:46 2021 +0100

Tweak loplugin:implicitboolconversion to allow some more bool -> sal_Bool

...in templated code, to cater for the needs of
 "Prepare for removal of
non-const operator[] from Sequence in testtools".

For one, by defining ImplicitBoolConversion::TraverseInitListExpr, make sure
that Clang versions before and after


"[AST] Treat semantic form of InitListExpr as implicit code in traversals"
behave the same.  Old versions of Clang would have erroneously reported

  Sequence> s2{ { false } };

(and reported

  Sequence> s4{ { false } };

twice) in compilerplugins/clang/test/implicitboolconversion.cxx when one of 
the
four combinations of syntactic/semantic visit of the outer/inner 
InitListExpr
defeated the intended suppression logic in
ImplicitBoolConversion::TraverseCXXStdInitializerListExpr.

And for another, ImplicitBoolConversion::TraverseInitListExpr can subsume 
the
exising ImplicitBoolConversion::TraverseCXXStdInitializerListExpr.

But for a third, that would still make

  Sequence> s6{ { false } };

in compilerplugins/clang/test/implicitboolconversion.cxx emit a false 
warning,
so add a cheesy "TODO" chicken-out special case to
ImplicitBoolConversion::checkCXXConstructExpr for now.

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

diff --git a/compilerplugins/clang/implicitboolconversion.cxx 
b/compilerplugins/clang/implicitboolconversion.cxx
index 14574e3cd420..bc0b74932b71 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -274,7 +274,7 @@ public:
 { return TraverseCompoundAssignOperator(expr); }
 #endif
 
-bool TraverseCXXStdInitializerListExpr(CXXStdInitializerListExpr * expr);
+bool TraverseInitListExpr(InitListExpr * expr);
 
 bool TraverseReturnStmt(ReturnStmt * stmt);
 
@@ -626,36 +626,15 @@ bool 
ImplicitBoolConversion::TraverseCompoundAssignOperator(CompoundAssignOperat
 }
 }
 
-bool ImplicitBoolConversion::TraverseCXXStdInitializerListExpr(
-CXXStdInitializerListExpr * expr)
-{
-// Must be some std::initializer_list; check whether T is sal_Bool 
(i.e.,
-// unsigned char) [TODO: check for real sal_Bool instead]:
-auto t = expr->getType();
-if (auto et = dyn_cast(t)) {
-t = et->desugar();
-}
-auto ts = t->getAs();
-if (ts == nullptr
-|| !ts->getArg(0).getAsType()->isSpecificBuiltinType(
-clang::BuiltinType::UChar))
-{
-return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
-}
-// Avoid warnings for code like
-//
-//  Sequence arBool({true, false, true});
-//
-auto e = dyn_cast(
-ignoreParenAndTemporaryMaterialization(expr->getSubExpr()));
-if (e == nullptr) {
-return RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
-}
+bool ImplicitBoolConversion::TraverseInitListExpr(InitListExpr * expr) {
 nested.push(std::vector());
-bool ret = RecursiveASTVisitor::TraverseCXXStdInitializerListExpr(expr);
+auto const e = expr->isSemanticForm() ? expr : expr->getSemanticForm();
+auto const ret = TraverseSynOrSemInitListExpr(e, nullptr);
 assert(!nested.empty());
 for (auto i: nested.top()) {
-if (std::find(e->begin(), e->end(), i) == e->end()) {
+if (std::find(e->begin(), e->end(), i) == e->end()
+|| !i->getType()->isSpecificBuiltinType(clang::BuiltinType::UChar))
+{
 reportWarning(i);
 }
 }
@@ -857,31 +836,38 @@ void ImplicitBoolConversion::checkCXXConstructExpr(
 if (j != expr->arg_end()) {
 TemplateSpecializationType const * t1 = expr->getType()->
 getAs();
-SubstTemplateTypeParmType const * t2 = nullptr;
-CXXConstructorDecl const * d = expr->getConstructor();
-if (d->getNumParams() == expr->getNumArgs()) { //TODO: better check
-t2 = getAsSubstTemplateTypeParmType(
-d->getParamDecl(j - expr->arg_begin())->getType()
-.getNonReferenceType());
-}
-if (t1 != nullptr && t2 != nullptr) {
-TemplateDecl const * td
-= 

[Libreoffice-bugs] [Bug 132243] [META] Dialog tunneling regressions

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132243
Bug 132243 depends on bug 119206, which changed state.

Bug 119206 Summary: Freeze if Option “Edit document properties before saving” 
is Enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=119206

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108747] [META] File properties/settings (meta data) bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108747
Bug 108747 depends on bug 119206, which changed state.

Bug 119206 Summary: Freeze if Option “Edit document properties before saving” 
is Enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=119206

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 107943] [META] Save bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=107943
Bug 107943 depends on bug 119206, which changed state.

Bug 119206 Summary: Freeze if Option “Edit document properties before saving” 
is Enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=119206

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/comphelper reportdesign/source sfx2/source

[Mike Kaganski (via logerrit)]

 connectivity/source/commontools/dbmetadata.cxx |6 -
 dbaccess/source/core/dataaccess/documentdefinition.cxx |   14 +--
 dbaccess/source/filter/xml/dbloader2.cxx   |6 -
 dbaccess/source/ui/app/AppController.cxx   |   12 +--
 dbaccess/source/ui/app/AppDetailPageHelper.cxx |2 
 dbaccess/source/ui/misc/databaseobjectview.cxx |   26 +++
 dbaccess/source/ui/misc/dsmeta.cxx |   62 +++--
 dbaccess/source/ui/misc/linkeddocuments.cxx|4 -
 dbaccess/source/ui/querydesign/querycontroller.cxx |6 -
 include/comphelper/namedvaluecollection.hxx|   57 ---
 reportdesign/source/ui/misc/UITools.cxx|6 -
 sfx2/source/view/frmload.cxx   |   14 +--
 12 files changed, 75 insertions(+), 140 deletions(-)

New commits:
commit c9b100df77331ebe1f5e66b9dd248c8cc43a885f
Author: Mike Kaganski 
AuthorDate: Tue Nov 2 18:55:59 2021 +0300
Commit: Mike Kaganski 
CommitDate: Tue Nov 2 19:49:04 2021 +0100

Drop char*-based API from NamedValueCollection

Change-Id: I87f339b348580e256a8d65470ad15cbdabf2c9dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124609
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/connectivity/source/commontools/dbmetadata.cxx 
b/connectivity/source/commontools/dbmetadata.cxx
index d4d75109f815..0a2123aaa782 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -107,7 +107,7 @@ namespace dbtools
 }
 
 
-bool lcl_getDriverSetting( const char* _asciiName, const 
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
+bool lcl_getDriverSetting( const OUString& _asciiName, const 
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
 {
 lcl_checkConnected( _metaData );
 const ::comphelper::NamedValueCollection& rDriverMetaData = 
_metaData.aDriverConfig.getMetaData( _metaData.xConnectionMetaData->getURL() );
@@ -118,7 +118,7 @@ namespace dbtools
 }
 
 
-bool lcl_getConnectionSetting( const char* _asciiName, const 
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
+bool lcl_getConnectionSetting(const OUString& _asciiName, const 
DatabaseMetaData_Impl& _metaData, Any& _out_setting )
 {
 try
 {
@@ -130,7 +130,7 @@ namespace dbtools
 xDataSource->getPropertyValue("Settings"),
 UNO_QUERY_THROW );
 
-_out_setting = xDataSourceSettings->getPropertyValue( 
OUString::createFromAscii( _asciiName ) );
+_out_setting = xDataSourceSettings->getPropertyValue( 
_asciiName );
 }
 else
 {
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 9a2944bb338d..7e6efc688a1e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1441,16 +1441,14 @@ void ODocumentDefinition::separateOpenCommandArguments( 
const Sequence< Property
 {
 ::comphelper::NamedValueCollection aOpenCommandArguments( 
i_rOpenCommandArguments );
 
-const char* const pObjectDescriptorArgs[] =
+static const std::u16string_view sObjectDescriptorArgs[] = { 
u"RecoveryStorage" };
+for (const auto& rObjectDescriptorArg : sObjectDescriptorArgs)
 {
-"RecoveryStorage"
-};
-for (const char* pObjectDescriptorArg : pObjectDescriptorArgs)
-{
-if ( aOpenCommandArguments.has( pObjectDescriptorArg ) )
+const OUString sObjectDescriptorArg(rObjectDescriptorArg);
+if ( aOpenCommandArguments.has( sObjectDescriptorArg ) )
 {
-o_rEmbeddedObjectDescriptor.put( pObjectDescriptorArg, 
aOpenCommandArguments.get( pObjectDescriptorArg ) );
-aOpenCommandArguments.remove( pObjectDescriptorArg );
+o_rEmbeddedObjectDescriptor.put( sObjectDescriptorArg, 
aOpenCommandArguments.get( sObjectDescriptorArg ) );
+aOpenCommandArguments.remove( sObjectDescriptorArg );
 }
 }
 
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx 
b/dbaccess/source/filter/xml/dbloader2.cxx
index 0f0674d2c038..30d613a56e4b 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -138,8 +138,8 @@ OUString SAL_CALL DBTypeDetection::detect( 
css::uno::Sequence< css::beans::Prope
 {
 // After fixing of the i88522 issue ( use the new file 
locking for database files ) the stream from the type detection can be used 
further
 // for now the file should be reopened to have read/write 
access
-aMedia.remove( OUString(  "InputStream" ) );
-aMedia.remove( OUString(  "Stream" ) );
+  

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

[Tomaž Vajngerl (via logerrit)]

 xmloff/source/style/PageMasterImportPropMapper.cxx |  134 +++--
 1 file changed, 71 insertions(+), 63 deletions(-)

New commits:
commit b0e574a8be2a080f5039e968f4f32ce4b8fa2b26
Author: Tomaž Vajngerl 
AuthorDate: Fri Oct 29 17:23:02 2021 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Nov 2 19:35:49 2021 +0100

xmloff: Prevent gutter margin xml property to be deallocated

Previously we stored a pointer to the gutter margin XMLPropertyState
so we could read it later. The problem with this is that in between
when we storing and reading the property state, we add elements
to the rProperties vector, where the XML properties are allocated.

Adding new elements to the vector can cause that the internal
array is reallocated to a bigger size and elements copied to the
new array, so our pointer shows to a invalid (deallocated) memory
address.

This issue is fixed by moving the code up to before we add new
elements to rProperties vector and a big warning is written to not
use XMLPropertyState* pointers after the code adds to the
rProperties vector.

Change-Id: I24b0285d49e678fcb3b333bf4054f5cef4207003
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124572
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx 
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index b9850eaec618..8ee711804333 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -390,6 +390,74 @@ void PageMasterImportPropertyMapper::finished(std::vector< 
XMLPropertyState >& r
 pAllFooterMarginProperty->mnIndex = -1;
 }
 
+if (pMarginGutter)
+{
+sal_Int32 nGutterMargin{};
+pMarginGutter->maValue >>= nGutterMargin;
+
+bool bGutterAtTop{};
+uno::Reference xSI(GetImport().GetModel(), 
uno::UNO_QUERY);
+if (xSI.is() && xSI->supportsService("com.sun.star.text.TextDocument"))
+{
+uno::Reference 
xFac(GetImport().GetModel(), uno::UNO_QUERY);
+if (xFac.is())
+{
+uno::Reference xProps(
+xFac->createInstance("com.sun.star.document.Settings"), 
uno::UNO_QUERY);
+if (xProps.is())
+{
+xProps->getPropertyValue("GutterAtTop") >>= bGutterAtTop;
+}
+}
+}
+if (bGutterAtTop)
+{
+if (nGutterMargin && pMargins[XML_LINE_TOP])
+{
+// Decrease top margin to not include gutter.
+sal_Int32 nTopMargin{};
+pMargins[XML_LINE_TOP]->maValue >>= nTopMargin;
+nTopMargin -= nGutterMargin;
+pMargins[XML_LINE_TOP]->maValue <<= nTopMargin;
+}
+}
+else
+{
+bool bRtlGutter{};
+if (nGutterMargin && pRtlGutter)
+{
+pRtlGutter->maValue >>= bRtlGutter;
+}
+if (bRtlGutter)
+{
+if (nGutterMargin && pMargins[XML_LINE_RIGHT])
+{
+// Decrease right margin to not include gutter.
+sal_Int32 nRightMargin{};
+pMargins[XML_LINE_RIGHT]->maValue >>= nRightMargin;
+nRightMargin -= nGutterMargin;
+pMargins[XML_LINE_RIGHT]->maValue <<= nRightMargin;
+}
+}
+else
+{
+if (nGutterMargin && pMargins[XML_LINE_LEFT])
+{
+// Decrease left margin to not include gutter.
+sal_Int32 nLeftMargin{};
+pMargins[XML_LINE_LEFT]->maValue >>= nLeftMargin;
+nLeftMargin -= nGutterMargin;
+pMargins[XML_LINE_LEFT]->maValue <<= nLeftMargin;
+}
+}
+}
+}
+
+// CAUTION!
+// The following code adds into the rProperties vector, so all the
+// XMLPropertyState* pointers that are pointing to the rProperties
+// elements could potentially be deallocated, so don't use them after
+// this!
 for (sal_uInt16 i = 0; i < 4; i++)
 {
 if (pNewMargins[i])
@@ -435,6 +503,9 @@ void PageMasterImportPropertyMapper::finished(std::vector< 
XMLPropertyState >& r
 delete pFooterNewBorders[i];
 }
 }
+// CAUTION - do not use XMLPropertyState* pointers (like pMargins,
+// pMarginGutter) after this.
+
 if(xHeaderDynamic)
 {
 rProperties.push_back(*xHeaderDynamic);
@@ -446,68 +517,5 @@ void PageMasterImportPropertyMapper::finished(std::vector< 
XMLPropertyState >& r
 xFooterDynamic.reset();
 }
 
-if (!pMarginGutter)
-return;
-
-sal_Int32 nGutterMargin{};
-pMarginGutter->maValue >>= nGutterMargin;

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

[Jim Raykowski (via logerrit)]

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

New commits:
commit 1441b4e83337fe2389eaae146b43a8e7c036a85d
Author: Jim Raykowski 
AuthorDate: Sun Oct 31 22:48:42 2021 -0800
Commit: Jim Raykowski 
CommitDate: Tue Nov 2 19:20:54 2021 +0100

SwNavigator: correct outline level comparison used in determining

outline content type member count

Outline content type member count can be less than the number of
outline nodes in the document model if the outline level setting is
less than outline level maximum, MAXLEVEL. Currently, the outline node
count is incorrectly compared to the outline level maximum in
determining the outline content type member count. The member count is
compared against the old member count to determine if the member array
needs to be cleared and filled when a member in the array is wanted by
a call to the GetMember function. This patch changes the outline level
maximum to be compared to the set outline level.

Change-Id: Ie1348575becbbc14446b417bcd568f158330cf9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124537
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index f6f56c9bfb26..8d5df012b844 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -353,7 +353,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 {
 m_sTypeToken = "outline";
 m_nMemberCount = 
m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineNodesCount();
-if (m_nMemberCount < MAXLEVEL)
+if (m_nOutlineLevel < MAXLEVEL)
 {
 const size_t nOutlineCount = m_nMemberCount;
 for(size_t j = 0; j < nOutlineCount; ++j)

[Libreoffice-bugs] [Bug 145347] Line wrapping broken in various parts of the UI

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145347

Buovjaga  changed:

   What|Removed |Added

 CC||noelgran...@gmail.com

--- Comment #2 from Buovjaga  ---
(In reply to Buovjaga from comment #0)
> After
> https://git.libreoffice.org/core/commit/
> 4fc1b3fb659be916167518b49ffe8193e9033f30
> flatten ImplGetTextLines
> 
> lines are no longer wrapped in Help - About window
> 
> Bibisected with linux-64-7.3 repo.
> 
> Adding Cc: to Noel Grandin

and apparently I forgot to add Noel for real...

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Tor Lillqvist (via logerrit)]

 include/i18nutil/paper.hxx |4 
 vcl/inc/print.hrc  |3 +++
 vcl/source/gdi/print.cxx   |1 +
 3 files changed, 8 insertions(+)

New commits:
commit ae6f7eecfc62442584473034853539706b03f7af
Author: Tor Lillqvist 
AuthorDate: Tue Nov 2 18:14:48 2021 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Nov 2 19:15:08 2021 +0100

Add comments to two arrays mentioning that they must match the enum Paper

At least I think they must. Also add a comment to the enum pointing at
those arrays. There are now four different places in four files that
must be manually kept in sync. Quite possibly more. This stinks.

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

diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 71ca22bb9486..b84d7b3af074 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -32,6 +32,10 @@ struct Locale;
 //!! The values of the following enumerators must correspond to the array 
position
 //!! of the respective paper size in the file i18nutil/source/utility/paper.cxx
 //!! Thus don't reorder the enum values here without changing the code there 
as well.
+
+//!! Also the RID_STR_PAPERNAMES array in vcl/inc/print.hrc and the
+//!! PaperIndex array in Printer::GetPaperName() in
+//!! vcl/source/gdi/print.cxx are parallel to this enum.
 enum Paper : unsigned
 {
 PAPER_A0,
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index b654a77ec3b8..7e19c4c75004 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -27,6 +27,9 @@
 const TranslateId RID_STR_PAPERNAMES[] =
 {
 // To translators: This is the first entry of a sequence of paper size 
names
+
+// This array must (probably) match exactly the enum Paper in 

+
 NC_("RID_STR_PAPERNAMES", "A0"),
 NC_("RID_STR_PAPERNAMES", "A1"),
 NC_("RID_STR_PAPERNAMES", "A2"),
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 1b7e4210e691..e728edf1dca3 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1387,6 +1387,7 @@ OUString Printer::GetPaperName( Paper ePaper )
 ImplSVData* pSVData = ImplGetSVData();
 if( pSVData->maPaperNames.empty() )
 {
+// This array must (probably) match exactly the enum Paper in 

 static const int PaperIndex[] =
 {
 PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5, 
PAPER_B4_ISO, PAPER_B5_ISO,

[Libreoffice-bugs] [Bug 142952] Crash in: mergedlo.dll

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=142952

Buovjaga  changed:

   What|Removed |Added

 Resolution|FIXED   |WORKSFORME

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 142952] Crash in: mergedlo.dll

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=142952

Andreas Säger  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #12 from Andreas Säger  ---
Issue seems to be fixed in:

Version: 7.2.2.2 (x64) / LibreOffice Community
Build ID: 02b2acce88a210515b4a5bb2e46cbfb63fe97d56
CPU threads: 8; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win
Locale: de-DE (de_DE); UI: de-DE
Calc: threaded

I don't know how.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Julien Nabet (via logerrit)]

 forms/source/component/DatabaseForm.cxx  |5 +++--
 forms/source/component/Date.cxx  |2 +-
 forms/source/component/FormComponent.cxx |4 ++--
 forms/source/component/ImageControl.cxx  |2 +-
 forms/source/component/Time.cxx  |2 +-
 forms/source/inc/property.hxx|   20 +---
 6 files changed, 9 insertions(+), 26 deletions(-)

New commits:
commit de9f8683234ea2187f650210b7c3e66818778e9f
Author: Julien Nabet 
AuthorDate: Mon Nov 1 19:17:37 2021 +0100
Commit: Julien Nabet 
CommitDate: Tue Nov 2 18:42:35 2021 +0100

Replace some macros in forms

DECL_IFACE_PROP2 + DECL_IFACE_PROP3 + DECL_IFACE_PROP4
+ DECL_BOOL_PROP3
Change-Id: Ibfe652001f4e914cad364222bcaf38dec69298e5

Change-Id: I432e045b9d071d61cd142bca66f40233cd59ef0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124564
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 7411abf90351..0882d82a47c7 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1290,7 +1290,8 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
 RemoveProperty( _rAggregateProps, PROPERTY_HAVINGCLAUSE );
 RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER );
 
-DECL_IFACE_PROP4( ACTIVE_CONNECTION,XConnection, BOUND, 
TRANSIENT, MAYBEVOID, CONSTRAINED);
+DECL_IFACE_PROP_IMPL(ACTIVE_CONNECTION, XConnection) 
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT 
|
+ 
css::beans::PropertyAttribute::MAYBEVOID | PropertyAttribute::CONSTRAINED);
 DECL_BOOL_PROP2 ( APPLYFILTER,   BOUND, 
MAYBEDEFAULT);
 DECL_PROP1  ( NAME, OUString,BOUND 
 );
 DECL_PROP1  ( MASTERFIELDS, Sequence< OUString >,BOUND 
 );
@@ -1309,7 +1310,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
 DECL_PROP1  ( TARGET_FRAME, OUString,BOUND 
 );
 DECL_PROP1  ( SUBMIT_METHOD,FormSubmitMethod,BOUND 
 );
 DECL_PROP1  ( SUBMIT_ENCODING,  FormSubmitEncoding,  BOUND 
 );
-DECL_BOOL_PROP3 ( DYNAMIC_CONTROL_BORDER,BOUND, 
MAYBEVOID, MAYBEDEFAULT );
+DECL_BOOL_PROP_IMPL(DYNAMIC_CONTROL_BORDER) 
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID 
| css::beans::PropertyAttribute::MAYBEDEFAULT );
 DECL_PROP3  ( CONTROL_BORDER_COLOR_FOCUS,   sal_Int32,   BOUND, 
MAYBEVOID, MAYBEDEFAULT );
 DECL_PROP3  ( CONTROL_BORDER_COLOR_MOUSE,   sal_Int32,   BOUND, 
MAYBEVOID, MAYBEDEFAULT );
 DECL_PROP3  ( CONTROL_BORDER_COLOR_INVALID, sal_Int32,   BOUND, 
MAYBEVOID, MAYBEDEFAULT );
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 1d16109ce672..90a348482540 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -145,7 +145,7 @@ void ODateModel::describeFixedProperties( Sequence< 
Property >& _rProps ) const
 DECL_PROP3(DEFAULT_DATE,util::Date, BOUND, 
MAYBEDEFAULT, MAYBEVOID);
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
 DECL_PROP1(FORMATKEY,   sal_Int32,  TRANSIENT);
-DECL_IFACE_PROP2(FORMATSSUPPLIER,   XNumberFormatsSupplier, READONLY, 
TRANSIENT);
+DECL_IFACE_PROP_IMPL(FORMATSSUPPLIER, XNumberFormatsSupplier) 
css::beans::PropertyAttribute::READONLY | 
css::beans::PropertyAttribute::TRANSIENT);
 END_DESCRIBE_PROPERTIES();
 }
 
diff --git a/forms/source/component/FormComponent.cxx 
b/forms/source/component/FormComponent.cxx
index 0f67f8433e95..16d90a75f5df 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -2780,8 +2780,8 @@ void OBoundControlModel::describeFixedProperties( 
Sequence< Property >& _rProps
 {
 BEGIN_DESCRIBE_PROPERTIES( 5, OControlModel )
 DECL_PROP1  ( CONTROLSOURCE,   OUString, BOUND );
-DECL_IFACE_PROP3( BOUNDFIELD,   XPropertySet,   BOUND, 
READONLY, TRANSIENT );
-DECL_IFACE_PROP2( CONTROLLABEL, XPropertySet,   BOUND, 
MAYBEVOID );
+DECL_IFACE_PROP_IMPL(BOUNDFIELD, XPropertySet) 
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY 
| css::beans::PropertyAttribute::TRANSIENT);
+DECL_IFACE_PROP_IMPL(CONTROLLABEL, XPropertySet) 
css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEVOID);
 DECL_PROP2  ( CONTROLSOURCEPROPERTY,OUString,READONLY, 
TRANSIENT );
 DECL_BOOL_PROP1 ( INPUT_REQUIRED,   

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/guisaveas.cxx |9 -
 sfx2/source/doc/objserv.cxx   |   27 ---
 2 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 39994c43bf6610f2a8fde55f54ed9a7e279935b4
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 15:04:02 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 18:31:27 2021 +0100

Resolves: tdf#119206 run properties sync when launched during save

use (abuse?) a SynchronMode of true, which will become
SfxRequest::IsSynchronCall of true in SfxObjectShell::ExecFile_Impl to
request that we do not want the properties dialog to be run async. It
looks impractical to rearrange all the post-dialog-call close code to be
part of some callback executed when the dialog completes.

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

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index ee059c790619..3d8a2276c4f1 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1124,7 +1124,14 @@ bool ModelData_Impl::ShowDocumentInfoDialog()

 0 );
 if ( xDispatch.is() )
 {
-xDispatch->dispatch( aURL, uno::Sequence< 
beans::PropertyValue >() );
+// tdf#119206 use (abuse?) a SynchronMode of true,
+// which will become SfxRequest::IsSynchronCall of true
+// in SfxObjectShell::ExecFile_Impl to request that we
+// do not want the properties dialog to be run async
+uno::Sequence< beans::PropertyValue > aProperties{
+comphelper::makePropertyValue("SynchronMode", true)
+};
+xDispatch->dispatch(aURL, aProperties);
 bDialogUsed = true;
 }
 }
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 3fb676dc4b0a..bb5acfcfc89c 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -602,9 +602,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 
 // creating dialog is done via virtual method; application will
 // add its own statistics page
-std::shared_ptr pReq = 
std::make_shared(rReq);
 std::shared_ptr 
xDlg(CreateDocumentInfoDialog(rReq.GetFrameWeld(), aSet));
-SfxTabDialogController::runAsync(xDlg, [this, xDlg, xCmisDoc, 
pReq](sal_Int32 nResult)
+auto aFunc = [this, xDlg, xCmisDoc](sal_Int32 nResult, 
SfxRequest& rRequest)
 {
 if (RET_OK == nResult)
 {
@@ -620,17 +619,31 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
 SetUseUserData( pDocInfoItem->IsUseUserData() );
 SetUseThumbnailSave( pDocInfoItem-> 
IsUseThumbnailSave() );
 // add data from dialog for possible recording 
purpose
-pReq->AppendItem( SfxDocumentInfoItem( GetTitle(),
+rRequest.AppendItem( SfxDocumentInfoItem( 
GetTitle(),
 getDocProperties(), aNewCmisProperties, 
IsUseUserData(), IsUseThumbnailSave() ) );
 }
-pReq->Done();
+rRequest.Done();
 }
 else
+{
 // nothing done; no recording
-pReq->Ignore();
-});
+rRequest.Ignore();
+}
+};
 
-rReq.Ignore();
+if (!rReq.IsSynchronCall())
+{
+std::shared_ptr pReq = 
std::make_shared(rReq);
+SfxTabDialogController::runAsync(xDlg, [pReq, 
aFunc](sal_Int32 nResult)
+{
+aFunc(nResult, *pReq);
+});
+rReq.Ignore();
+}
+else
+{
+aFunc(xDlg->run(), rReq);
+}
 }
 
 return;

[Libreoffice-commits] core.git: include/sfx2 sfx2/Library_sfx.mk sfx2/sdi sfx2/source

[Caolán McNamara (via logerrit)]

 include/sfx2/frame.hxx|1 
 sfx2/Library_sfx.mk   |1 
 sfx2/sdi/sfx.sdi  |2 -
 sfx2/source/control/asyncfunc.cxx |   28 ---
 sfx2/source/doc/guisaveas.cxx |   54 +-
 sfx2/source/doc/objserv.cxx   |   10 ---
 sfx2/source/view/frame.cxx|   10 ---
 7 files changed, 28 insertions(+), 78 deletions(-)

New commits:
commit 688489959e69994d455f36f3e9bb4c0ba3ee87aa
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 14:25:24 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 18:29:13 2021 +0100

Revert "tdf#117895: "Edit document properties before saving"..."

This reverts commit 3add3e5b70ad991c8351a54b0da62d05e977458f to try
and alternative approach

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

diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 26560b3db1f6..d8a0b9d90501 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -171,7 +171,6 @@ class SFX2_DLLPUBLIC SfxUnoAnyItem final : public 
SfxPoolItem
 css::uno::Any  aValue;
 public:
 static SfxPoolItem* CreateDefault();
-SfxUnoAnyItem();
 SfxUnoAnyItem( sal_uInt16 nWhich, const 
css::uno::Any& rAny );
 const css::uno::Any&GetValue() const
 { return aValue; }
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index a47d57138d94..d5f1c28ed436 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -133,7 +133,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/bastyp/sfxresid \
 sfx2/source/commandpopup/CommandPopup \
 sfx2/source/config/evntconf \
-sfx2/source/control/asyncfunc \
 sfx2/source/control/bindings \
 sfx2/source/control/ctrlitem \
sfx2/source/control/dispatch \
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 85570cdbb08c..0a9b40b7f7a5 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3325,7 +3325,7 @@ SfxBoolItem PrintPreview SID_PRINTPREVIEW
 
 
 SfxVoidItem SetDocumentProperties SID_DOCINFO
-(SfxDocumentInfoItem Properties SID_DOCINFO,SfxUnoAnyItem AsyncFunc FN_PARAM_2)
+(SfxDocumentInfoItem Properties SID_DOCINFO)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sfx2/source/control/asyncfunc.cxx 
b/sfx2/source/control/asyncfunc.cxx
deleted file mode 100644
index b81639af5646..
--- a/sfx2/source/control/asyncfunc.cxx
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include 
-
-AsyncFunc::AsyncFunc(const std::function& rAsyncFunc)
-: m_pAsyncFunc(rAsyncFunc)
-{
-}
-
-AsyncFunc::~AsyncFunc() {}
-
-void AsyncFunc::Execute()
-{
-if (m_pAsyncFunc)
-m_pAsyncFunc();
-}
-
-//XUnoTunnel
-UNO3_GETIMPLEMENTATION_IMPL(AsyncFunc)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index d5eb3369d735..ee059c790619 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -71,7 +71,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -318,7 +317,7 @@ public:
 const css::uno::Sequence< OUString >& rDenyList
 );
 
-bool ShowDocumentInfoDialog(const std::function< void () >&);
+bool ShowDocumentInfoDialog();
 
 static OUString GetRecommendedExtension( const OUString& aTypeName );
 OUString GetRecommendedDir( const OUString& aSuggestedDir );
@@ -1102,7 +1101,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 
nStoreMode,
 }
 
 
-bool ModelData_Impl::ShowDocumentInfoDialog(const std::function< void () >& 
aFunc)
+bool ModelData_Impl::ShowDocumentInfoDialog()
 {
 bool bDialogUsed = false;
 
@@ -1125,11 +1124,7 @@ bool ModelData_Impl::ShowDocumentInfoDialog(const 
std::function< void () >& aFun

 0 );
 if ( xDispatch.is() )
 {
-uno::Reference< lang::XUnoTunnel > aAsyncFunc(new 
AsyncFunc(aFunc));
-uno::Sequence< beans::PropertyValue > aProperties{
-comphelper::makePropertyValue("AsyncFunc", 
aAsyncFunc)
-};
-xDispatch->dispatch( aURL, aProperties );
+xDispatch->dispatch( aURL, 

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

[Caolán McNamara (via logerrit)]

 sfx2/source/doc/guisaveas.cxx |   36 
 1 file changed, 12 insertions(+), 24 deletions(-)

New commits:
commit fffd76195e0701cf774e36963105cd63a2e65a26
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 14:23:22 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 18:28:49 2021 +0100

Revert "tdf#120343 show pdf in async pdf export dialog callback"

This reverts commit 9df8a2eb8c216b16927aac2182b881b21d8b2d14 to try
an alternative approach.

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

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 4c50b5e19f27..d5eb3369d735 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1305,22 +1305,6 @@ uno::Reference< css::frame::XModuleManager2 > const & 
SfxStoringHelper::GetModul
 return m_xModuleManager;
 }
 
-namespace
-{
-void LaunchPDFViewer(const INetURLObject& rURL)
-{
-// Launch PDF viewer
-FilterConfigItem aItem( u"Office.Common/Filter/PDF/Export/" );
-bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
-
-if ( aViewPDF )
-{
-uno::Reference 
xSystemShellExecute(SystemShellExecute::create(::comphelper::getProcessComponentContext()));
-
xSystemShellExecute->execute(rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE),
 "", SystemShellExecuteFlags::URIS_ONLY);
-}
-}
-}
-
 bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& 
xModel,
 std::u16string_view aSlotName,
 uno::Sequence< 
beans::PropertyValue >& aArgsSequence,
@@ -1672,11 +1656,6 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 {
 SfxStoringHelper::SetDocInfoState(aModel.GetModel(), 
xOldDocProps);
 }
-
-// Launch PDF viewer
-if (nStoreMode & PDFEXPORT_REQUESTED)
-LaunchPDFViewer(aURL);
-
 };
 
 // use dispatch API to show document info dialog
@@ -1698,10 +1677,19 @@ bool SfxStoringHelper::GUIStoreModel( const 
uno::Reference< frame::XModel >& xMo
 aModelData.GetStorable()->storeToURL( aURL.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
 else
 aModelData.GetStorable()->storeAsURL( aURL.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), aArgsSequence );
+}
 
-// Launch PDF viewer
-if (nStoreMode & PDFEXPORT_REQUESTED)
-LaunchPDFViewer(aURL);
+// Launch PDF viewer
+if ( nStoreMode & PDFEXPORT_REQUESTED )
+{
+FilterConfigItem aItem(u"Office.Common/Filter/PDF/Export/");
+bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
+
+if ( aViewPDF )
+{
+uno::Reference 
xSystemShellExecute(SystemShellExecute::create( 
::comphelper::getProcessComponentContext() ) );
+xSystemShellExecute->execute( aURL.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), "", SystemShellExecuteFlags::URIS_ONLY 
);
+}
 }
 
 return bDialogUsed;

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/html/htmlsect.cxx |2 +-
 sw/source/filter/html/htmltab.cxx  |   32 +---
 sw/source/filter/html/swhtml.hxx   |2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 8423861a74d7c6425ed2c3699806dd97415a04e1
Author: Caolán McNamara 
AuthorDate: Mon Nov 1 19:41:58 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 18:26:37 2021 +0100

drop PendingDrawObjectsInPaM in favor of detecting draw objects removal

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

diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 9b212c0c5f4b..928e9bfe158d 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -207,7 +207,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 static_cast( () );
 aDelPam.GetPoint()->nNode = pStNd->EndOfSectionIndex() - 1;
 
-if (!PendingObjectsInPaM(aDelPam))
+if (!PendingTableInPaM(aDelPam))
 {
 m_xDoc->getIDocumentContentOperations().DeleteRange(aDelPam);
 m_xDoc->getIDocumentContentOperations().DelFullPara(aDelPam);
diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 7407988ce640..ffb9c173027f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -634,8 +634,6 @@ public:
 
 void IncBoxCount() { m_nBoxes++; }
 bool IsOverflowing() const { return m_nBoxes > 64000; }
-
-bool PendingDrawObjectsInPaM(SwPaM& rPam) const;
 };
 
 void HTMLTableCnts::InitCtor()
@@ -5256,39 +5254,11 @@ std::shared_ptr 
SwHTMLParser::BuildTable(SvxAdjust eParentAdjust,
 return xRetTable;
 }
 
-bool HTMLTable::PendingDrawObjectsInPaM(SwPaM& rPam) const
-{
-if (!m_xResizeDrawObjects)
-return false;
-
-bool bRet = false;
-
-sal_uInt16 nCount = m_xResizeDrawObjects->size();
-for (sal_uInt16 i = 0; i < nCount && !bRet; ++i)
-{
-SdrObject *pObj = (*m_xResizeDrawObjects)[i];
-SwFrameFormat* pObjectFormat = ::FindFrameFormat(pObj);
-if (!pObjectFormat)
-continue;
-const SwFormatAnchor& rAnch = pObjectFormat->GetAnchor();
-if (const SwPosition* pPos = rAnch.GetContentAnchor())
-{
-SwNodeIndex aObjNodeIndex(pPos->nNode);
-bRet = (aObjNodeIndex >= rPam.Start()->nNode && aObjNodeIndex <= 
rPam.End()->nNode);
-}
-}
-
-return bRet;
-}
-
-bool SwHTMLParser::PendingObjectsInPaM(SwPaM& rPam) const
+bool SwHTMLParser::PendingTableInPaM(SwPaM& rPam) const
 {
 bool bRet = false;
 for (const auto& a : m_aTables)
 {
-bRet = a->PendingDrawObjectsInPaM(rPam);
-if (bRet)
-break;
 const SwTable *pTable = a->GetSwTable();
 if (!pTable)
 continue;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 023a796b5f5c..a0b714307974 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -874,7 +874,7 @@ private:
 bool HasCurrentParaFlys( bool bNoSurroundOnly = false,
  bool bSurroundOnly = false ) const;
 
-bool PendingObjectsInPaM(SwPaM& rPam) const;
+bool PendingTableInPaM(SwPaM& rPam) const;
 
 class TableDepthGuard
 {

[Libreoffice-bugs] [Bug 129824] Crash in: SwDocUpdateField::MakeFieldList_(SwDoc &, int) after "Insert" of a "User Field" with cursor in value field of dialog box ( steps in comment 3 )

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=129824

--- Comment #14 from Buovjaga  ---
(In reply to Dieter from comment #13)
> (In reply to Buovjaga from comment #12)
> > I can't repro now either. Even if the field format is text, I can't type
> > into the inserted field directly in the document canvas.
> 
> If you have a look at summary of crash signature, you can see, that crashes
> are related to Windows:
> https://crashreport.libreoffice.org/stats/signature/SwDocUpdateField::
> MakeFieldList_(SwDoc%20&,int)

Well, I don't have an explanation on why Linux is missing there, but as you can
see from my comment 9 I could bibisect this on Linux.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145361] Cannot convert to XHTML document containing list with line break

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145361

--- Comment #6 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "libreoffice-7-2":

https://git.libreoffice.org/core/commit/c10bfb4c582c13a294c1689ed7f9256b24d22075

tdf#145361 fix XSLT for older libxslt

It will be available in 7.2.3.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145361] Cannot convert to XHTML document containing list with line break

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145361

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:7.3.0|target:7.3.0 target:7.2.3

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 132499] Remove any remnants from ODBC < 3.0 + add missing functions + remove deprecated functions with ODBC > 3.0

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132499

--- Comment #6 from Julien Nabet  ---
As indicated in gerrit, it's just a first step.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Noel Grandin (via logerrit)]

 filter/source/xslt/odf2xhtml/export/common/body.xsl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c10bfb4c582c13a294c1689ed7f9256b24d22075
Author: Noel Grandin 
AuthorDate: Fri Oct 29 14:31:19 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Nov 2 18:02:41 2021 +0100

tdf#145361 fix XSLT for older libxslt

regression from
commit 3eb870f0843a00042ca7dd89837fbe0cc6f918c2
Author: Noel 
Date:   Fri Feb 26 12:45:19 2021 +0200
fix xhtml list export in other locales
where I used 'replace' which is not available on older libxslt, so
switch to 'translate' which works just as well here, and is available

Change-Id: Idd1224e23c0d48956d94b6fc2c2a7b1afa05fa0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124435
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 6c747ccf6cbfe0dc5d591f8ce68a1ca6c63cde53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124478
Reviewed-by: Xisco Fauli 

diff --git a/filter/source/xslt/odf2xhtml/export/common/body.xsl 
b/filter/source/xslt/odf2xhtml/export/common/body.xsl
index 9b10e56187bf..bcad3abd9ab3 100644
--- a/filter/source/xslt/odf2xhtml/export/common/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/body.xsl
@@ -106,7 +106,7 @@
 
 
 
-margin-left:cm
+margin-left:cm
 
 
 

[Libreoffice-bugs] [Bug 132499] Remove any remnants from ODBC < 3.0 + add missing functions + remove deprecated functions with ODBC > 3.0

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132499

--- Comment #5 from Commit Notification 
 ---
Julien Nabet committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/55133fc5fc499f6266f75ad3df77106f12333201

tdf#132499: first stab to remove old stuff from ODBC ver < 3

It will be available in 7.3.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 132499] Remove any remnants from ODBC < 3.0 + add missing functions + remove deprecated functions with ODBC > 3.0

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=132499

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:7.3.0

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Julien Nabet (via logerrit)]

 external/unixODBC/inc/odbc/sql.h|4 -
 external/unixODBC/inc/odbc/sqlext.h |   74 
 2 files changed, 78 deletions(-)

New commits:
commit 55133fc5fc499f6266f75ad3df77106f12333201
Author: Julien Nabet 
AuthorDate: Mon Nov 1 19:41:59 2021 +0100
Commit: Julien Nabet 
CommitDate: Tue Nov 2 17:57:25 2021 +0100

tdf#132499: first stab to remove old stuff from ODBC ver < 3

Change-Id: I683d4933fe4a2453b8ac5e9e8aa61946c4173bac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124566
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/external/unixODBC/inc/odbc/sql.h b/external/unixODBC/inc/odbc/sql.h
index 6d1e1608372a..0341340bb0d2 100644
--- a/external/unixODBC/inc/odbc/sql.h
+++ b/external/unixODBC/inc/odbc/sql.h
@@ -467,10 +467,8 @@ extern "C" {
 #endif /* ODBCVER >= 0x0300 */
 
 /* SQL_ALTER_TABLE bitmasks */
-#if (ODBCVER >= 0x0200)
 #define SQL_AT_ADD_COLUMN   0x0001L
 #define SQL_AT_DROP_COLUMN  0x0002L
-#endif /* ODBCVER >= 0x0200 */
 
 #if (ODBCVER >= 0x0300)
 #define SQL_AT_ADD_CONSTRAINT   0x0008L
@@ -529,7 +527,6 @@ extern "C" {
 /* NB: this means 'outer join', not what  you may be thinking */
 
 
-#if (ODBCVER >= 0x0201)
 #define SQL_OJ_LEFT 0x0001L
 #define SQL_OJ_RIGHT0x0002L
 #define SQL_OJ_FULL 0x0004L
@@ -537,7 +534,6 @@ extern "C" {
 #define SQL_OJ_NOT_ORDERED  0x0010L
 #define SQL_OJ_INNER0x0020L
 #define SQL_OJ_ALL_COMPARISON_OPS   0x0040L
-#endif
 
 /* SQL_SCROLL_CONCURRENCY bitmasks */
 #define SQL_SCCO_READ_ONLY  0x0001L
diff --git a/external/unixODBC/inc/odbc/sqlext.h 
b/external/unixODBC/inc/odbc/sqlext.h
index 5bc9d7d80088..5ad540c8a282 100644
--- a/external/unixODBC/inc/odbc/sqlext.h
+++ b/external/unixODBC/inc/odbc/sqlext.h
@@ -58,11 +58,7 @@ extern "C" { /* Assume C 
declarations for C++ */
 #define SQL_MAX_OPTION_STRING_LENGTH256
 
 /* return code SQL_NO_DATA_FOUND is the same as SQL_NO_DATA */
-#if (ODBCVER < 0x0300)
-#define SQL_NO_DATA_FOUND   100
-#else
 #define SQL_NO_DATA_FOUND   SQL_NO_DATA
-#endif
 
 /* an end handle type */
 #if (ODBCVER >= 0x0300)
@@ -152,16 +148,6 @@ extern "C" { /* Assume C 
declarations for C++ */
 #define SQL_ATTR_ANSI_APP   115
 #endif
 
-/* SQL_CONNECT_OPT_DRVR_START is not meaningful for 3.0 driver */
-#if (ODBCVER < 0x0300)
-#define SQL_CONNECT_OPT_DRVR_START  1000
-#endif  /* ODBCVER < 0x0300 */
-
-#if (ODBCVER < 0x0300)
-#define SQL_CONN_OPT_MAXSQL_PACKET_SIZE
-#define SQL_CONN_OPT_MINSQL_ACCESS_MODE
-#endif /* ODBCVER < 0x0300 */
-
 /* SQL_ACCESS_MODE options */
 #define SQL_MODE_READ_WRITE 0UL
 #define SQL_MODE_READ_ONLY  1UL
@@ -255,11 +241,6 @@ extern "C" { /* Assume C 
declarations for C++ */
 
 #endif  /* ODBCVER >= 0x0300 */
 
-#if (ODBCVER < 0x0300)
-#define SQL_STMT_OPT_MAXSQL_ROW_NUMBER
-#define SQL_STMT_OPT_MINSQL_QUERY_TIMEOUT
-#endif  /* ODBCVER < 0x0300 */
-
 /* New defines for SEARCHABLE column in SQLGetTypeInfo */
 
 #if (ODBCVER >= 0x0300)
@@ -456,24 +437,10 @@ extern "C" { /* Assume C 
declarations for C++ */
 #endif  /* ODBCVER >= 0x0300 */
 
 
-#if (ODBCVER <= 0x0300)
-#define SQL_UNICODE (-95)
-#define SQL_UNICODE_VARCHAR (-96)
-#define SQL_UNICODE_LONGVARCHAR (-97)
-#define SQL_UNICODE_CHARSQL_UNICODE
-#else
-/* The previous definitions for SQL_UNICODE_ are historical and obsolete */
-
 #define SQL_UNICODE SQL_WCHAR
 #define SQL_UNICODE_VARCHAR SQL_WVARCHAR
 #define SQL_UNICODE_LONGVARCHAR SQL_WLONGVARCHAR
 #define SQL_UNICODE_CHARSQL_WCHAR
-#endif
-
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_DRIVER_START   SQL_INTERVAL_YEAR
-#define SQL_TYPE_DRIVER_END SQL_UNICODE_LONGVARCHAR
-#endif  /* ODBCVER < 0x0300 */
 
 /* C datatype to SQL datatype mapping  SQL types
--- */
@@ -537,10 +504,6 @@ extern "C" { /* Assume C 
declarations for C++ */
 #endif  /* ODBCVER >= 0x0350 */
 
 #define SQL_TYPE_NULL   0
-#if (ODBCVER < 0x0300)
-#define SQL_TYPE_MINSQL_BIT
-#define SQL_TYPE_MAXSQL_VARCHAR
-#endif
 
 #if (ODBCVER >= 0x0300)
 #define SQL_C_VARBOOKMARK   SQL_C_BINARY
@@ -593,9 +556,6 @@ extern "C" { /* Assume C 
declarations for C++ */
 #define SQL_COLUMN_QUALIFIER_NAME   17
 #define SQL_COLUMN_LABEL18
 #define SQL_COLATT_OPT_MAX  SQL_COLUMN_LABEL
-#if (ODBCVER < 0x0300)
-#define 

[Libreoffice-bugs] [Bug 145062] Crash when inserting hidden field over input field

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145062

--- Comment #7 from Dieter  ---
(In reply to Gabor Kelemen (allotropia) from comment #6)
> Sure but the crashreporter is enabled only for Windows builds, so that's not
> indicative.
> I can make it crash on Linux as well.

Thank you for that information, that is new to me. But there are other
summaries of crash signatures that also shows crashes with Linux (but I don't
have to understand everything).

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145062] Crash when inserting hidden field over input field

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145062

--- Comment #6 from Gabor Kelemen (allotropia)  ---
(In reply to Dieter from comment #5)
> All crashes with that signature are Windows related, see:
> https://crashreport.libreoffice.org/stats/signature/SwDocUpdateField::
> MakeFieldList_(SwDoc%20&,int)

Sure but the crashreporter is enabled only for Windows builds, so that's not
indicative.
I can make it crash on Linux as well.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Caolán McNamara (via logerrit)]

 sw/qa/core/data/html/pass/ofz40593-1.html |binary
 sw/source/filter/html/htmltab.cxx |   32 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 2f01faaf88b6d172d7293f0c9e2a061d99b8ceb5
Author: Caolán McNamara 
AuthorDate: Mon Nov 1 17:34:23 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 17:41:51 2021 +0100

ofz#40593 remove Objects from m_xResizeDrawObjects if deleted during parse

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

diff --git a/sw/qa/core/data/html/pass/ofz40593-1.html 
b/sw/qa/core/data/html/pass/ofz40593-1.html
new file mode 100644
index ..43510d5d00b2
Binary files /dev/null and b/sw/qa/core/data/html/pass/ofz40593-1.html differ
diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 7f39463b0fd6..7407988ce640 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -380,7 +381,7 @@ public:
 // HTML table
 typedef std::vector SdrObjects;
 
-class HTMLTable
+class HTMLTable : public sdr::ObjectUser
 {
 OUString m_aId;
 OUString m_aStyle;
@@ -528,6 +529,8 @@ private:
 sal_uInt16 GetBorderWidth( const SvxBorderLine& rBLine,
bool bWithDistance=false ) const;
 
+virtual void ObjectInDestruction(const SdrObject& rObject) override;
+
 public:
 
 bool m_bFirstCell;// is there a cell created already?
@@ -537,7 +540,7 @@ public:
   bool bHasToFly,
   const HTMLTableOptions& rOptions);
 
-~HTMLTable();
+virtual ~HTMLTable();
 
 // Identifying of a cell
 const HTMLTableCell& GetCell(sal_uInt16 nRow, sal_uInt16 nCell) const;
@@ -1071,11 +1074,33 @@ bool SwHTMLParser::IsReqIF() const
 return m_bReqIF;
 }
 
+// if any m_xResizeDrawObjects members are deleted during parse, remove them
+// from m_xResizeDrawObjects and m_xDrawObjectPercentWidths
+void HTMLTable::ObjectInDestruction(const SdrObject& rObject)
+{
+auto it = std::find(m_xResizeDrawObjects->begin(), 
m_xResizeDrawObjects->end(), );
+assert(it != m_xResizeDrawObjects->end());
+auto nIndex = std::distance(m_xResizeDrawObjects->begin(), it);
+m_xResizeDrawObjects->erase(it);
+auto otherit = m_xDrawObjectPercentWidths->begin() + nIndex * 3;
+m_xDrawObjectPercentWidths->erase(otherit, otherit + 3);
+}
+
 HTMLTable::~HTMLTable()
 {
 m_pParser->DeregisterHTMLTable(this);
 
-m_xResizeDrawObjects.reset();
+if (m_xResizeDrawObjects)
+{
+size_t nCount = m_xResizeDrawObjects->size();
+for (size_t i = 0; i < nCount; ++i)
+{
+SdrObject *pObj = (*m_xResizeDrawObjects)[i];
+pObj->RemoveObjectUser(*this);
+m_xResizeDrawObjects.reset();
+}
+}
+
 m_xDrawObjectPercentWidths.reset();
 
 m_pContext.reset();
@@ -2477,6 +2502,7 @@ void HTMLTable::RegisterDrawObject( SdrObject *pObj, 
sal_uInt8 nPercentWidth )
 if( !m_xResizeDrawObjects )
 m_xResizeDrawObjects.emplace();
 m_xResizeDrawObjects->push_back( pObj );
+pObj->AddObjectUser(*this);
 
 if( !m_xDrawObjectPercentWidths )
 m_xDrawObjectPercentWidths.emplace();

[Libreoffice-bugs] [Bug 114039] [META] Field dialog bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=114039

Dieter  changed:

   What|Removed |Added

 Depends on||145062


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=145062
[Bug 145062] Crash when inserting hidden field over input field
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145062] Crash when inserting hidden field over input field

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145062

Dieter  changed:

   What|Removed |Added

 Blocks||114039


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=114039
[Bug 114039] [META] Field dialog bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 129824] Crash in: SwDocUpdateField::MakeFieldList_(SwDoc &, int) after "Insert" of a "User Field" with cursor in value field of dialog box ( steps in comment 3 )

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=129824

Dieter  changed:

   What|Removed |Added

 OS|All |Windows (All)

--- Comment #13 from Dieter  ---
(In reply to Buovjaga from comment #12)
> I can't repro now either. Even if the field format is text, I can't type
> into the inserted field directly in the document canvas.

If you have a look at summary of crash signature, you can see, that crashes are
related to Windows:
https://crashreport.libreoffice.org/stats/signature/SwDocUpdateField::MakeFieldList_(SwDoc%20&,int)

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144399] Impress: FILESAVE to ODP as read-only with additional password protection for editing not working

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144399

Timur  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=14
   ||5511

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145511] FILESAVE to PPTX as read-only with additional password protection for editing not working

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145511

Timur  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=14
   ||4399

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 145062] Crash when inserting hidden field over input field

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145062

Dieter  changed:

   What|Removed |Added

 OS|All |Windows (All)

--- Comment #5 from Dieter  ---
(In reply to Gabor Kelemen (allotropia) from comment #4)
> You should NOT close the Fields dialog after step 6.

Thank you for this hint. Now I could reproduce it with
Version: 7.2.2.2 (x64) / LibreOffice Community
Build ID: 02b2acce88a210515b4a5bb2e46cbfb63fe97d56
CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win
Locale: de-DE (de_DE); UI: en-GB
Calc: CL

https://crashreport.libreoffice.org/stats/crash_details/645e72fb-52f8-4f9d-baf2-f63d0f5179e2

All crashes with that signature are Windows related, see:
https://crashreport.libreoffice.org/stats/signature/SwDocUpdateField::MakeFieldList_(SwDoc%20&,int)

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit edfb9ddb55d2959b8d05366233183306d19b3780
Author: Jim Raykowski 
AuthorDate: Mon Nov 1 21:08:51 2021 -0800
Commit: Jim Raykowski 
CommitDate: Tue Nov 2 17:16:49 2021 +0100

SwNavigator: fix two uses of UpdateListBox

1) UpdateListBox only needs to be called in the CommandHdl function
when the content tree displayed is changed using the context menu
Display submenu.
2) When content is deleted it is unnecessary to call UpdateListBox.

Change-Id: I69679b4b074932dff5d594217e456ca818971032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124578
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 5f323790e107..f6f56c9bfb26 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4630,9 +4630,9 @@ void SwContentTree::ExecuteContextMenuAction(const 
OString& rSelectedPopupEntry)
 m_eState = (nSelectedPopupEntry == 1) ? State::ACTIVE : 
State::HIDDEN;
 Display(nSelectedPopupEntry == 1);
 }
+GetParentWindow()->UpdateListBox();
 }
 }
-GetParentWindow()->UpdateListBox();
 }
 
 void SwContentTree::DeleteOutlineSelections()
@@ -5094,7 +5094,6 @@ void SwContentTree::EditEntry(const weld::TreeIter& 
rEntry, EditEntryMode nMode)
 if(EditEntryMode::DELETE == nMode)
 {
 m_bViewHasChanged = true;
-GetParentWindow()->UpdateListBox();
 TimerUpdate(_aUpdTimer);
 grab_focus();
 }

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   36 +++-
 1 file changed, 19 insertions(+), 17 deletions(-)

New commits:
commit 7826ed1b4a4f1424f7425037da4ecec86ab24d46
Author: Jim Raykowski 
AuthorDate: Mon Nov 1 17:40:02 2021 -0800
Commit: Jim Raykowski 
CommitDate: Tue Nov 2 17:15:20 2021 +0100

SwNavigator: Track frame content before other content

Do this to prevent other trackable content from being track when a
frame is selected. e.g. a hyperlink is at the start of frame content
and the frame is selected. Without this patch the hyperlink is
highlighted in the Navigator content tree instead of the frame.

Change-Id: I0adac6659de6a5698b50a887052cc6aaffee578d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124577
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index e813826fb154..5f323790e107 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3677,6 +3677,25 @@ void SwContentTree::UpdateTracking()
 
 if (bTrack)
 {
+{
+// graphic, frame, and ole
+OUString aContentTypeName;
+if (m_bImageTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Graphic &&
+!(m_bIsRoot && m_nRootType != ContentTypeId::GRAPHIC))
+aContentTypeName = SwResId(STR_CONTENT_TYPE_GRAPHIC);
+else if (m_bFrameTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Frame &&
+ !(m_bIsRoot && m_nRootType != ContentTypeId::FRAME))
+aContentTypeName = SwResId(STR_CONTENT_TYPE_FRAME);
+else if (m_bOLEobjectTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Ole &&
+ !(m_bIsRoot && m_nRootType != ContentTypeId::OLE))
+aContentTypeName = SwResId(STR_CONTENT_TYPE_OLE);
+if (!aContentTypeName.isEmpty())
+{
+OUString aName(m_pActiveShell->GetFlyName());
+lcl_SelectByContentTypeAndName(this, *m_xTreeView, 
aContentTypeName, aName);
+return;
+}
+}
 // footnotes and endnotes
 if (SwContentAtPos aContentAtPos(IsAttrAtPos::Ftn); 
m_bFootnoteTracking &&
 
m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(), 
aContentAtPos) &&
@@ -3792,23 +3811,6 @@ void SwContentTree::UpdateTracking()
 Select();
 return;
 }
-// graphic, frame, and ole
-OUString aContentTypeName;
-if (m_bImageTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Graphic &&
-!(m_bIsRoot && m_nRootType != ContentTypeId::GRAPHIC))
-aContentTypeName = SwResId(STR_CONTENT_TYPE_GRAPHIC);
-else if (m_bFrameTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Frame &&
- !(m_bIsRoot && m_nRootType != ContentTypeId::FRAME))
-aContentTypeName = SwResId(STR_CONTENT_TYPE_FRAME);
-else if (m_bOLEobjectTracking && m_pActiveShell->GetSelectionType() == 
SelectionType::Ole &&
- !(m_bIsRoot && m_nRootType != ContentTypeId::OLE))
-aContentTypeName = SwResId(STR_CONTENT_TYPE_OLE);
-if (!aContentTypeName.isEmpty())
-{
-OUString aName(m_pActiveShell->GetFlyName());
-lcl_SelectByContentTypeAndName(this, *m_xTreeView, 
aContentTypeName, aName);
-return;
-}
 // table
 if (m_bTableTracking && m_pActiveShell->IsCursorInTable() &&
 !(m_bIsRoot && m_nRootType != ContentTypeId::TABLE))

[Libreoffice-bugs] [Bug 103610] [META] Slide show (presentation mode) bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=103610
Bug 103610 depends on bug 136945, which changed state.

Bug 136945 Summary: Custom Slide Show drag-and-drop not reordering slides as 
desired
https://bugs.documentfoundation.org/show_bug.cgi?id=136945

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Caolán McNamara (via logerrit)]

 cui/source/customize/cfg.cxx  |   31 ---
 cui/source/inc/cfg.hxx|6 ++
 include/vcl/weldutils.hxx |   21 +
 sd/source/ui/dlg/custsdlg.cxx |   35 +--
 sd/source/ui/inc/custsdlg.hxx |   16 ++--
 vcl/source/app/weldutils.cxx  |   33 +
 6 files changed, 63 insertions(+), 79 deletions(-)

New commits:
commit 0f684565d9246ccc39766289e9a5c383e8f9d838
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 11:44:47 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 17:13:35 2021 +0100

extract a ReorderingDropTarget for reuse

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

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 943dc83247d4..79961fe690c2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3201,39 +3201,16 @@ SvxIconChangeDialog::SvxIconChangeDialog(weld::Window 
*pWindow, const OUString&
 }
 
 
SvxConfigPageFunctionDropTarget::SvxConfigPageFunctionDropTarget(SvxConfigPage,
 weld::TreeView& rTreeView)
-: DropTargetHelper(rTreeView.get_drop_target())
+: weld::ReorderingDropTarget(rTreeView)
 , m_rPage(rPage)
-, m_rTreeView(rTreeView)
 {
 }
 
-sal_Int8 SvxConfigPageFunctionDropTarget::AcceptDrop(const AcceptDropEvent& 
rEvt)
+sal_Int8 SvxConfigPageFunctionDropTarget::ExecuteDrop(const ExecuteDropEvent& 
rEvt)
 {
-// to enable the autoscroll when we're close to the edges
-m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, nullptr, true);
-return DND_ACTION_MOVE;
-}
-
-sal_Int8 SvxConfigPageFunctionDropTarget::ExecuteDrop( const ExecuteDropEvent& 
rEvt )
-{
-weld::TreeView* pSource = m_rTreeView.get_drag_source();
-// only dragging within the same widget allowed
-if (!pSource || pSource != _rTreeView)
-return DND_ACTION_NONE;
-
-std::unique_ptr xSource(m_rTreeView.make_iterator());
-if (!m_rTreeView.get_selected(xSource.get()))
-return DND_ACTION_NONE;
-
-std::unique_ptr xTarget(m_rTreeView.make_iterator());
-int nTargetPos = -1;
-if (m_rTreeView.get_dest_row_at_pos(rEvt.maPosPixel, xTarget.get(), true))
-nTargetPos = m_rTreeView.get_iter_index_in_parent(*xTarget);
-m_rTreeView.move_subtree(*xSource, nullptr, nTargetPos);
-
+sal_Int8 nRet = weld::ReorderingDropTarget::ExecuteDrop(rEvt);
 m_rPage.ListModified();
-
-return DND_ACTION_NONE;
+return nRet;;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index c1b492cb4b90..b143367a547f 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -352,13 +352,11 @@ public:
 void CreateDropDown();
 };
 
-class SvxConfigPageFunctionDropTarget : public DropTargetHelper
+class SvxConfigPageFunctionDropTarget : public weld::ReorderingDropTarget
 {
 private:
 SvxConfigPage& m_rPage;
-weld::TreeView& m_rTreeView;
 
-virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
 virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
 
 public:
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 8cb591ce8140..cadbd5585ef7 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class CalendarWrapper;
@@ -418,6 +419,26 @@ public:
 bool IsModKeyPressed() const { return m_bModKey; }
 };
 
+/*
+  If a TreeView is used as a list, rather than a tree, and DnD should just
+  reorder rows, then this can be used to implement that.
+
+  Because the TreeView doesn't want or need subnodes, the drop target can be
+  simply visually indicated as being between rows (the issue of a final drop
+  location of a child of the drop target doesn't arise), and the meaning of
+  what a drop before or after the last row should do is unambigious.
+*/
+class VCL_DLLPUBLIC ReorderingDropTarget : public DropTargetHelper
+{
+protected:
+weld::TreeView& m_rTreeView;
+virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override;
+virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override;
+
+public:
+ReorderingDropTarget(weld::TreeView& rTreeView);
+};
+
 // get the row the iterator is on
 VCL_DLLPUBLIC size_t GetAbsPos(const weld::TreeView& rTreeView, const 
weld::TreeIter& rIter);
 
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index bd629f87bfaa..fc8e774d82e9 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -250,7 +250,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg(weld::Window* 
pWindow, SdDrawDocume
 , 

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

[Jim Raykowski (via logerrit)]

 sd/source/ui/dlg/custsdlg.cxx  |   34 ++
 sd/source/ui/inc/custsdlg.hxx  |   14 ++
 sw/source/uibase/utlui/content.cxx |   22 +-
 3 files changed, 57 insertions(+), 13 deletions(-)

New commits:
commit e0fa72a714c1992370f023308814acf96763e2c9
Author: Jim Raykowski 
AuthorDate: Mon Nov 1 21:43:08 2021 -0800
Commit: Jim Raykowski 
CommitDate: Tue Nov 2 17:13:25 2021 +0100

SwNavigator: Make list of open files in Display sub menu consistent

with list of open files in open files list box

This patch makes the display format used for the list of open files
in the content tree context menu 'Display' sub menu consistent with the
display format used for the list of open files in the open files list
box by adding '(inactive)' after the file name of an inactive file and
removing the space after the open parenthesis and before the closing
parenthesis surrounding the word 'hidden' for the hidden shell file.

Change-Id: I91670377fae576cab6f013ed6f2eb3d0e6a88eaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124580
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index eca4fd28b4b3..e813826fb154 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1567,18 +1567,14 @@ IMPL_LINK(SwContentTree, CommandHdl, const 
CommandEvent&, rCEvt, bool)
 xSubPop2->set_active(OString::number(201 + 
static_cast(GetParentWindow()->GetRegionDropMode())), true);
 
 // Insert the list of the open files
+{
 sal_uInt16 nId = 301;
-const SwView* pActiveView = ::GetActiveView();
 SwView *pView = SwModule::GetFirstView();
 while (pView)
 {
-OUString sInsert = pView->GetDocShell()->GetTitle();
-if (pView == pActiveView)
-{
-sInsert += "(" +
-m_aContextStrings[IDX_STR_ACTIVE] +
-")";
-}
+OUString sInsert = pView->GetDocShell()->GetTitle() + " (" +
+m_aContextStrings[pView == GetActiveView() ? IDX_STR_ACTIVE :
+ IDX_STR_INACTIVE] 
+ ")";
 xSubPop3->append_radio(OUString::number(nId), sInsert);
 if (State::CONSTANT == m_eState && m_pActiveShell == 
>GetWrtShell())
 xSubPop3->set_active(OString::number(nId), true);
@@ -1586,19 +1582,19 @@ IMPL_LINK(SwContentTree, CommandHdl, const 
CommandEvent&, rCEvt, bool)
 nId++;
 }
 xSubPop3->append_radio(OUString::number(nId++), 
m_aContextStrings[IDX_STR_ACTIVE_VIEW]);
-if (m_pHiddenShell)
+if (m_pHiddenShell) // can have only one hidden shell
 {
 OUString sHiddenEntry = 
m_pHiddenShell->GetView().GetDocShell()->GetTitle() +
-" ( " +
+" (" +
 m_aContextStrings[IDX_STR_HIDDEN] +
-" )";
+")";
 xSubPop3->append_radio(OUString::number(nId), sHiddenEntry);
 }
-
 if (State::ACTIVE == m_eState)
 xSubPop3->set_active(OString::number(--nId), true);
 else if (State::HIDDEN == m_eState)
 xSubPop3->set_active(OString::number(nId), true);
+}
 
 std::unique_ptr xEntry(m_xTreeView->make_iterator());
 if (!m_xTreeView->get_selected(xEntry.get()))
@@ -1701,7 +1697,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
 }
 // Edit only if the shown content is coming from the current view.
 if (State::HIDDEN != m_eState &&
-(State::ACTIVE == m_eState || m_pActiveShell == 
pActiveView->GetWrtShellPtr())
+(State::ACTIVE == m_eState || m_pActiveShell == 
GetActiveView()->GetWrtShellPtr())
 && lcl_IsContent(*xEntry, *m_xTreeView))
 {
 const bool bReadonly = 
m_pActiveShell->GetView().GetDocShell()->IsReadOnly();
commit 2aed402cf922479813ac1ce048c8ed276407401c
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 11:30:16 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 17:13:14 2021 +0100

Resolves: tdf#136945 fix custom slide show dnd to reorder pages

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

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index f776a6a7e2ba..bd629f87bfaa 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -250,6 +250,7 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg(weld::Window* 
pWindow, SdDrawDocume
 , m_xBtnAdd(m_xBuilder->weld_button("add"))
 , m_xBtnRemove(m_xBuilder->weld_button("remove"))
 , m_xLbCustomPages(m_xBuilder->weld_tree_view("custompages"))
+, m_xDropTargetHelper(new CustomPagesDropTarget(*m_xLbCustomPages))
 , 

[Libreoffice-bugs] [Bug 145298] Keyboard Shortcuts partially unassignable with LibreOffice Writer

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=145298

--- Comment #2 from Dircules  ---
In addition to this bug, it is to critizize that some default keyboard
shortcuts are occupied but not listed in Tools > Custompize > Keyboard.
For instance, I assigned Shift+Alt+Right to a macro which inserts a right arrow
(Wingdings 3, char 0x67) into the text.  And it works fine unless your cursor
position is within a table. Here, the shortcut Shift+Alt+Right will decrease
the horizontal size of the table cell.
Double seizures should not be possible as they lead to inconsistency, or at
least surprising behavior.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 60d51a43d4fb047ae814ef5296ffb8031080262a
Author: Jim Raykowski 
AuthorDate: Mon Nov 1 15:18:49 2021 -0800
Commit: Jim Raykowski 
CommitDate: Tue Nov 2 17:08:15 2021 +0100

SwNavigator: Disallow going to content when content is not visible

Change-Id: I3644956866b562118fcb4610bce0b977cab29dce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124576
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 5bfd2ac956bd..eca4fd28b4b3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1605,7 +1605,8 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
 xEntry.reset();
 
 bool bRemoveGotoEntry = false;
-if (State::HIDDEN == m_eState || !xEntry || !lcl_IsContent(*xEntry, 
*m_xTreeView))
+if (State::HIDDEN == m_eState || !xEntry || !lcl_IsContent(*xEntry, 
*m_xTreeView) ||
+
reinterpret_cast(m_xTreeView->get_id(*xEntry).toInt64())->IsInvisible())
 bRemoveGotoEntry = true;
 
 bool bRemovePostItEntries = true;
@@ -2230,17 +2231,20 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, 
weld::TreeView&, bool)
 }
 else if (!lcl_IsContentType(*xEntry, *m_xTreeView) && (State::HIDDEN 
!= m_eState))
 {
-if (State::CONSTANT == m_eState)
-{
-m_pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
-}
-//Jump to content type:
 
assert(dynamic_cast(reinterpret_cast(m_xTreeView->get_id(*xEntry).toInt64(;
 SwContent* pCnt = 
reinterpret_cast(m_xTreeView->get_id(*xEntry).toInt64());
 assert(pCnt && "no UserData");
-GotoContent(pCnt);
-// fdo#36308 don't expand outlines on double-click
-bConsumed = pCnt->GetParent()->GetType() == ContentTypeId::OUTLINE;
+if (pCnt && !pCnt->IsInvisible())
+{
+if (State::CONSTANT == m_eState)
+{
+
m_pActiveShell->GetView().GetViewFrame()->GetWindow().ToTop();
+}
+//Jump to content type:
+GotoContent(pCnt);
+// fdo#36308 don't expand outlines on double-click
+bConsumed = pCnt->GetParent()->GetType() == 
ContentTypeId::OUTLINE;
+}
 }
 }
 

[Libreoffice-bugs] [Bug 139734] Drop redundant asserts after MacrosTest::loadFromDesktop

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=139734

--- Comment #26 from Commit Notification 
 ---
Henrik Palomäki committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/0935a53a1ef70d0cbaef5fbfe2a0bc2f3ddfeafd

tdf#139734 Drop redundant asserts after MacrosTest::loadFromDesktop

It will be available in 7.3.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Henrik Palomäki (via logerrit)]

 sd/qa/unit/uiimpress.cxx |   16 
 1 file changed, 16 deletions(-)

New commits:
commit 0935a53a1ef70d0cbaef5fbfe2a0bc2f3ddfeafd
Author: Henrik Palomäki 
AuthorDate: Tue Nov 2 09:37:15 2021 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Tue Nov 2 17:01:56 2021 +0100

tdf#139734 Drop redundant asserts after MacrosTest::loadFromDesktop

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

diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index f4fa936f7bde..f692bd66a022 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -242,8 +242,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf124708)
 {
 mxComponent = 
loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf124708.ppt"));
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 dispatchCommand(mxComponent, ".uno:NextPage", {});
 Scheduler::ProcessEventsToIdle();
 
@@ -274,8 +272,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf143412)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 auto pXImpressDocument = 
dynamic_cast(mxComponent.get());
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 
@@ -315,8 +311,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf139996)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 sd::slidesorter::SlideSorterViewShell* pSSVS = getSlideSorterViewShell();
 auto& rSSController = pSSVS->GetSlideSorter().GetController();
 auto& rPageSelector = rSSController.GetPageSelector();
@@ -384,8 +378,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf100950)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 dispatchCommand(mxComponent, ".uno:InsertPage", {});
 Scheduler::ProcessEventsToIdle();
 
@@ -410,8 +402,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf129346)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 dispatchCommand(mxComponent, ".uno:DiaMode", {});
 Scheduler::ProcessEventsToIdle();
 checkCurrentPageNumber(1);
@@ -430,8 +420,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testmoveSlides)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 auto pXImpressDocument = 
dynamic_cast(mxComponent.get());
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 
@@ -494,7 +482,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf141703)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
 auto pXImpressDocument = 
dynamic_cast(mxComponent.get());
 
 uno::Sequence aArgs(comphelper::InitPropertySequence(
@@ -557,8 +544,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf127481)
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
 
-CPPUNIT_ASSERT(mxComponent.is());
-
 auto pXImpressDocument = 
dynamic_cast(mxComponent.get());
 sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
 SdPage* pActualPage = pViewShell->GetActualPage();
@@ -763,7 +748,6 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf142589)
 {
 mxComponent = loadFromDesktop("private:factory/simpress",
   
"com.sun.star.presentation.PresentationDocument");
-CPPUNIT_ASSERT(mxComponent.is());
 
 auto pImpressDocument = 
dynamic_cast(mxComponent.get());
 sd::ViewShell* pViewShell = 
pImpressDocument->GetDocShell()->GetViewShell();

[Libreoffice-bugs] [Bug 141908] CppUnittests: replace usage of sal_Int32 with colors

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=141908

--- Comment #12 from Commit Notification 
 ---
Henrik Palomäki committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/1637f4449c10ec1f8869498ba0cafc61a8a77bbf

tdf#141908 replace usage of sal_Int32 with colors in htmlexport

It will be available in 7.3.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Henrik Palomäki (via logerrit)]

 sw/qa/extras/htmlexport/htmlexport.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1637f4449c10ec1f8869498ba0cafc61a8a77bbf
Author: Henrik Palomäki 
AuthorDate: Fri Oct 29 12:42:53 2021 +0300
Commit: Xisco Fauli 
CommitDate: Tue Nov 2 16:57:19 2021 +0100

tdf#141908 replace usage of sal_Int32 with colors in htmlexport

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

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index d16c60735ace..641a1e1560c8 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -359,7 +359,7 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo86857, 
"fdo86857.html")
 // problem was that background color on page style was not exported
 uno::Reference 
xPageStyles(getStyles("PageStyles"));
 uno::Reference xStyle(xPageStyles->getByName("HTML"), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), getProperty(xStyle, 
"BackColor"));
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, getProperty(xStyle, 
"BackColor"));
 // check that table background color works, which still uses RES_BACKGROUND
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xTables(xTablesSupplier->getTextTables(),
@@ -367,7 +367,7 @@ DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo86857, 
"fdo86857.html")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
 uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
 uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x66), getProperty(xCell, 
"BackColor"));
+CPPUNIT_ASSERT_EQUAL(Color(0x66), getProperty(xCell, 
"BackColor"));
 }
 
 DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testCharacterBorder, "charborder.odt")

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Mike Kaganski (via logerrit)]

 bin/gbuild-to-ide |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 49e087ef44d3b7b26baf71469621c0a2135e00a9
Author: Mike Kaganski 
AuthorDate: Tue Nov 2 14:40:21 2021 +0300
Commit: Mike Kaganski 
CommitDate: Tue Nov 2 16:49:02 2021 +0100

vs-ide-integration: make projects' GUIDs stable

Use uuid.uuid5 with a custom URL to generate stable GUIDs. This avoids
glitches in IDE when re-opening the solution after its re-generation
makes some previously opened files to show duplicate entries in IDE's
tabbed UI.

Also drop the UniqueIdentifier elements from .vcxproj.filters files,
which are optional and only used in VS automation [1], so are useless
with randomly-generated GUIDs.

[1] 
https://docs.microsoft.com/en-us/cpp/build/reference/vcxproj-filters-files

Change-Id: I91dae730286b3187a6ceffcb9ae3afc2b479f4d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124594
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index b66a641b7d34..b7c290cb8285 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -23,6 +23,7 @@ import traceback
 import subprocess
 from sys import platform
 import collections
+import urllib.parse
 
 class GbuildLinkTarget:
 def __init__(self, name, location, include, include_sys, defs, cxxobjects, 
cxxflags, cobjects, cflags, linked_libs):
@@ -962,6 +963,10 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 
 self.write_solution(os.path.join(self.solution_directory, 
'LibreOffice.sln'), all_projects)
 
+@staticmethod
+def gen_guid(category, name):
+return str(uuid.uuid5(uuid.NAMESPACE_URL, 
'vnd.libreoffice.vs-ide-integration:' + category + '/' + 
urllib.parse.quote(name))).upper()
+
 nmake_project_guid = '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942'
 nmake_folder_guid = '2150E333-8FDC-42A3-9474-1A3956D46DE8'
 
@@ -1071,7 +1076,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 folder = os.path.dirname(project_path)
 if not os.path.exists(folder):
 os.makedirs(folder)
-project_guid = str(uuid.uuid4()).upper()
+project_guid = self.gen_guid('project', target.short_name())
 cxxflags = ' '.join(target.cxxflags)
 ns = 'http://schemas.microsoft.com/developer/msbuild/2003'
 ET.register_namespace('', ns)
@@ -1232,8 +1237,6 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 filters_node = ET.SubElement(proj_node, '{%s}ItemGroup' % ns)
 for proj_filter in filters:
 filter_node = ET.SubElement(filters_node, '{%s}Filter' % ns, 
Include=proj_filter)
-filter_id_node = ET.SubElement(filter_node, '{%s}UniqueIdentifier' 
% ns)
-filter_id_node.text = '{%s}' % str(uuid.uuid4())
 self.write_pretty_xml(proj_node, filters_path)
 
 

[Libreoffice-bugs] [Bug 139336] FILESAVE DOCX No second page after section containing footnote

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=139336

--- Comment #6 from Commit Notification 
 ---
Attila Szűcs committed a patch related to this issue.
It has been pushed to "master":

https://git.libreoffice.org/core/commit/4c31b4ef2083087a822c3ae648fd09acc67d2f88

tdf#139336 sw: fix extra pages of multicolumn sections with footnotes

It will be available in 7.3.0.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 139336] FILESAVE DOCX No second page after section containing footnote

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=139336

Commit Notification  changed:

   What|Removed |Added

 Whiteboard||target:7.3.0

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Attila Szűcs (via logerrit)]

 
sw/qa/extras/layout/data/tdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage.docx
 |binary
 sw/qa/extras/layout/layout.cxx 
  |   14 +
 sw/source/core/layout/findfrm.cxx  
  |   27 +-
 sw/source/core/layout/wsfrm.cxx
  |1 
 4 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 4c31b4ef2083087a822c3ae648fd09acc67d2f88
Author: Attila Szűcs 
AuthorDate: Wed Sep 8 15:51:16 2021 +0200
Commit: László Németh 
CommitDate: Tue Nov 2 16:31:24 2021 +0100

tdf#139336 sw: fix extra pages of multicolumn sections with footnotes

Adding footnotes to multicolumn sections resulted page-long
section layout, not regarding to the amount of its text content.
E.g. a page with n multicolumn sections and footnotes could load
as n (mostly empty) pages. The problem is related to the footnotes
showed under columns of sections, which can be ambiguous at different
column number of the different sections on the same page.
As a workaround for interoperability, show footnotes per pages to
remove the extra pages, e.g. allowing to show the separated sections
on a single page, like MSO does.

Note: a compatibility option will be added to avoid regressions.

Note: This fix doesn't change multicolumn page styles or not evenly
distributed multicolumn sections or footnotes not collected at the
end of the sections.

Test: choose Edit Section... in local menu of the sections of the
unit test document. In Options..., see checkbox "Evenly distribute
contents to all columns" on page Columns, and Footnotes/"Collect at
end of text" on page Footnotes/Endnotes. To see the result of the
new settings, save and reload the document. Note: DOCX format doesn't
support "Collect at end of text", only OpenDocument.

Note: In MSO, it's possible to set multimulticolumn footnotes
separately from section column number. It's column number can
be 1–4, or "auto", which uses the column number of the first
section of the page.

See also tdf#138508 (Single column footnotes on multi-column pages).

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

diff --git 
a/sw/qa/extras/layout/data/tdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage.docx
 
b/sw/qa/extras/layout/data/tdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage.docx
new file mode 100644
index ..a44ff4047111
Binary files /dev/null and 
b/sw/qa/extras/layout/data/tdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage.docx
 differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1b7ad51d71c2..9050a00a86cf 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3719,6 +3719,20 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf135035)
 CPPUNIT_ASSERT_GREATER(nParentWidth, nFly3Width);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testTdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage)
+{
+SwDoc* pDoc
+= createSwDoc(DATA_DIRECTORY, 
"tdf139336_ColumnsWithFootnoteDoNotOccupyEntirePage.docx");
+CPPUNIT_ASSERT(pDoc);
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+// Without the fix, it would be 5 pages, but with the fix the whole 
document
+// would fit into 1 page, but it will be 2 pages right now, because
+// when writer import (from docx) the last section with columns, then it 
does not set
+// the evenly distributed settings, and this settings is required for the 
fix now, to
+// avoid some regression.
+assertXPath(pXmlDoc, "/root/page", 2);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/findfrm.cxx 
b/sw/source/core/layout/findfrm.cxx
index e90ee98c1fdf..1eae79d9cd60 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -39,6 +40,7 @@
 #include 
 #include 
 
+
 /// Searches the first ContentFrame in BodyText below the page.
 SwLayoutFrame *SwFootnoteBossFrame::FindBodyCont()
 {
@@ -440,7 +442,30 @@ SwFootnoteBossFrame* SwFrame::FindFootnoteBossFrame( bool 
bFootnotes )
 // don't contain footnote texts there
 if( pRet->IsInTab() )
 pRet = pRet->FindTabFrame();
-while ( pRet && !pRet->IsFootnoteBossFrame() )
+
+// tdf139336: put the footnotes into the page frame (instead of a column 
frame)
+// to avoid maximizing the section to the full page if:
+// - it is in a section
+// - collect footnotes at section end (FootnoteAtEnd) is not set
+// - columns are evenly distributed (=balanced) is not set
+// Note 1: at page end, the 

[Libreoffice-bugs] [Bug 139205] Translated Calc styles lose hirearchical structure

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=139205

Kevin Suo  changed:

   What|Removed |Added

 Status|ASSIGNED|NEW
   Assignee|suokunl...@126.com  |libreoffice-b...@lists.free
   ||desktop.org

--- Comment #14 from Kevin Suo  ---
I self-abandoned the patch. This issue need more investigation. Although my
patch fixes this bug, the current programmatic <-> display name conversion
logic seems to be improved a little bit.

For instance, currently in
https://opengrok.libreoffice.org/xref/core/sc/source/core/tool/stylehelper.cxx?r=3b6dd549#61
there are duplicated entries in the aCellMap. 

Also the SC_STYLE_PROG_RESULT1 = u"Result2" seems never used in our code base. 

In addition, we have already defined the style names in
https://opengrok.libreoffice.org/xref/core/sc/inc/globstr.hrc?r=14cfff50#272
so why not use that directly but define additional "programmic names"?

Further, in bug 132137 someone tried to improve the Calc style names, but
caused regression and thus the patch was reverted. One reason was that they
found there should be hard-coded style names someone, without identifying the
exact place.

So let me think about all these further but it may take time. Set back to NEW
in case someone else want to work on this.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Caolán McNamara (via logerrit)]

 sd/uiconfig/simpress/ui/definecustomslideshow.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 83298077a4cd577860e2114b429a2d413c3ea10c
Author: Caolán McNamara 
AuthorDate: Tue Nov 2 10:12:49 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 2 16:07:00 2021 +0100

tdf#136945 use ListStore instead of TreeStore to avoid dnd creating subnodes

because this just wants a flat list and a drop "on" a row shouldn't
create a child of that row, but a sibling

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

diff --git a/sd/uiconfig/simpress/ui/definecustomslideshow.ui 
b/sd/uiconfig/simpress/ui/definecustomslideshow.ui
index fd35ce574762..9d8023e4e4eb 100644
--- a/sd/uiconfig/simpress/ui/definecustomslideshow.ui
+++ b/sd/uiconfig/simpress/ui/definecustomslideshow.ui
@@ -2,7 +2,7 @@
 
 
   
-  
+  
 
   
   
@@ -10,7 +10,7 @@
   
 
   
-  
+  
 
   
   

[Libreoffice-bugs] [Bug 119206] Freeze if Option “Edit document properties before saving” is Enabled

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=119206

Caolán McNamara  changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |caol...@redhat.com
   |desktop.org |
 Status|NEW |ASSIGNED

--- Comment #13 from Caolán McNamara  ---
I think on the close path that running this async can't really be made work
without way way more work than anyone is going to put in.

So I'll take this and...

undo fix for tdf#120343 and undo fix for tdf#117895 and instead rearrange
things to that file, properties continues to be run async, but when the
properties dialog is launched from close its run sync

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 144598] Crash in: SkRect::round()

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=144598

--- Comment #57 from Steve Garry  ---
OK, will investigate further, and revert. Thanks

-- 
You are receiving this mail because:
You are the assignee for the bug.