date:20210916

 external/skia/UnpackedTarball_skia.mk|1 +
 external/skia/windows-libraries-system32.patch.1 |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 54850fe48da0170e2a66ada4688771ae63a8eea8
Author: Luboš Luňák 
AuthorDate: Wed Sep 1 11:00:38 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 10:47:53 2021 +0200

patch Skia to search only system32/ for libraries

LO on Windows defaults to Vulkan, and Skia tries to load the vulkan
DLL, which may not be present on some systems. The library AFAICT
should always be in a system directory, so restrict library
searching to just there to avoid the possibility of DLL hijacking,
just to be safe.

Change-Id: I78ad3c7297e613c0316e82c5ff3c0110a02da337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121437
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122135
Reviewed-by: Caolán McNamara 

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index 104b307f2d64..bd9694bae443 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -40,6 +40,7 @@ skia_patches := \
 skia_sk_cpu_sse_level_0_by_default.patch.1 \
 fix-warnings.patch.1 \
 disable-freetype-colrv1.1 \
+windows-libraries-system32.patch.1 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/windows-libraries-system32.patch.1 
b/external/skia/windows-libraries-system32.patch.1
new file mode 100644
index ..45c0e35d1cfa
--- /dev/null
+++ b/external/skia/windows-libraries-system32.patch.1
@@ -0,0 +1,13 @@
+diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
+index d2dcbe0af6..c288bbf177 100644
+--- a/src/ports/SkOSLibrary_win.cpp
 b/src/ports/SkOSLibrary_win.cpp
+@@ -11,7 +11,7 @@
+ #include "src/ports/SkOSLibrary.h"
+ 
+ void* SkLoadDynamicLibrary(const char* libraryName) {
+-return LoadLibraryA(libraryName);
++return LoadLibraryExA(libraryName, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+ }
+ 
+ void* SkGetProcedureAddress(void* library, const char* functionName) {

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

 source/text/simpress/00/0413.xhp |4 +---
 source/text/simpress/01/0525.xhp |2 +-
 source/text/simpress/01/05250700.xhp |4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 1a62af2400327a33a9e51b7d4697364ba14dfa9e
Author: Johnny_M 
AuthorDate: Sat Sep 11 16:05:02 2021 +0200
Commit: Olivier Hallot 
CommitDate: Thu Sep 16 10:19:37 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/simpress/00/0413.xhp 
b/source/text/simpress/00/0413.xhp
index 3e87502d2..c1b73eeb2 100644
--- a/source/text/simpress/00/0413.xhp
+++ b/source/text/simpress/00/0413.xhp
@@ -109,12 +109,11 @@
 
 
 
-
+
 Choose 
Shape - Arrange - Reverse (%PRODUCTNAME Draw only)
 Open the 
context menu of a selected object and choose Arrange - Reverse
 
 On the Drawing 
bar, open the Arrange toolbar and click:
-
 
 
 
@@ -128,7 +127,6 @@
 
 
 
-
 
 
 Choose 
Shape - Combine (%PRODUCTNAME Draw 
only)
diff --git a/source/text/simpress/01/0525.xhp 
b/source/text/simpress/01/0525.xhp
index afdcbef76..6d5729e6f 100644
--- a/source/text/simpress/01/0525.xhp
+++ b/source/text/simpress/01/0525.xhp
@@ -42,6 +42,6 @@
 
 
 
-
+
 
 
diff --git a/source/text/simpress/01/05250700.xhp 
b/source/text/simpress/01/05250700.xhp
index 771eb9f9e..81976503b 100644
--- a/source/text/simpress/01/05250700.xhp
+++ b/source/text/simpress/01/05250700.xhp
@@ -32,7 +32,7 @@
 
 
 
-
+
 reversing objects
 objects; reversing
 
@@ -41,7 +41,7 @@
 Reverses the stacking order of the selected 
objects.
 
 
-  
+  
 
 You can select 
this function only if at least two drawing elements are selected 
together.

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 81ebd481550657eb1b0d0e931388caa17a1effe9
Author: Johnny_M 
AuthorDate: Thu Sep 16 10:19:41 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Sep 16 10:19:41 2021 +0200

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 2f54ef24da73..1a62af240032 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2f54ef24da73bafb8da3ab5a05592c8b0e31edd4
+Subproject commit 1a62af2400327a33a9e51b7d4697364ba14dfa9e

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit f39219dbc92773acb0792e8cb0d04d4024476b99
Author: Johnny_M 
AuthorDate: Thu Sep 16 10:19:01 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Sep 16 10:19:01 2021 +0200

Update git submodules

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

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

diff --git a/helpcontent2 b/helpcontent2
index 323c851c0055..2f54ef24da73 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 323c851c00559631e9e2ee1098d9aed89ca1d2ff
+Subproject commit 2f54ef24da73bafb8da3ab5a05592c8b0e31edd4

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

 source/text/simpress/01/0499.xhp |2 +-
 source/text/simpress/01/04990500.xhp |2 +-
 source/text/swriter/01/04120221.xhp  |2 +-
 source/text/swriter/01/04120222.xhp  |2 +-
 source/text/swriter/01/04120223.xhp  |2 +-
 source/text/swriter/01/04120224.xhp  |2 +-
 source/text/swriter/01/04120225.xhp  |2 +-
 source/text/swriter/01/04120226.xhp  |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 2f54ef24da73bafb8da3ab5a05592c8b0e31edd4
Author: Johnny_M 
AuthorDate: Sat Sep 11 16:49:24 2021 +0200
Commit: Olivier Hallot 
CommitDate: Thu Sep 16 10:18:58 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/simpress/01/0499.xhp 
b/source/text/simpress/01/0499.xhp
index 6dedd0ead..eae05a2f4 100644
--- a/source/text/simpress/01/0499.xhp
+++ b/source/text/simpress/01/0499.xhp
@@ -45,7 +45,7 @@
   
   
   
-  
+  
   
  
 
diff --git a/source/text/simpress/01/04990500.xhp 
b/source/text/simpress/01/04990500.xhp
index d8e44662d..f55aae00a 100644
--- a/source/text/simpress/01/04990500.xhp
+++ b/source/text/simpress/01/04990500.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 fields; page numbers
 page number field
 slide numbers
diff --git a/source/text/swriter/01/04120221.xhp 
b/source/text/swriter/01/04120221.xhp
index f26ac46e2..76c549e2c 100644
--- a/source/text/swriter/01/04120221.xhp
+++ b/source/text/swriter/01/04120221.xhp
@@ -83,7 +83,7 @@
 Inserts a tab stop. To add 
leader dots to the tab stop, select a character in the Fill character 
box. To change the position of the tab stop, enter a value in the 
Tab stop position box, or select the Align right 
check box.
 
 
-
+
 
 
 Page 
number (#)
diff --git a/source/text/swriter/01/04120222.xhp 
b/source/text/swriter/01/04120222.xhp
index fae15b6d8..38491d08c 100644
--- a/source/text/swriter/01/04120222.xhp
+++ b/source/text/swriter/01/04120222.xhp
@@ -50,7 +50,7 @@
 Enter the maximum hierarchy level down to which objects are shown in 
the generated index.
 
 
-
+
 
 
 Character Style for main entries
diff --git a/source/text/swriter/01/04120223.xhp 
b/source/text/swriter/01/04120223.xhp
index 38a7ddce0..295ae26a4 100644
--- a/source/text/swriter/01/04120223.xhp
+++ b/source/text/swriter/01/04120223.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/04120224.xhp 
b/source/text/swriter/01/04120224.xhp
index f66b3a2f1..b82b636dd 100644
--- a/source/text/swriter/01/04120224.xhp
+++ b/source/text/swriter/01/04120224.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/04120225.xhp 
b/source/text/swriter/01/04120225.xhp
index 914a89829..4087d65e6 100644
--- a/source/text/swriter/01/04120225.xhp
+++ b/source/text/swriter/01/04120225.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/swriter/01/04120226.xhp 
b/source/text/swriter/01/04120226.xhp
index 3664b7a0b..18d002088 100644
--- a/source/text/swriter/01/04120226.xhp
+++ b/source/text/swriter/01/04120226.xhp
@@ -40,7 +40,7 @@
 
 
 
-
+

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

 filter/source/msfilter/svdfppt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10a556f9e8653f5d94fba2703d8320639c64f5c7
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 08:58:33 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 11:07:48 2021 +0200

ofz: MemorySanitizer: use-of-uninitialized-value

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

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index dba0659e6a3d..443e5b762b91 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -172,7 +172,7 @@ SvStream& ReadPptCurrentUserAtom( SvStream& rIn, 
PptCurrentUserAtom& rAtom )
 if ( aHd.nRecType == PPT_PST_CurrentUserAtom )
 {
 sal_uInt32 nLen;
-sal_uInt16 nUserNameLen, nPad;
+sal_uInt16 nUserNameLen(0), nPad;
 rIn.ReadUInt32( nLen )
.ReadUInt32( rAtom.nMagic )
.ReadUInt32( rAtom.nCurrentUserEdit )

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

2021-09-16 Thread Miklos Vajna (via logerrit)

 sw/source/core/text/porlay.cxx |9 +
 sw/source/core/text/porlay.hxx |2 +-
 sw/source/core/text/porlin.cxx |8 
 sw/source/core/text/porlin.hxx |4 
 4 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit cf548fbcc637f2049c9c924e1ff774787cff06ec
Author: Miklos Vajna 
AuthorDate: Wed Sep 15 19:57:27 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 16 08:18:55 2021 +0200

sw layout xml dump: show SwLinePortion

Towards showing details of multi-portions.

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

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index eddab2b7ea00..3b85c71fb624 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -751,6 +751,15 @@ void SwLineLayout::dumpAsXml(xmlTextWriterPtr pWriter) 
const
 {
 (void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwLineLayout"));
 (void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", 
this);
+
+const SwLinePortion* pFirstPor = GetFirstPortion();
+pFirstPor->SwLinePortion::dumpAsXml(pWriter);
+for (const SwLinePortion* pPor = pFirstPor->GetNextPortion(); pPor;
+ pPor = pPor->GetNextPortion())
+{
+pPor->dumpAsXml(pWriter);
+}
+
 (void)xmlTextWriterEndElement(pWriter);
 }
 
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 3f2d1e478448..daeee36c7ad5 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -243,7 +243,7 @@ public:
const SwLinePortion* _pDontConsiderPortion = 
nullptr,
const bool _bNoFlyCntPorAndLinePor = false ) const;
 
-virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 };
 
 /// Collection of SwLineLayout instances, represents the paragraph text in 
Writer layout.
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index c5dc41ff3db5..09283b4978e4 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -317,4 +317,12 @@ void SwLinePortion::HandlePortion( SwPortionHandler& rPH ) 
const
 rPH.Special( GetLen(), OUString(), GetWhichPor(), Height(), Width() );
 }
 
+void SwLinePortion::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+(void)xmlTextWriterStartElement(pWriter, BAD_CAST("SwLinePortion"));
+(void)xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", 
this);
+(void)xmlTextWriterWriteAttribute(pWriter, BAD_CAST("symbol"), 
BAD_CAST(typeid(*this).name()));
+(void)xmlTextWriterEndElement(pWriter);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 3dc7ff9e287d..6e7525a1a6ad 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -18,6 +18,8 @@
  */
 #pragma once
 
+#include 
+
 #include "possiz.hxx"
 #include 
 #include 
@@ -170,6 +172,8 @@ public:
 bool GetJoinBorderWithNext() const { return m_bJoinBorderWithNext; }
 void SetJoinBorderWithPrev( const bool bJoinPrev ) { m_bJoinBorderWithPrev 
= bJoinPrev; }
 void SetJoinBorderWithNext( const bool bJoinNext ) { m_bJoinBorderWithNext 
= bJoinNext; }
+
+virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 inline SwLinePortion ::operator=(const SwLinePortion )

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

2021-09-16 Thread Michael Weghorn (via logerrit)

 winaccessibility/inc/AccDescendantManagerEventListener.hxx|3 +
 winaccessibility/source/service/AccDescendantManagerEventListener.cxx |   20 
--
 2 files changed, 20 insertions(+), 3 deletions(-)

New commits:
commit 836a226205df9e76e77d26af80f402de7b876d61
Author: Michael Weghorn 
AuthorDate: Thu Sep 16 07:11:47 2021 +0100
Commit: Michael Weghorn 
CommitDate: Thu Sep 16 09:25:36 2021 +0200

tdf#100086 wina11y: Don't delete a11y object for removed cell right away

When handling a SELECTION_CHANGED_REMOVE event,
AccDescendantManagerEventListener previously emitted a corresponding
EVENT_OBJECT_SELECTIONREMOVE MSAA event with the removed child's ID
as a parameter, then deleted that child's accessibility object.

This resulted in the accessibility object no longer being available
if accessibility tools queried for the object just received in
the EVENT_OBJECT_SELECTIONREMOVE event.

As a consequence, no 'event_selectionRemove' would be triggered
for any table cell object on NVDA side, so an updated selection
would not be announced for that case.

To keep child objects available for such cases, don't delete the
corresponding object in the handler for the SELECTION_CHANGED_REMOVE
handler, but remember it for deletion and only do the actual deletion
once a subsequent different event is handled.

With this in place, the announcement for multiple selected cells in
Calc generally works with the NVDA screen reader and a pending
NVDA pull request [1] by Leonard de Ruijter in place
(s.a. discussion in NVDA issue [2] for more background
and further information).

(There are still cases where events in response
to selection changes are missing, as described e.g. in
tdf#118508 and tdf#118748, but those are not winaccessibility-specific
and it's the same when using the gtk3 VCL plugin with the Orca screen
reader on Linux.)

[1] https://github.com/nvaccess/nvda/pull/12849
[2] https://github.com/nvaccess/nvda/issues/9310

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

diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx 
b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
index 57ae373ce5f7..73cda0f4eb46 100644
--- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx
+++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include 
+#include 
 #include "AccComponentEventListener.hxx"
 #include 
 #include 
@@ -32,6 +33,8 @@
  */
 class AccDescendantManagerEventListener: public AccComponentEventListener
 {
+private:
+std::vector 
m_aUnselectedChildrenForDeletion;
 
 public:
 AccDescendantManagerEventListener(css::accessibility::XAccessible* pAcc, 
AccObjectManagerAgent* Agent);
diff --git 
a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx 
b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index c8fc771ae503..479f045cf6f3 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -183,10 +183,24 @@ bool 
AccDescendantManagerEventListener::NotifyChildEvent(short nWinEvent,const A
 XAccessible* pAcc = xChild.get();
 pAgent->NotifyAccEvent(nWinEvent, pAcc);
 
-if (pAgent->IsStateManageDescendant(m_xAccessible.get())
-&& (nWinEvent == UM_EVENT_SELECTION_CHANGED_REMOVE))
+if (pAgent->IsStateManageDescendant(m_xAccessible.get()))
 {
-pAgent->DeleteAccObj( pAcc );
+if (nWinEvent == UM_EVENT_SELECTION_CHANGED_REMOVE)
+{
+// The object has just been sent in a 
SELECTION_CHANGED_REMOVE event
+// and accessibility tools may query for the object and 
call methods on
+// it as a response to this.
+// Therefore, don't delete the object yet, but remember it 
for deletion
+// once the next event of a different type occurs.
+m_aUnselectedChildrenForDeletion.push_back(pAcc);
+}
+else
+{
+// handle any pending deletions for objects previously 
removed from selection
+for (XAccessible* pAcc : m_aUnselectedChildrenForDeletion)
+pAgent->DeleteAccObj(pAcc);
+m_aUnselectedChildrenForDeletion.clear();
+}
 }
 return true;
 }

ESC meeting agenda: 2021-09-16 16:00 Berlin time

2021-09-16 Thread Miklos Vajna


Hi,

The prototype agenda is below. Extra items are appreciated either in
this document or as a reply to this mail:

https://nextcloud.documentfoundation.org/apps/files/?dir=/Common2/esc-minutes

You can join using Jitsi here:

https://jitsi.documentfoundation.org/esc

Regards,

Miklos



* Present:
+

* Completed Action Items:
+ None

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.2 status
+ 7.1 status
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
258(258) (topicUI) bugs open, 164(164) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  5(3)  13(-2) 42(0)   93(3)
 commented 32(-48)   250(-50)   762(-60)   3515(-44)
   removed  1(1)   4(1)   9(-1)  37(1)
  resolved  4(-9) 32(-10)   100(-12)504(-9)
+ top 10 contributors:
  Heiko Tietze made 208 changes in 1 month, and 2436 changes in 1 year
  Telesto made 49 changes in 1 month, and 698 changes in 1 year
  Foote, V Stuart made 29 changes in 1 month, and 644 changes in 1 year
  Roman Kuznetsov made 24 changes in 1 month, and 242 changes in 1 year
  Ilmari Lauhakangas made 20 changes in 1 month, and 420 changes in 1 
year
  Timur made 18 changes in 1 month, and 134 changes in 1 year
  Nabet, Julien made 14 changes in 1 month, and 50 changes in 1 year
  Kaganski, Mike made 11 changes in 1 month, and 183 changes in 1 year
  Dieter made 10 changes in 1 month, and 325 changes in 1 year
  BogdanB made 8 changes in 1 month, and 136 changes in 1 year

* Crash Testing (Caolan)
+ 7(-4) import failure, 4(-3) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
+ 7.2.0.1295(+8)
+ 7.2.0.2115(+8)
+ 7.2.0.367(+1)
+ 7.2.0.49915(+2407)

* Mentoring/EasyHack update (Hossein)
  committer...   1 week  1 month  3 months 12 months
  open  66(1)   117(5)   167(5)179(8)
   reviews 382(-60)1482(-136)   3818(-12) 7028(228)
merged 270(-73)1335(14) 3884(-74) 8374(267)
 abandoned  13(-6)   57(-26) 202(2)454(13)
   own commits 159(-129)   1020(-32)2957(-102)   12722(-148)
review commits  56(-48) 356(-12)1024(-22) 4331(-16)
contributor...   1 week  1 month 3 months 12 months
  open  38(-9)   87(5)  126(8)137(10)
   reviews 738(-154)   3202(-76)   8902(-156)   18518(582)
merged  28(-7)  145(0)  377(-2)   735(26)
 abandoned   2(0)24(-23) 93(-3)   257(2)
   own commits  23(-15) 147(-5) 418(-17) 1963(-13)
review commits   0(0) 0(0)0(0)  0(0)
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 1(1)   cleanup_comments 278(278)
   total 331(331)   assigned 25(25)   open 279(279)
+ top 10 contributors:
  Johnny_M made 92 patches in 1 month, and 744 patches in 1 year
  Dante DM made 10 patches in 1 month, and 126 patches in 1 year
  Akshit Kushwaha made 5 patches in 1 month, and 23 patches in 1 year
  Ming Hua made 4 patches in 1 month, and 21 patches in 1 year
  Baran Aytas made 4 patches in 1 month, and 4 patches in 1 year
  Bayram Çiçek made 3 patches in 1 month, and 15 patches in 1 year
  Emircan Ağaç made 3 patches in 1 month, and 12 patches in 1 year
  Nagy Tibor made 2 patches in 1 month, and 39 patches in 1 year
  Tushar Kumar Rai made 2 patches in 1 month, and 9 patches in 1 year
  Anshu made 2 patches in 1 month, and 11 patches in 1 year
+ top 10 reviewers:
  Michael Stahl made 152 review comments in 1 month, and 556 in 1 year
  Olivier Hallot made 130 review comments in 1 month, and 678 in 1 year
  Xisco Fauli made 122 review comments in 1 month, and 506 in 1 year
  Adolfo Jayme Barrientos made 118 review comments in 1 month, and 490 
in 1 year
  Kaganski, Mike made 100 review comments in 1 month, and 426 in 1 year
  Vajngerl, Tomaž made 80 review comments in 1 month, and 368 in 1 year
  Németh, László made 72 review comments in 1 month, and 336 in 1 year
  Grandin, Noel made 70 review comments in 1 month, and 432 in 1 year
  Hossein made 56 review comments in 1 month, and 88 in 1 year
  Vajna, Miklos made 52 review comments in 1 month, and 382 in 1 year
+ Patches automatically abandoned:
WIP strong_int for SwTwips ( Noel Grandin )

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

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

New commits:
commit 8087113baf9dfa346f4f8280463ca8bc16106f2e
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 12:02:58 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 14:45:07 2021 +0200

gtk4: adjust to GtkMenuButton changes in 4.6 onwards

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index c3bdb8a197f5..b2f544e4dea8 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10223,7 +10223,15 @@ public:
 }
 g_list_free(pChildren);
 #else
-GtkWidget* pChild = 
gtk_widget_get_last_child(GTK_WIDGET(m_pMenuButton));
+GtkWidget* pChild;
+if (gtk_check_version(4, 5, 0) == nullptr)
+{
+pChild = gtk_widget_get_first_child(GTK_WIDGET(m_pMenuButton));
+pChild = gtk_widget_get_first_child(pChild);
+pChild = gtk_widget_get_first_child(pChild);
+}
+else
+pChild = gtk_widget_get_last_child(GTK_WIDGET(m_pMenuButton));
 g_object_ref(pChild);
 gtk_widget_unparent(pChild);
 gtk_button_set_child(GTK_BUTTON(m_pToggleButton), pChild);

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

 vcl/unx/gtk3/gtkinst.cxx |   41 ++---
 1 file changed, 26 insertions(+), 15 deletions(-)

New commits:
commit 522905a0674992fe2ab52afc1415c46ad33cf7f0
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 12:30:45 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 15:07:03 2021 +0200

gtk4: 4.6.0 will have gtk_menu_button_set_child

which will solve the problem of setting icons and keeping the drop
down for GtkMenuButtons used in toolbars

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b2f544e4dea8..9cdbac410f31 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10953,10 +10953,27 @@ private:
 }
 #endif
 
+#if GTK_CHECK_VERSION(4, 0, 0)
+static void set_item_image(GtkWidget* pItem, GtkWidget* pImage)
+{
+if (GTK_IS_BUTTON(pItem))
+gtk_button_set_child(GTK_BUTTON(pItem), pImage);
+else if (GTK_IS_MENU_BUTTON(pItem))
+{
+// TODO after gtk 4.6 is released require that version and drop 
this
+static auto menu_button_set_child = reinterpret_cast(dlsym(nullptr, "gtk_menu_button_set_child"));
+if (menu_button_set_child)
+menu_button_set_child(GTK_MENU_BUTTON(pItem), pImage);
+}
+// versions of gtk4 > 4.2.1 might do this on their own
+gtk_widget_remove_css_class(pItem, "text-button");
+}
+#endif
+
 #if !GTK_CHECK_VERSION(4, 0, 0)
 static void set_item_image(GtkToolButton* pItem, const 
css::uno::Reference& rIcon)
 #else
-static void set_item_image(GtkButton* pItem, const 
css::uno::Reference& rIcon)
+static void set_item_image(GtkWidget* pItem, const 
css::uno::Reference& rIcon)
 #endif
 {
 GtkWidget* pImage = nullptr;
@@ -10971,16 +10988,14 @@ private:
 #if !GTK_CHECK_VERSION(4, 0, 0)
 gtk_tool_button_set_icon_widget(pItem, pImage);
 #else
-gtk_button_set_child(pItem, pImage);
-// versions of gtk4 > 4.2.1 might do this on their own
-gtk_widget_remove_css_class(GTK_WIDGET(pItem), "text-button");
+set_item_image(pItem, pImage);
 #endif
 }
 
 #if !GTK_CHECK_VERSION(4, 0, 0)
 void set_item_image(GtkToolButton* pItem, const VirtualDevice* pDevice)
 #else
-void set_item_image(GtkButton* pItem, const VirtualDevice* pDevice)
+void set_item_image(GtkWidget* pItem, const VirtualDevice* pDevice)
 #endif
 {
 GtkWidget* pImage = nullptr;
@@ -10994,9 +11009,7 @@ private:
 #if !GTK_CHECK_VERSION(4, 0, 0)
 gtk_tool_button_set_icon_widget(pItem, pImage);
 #else
-gtk_button_set_child(pItem, pImage);
-// versions of gtk4 > 4.2.1 might do this on their own
-gtk_widget_remove_css_class(GTK_WIDGET(pItem), "text-button");
+set_item_image(pItem, pImage);
 #endif
 gtk_widget_queue_draw(GTK_WIDGET(m_pToolbar));
 }
@@ -11343,9 +11356,9 @@ public:
 return;
 set_item_image(GTK_TOOL_BUTTON(pItem), rIcon);
 #else
-if (!pItem || !GTK_IS_BUTTON(pItem))
+if (!pItem)
 return;
-set_item_image(GTK_BUTTON(pItem), rIcon);
+set_item_image(pItem, rIcon);
 #endif
 }
 
@@ -11357,9 +11370,9 @@ public:
 return;
 set_item_image(GTK_TOOL_BUTTON(pItem), pDevice);
 #else
-if (!pItem || !GTK_IS_BUTTON(pItem))
+if (!pItem)
 return;
-set_item_image(GTK_BUTTON(pItem), pDevice);
+set_item_image(pItem, pDevice);
 #endif
 }
 
@@ -11371,9 +11384,7 @@ public:
 return;
 set_item_image(GTK_TOOL_BUTTON(pItem), rIcon);
 #else
-if (!GTK_IS_BUTTON(pItem))
-return;
-set_item_image(GTK_BUTTON(pItem), rIcon);
+set_item_image(pItem, rIcon);
 #endif
 }

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

 vcl/unx/gtk4/convert3to4.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5618448b96991c3ec3dcabd8cba144f17ee1e4d2
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 12:35:49 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 15:06:32 2021 +0200

gtk4: set always-show-arrow on GtkMenuToolButton replacements

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

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 7713e6f3f6a0..277eb0cf52fb 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1139,6 +1139,8 @@ ConvertResult Convert3To4(const 
css::uno::Reference& xNode
 else if (sClass == "GtkMenuToolButton")
 {
 xClass->setNodeValue("GtkMenuButton");
+auto xAlwaysShowArrow = CreateProperty(xDoc, 
"always-show-arrow", "True");
+insertAsFirstChild(xChild, xAlwaysShowArrow);
 }
 else if (sClass == "GtkRadioToolButton")
 {

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

2021-09-16 Thread Tünde Tóth (via logerrit)

 comphelper/source/misc/docpasswordhelper.cxx |   40 ---
 oox/source/token/properties.txt  |1 
 sc/qa/uitest/calc_tests9/tdf115933.py|   32 +
 sc/qa/uitest/data/tdf115933.xlsx |binary
 sc/source/filter/oox/workbooksettings.cxx|   15 ++
 5 files changed, 79 insertions(+), 9 deletions(-)

New commits:
commit 40f38fd16dad4374543d4a7a109b3264837ce8d1
Author: Tünde Tóth 
AuthorDate: Wed Sep 1 15:47:40 2021 +0200
Commit: László Németh 
CommitDate: Thu Sep 16 15:54:57 2021 +0200

tdf#115933 XLSX import: fix permission for editing

The passwords for editing in XLSX documents
created with Excel weren't asked and verified.

Note: LibreOffice supports only a subset of the hashing
algorithms specified in MS-OE376, according to
DocPasswordHelper::GetOoxHashAsVector() and

https://docs.microsoft.com/en-us/openspecs/office_standards/ms-oe376/f70a4140-340b-4e94-a604-dff25b9846b1.
Also the documents encrypted with unsupported algorithms
got edit protection now, but it's not possible to add
permission to edit them (copy of these documents are still
editable).

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

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index cd7090944dc0..980faff14698 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -116,8 +116,7 @@ bool DocPasswordHelper::IsModifyPasswordCorrect( 
std::u16string_view aPassword,
 if ( !aPassword.empty() && aInfo.hasElements() )
 {
 OUString sAlgorithm;
-uno::Sequence< sal_Int8 > aSalt;
-uno::Sequence< sal_Int8 > aHash;
+uno::Any aSalt, aHash;
 sal_Int32 nCount = 0;
 
 for ( const auto & prop : aInfo )
@@ -125,20 +124,43 @@ bool DocPasswordHelper::IsModifyPasswordCorrect( 
std::u16string_view aPassword,
 if ( prop.Name == "algorithm-name" )
 prop.Value >>= sAlgorithm;
 else if ( prop.Name == "salt" )
-prop.Value >>= aSalt;
+aSalt = prop.Value;
 else if ( prop.Name == "iteration-count" )
 prop.Value >>= nCount;
 else if ( prop.Name == "hash" )
-prop.Value >>= aHash;
+aHash = prop.Value;
 }
 
-if ( sAlgorithm == "PBKDF2" && aSalt.hasElements() && nCount > 0 && 
aHash.hasElements() )
+if ( sAlgorithm == "PBKDF2" )
 {
-uno::Sequence< sal_Int8 > aNewHash = GeneratePBKDF2Hash( 
aPassword, aSalt, nCount, aHash.getLength() );
-for ( sal_Int32 nInd = 0; nInd < aNewHash.getLength() && nInd < 
aHash.getLength() && aNewHash[nInd] == aHash[nInd]; nInd ++ )
+uno::Sequence aIntSalt, aIntHash;
+aSalt >>= aIntSalt;
+aHash >>= aIntHash;
+if (aIntSalt.hasElements() && nCount > 0 && aIntHash.hasElements())
 {
-if ( nInd == aNewHash.getLength() - 1 && nInd == 
aHash.getLength() - 1 )
-bResult = true;
+uno::Sequence aNewHash
+= GeneratePBKDF2Hash(aPassword, aIntSalt, nCount, 
aIntHash.getLength());
+for (sal_Int32 nInd = 0; nInd < aNewHash.getLength() && nInd < 
aIntHash.getLength()
+ && aNewHash[nInd] == aIntHash[nInd];
+ nInd++)
+{
+if (nInd == aNewHash.getLength() - 1 && nInd == 
aIntHash.getLength() - 1)
+bResult = true;
+}
+}
+}
+else if (nCount > 0)
+{
+OUString sSalt, sHash;
+aSalt >>= sSalt;
+aHash >>= sHash;
+if (!sSalt.isEmpty() && !sHash.isEmpty())
+{
+const OUString 
aNewHash(GetOoxHashAsBase64(OUString(aPassword), sSalt, nCount,
+   
comphelper::Hash::IterCount::APPEND,
+   sAlgorithm));
+if (!aNewHash.isEmpty())
+bResult = aNewHash == sHash;
 }
 }
 }
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 808df85533ff..2c56d0f46804 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -337,6 +337,7 @@ MirroredY
 MissingValueTreatment
 Model
 ModifyPasswordHash
+ModifyPasswordInfo
 MoveProtect
 MovingAveragePeriod
 MultiLine
diff --git a/sc/qa/uitest/calc_tests9/tdf115933.py 
b/sc/qa/uitest/calc_tests9/tdf115933.py
new file mode 100644
index ..be7719487958
--- /dev/null
+++

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

2021-09-16 Thread Samuel Mehrbrodt (via logerrit)

 sc/source/ui/dbgui/filtdlg.cxx   |  243 ++-
 sc/source/ui/inc/filtdlg.hxx |   10 
 sc/uiconfig/scalc/ui/standardfilterdialog.ui |  428 ---
 solenv/sanitizers/ui/modules/scalc.suppr |5 
 4 files changed, 560 insertions(+), 126 deletions(-)

New commits:
commit d9dd003f63a781e63bfbe380ea737e080c21881f
Author: Samuel Mehrbrodt 
AuthorDate: Thu Sep 9 09:33:49 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Sep 16 16:21:19 2021 +0200

tdf#143103 Support Color Filter in "Standard Filter" dialog

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

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index ef093efcb326..06df4ae300f2 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -34,10 +34,14 @@
 #include 
 
 #include 
+#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -56,6 +60,8 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 , aStrEmpty(ScResId(SCSTR_FILTER_EMPTY))
 , aStrNotEmpty(ScResId(SCSTR_FILTER_NOTEMPTY))
 , aStrColumn(ScResId(SCSTR_COLUMN))
+, aStrTextColor(ScResId(SCSTR_FILTER_TEXT_COLOR))
+, aStrBackgroundColor(ScResId(SCSTR_FILTER_BACKGROUND_COLOR))
 , nWhichQuery(rArgSet.GetPool()->GetWhich(SID_QUERY))
 , theQueryData(static_cast(rArgSet.Get(nWhichQuery)).GetQueryData())
 , pViewData(nullptr)
@@ -66,21 +72,25 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* 
pCW, weld::Window* pPa
 , m_xLbField1(m_xBuilder->weld_combo_box("field1"))
 , m_xLbCond1(m_xBuilder->weld_combo_box("cond1"))
 , m_xEdVal1(m_xBuilder->weld_combo_box("val1"))
+, m_xLbColor1(m_xBuilder->weld_combo_box("color1"))
 , m_xBtnRemove1(m_xBuilder->weld_button("remove1"))
 , m_xLbConnect2(m_xBuilder->weld_combo_box("connect2"))
 , m_xLbField2(m_xBuilder->weld_combo_box("field2"))
 , m_xLbCond2(m_xBuilder->weld_combo_box("cond2"))
 , m_xEdVal2(m_xBuilder->weld_combo_box("val2"))
+, m_xLbColor2(m_xBuilder->weld_combo_box("color2"))
 , m_xBtnRemove2(m_xBuilder->weld_button("remove2"))
 , m_xLbConnect3(m_xBuilder->weld_combo_box("connect3"))
 , m_xLbField3(m_xBuilder->weld_combo_box("field3"))
 , m_xLbCond3(m_xBuilder->weld_combo_box("cond3"))
 , m_xEdVal3(m_xBuilder->weld_combo_box("val3"))
+, m_xLbColor3(m_xBuilder->weld_combo_box("color3"))
 , m_xBtnRemove3(m_xBuilder->weld_button("remove3"))
 , m_xLbConnect4(m_xBuilder->weld_combo_box("connect4"))
 , m_xLbField4(m_xBuilder->weld_combo_box("field4"))
 , m_xLbCond4(m_xBuilder->weld_combo_box("cond4"))
 , m_xEdVal4(m_xBuilder->weld_combo_box("val4"))
+, m_xLbColor4(m_xBuilder->weld_combo_box("color4"))
 , m_xBtnRemove4(m_xBuilder->weld_button("remove4"))
 , m_xContents(m_xBuilder->weld_widget("grid"))
 , m_xScrollBar(m_xBuilder->weld_scrolled_window("scrollbar", true))
@@ -122,6 +132,33 @@ ScFilterDlg::~ScFilterDlg()
 pTimer.reset();
 }
 
+namespace {
+VirtualDevice* lcl_getColorImage(const Color )
+{
+const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
+Size aImageSize(rStyleSettings.GetListBoxPreviewDefaultPixelSize());
+
+VclPtrInstance xDevice;
+xDevice->SetOutputSize(aImageSize);
+const tools::Rectangle aRect(Point(0, 0), aImageSize);
+if (rColor == COL_NONE_COLOR)
+{
+const Color aW(COL_WHITE);
+const Color aG(0xef, 0xef, 0xef);
+xDevice->DrawCheckered(aRect.TopLeft(), aRect.GetSize(), 8, aW, aG);
+xDevice->SetFillColor();
+}
+else
+{
+xDevice->SetFillColor(rColor);
+}
+
+xDevice->DrawRect(aRect);
+
+return xDevice.get();
+}
+}
+
 void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 {
 const ScQueryItem& rQueryItem = static_cast(
@@ -157,6 +194,11 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 m_xLbCond3->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
 m_xLbCond4->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
 
+m_xLbColor1->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor2->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor3->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+m_xLbColor4->connect_changed( LINK( this, ScFilterDlg, LbSelectHdl ) );
+
 m_xBtnRemove1->connect_clicked( LINK( this, ScFilterDlg, BtnRemoveHdl ) );
 m_xBtnRemove2->connect_clicked( LINK( this, ScFilterDlg, BtnRemoveHdl ) );
 m_xBtnRemove3->connect_clicked( LINK( this, ScFilterDlg, BtnRemoveHdl ) );
@@ -187,6 +229,11 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 maConnLbArr.push_back(m_xLbConnect2.get());

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

 vcl/unx/gtk3/gtkinst.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit d16d5b0dfdd43d6dfcf8caffaede6f5cfe22af29
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 13:03:29 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 16:28:02 2021 +0200

gtk4: use gtk_menu_button_set_child when available to fill in icon

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 9cdbac410f31..13e441fe58f8 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -21758,6 +21758,29 @@ private:
 }
 }
 }
+else if (GTK_IS_MENU_BUTTON(pWidget))
+{
+GtkMenuButton* pButton = GTK_MENU_BUTTON(pWidget);
+if (const gchar* icon_name = 
gtk_menu_button_get_icon_name(pButton))
+{
+OUString aIconName(icon_name, strlen(icon_name), 
RTL_TEXTENCODING_UTF8);
+if (!IsAllowedBuiltInIcon(aIconName))
+{
+if (GdkPixbuf* pixbuf = 
load_icon_by_name_theme_lang(aIconName, m_aIconTheme, m_aUILang))
+{
+GtkWidget* pImage = gtk_image_new_from_pixbuf(pixbuf);
+gtk_widget_set_halign(pImage, GTK_ALIGN_CENTER);
+gtk_widget_set_valign(pImage, GTK_ALIGN_CENTER);
+g_object_unref(pixbuf);
+// TODO after gtk 4.6 is released require that version 
and drop this
+static auto menu_button_set_child = 
reinterpret_cast(dlsym(nullptr, 
"gtk_menu_button_set_child"));
+if (menu_button_set_child)
+menu_button_set_child(pButton, pImage);
+gtk_widget_show(pImage);
+}
+}
+}
+}
 #endif
 
 //set helpids

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

 sfx2/source/sidebar/DeckTitleBar.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bf89ac73fdb1ca8c083913f6ad8aaf8cec9114c5
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 09:10:08 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 16:28:20 2021 +0200

occasionally the bg color of the deck grip is wrong

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

diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index 6700014e82a4..42379e5354f3 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -53,6 +53,7 @@ public:
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& /*rRect*/) override
 {
 
rRenderContext.SetBackground(Theme::GetColor(Theme::Color_DeckTitleBarBackground));
+rRenderContext.Erase();
 rRenderContext.DrawBitmapEx(Point(0, 0), maGrip);
 }
 };

Improvement for Hebrew writing

2021-09-16 Thread Simone Aiello

The software has problems with the integration of Latin text and Hebrew text. 
Would it be possible to make a change? Or make a plugin to make things better? 
Is there anyone who could help me reprogram the software and figure out where I 
could work to customize it?

Good day to all, Simone

Re: Build failure on x86 linux: undefined reference to `__atomic_load'

2021-09-16 Thread Luke Benes

Rene,
> Or clang needs -latomic and gcc not.
Yes, it does. Looks like a known bug in clang:
 https://bugs.llvm.org/show_bug.cgi?id=45785

Building with "-DCMAKE_CXX_FLAGS=-latomic", resolves the undefined reference to 
`__atomic_load' and allows the build to complete successfully. However, it 
causes clang to spam 
clang-12: warning: -latomic: 'linker' input unused 
[-Wunused-command-line-argument]

when building.

-Luke

ESC meeting minutes: 2021-09-16

2021-09-16 Thread Miklos Vajna

* Present:
+ Gabriel, Hossein, Heiko, Stephan, Caolan, Michael W, Eike, Sophie, 
Miklos, Olivier, Xisco, Michael S

* Completed Action Items:
+ None

* Pending Action Items:
+ None

* Release Engineering update (Cloph)
+ 7.2 status: 7.2.1 was out today. 7.2.2 RC1 on week 38
+ 7.1 status: 7.1.7 rc1 will be mid-October
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+ Helpcontent2
   + Translation roundtrip brings improvements to Help (ohallot, fitoshido, 
 R. Lima)
   + Refactoring by Johnny M
   + New pages and fixes (erack, Ross Johnson)
+ Guides
   + Work in progress
   + Czech team published Impress Guide

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
258(258) (topicUI) bugs open, 164(164) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  5(3)  13(-2) 42(0)   93(3)
 commented 32(-48)   250(-50)   762(-60)   3515(-44)
   removed  1(1)   4(1)   9(-1)  37(1)
  resolved  4(-9) 32(-10)   100(-12)504(-9)
+ top 10 contributors:
  Heiko Tietze made 208 changes in 1 month, and 2436 changes in 1 year
  Telesto made 49 changes in 1 month, and 698 changes in 1 year
  Foote, V Stuart made 29 changes in 1 month, and 644 changes in 1 year
  Roman Kuznetsov made 24 changes in 1 month, and 242 changes in 1 year
  Ilmari Lauhakangas made 20 changes in 1 month, and 420 changes in 1 
year
  Timur made 18 changes in 1 month, and 134 changes in 1 year
  Nabet, Julien made 14 changes in 1 month, and 50 changes in 1 year
  Kaganski, Mike made 11 changes in 1 month, and 183 changes in 1 year
  Dieter made 10 changes in 1 month, and 325 changes in 1 year
  BogdanB made 8 changes in 1 month, and 136 changes in 1 year

* New tickets with needsUXEval Sep/09-16

  [Bug 144493] promote / demote chapter -- just a side note
  [Bug 15] [UI] Inconsistency in UI for Insert Line in Draw
  [Bug 14] [UI] Inconsistency in UI for curve points
->[Bug 144201] The Gallery popup option "Insert as Background" should appear
   only in Writer
  + the functionality is useful for Impress/Draw
  + not comfortable with limiting the behavior
  [Bug 144483] UI Save merged document dialog should separate the range
   selector from the single/individual documents radio buttons
  [Bug 12] Calc "Paste Special" Menue GUI optimization
  [Bug 139591] Separation between start interactive frame not ok. I's hard
   to place cursor at the start of the paragraph with the mouse
   (depend on zoomlevel)
  [Bug 144415] Formatting: Indentations or Tab Stops of Outline Levels
  [Bug 144408] UI: New Document doesn't inherit size from 'source' window

* Crash Testing (Caolan)
+ 7(-4) import failure, 4(-3) export failures
+ 0 coverity issues
+ 13 ossfuzz issues
  - doesn’t include msan
  - 3 dups of the same fixed uninit var
  - 3 dups of the same leak that has a fix pushed
  - 2 dups of a recent exception which has fixed pushed
  - 5 timeouts

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.1.5.2
 + (+268) 2525 2257 2542 2518 2412 1832 1718 654 0
   + https://crashreport.libreoffice.org/stats/version/7.1.6.2
 + (+210) 210 0
   + https://crashreport.libreoffice.org/stats/version/7.2.0.4
 + (+324) 2483 2159 1768 1068 0
  + normal week, waiting for the results from 7.2.1 next week
* Mentoring/EasyHack update (Hossein)
  committer...   1 week  1 month  3 months 12 months
  open  66(1)   117(5)   167(5)179(8)
   reviews 382(-60)1482(-136)   3818(-12) 7028(228)
merged 270(-73)1335(14) 3884(-74) 8374(267)
 abandoned  13(-6)   57(-26) 202(2)454(13)
   own commits 159(-129)   1020(-32)2957(-102)   12722(-148)
review commits  56(-48) 356(-12)1024(-22) 4331(-16)
contributor...   1 week  1 month 3 months 12 months
  open  38(-9)   87(5)  126(8)137(10)
   reviews 738(-154)   3202(-76)   8902(-156)   18518(582)
merged  28(-7)  145(0)  377(-2)   735(26)
 abandoned   2(0)24(-23) 93(-3)   257(2)
   own commits  23(-15) 147(-5) 418(-17) 1963(-13)
review commits   0(0) 0(0)0(0)  0(0)
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 1(1)   cleanup_comments 278(278)
   total 331(331)   assigned 25(25)   open 279(279)
+ top 10 contributors:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - chart2/source desktop/inc include/sfx2 sc/source sd/source sfx2/source svx/source sw/source tools/source

 chart2/source/controller/main/ChartWindow.cxx |8 
 desktop/inc/lib/init.hxx  |7 +++
 include/sfx2/lokhelper.hxx|3 ++-
 sc/source/ui/view/gridwin4.cxx|   11 ++-
 sc/source/ui/view/tabview.cxx |2 +-
 sc/source/ui/view/tabview3.cxx|4 ++--
 sd/source/ui/view/sdwindow.cxx|   11 ++-
 sfx2/source/view/lokhelper.cxx|   10 ++
 svx/source/svdraw/sdrpagewindow.cxx   |2 +-
 svx/source/svdraw/svdmrkv.cxx |8 
 sw/source/uibase/docvw/edtwin.cxx |8 +---
 tools/source/generic/gen.cxx  |8 ++--
 12 files changed, 38 insertions(+), 44 deletions(-)

New commits:
commit 712c5d7090abea828aff57f199879a7897211680
Author: Noel Grandin 
AuthorDate: Wed Aug 4 11:37:34 2021 +0200
Commit: Michael Meeks 
CommitDate: Thu Sep 16 19:01:07 2021 +0200

improve LOK notifyInvalidation

(*) tweak buffer in SfxLokHelper::notifyInvalidation to be a bit larger,
so we avoid the cost of a resize
(*) use our optimised OString concatentation instead of going via
std::stringstream
(*) pass down a pointer to rectangle, instead of a string. later we will
use this to avoid doing the stringify until later

Change-Id: Ia3e3042bc919d9b9cb80e47a93704eb236438605
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119994
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120072
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 417f881d20cafe88a02b64894ba4483875fb9460)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122123

diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index 6ab1fae77b99..f8fcb1f0aa34 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -283,11 +283,11 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* 
pRectangle)
 SfxViewShell* pCurrentShell = SfxViewShell::Current();
 if ( nullptr == pCurrentShell )
 return;
-OString sRectangle;
+tools::Rectangle aResultRectangle;
 if (!pRectangle)
 {
 // we have to invalidate the whole chart area not the whole document
-sRectangle = GetBoundingBox().toString();
+aResultRectangle = GetBoundingBox();
 }
 else
 {
@@ -325,9 +325,9 @@ void ChartWindow::LogicInvalidate(const tools::Rectangle* 
pRectangle)
 aRectangle = tools::Rectangle(aRectangle.TopLeft() + aOffset, 
aRectangle.GetSize());
 }
 
-sRectangle = aRectangle.toString();
+aResultRectangle = aRectangle;
 }
-SfxLokHelper::notifyInvalidation(pCurrentShell, sRectangle);
+SfxLokHelper::notifyInvalidation(pCurrentShell, );
 }
 
 FactoryFunction ChartWindow::GetUITestFactory() const
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 84d9d5299fd4..3d95d4f602b4 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -46,11 +46,10 @@ namespace desktop {
 
 OString toString() const
 {
-std::stringstream ss;
-ss << m_aRectangle.toString();
 if (m_nPart >= -1)
-ss << ", " << m_nPart;
-return ss.str().c_str();
+return m_aRectangle.toString() + ", " + 
OString::number(m_nPart);
+else
+return m_aRectangle.toString();
 }
 
 /// Infinite Rectangle is both sides are
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 07baf8a20a3c..390b024757cf 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -107,7 +108,7 @@ public:
 /// Emits a LOK_CALLBACK_DOCUMENT_SIZE_CHANGED for all views of the same 
document - if @bInvalidateAll - first invalidates all parts
 static void notifyDocumentSizeChangedAllViews(vcl::ITiledRenderable* pDoc, 
bool bInvalidateAll = true);
 /// Emits a LOK_CALLBACK_INVALIDATE_TILES, but tweaks it according to 
setOptionalFeatures() if needed.
-static void notifyInvalidation(SfxViewShell const* pThisView, const 
OString& rPayload);
+static void notifyInvalidation(SfxViewShell const* pThisView, 
tools::Rectangle const *);
 /// Emits a LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, but tweaks it 
according to setOptionalFeatures() if needed.
 static void notifyVisCursorInvalidation(OutlinerViewShell const* 
pThisView, const OString& rRectangle, bool bMispelledWord = false, const 
OString& rHyperlink = "");
 /// Notifies all views with the given type and payload.
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index

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

 tools/source/generic/fract.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3b995a0f54ed6d16b090cb4873418d22faafc139
Author: Noel Grandin 
AuthorDate: Thu Sep 16 11:59:08 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 20:22:35 2021 +0200

Revert "speedup rational_FromDouble"

This reverts commit 67d83e40e2c4f3862c50e6abeabfc24a75119fc8.

because it causes less accuracy sometimes, eg. see
  https://gerrit.libreoffice.org/c/core/+/122186

Change-Id: I06eb4921359a8fe6689c6cfd3e2967e25b646fa3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122124
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit f2315daf701847a180a5759039b4951fb4da0653)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122126

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 57dd4e79c138..1b3c95a6cdda 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -370,8 +370,8 @@ bool operator > ( const Fraction& rVal1, const Fraction& 
rVal2 )
 }
 
 // If dVal > LONG_MAX or dVal < LONG_MIN, the rational throws a 
boost::bad_rational.
-// Otherwise, dVal and denominator are multiplied by 8, until one of them
-// is larger than (LONG_MAX / 8).
+// Otherwise, dVal and denominator are multiplied by 10, until one of them
+// is larger than (LONG_MAX / 10).
 //
 // NOTE: here we use 'sal_Int32' due that only values in sal_Int32 range are 
valid.
 static boost::rational rational_FromDouble(double dVal)
@@ -381,11 +381,11 @@ static boost::rational 
rational_FromDouble(double dVal)
  std::isnan(dVal) )
 throw boost::bad_rational();
 
-const sal_Int32 nMAX = std::numeric_limits::max() / 8;
+const sal_Int32 nMAX = std::numeric_limits::max() / 10;
 sal_Int32 nDen = 1;
 while ( std::abs( dVal ) < nMAX && nDen < nMAX ) {
-dVal *= 8;
-nDen *= 8;
+dVal *= 10;
+nDen *= 10;
 }
 return boost::rational( sal_Int32(dVal), nDen );
 }

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

 i18npool/source/calendar/calendar_gregorian.cxx |   60 +++-
 i18npool/source/transliteration/transliterationImpl.cxx |   16 +---
 2 files changed, 36 insertions(+), 40 deletions(-)

New commits:
commit 922b8420071989026bf7cc2a973714788e0211dd
Author: Noel Grandin 
AuthorDate: Thu Sep 16 14:28:52 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 20:16:50 2021 +0200

expand out unnecessary macro

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

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index 1da80995b1d1..6a1dad685309 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -127,8 +127,6 @@ using namespace ::com::sun::star::lang;
 
 namespace i18npool {
 
-#define ERROR RuntimeException()
-
 Calendar_gregorian::Calendar_gregorian()
 : mxNatNum(new NativeNumberSupplierService)
 {
@@ -174,7 +172,7 @@ Calendar_gregorian::init(const Era *_eraArray)
  */
 UErrorCode status = U_ZERO_ERROR;
 body.reset( icu::Calendar::createInstance( aIcuLocale, status) );
-if (!body || !U_SUCCESS(status)) throw ERROR;
+if (!body || !U_SUCCESS(status)) throw RuntimeException();
 eraArray=_eraArray;
 }
 
@@ -195,7 +193,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, 
sal_Int16 idx, sal_Int16
 css::lang::Locale jaLocale("ja", OUString(), OUString());
 if (idx == 0) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timeAM;
 else if (idx == 1) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timePM;
-else throw ERROR;
+else throw RuntimeException();
 }
 else
 return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType 
);
@@ -215,7 +213,7 @@ Calendar_hanja_yoil::getDisplayName( sal_Int16 
displayIndex, sal_Int16 idx, sal_
 css::lang::Locale jaLocale("ja", OUString(), OUString());
 if (idx == 0) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timeAM;
 else if (idx == 1) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timePM;
-else throw ERROR;
+else throw RuntimeException();
 }
 else
 return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType 
);
@@ -295,7 +293,7 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, 
const css::lang::Loc
 }
 }
 // Calendar is not for the locale
-throw ERROR;
+throw RuntimeException();
 }
 
 
@@ -333,7 +331,7 @@ Calendar_gregorian::setDateTime( double fTimeInDays )
 "Calendar_gregorian::setDateTime: " << std::fixed << fM << " 
rounded to " << fR);
 UErrorCode status = U_ZERO_ERROR;
 body->setTime( fR, status);
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 getValue();
 }
 
@@ -346,7 +344,7 @@ Calendar_gregorian::getDateTime()
 }
 UErrorCode status = U_ZERO_ERROR;
 double fR = body->getTime(status);
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 return fR / U_MILLIS_PER_DAY;
 }
 
@@ -362,10 +360,10 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
 UErrorCode status = U_ZERO_ERROR;
 body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
 
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 body->setTime( fR - (nZoneOffset + nDSTOffset), status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 getValue();
 }
 
@@ -378,13 +376,13 @@ Calendar_gregorian::getLocalDateTime()
 }
 UErrorCode status = U_ZERO_ERROR;
 double fTime = body->getTime( status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 int32_t nZoneOffset = body->get( UCAL_ZONE_OFFSET, status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 int32_t nDSTOffset = body->get( UCAL_DST_OFFSET, status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 return (fTime + (nZoneOffset + nDSTOffset)) / U_MILLIS_PER_DAY;
 }
 
@@ -471,7 +469,7 @@ static UCalendarDateFields fieldNameConverter(sal_Int16 
fieldIndex)
 case CalendarFieldIndex::YEAR:  f = UCAL_YEAR; break;
 case CalendarFieldIndex::MONTH: f = UCAL_MONTH; break;
 case CalendarFieldIndex::ERA:   f = UCAL_ERA; break;
-default: throw ERROR;
+default: throw RuntimeException();
 }
 return f;
 }
@@ -480,7 +478,7 @@ void SAL_CALL

[Libreoffice-commits] core.git: configure.ac external/breakpad external/coinmp external/cppunit external/lcms2 external/postgresql external/python3

2021-09-16 Thread Hossein (via logerrit)

 configure.ac  |  109 --
 external/breakpad/ExternalProject_breakpad.mk |1 
 external/coinmp/ExternalProject_coinmp.mk |1 
 external/cppunit/ExternalProject_cppunit.mk   |1 
 external/lcms2/ExternalProject_lcms2.mk   |1 
 external/postgresql/ExternalProject_postgresql.mk |1 
 external/python3/ExternalProject_python3.mk   |1 
 7 files changed, 47 insertions(+), 68 deletions(-)

New commits:
commit c156a8c708f74dd31e1ef024edc578c3915619cb
Author: Hossein 
AuthorDate: Wed Sep 15 10:08:43 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Sep 16 19:50:56 2021 +0200

Add preliminary VS 2022 support

This patch changes the configure.ac, so that LibreOffice compiles
with the latest VS 2022 preview.

The option --with-visual-studio=2022 should be added to the
autogen.input, in order to use VS 2022 preview.

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

diff --git a/configure.ac b/configure.ac
index 4af48fc034d7..0a2d098b252c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3840,6 +3840,8 @@ map_vs_year_to_version()
 case $1 in
 2019)
 vsversion=16;;
+2022)
+vsversion=17;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3931,7 +3933,7 @@ find_msvc()
 PathFormat "$vswhere"
 vswhere=$formatted_path_unix
 for ver in $vsversions; do
-vswhereoutput=`$vswhere -version "@<:@ $ver , $(expr $ver + 1) @:}@" 
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 
installationPath | head -1`
+vswhereoutput=`$vswhere -prerelease -version "@<:@ $ver , $(expr $ver 
+ 1) @:}@" -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 
-property installationPath | head -1`
 # Fall back to all MS products (this includes VC++ Build Tools)
 if ! test -n "$vswhereoutput"; then
 AC_MSG_CHECKING([VC++ Build Tools and similar])
@@ -3951,6 +3953,10 @@ find_msvc()
 vcyear=2019
 vcnum=160
 ;;
+17.0)
+vcyear=2022
+vcnum=170
+;;
 esac
 vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
 
@@ -4064,25 +4070,18 @@ if test "$_os" = "WINNT"; then
 AC_MSG_CHECKING([for MSBuild.exe location for: $vcnumwithdot])
 # Find the proper version of MSBuild.exe to use based on the VS version
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
-if test -n "$regvalue" ; then
-AC_MSG_RESULT([found: $regvalue])
-MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
-else
-if test "$vcnumwithdot" = "16.0"; then
-if test "$WIN_BUILD_ARCH" != "x64"; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
-else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
-fi
+if test -z "$regvalue" ; then
+if test "$WIN_BUILD_ARCH" != "x64"; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
 else
-if test "$WIN_BUILD_ARCH" != "x64"; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
-else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
-fi
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
 fi
+fi
+if test -d "$regvalue" ; then
 MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
 AC_MSG_RESULT([$regvalue])
+else
+AC_MSG_ERROR([MSBuild.exe location not found])
 fi
 
 # Find the version of devenv.exe
@@ -4125,7 +4124,7 @@ if test "$_os" = "WINNT"; then
 # are always "better", we list them in reverse chronological order.
 
 case "$vcnum" in
-160)
+160 | 170)
 WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
 ;;
 esac
@@ -6410,11 +6409,15 @@ find_msms()
 # Return value: $msmdir
 
 AC_MSG_CHECKING([for MSVC merge modules directory])
-local my_msm_files=Microsoft_VC${VCVER}_CRT_x86.msm
+local my_msm_files
 local my_msm_dir
 
+dnl Order my_msm_files in increasing order. Then check the directories 
returned
+dnl by ls in an inner loop; assuming they are also ordered in increasing 
order,
+dnl the result will be the highest MSM version found in the highest 
directory.
+
 case "$VCVER" in
-160)
+160 | 170)
 my_msm_files="Microsoft_VC141_CRT_x86.msm Microsoft_VC142_CRT_x86.msm 
${my_msm_files}"
 ;;
 esac
@@ -6423,45 +6426,14 @@ find_msms()
 done
 
 msmdir=
-for ver in 14.0 15.0; do
-reg_get_value_32

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

 emfio/source/reader/wmfreader.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d09770aab5b77c8f19da85588154151ab45b
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 20:08:55 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 22:07:44 2021 +0200

ofz: MemorySanitizer: use-of-uninitialized-value

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

diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index d71dbf485710..831a8eb4a837 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -930,8 +930,8 @@ namespace emfio
 case W_META_DIBCREATEPATTERNBRUSH:
 {
 Bitmap  aBmp;
-sal_uInt32  nRed = 0, nGreen = 0, nBlue = 0, nCount = 1;
-sal_uInt16  nStyle, nColorUsage;
+sal_uInt32 nRed(0), nGreen(0), nBlue(0), nCount(1);
+sal_uInt16 nStyle(0), nColorUsage(0);
 
 mpInputStream->ReadUInt16( nStyle ).ReadUInt16( nColorUsage );
 SAL_INFO( "emfio", "\t\t Style:" << nStyle << ", ColorUsage: " 
<< nColorUsage );

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - download.lst

2021-09-16 Thread Heiko Tietze (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 299da25441aea14e631888d1f355cd6b0ecd6d7d
Author: Heiko Tietze 
AuthorDate: Thu Sep 16 10:41:06 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Sep 17 05:10:55 2021 +0200

Resolves tdf#144523 - Update Liberation fonts to 2.1.4 release

Change-Id: I25aa71d214eec3a131a7b11dfe292764061a127c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122182
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 95406f2e172df13ae9c6536ca1378cd7fca3b2de)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122129
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 4a46891079e0..a1e91cd873a8 100644
--- a/download.lst
+++ b/download.lst
@@ -66,8 +66,8 @@ export FONT_GENTIUM_SHA256SUM := 
2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8a
 export FONT_GENTIUM_TARBALL := 
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
 export FONT_LIBERATION_NARROW_SHA256SUM := 
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
 export FONT_LIBERATION_NARROW_TARBALL := 
liberation-narrow-fonts-ttf-1.07.6.tar.gz
-export FONT_LIBERATION_SHA256SUM := 
c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
-export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.00.4.tar.gz
+export FONT_LIBERATION_SHA256SUM := 
26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef
+export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.1.4.tar.gz
 export FONT_LINLIBERTINEG_SHA256SUM := 
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 export FONT_SOURCECODE_SHA256SUM := 
09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f

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

2021-09-16 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/utlui/content.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit f11ed86c0ce8b41482ad217bb6700832ef746870
Author: Jim Raykowski 
AuthorDate: Tue Sep 14 17:03:24 2021 -0800
Commit: Jim Raykowski 
CommitDate: Fri Sep 17 03:44:22 2021 +0200

tdf#95378 Writer Navigator: Track sections

This patch adds document content tracking of sections.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 0a14d3d12abb..57171cceeb0b 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3505,6 +3505,14 @@ void SwContentTree::UpdateTracking()
 }
 return;
 }
+// section
+if (const SwSection* pSection = m_pActiveShell->GetCurrSection(); pSection 
&&
+!(m_bIsRoot && m_nRootType != ContentTypeId::REGION))
+{
+lcl_SelectByContentTypeAndName(this, *m_xTreeView, 
SwResId(STR_CONTENT_TYPE_REGION),
+   pSection->GetSectionName());
+return;
+}
 // outline
 // find out where the cursor is
 const SwOutlineNodes::size_type nActPos = 
GetWrtShell()->GetOutlinePos(MAXLEVEL);

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

 desktop/source/lib/init.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 79b26048ae03a3ed92446012b6235d6a464bf7b8
Author: Luboš Luňák 
AuthorDate: Wed Sep 15 18:46:09 2021 +0200
Commit: Luboš Luňák 
CommitDate: Fri Sep 17 00:53:29 2021 +0200

use our string->number functions instead of std::istringstream

This is sort of the other side of the 417f881d20cafe88a02b6489
optimizations. C++ streams are relatively slow.

Change-Id: I295cc662ecab68eb23a6cb3a85606a4c95edeb07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122159
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 9c5a9ee14273593ebcc4bf0f1d42583b6f4f3c52)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122122
Tested-by: Jenkins CollaboraOffice 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b803d1372a77..c95de6ed4082 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -529,17 +529,33 @@ RectangleAndPart RectangleAndPart::Create(const 
std::string& rPayload)
 return aRet;
 }
 
-std::istringstream aStream(rPayload);
-tools::Long nLeft, nTop, nWidth, nHeight;
+// Read ', , , [, ]'. C++ streams are 
simpler but slower.
+const char* pos = rPayload.c_str();
+const char* end = rPayload.c_str() + rPayload.size();
+tools::Long nLeft = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nTop = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nWidth = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nHeight = rtl_str_toInt64_WithLength(pos, 10, end - pos);
 tools::Long nPart = INT_MIN;
-char nComma;
 if (comphelper::LibreOfficeKit::isPartInInvalidation())
 {
-aStream >> nLeft >> nComma >> nTop >> nComma >> nWidth >> nComma >> 
nHeight >> nComma >> nPart;
-}
-else
-{
-aStream >> nLeft >> nComma >> nTop >> nComma >> nWidth >> nComma >> 
nHeight;
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+nPart = rtl_str_toInt64_WithLength(pos, 10, end - pos);
 }
 
 if (nWidth > 0 && nHeight > 0)

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

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

New commits:
commit 428118bfef1813f6da83b10dab624b219d981483
Author: Luboš Luňák 
AuthorDate: Thu Sep 16 12:23:59 2021 +0200
Commit: Luboš Luňák 
CommitDate: Fri Sep 17 00:52:33 2021 +0200

avoid more window invalidation in LOK mode

This is an extension of 9b73d3e8926d5f9b10464d19b539eef3eb088f50.
If we're not painting to windows in LOK mode, then it's a waste of CPU
time to calculate invalidations for them when it'll be thrown away
anyway.

Change-Id: I20b1064cb9e41fd6d88b8dc2ee4edb80ae0e9104
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122125
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 910bbe6b69f5..c7c3b7544937 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -757,6 +757,12 @@ void Window::ImplInvalidateFrameRegion( const vcl::Region* 
pRegion, InvalidateFl
 
 void Window::ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 vcl::Region aRegion = rRegion;
 
 ImplClipBoundaries( aRegion, true, true );
@@ -787,6 +793,12 @@ void Window::ImplInvalidateParentFrameRegion( vcl::Region& 
rRegion )
 
 void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags 
nFlags )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 // check what has to be redrawn
 bool bInvalidateAll = !pRegion;

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

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

New commits:
commit a9cc066a86c6bd3423c5802c5a4eded55a50c754
Author: Luboš Luňák 
AuthorDate: Thu Sep 16 12:23:59 2021 +0200
Commit: Luboš Luňák 
CommitDate: Fri Sep 17 00:52:17 2021 +0200

avoid more window invalidation in LOK mode

This is an extension of 9b73d3e8926d5f9b10464d19b539eef3eb088f50.
If we're not painting to windows in LOK mode, then it's a waste of CPU
time to calculate invalidations for them when it'll be thrown away
anyway.

Change-Id: I20b1064cb9e41fd6d88b8dc2ee4edb80ae0e9104
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122194
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 5a01e4825e3a..0db0e6ccc400 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -758,6 +758,12 @@ void Window::ImplInvalidateFrameRegion( const vcl::Region* 
pRegion, InvalidateFl
 
 void Window::ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 vcl::Region aRegion = rRegion;
 
 ImplClipBoundaries( aRegion, true, true );
@@ -788,6 +794,12 @@ void Window::ImplInvalidateParentFrameRegion( vcl::Region& 
rRegion )
 
 void Window::ImplInvalidate( const vcl::Region* pRegion, InvalidateFlags 
nFlags )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 // check what has to be redrawn
 bool bInvalidateAll = !pRegion;

MacUpdate - your app listing has been updated

2021-09-16 Thread MacUpdate

Title: Untitled Document

App Listing Updated
Hi The Document Foundation, We have updated your application listing for LibreOffice 7.2.1.2 on MacUpdate.com. Please take a moment to review your application's information to make sure that everything is correct.

View your updated app listing

You can login to your Developer Account to reply to comments and view stats, or submit new updates and changes to your app listing.

Desktop Install Compatibility
MacUpdate Desktop 6 is helping developers make it easier for users to fully install and use their apps. Download Desktop 6 and to ensure your app works with the “Install” link on our download pages.

Advertise With MacUpdate
The best Mac devs advertise their apps on MacUpdate.com because it’s the most targeted, highly performing Mac app advertising you can find on the web. Contact a...@macupdate.com to guarantee your annual ad campaigns get booked and expand your app’s audience.

Learn more

Questions? Contact our Content Update Team upda...@macupdate.com.

You are receiving this offer because you have an app listed on MacUpdate.com. Add us to your address book or white list to ensure reliable delivery.

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

2021-09-16 Thread Michael Weghorn (via logerrit)

 winaccessibility/inc/AccObjectManagerAgent.hxx|   11 +++
 winaccessibility/source/UAccCOM/MAccessible.cxx   |3 +--
 winaccessibility/source/service/AccFrameEventListener.cxx |3 +--
 winaccessibility/source/service/AccObjectManagerAgent.cxx |   14 ++
 winaccessibility/source/service/AccTopWindowListener.cxx  |6 ++
 5 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 36be1ecdc8cc2ef36ff9db0ba8af78b4aeee774e
Author: Michael Weghorn 
AuthorDate: Thu Sep 16 14:57:53 2021 +0100
Commit: Michael Weghorn 
CommitDate: Fri Sep 17 07:05:46 2021 +0200

wina11y: Get rid of more HWND<->sal_Int64 casting

... by changing the first param for
AccObjectManagerAgent::SaveTopWindowHandle
to HWND.

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

diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx 
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index c3e1ee78c387..e4e87be3dc3c 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -85,8 +85,7 @@ public:
 short GetParentRole(css::accessibility::XAccessible* pXAcc );
 bool IsContainer(css::accessibility::XAccessible* pXAcc);
 
-void SaveTopWindowHandle(sal_Int64 hWnd,
-css::accessibility::XAccessible* pXAcc);
+void SaveTopWindowHandle(HWND hWnd, css::accessibility::XAccessible* 
pXAcc);
 
 void UpdateChildState(css::accessibility::XAccessible* pXAcc);
 
diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx 
b/winaccessibility/source/service/AccObjectManagerAgent.cxx
index 1e0c37729f31..ab909d495398 100644
--- a/winaccessibility/source/service/AccObjectManagerAgent.cxx
+++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx
@@ -157,11 +157,10 @@ bool AccObjectManagerAgent::InsertAccObj(
* @return void
*/
 void
-AccObjectManagerAgent::SaveTopWindowHandle(sal_Int64 hWnd, XAccessible* pXAcc)
+AccObjectManagerAgent::SaveTopWindowHandle(HWND hWnd, XAccessible* pXAcc)
 {
 if( pWinManager )
-pWinManager->SaveTopWindowHandle(
-static_cast(reinterpret_cast(hWnd)), pXAcc);
+pWinManager->SaveTopWindowHandle(hWnd, pXAcc);
 }
 
 
diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx 
b/winaccessibility/source/service/AccTopWindowListener.cxx
index 3c52d3280bd2..6ea78eb57c5b 100644
--- a/winaccessibility/source/service/AccTopWindowListener.cxx
+++ b/winaccessibility/source/service/AccTopWindowListener.cxx
@@ -65,8 +65,7 @@ void AccTopWindowListener::HandleWindowOpened( 
css::accessibility::XAccessible*
 //Only AccessibleContext exist, add all listeners
 if(pAccessibleContext != nullptr && systemdata != nullptr)
 {
-accManagerAgent.SaveTopWindowHandle(
-reinterpret_cast(systemdata->hWnd), pAccessible);
+accManagerAgent.SaveTopWindowHandle(systemdata->hWnd, pAccessible);
 
 AddAllListeners(pAccessible,nullptr,systemdata->hWnd);
 
commit 2a5da1609d9d39e5b2bd80bd6af80bebcb6c1fb9
Author: Michael Weghorn 
AuthorDate: Thu Sep 16 14:50:29 2021 +0100
Commit: Michael Weghorn 
CommitDate: Fri Sep 17 07:05:33 2021 +0200

wina11y: Avoid some casting between HWND and sal_Int64

... by changing the corresponding params for
AccObjectManagerAgent::InsertAccObj and
AccObjectManagerAgent::InsertChildrenAccObj
to HWND.

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

diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx 
b/winaccessibility/inc/AccObjectManagerAgent.hxx
index ea4b5837b74f..c3e1ee78c387 100644
--- a/winaccessibility/inc/AccObjectManagerAgent.hxx
+++ b/winaccessibility/inc/AccObjectManagerAgent.hxx
@@ -21,6 +21,10 @@
 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 
 struct IMAccessible;
@@ -45,7 +49,7 @@ public:
 
 virtual bool InsertAccObj(css::accessibility::XAccessible* pXAcc,
   css::accessibility::XAccessible* pParentXAcc,
-  sal_Int64 pWnd=0);
+  HWND hWnd = 0);
 virtual void GetIAccessibleFromResID(long childID,IMAccessible**);
 virtual bool 
GetIAccessibleFromXAccessible(css::accessibility::XAccessible* pXAcc, 
IAccessible** ppIA);
 
@@ -55,7 +59,7 @@ public:
 bool NotifyAccEvent(short pEvent = 0, css::accessibility::XAccessible* 
pXAcc = nullptr);
 
 bool InsertChildrenAccObj(css::accessibility::XAccessible* pXAcc,
-  sal_Int64 pWnd=0);
+  HWND  hWnd = 0);
 void DeleteChildrenAccObj( css::accessibility::XAccessible* pXAcc );
 
 void  DecreaseState(

[Libreoffice-commits] core.git: 2 commits - vcl/win winaccessibility/source

2021-09-16 Thread Michael Weghorn (via logerrit)

 vcl/win/window/salframe.cxx   |3 ---
 winaccessibility/source/UAccCOM/MAccessible.h |   15 ---
 2 files changed, 18 deletions(-)

New commits:
commit 6a36d9b341f647d5547027c33bf4dc7c3df12cf8
Author: Michael Weghorn 
AuthorDate: Thu Sep 16 09:47:55 2021 +0100
Commit: Michael Weghorn 
CommitDate: Fri Sep 17 07:05:14 2021 +0200

Drop conditional WM_GETOBJECT define from vcl/win/window/salframe.cxx

WM_GETOBJECT is already defined in WinUser.h.

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

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index ae19b4a5c5c7..259a1395a3b2 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -86,9 +86,6 @@
 
 #include 
 #include 
-#ifndef WM_GETOBJECT // TESTME does this ever happen ?
-#  define WM_GETOBJECT  0x003D
-#endif
 
 #include 
 
commit f1c902af040eb358cc141a7a926272a25a2afba7
Author: Michael Weghorn 
AuthorDate: Thu Sep 16 09:43:28 2021 +0100
Commit: Michael Weghorn 
CommitDate: Fri Sep 17 07:04:59 2021 +0200

wina11y: Drop OBJID_* defines from MAccessible.h

They are defined in WinUser.h, so there's no
need to duplicate that.

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

diff --git a/winaccessibility/source/UAccCOM/MAccessible.h 
b/winaccessibility/source/UAccCOM/MAccessible.h
index 5384e6a5c665..71296cfc2fda 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -34,21 +34,6 @@ namespace {
 enum class XInterfaceType;
 }
 
-#define OBJID_WINDOW((LONG)0x)
-#define OBJID_SYSMENU   ((LONG)0x)
-#define OBJID_TITLEBAR  ((LONG)0xFFFE)
-#define OBJID_MENU  ((LONG)0xFFFD)
-#define OBJID_CLIENT((LONG)0xFFFC)
-#define OBJID_VSCROLL   ((LONG)0xFFFB)
-#define OBJID_HSCROLL   ((LONG)0xFFFA)
-#define OBJID_SIZEGRIP  ((LONG)0xFFF9)
-#define OBJID_CARET ((LONG)0xFFF8)
-#define OBJID_CURSOR((LONG)0xFFF7)
-#define OBJID_ALERT ((LONG)0xFFF6)
-#define OBJID_SOUND ((LONG)0xFFF5)
-#define OBJID_QUERYCLASSNAMEIDX ((LONG)0xFFF4)
-#define OBJID_NATIVEOM  ((LONG)0xFFF0)
-
 /**
  *This class implements IMAccessible interface, which inherits from 
IAccessible2, and
  *in turn inherits from IAccessible. So its methods include the methods 
defined only in

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

2021-09-16 Thread Jim Raykowski (via logerrit)

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

New commits:
commit 00eed7d73ba482ff3433afaeb1fb968de515c09d
Author: Jim Raykowski 
AuthorDate: Tue Sep 14 17:26:56 2021 -0800
Commit: Jim Raykowski 
CommitDate: Fri Sep 17 07:34:46 2021 +0200

Writer Navigator: Fix category content tracking

This patch fixes a tracking bug that causes category content not to be
tracked when field content is at the current cursor position in the
document.

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 57171cceeb0b..4efaa1b40502 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3392,7 +3392,8 @@ void SwContentTree::UpdateTracking()
 }
 
 // fields
-if (SwField* pField = m_pActiveShell->GetCurField())
+if (SwField* pField = m_pActiveShell->GetCurField(); pField &&
+!(m_bIsRoot && m_nRootType != ContentTypeId::TEXTFIELD))
 {
 OUString sContentType(SwResId(STR_CONTENT_TYPE_TEXTFIELD));
 if (pField->GetTypeId() == SwFieldTypesEnum::Postit)

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

2021-09-16 Thread Attila Bakos (NISZ) (via logerrit)

 sw/inc/textboxhelper.hxx |   14 
 sw/qa/uitest/writer_tests7/tdf143574.py  |3 
 sw/source/core/doc/DocumentLayoutManager.cxx |   81 +++-
 sw/source/core/doc/docdraw.cxx   |   30 +
 sw/source/core/doc/docfly.cxx|4 
 sw/source/core/doc/docfmt.cxx|7 
 sw/source/core/doc/textboxhelper.cxx |  456 ++-
 sw/source/core/draw/dcontact.cxx |   31 +
 sw/source/core/draw/dview.cxx|   12 
 sw/source/core/frmedt/fecopy.cxx |4 
 sw/source/core/frmedt/fefly1.cxx |   22 +
 sw/source/core/frmedt/feshview.cxx   |6 
 sw/source/core/layout/atrfrm.cxx |   15 
 sw/source/core/layout/flycnt.cxx |2 
 sw/source/core/text/porfly.cxx   |   13 
 sw/source/core/undo/undraw.cxx   |  110 ++
 sw/source/core/unocore/unodraw.cxx   |7 
 sw/source/uibase/shells/drawsh.cxx   |4 
 18 files changed, 531 insertions(+), 290 deletions(-)

New commits:
commit ba5156abace2e41ec4d21397c0875f7e1efd2beb
Author: Attila Bakos (NISZ) 
AuthorDate: Wed Sep 1 16:38:07 2021 +0200
Commit: László Németh 
CommitDate: Thu Sep 16 12:56:10 2021 +0200

tdf#143574 tdf#144271 sw: textboxes in group shapes - part 2

Sync textboxes with group shapes, adding textboxes to
group shapes, copying textboxes with group shapes,
grouping/ungrouping group shapes with textboxes, removing
textboxes from group shapes.

This patch fixes a memory leak (tdf#144271) introduced
by commit 504d78acb866495fd954fcd6db22ea68f174a5ab
"tdf#143574 sw: textboxes in group shapes - part 1".

Note: AS_CHAR anchoring is far not the best for group
shapes and import/export is still missing.

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

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 3cd442ed7194..978cf77327b9 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -69,10 +69,10 @@ public:
 
 /// Sync property of TextBox with the one of the shape.
 static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 
nMemberID,
- const css::uno::Any& rValue);
+ const css::uno::Any& rValue, SdrObject* pObj = 
nullptr);
 /// Does the same, but works on properties which lack an sw-specific WID / 
MemberID.
 static void syncProperty(SwFrameFormat* pShape, std::u16string_view 
rPropertyName,
- const css::uno::Any& rValue);
+ const css::uno::Any& rValue, SdrObject* pObj = 
nullptr);
 /// Get a property of the underlying TextFrame.
 static void getProperty(SwFrameFormat const* pShape, sal_uInt16 nWID, 
sal_uInt8 nMemberID,
 css::uno::Any& rValue);
@@ -83,7 +83,7 @@ public:
 static css::text::TextContentAnchorType mapAnchorType(const RndStdIds& 
rAnchorID);
 
 /// Similar to syncProperty(), but used by the internal API (e.g. for UI 
purposes).
-static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& 
rSet);
+static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet const& 
rSet, SdrObject* pObj);
 
 /// Copy shape attributes to the text frame
 static void updateTextBoxMargin(SdrObject* pObj);
@@ -94,11 +94,11 @@ public:
 
 /// Sets the anchor of the associated textframe of the given shape, and
 /// returns true on success.
-static bool changeAnchor(SwFrameFormat* pShape);
+static bool changeAnchor(SwFrameFormat* pShape, SdrObject* pObj);
 
 /// Does the positioning for the associated textframe of the shape, and
 /// returns true on success.
-static bool doTextBoxPositioning(SwFrameFormat* pShape);
+static bool doTextBoxPositioning(SwFrameFormat* pShape, SdrObject* pObj);
 
 /// Returns true if the anchor different for the  given shape, and the
 /// associated textframe of the given shape.
@@ -112,7 +112,7 @@ public:
 
 // Returns true on success. Synchronize z-order of the text frame of the 
given textbox
 // by setting it one level higher than the z-order of the shape of the 
textbox.
-static bool DoTextBoxZOrderCorrection(SwFrameFormat* pShape);
+static bool DoTextBoxZOrderCorrection(SwFrameFormat* pShape, SdrObject* 
pObj);
 
 /**
  * If we have an associated TextFrame, then return that.
@@ -134,7 +134,7 @@ public:
 static css::uno::Reference
 getUnoTextFrame(css::uno::Reference const& xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
-static tools::Rectangle getTextRectangle(SwFrameFormat* pShape, bool 
bAbsolute = true);
+static tools::Rectangle getTextRectangle(SdrObject* pShape, bool bAbsolute 
=

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

2021-09-16 Thread Stephan Bergmann (via logerrit)

 starmath/source/mathml/mathmlattr.cxx |   25 -
 1 file changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 1d4adcee1ba82cb8f02ac73be3e558d10dea8eda
Author: Stephan Bergmann 
AuthorDate: Thu Sep 16 11:23:03 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 16 13:00:40 2021 +0200

Increase accuracy of ParseMathMLUnsignedNumber Fraction result

The new test from d5e55d204b71710eb5eb5d2c683dd6698626df3c "tdf#144319:
sw_odfexport: Add unittest" started to cause UBSan failure during
CppunitTest_sw_odfexport (),

> /workdir/UnpackedTarball/boost/boost/rational.hpp:605:22: runtime error: 
signed integer overflow: 1073741824 * 2 cannot be represented in type 'int'
> #0 0x2b450983594f in 
boost::rational::operator/=(boost::rational const&) 
/workdir/UnpackedTarball/boost/boost/rational.hpp:605:22
> #1 0x2b450982e216 in Fraction::operator/=(Fraction const&) 
/tools/source/generic/fract.cxx:224:7
> #2 0x2b45098312d3 in operator/(Fraction const&, Fraction const&) 
/tools/source/generic/fract.cxx:320:10
> #3 0x2b46066963d5 in (anonymous 
namespace)::lcl_CountBlanks(MathMLAttributeLengthValue const&, int*, int*) 
/starmath/source/mathml/mathmlimport.cxx:1497:30
> #4 0x2b46066943eb in (anonymous 
namespace)::SmXMLSpaceContext_Impl::startFastElement(int, 
com::sun::star::uno::Reference 
const&) /starmath/source/mathml/mathmlimport.cxx:1526:25
[...]

Formula-14/content.xml in sw/qa/extras/odfexport/data/tdf144319.odt contains
width="0.444em", which resulted in the inaccurate Fraction 
476741369/1073741824
since 67d83e40e2c4f3862c50e6abeabfc24a75119fc8 "speedup rational_FromDouble"
(which computes dVal=4.76741e+08 and nDen=1073741824; where before that 
speedup
it computed dVal=4.44e+08 and nDen=10, which would have resulted in 
the
accurate Fraction 111/250).  The excessively large denominator (1073741824 =
std::numeric_limits::max()/2 + 1) then caused overflow later on, 
as
shown above.

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

diff --git a/starmath/source/mathml/mathmlattr.cxx 
b/starmath/source/mathml/mathmlattr.cxx
index 008f8e2a81f6..7da7f947a8c6 100644
--- a/starmath/source/mathml/mathmlattr.cxx
+++ b/starmath/source/mathml/mathmlattr.cxx
@@ -9,6 +9,8 @@
 
 #include 
 
+#include 
+
 #include 
 
 static sal_Int32 ParseMathMLUnsignedNumber(const OUString& rStr, Fraction& rUN)
@@ -16,6 +18,9 @@ static sal_Int32 ParseMathMLUnsignedNumber(const OUString& 
rStr, Fraction& rUN)
 auto nLen = rStr.getLength();
 sal_Int32 nDecimalPoint = -1;
 sal_Int32 nIdx;
+sal_Int64 nom = 0;
+sal_Int64 den = 1;
+bool validNomDen = true;
 for (nIdx = 0; nIdx < nLen; nIdx++)
 {
 auto cD = rStr[nIdx];
@@ -28,11 +33,29 @@ static sal_Int32 ParseMathMLUnsignedNumber(const OUString& 
rStr, Fraction& rUN)
 }
 if (cD < u'0' || u'9' < cD)
 break;
+if (validNomDen
+&& (o3tl::checked_multiply(nom, sal_Int64(10), nom)
+|| o3tl::checked_add(nom, sal_Int64(cD - u'0'), nom)
+|| (nDecimalPoint >= 0 && o3tl::checked_multiply(den, 
sal_Int64(10), den
+{
+validNomDen = false;
+}
 }
 if (nIdx == 0 || (nIdx == 1 && nDecimalPoint == 0))
 return -1;
 
-rUN = Fraction(rStr.copy(0, nIdx).toDouble());
+// If the input "xx.yyy" can be represented with nom = xx*10^n + yyy and 
den = 10^n in sal_Int64
+// (where n is the length of "yyy"), then use that to create an accurate 
Fraction (and TODO: we
+// could even ignore trailing "0" characters in "yyy", for a smaller n and 
thus a greater chance
+// of validNomDen); if not, use the less accurate approach of creating a 
Fraction from double:
+if (validNomDen)
+{
+rUN = Fraction(nom, den);
+}
+else
+{
+rUN = Fraction(rStr.copy(0, nIdx).toDouble());
+}
 
 return nIdx;
 }

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

 vcl/unx/gtk4/convert3to4.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 23d7e3965efb69f4df04a930104bac36eeeb0289
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 10:38:05 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 13:07:46 2021 +0200

gtk4: set can-shrink to False for GtkPicture

for the icon in GtkMenuButton in the calc, insert, header and footer in
gtk 4.6 where the MenuButton begins to support a child widget again but
the icon while now shown in squished

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

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 5ffb37a700f0..7713e6f3f6a0 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1280,6 +1280,9 @@ ConvertResult Convert3To4(const 
css::uno::Reference& xNode
 auto xUri = CreateProperty(xDoc, "file",

"private:///graphicrepository/" + sIconName);
 xChild->insertBefore(xUri, xChildPropertyIconName);
+// calc, insert, header and footer, custom header 
menubutton icon
+auto xCanShrink = CreateProperty(xDoc, "can-shrink", 
"False");
+xChild->insertBefore(xCanShrink, 
xChildPropertyIconName);
 xChild->removeChild(xChildPropertyIconName);
 }
 }

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

 tools/source/generic/fract.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f2315daf701847a180a5759039b4951fb4da0653
Author: Noel Grandin 
AuthorDate: Thu Sep 16 11:59:08 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 13:33:55 2021 +0200

Revert "speedup rational_FromDouble"

This reverts commit 67d83e40e2c4f3862c50e6abeabfc24a75119fc8.

because it causes less accuracy sometimes, eg. see
  https://gerrit.libreoffice.org/c/core/+/122186

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

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 57dd4e79c138..1b3c95a6cdda 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -370,8 +370,8 @@ bool operator > ( const Fraction& rVal1, const Fraction& 
rVal2 )
 }
 
 // If dVal > LONG_MAX or dVal < LONG_MIN, the rational throws a 
boost::bad_rational.
-// Otherwise, dVal and denominator are multiplied by 8, until one of them
-// is larger than (LONG_MAX / 8).
+// Otherwise, dVal and denominator are multiplied by 10, until one of them
+// is larger than (LONG_MAX / 10).
 //
 // NOTE: here we use 'sal_Int32' due that only values in sal_Int32 range are 
valid.
 static boost::rational rational_FromDouble(double dVal)
@@ -381,11 +381,11 @@ static boost::rational 
rational_FromDouble(double dVal)
  std::isnan(dVal) )
 throw boost::bad_rational();
 
-const sal_Int32 nMAX = std::numeric_limits::max() / 8;
+const sal_Int32 nMAX = std::numeric_limits::max() / 10;
 sal_Int32 nDen = 1;
 while ( std::abs( dVal ) < nMAX && nDen < nMAX ) {
-dVal *= 8;
-nDen *= 8;
+dVal *= 10;
+nDen *= 10;
 }
 return boost::rational( sal_Int32(dVal), nDen );
 }

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

 vcl/unx/gtk3/gtkinst.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit d60489cca78c91d24cf0ac7fd82e1bcccdc8d1da
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 11:39:49 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 13:41:46 2021 +0200

find_menu_button only needed for gtk3

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index bdf14df96d98..c3bdb8a197f5 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10779,6 +10779,7 @@ private:
 std::map m_aMap;
 std::map> m_aMenuButtonMap;
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
 // at the time of writing there is no gtk_menu_tool_button_set_popover 
available
 // though there will be in the future
 // 
https://gitlab.gnome.org/GNOME/gtk/commit/03e30431a8af9a947a0c4ccab545f24da16bfe17?w=1
@@ -10789,10 +10790,8 @@ private:
 GtkWidget **ppToggleButton = static_cast(user_data);
 *ppToggleButton = pWidget;
 }
-#if !GTK_CHECK_VERSION(4, 0, 0)
 else if (GTK_IS_CONTAINER(pWidget))
 gtk_container_forall(GTK_CONTAINER(pWidget), find_menu_button, 
user_data);
-#endif
 }
 
 static void find_menupeer_button(GtkWidget *pWidget, gpointer user_data)
@@ -10802,11 +10801,10 @@ private:
 GtkWidget **ppButton = static_cast(user_data);
 *ppButton = pWidget;
 }
-#if !GTK_CHECK_VERSION(4, 0, 0)
 else if (GTK_IS_CONTAINER(pWidget))
 gtk_container_forall(GTK_CONTAINER(pWidget), find_menupeer_button, 
user_data);
-#endif
 }
+#endif
 
 static void collect(GtkWidget* pItem, gpointer widget)
 {

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

 sw/source/core/bastyp/swregion.cxx |   92 +
 1 file changed, 54 insertions(+), 38 deletions(-)

New commits:
commit d13b63a9859d653d1aba688a56590aa0ef24b89c
Author: Luboš Luňák 
AuthorDate: Wed Sep 15 13:49:11 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Sep 16 11:29:19 2021 +0200

optimize SwRegionRects::Compress()

This function gets called on modifying documents, and it shows up
noticeably e.g. when profiling editing in Online.
The code repeatedly restarts the whole process on most changes,
but in practice this seems to only lead to repeated checks with
the same outcome. So finish the whole compression and try again
only at the end, if deemed needed. And even there I'm not sure
if it's actually ever needed, since I couldn't trigger such a case
in practice.

Change-Id: I15b0a83c6865bad21fe60a7e9ca0b87ceea5b489
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122156
Tested-by: Luboš Luňák 
Reviewed-by: Luboš Luňák 

diff --git a/sw/source/core/bastyp/swregion.cxx 
b/sw/source/core/bastyp/swregion.cxx
index ea59d25d532e..54b237c3756d 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -135,7 +135,7 @@ void SwRegionRects::Invert()
 swap( aInvRegion );
 }
 
-static SwTwips CalcArea( const SwRect  )
+static inline SwTwips CalcArea( const SwRect  )
 {
 return rRect.Width() * rRect.Height();
 }
@@ -143,51 +143,67 @@ static SwTwips CalcArea( const SwRect  )
 // combine all adjacent rectangles
 void SwRegionRects::Compress()
 {
-for (size_type i = 0; i < size(); )
+bool bAgain;
+do
 {
-bool bRestart(false);
-for ( size_type j = i+1; j < size(); ++j )
+bAgain = false;
+for (size_type i = 0; i < size(); ++i )
 {
-// If one rectangle contains a second completely than the latter
-// does not need to be stored and can be deleted
-if ( (*this)[i].IsInside( (*this)[j] ) )
+for ( size_type j = i+1; j < size(); ++j )
 {
-erase( begin() + j );
---j;
-}
-else if ( (*this)[j].IsInside( (*this)[i] ) )
-{
-(*this)[i] = (*this)[j];
-erase( begin() + j );
-bRestart = true;
-break;
-}
-else
-{
-// If two rectangles have the same area of their union minus 
the
-// intersection then one of them can be deleted.
-// For combining as much as possible (and for having less 
single
-// paints), the area of the union can be a little bit larger:
-// ( 9622 * 141.5 = 1361513 ~= a quarter (1/4) centimeter wider
-// than the width of an A4 page
-const tools::Long nFuzzy = 1361513;
-SwRect aUnion( (*this)[i] );
-aUnion.Union( (*this)[j] );
-SwRect aInter( (*this)[i] );
-aInter.Intersection( (*this)[j] );
-if ( (::CalcArea( (*this)[i] ) +
-  ::CalcArea( (*this)[j] ) + nFuzzy) >=
- (::CalcArea( aUnion ) - CalcArea( aInter )) )
+// If one rectangle contains a second completely than the 
latter
+// does not need to be stored and can be deleted
+if ( (*this)[i].IsInside( (*this)[j] ) )
+{
+erase( begin() + j );
+--j;
+}
+else if ( (*this)[j].IsInside( (*this)[i] ) )
 {
-(*this)[i] = aUnion;
+(*this)[i] = (*this)[j];
 erase( begin() + j );
-bRestart = true;
-break;
+--j;
+bAgain = true;
+}
+else
+{
+// TODO: I think the comment below and the code are 
partially incorrect.
+// An obvious mistake is the comment saying that one 
rectangle can be deleted,
+// while it's the union that gets used instead of the two 
rectangles.
+// I think this code is supposed to merge adjacent 
rectangles (possibly
+// overlapping), and such rectangles can be detected by 
their merged areas
+// being equal to the area of the union (which is 
obviously the case if they
+// share one side, and using the nFuzzy extra allow 
merging also rectangles
+// that do not quite cover the entire union but it's close 
enough).
+// So another mistake seems to be using '- CalcArea( 
aInter )',
+// it should be on the other side of the comparison to 
subtract shared area
+

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

 desktop/source/lib/init.cxx |   32 
 1 file changed, 24 insertions(+), 8 deletions(-)

New commits:
commit 9c5a9ee14273593ebcc4bf0f1d42583b6f4f3c52
Author: Luboš Luňák 
AuthorDate: Wed Sep 15 18:46:09 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Sep 16 11:32:40 2021 +0200

use our string->number functions instead of std::istringstream

This is sort of the other side of the 417f881d20cafe88a02b6489
optimizations. C++ streams are relatively slow.

Change-Id: I295cc662ecab68eb23a6cb3a85606a4c95edeb07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122159
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9674cdfcaa1d..6ab01d631910 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -524,17 +524,33 @@ RectangleAndPart RectangleAndPart::Create(const 
std::string& rPayload)
 return aRet;
 }
 
-std::istringstream aStream(rPayload);
-tools::Long nLeft, nTop, nWidth, nHeight;
+// Read ', , , [, ]'. C++ streams are 
simpler but slower.
+const char* pos = rPayload.c_str();
+const char* end = rPayload.c_str() + rPayload.size();
+tools::Long nLeft = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nTop = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nWidth = rtl_str_toInt64_WithLength(pos, 10, end - pos);
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+tools::Long nHeight = rtl_str_toInt64_WithLength(pos, 10, end - pos);
 tools::Long nPart = INT_MIN;
-char nComma;
 if (comphelper::LibreOfficeKit::isPartInInvalidation())
 {
-aStream >> nLeft >> nComma >> nTop >> nComma >> nWidth >> nComma >> 
nHeight >> nComma >> nPart;
-}
-else
-{
-aStream >> nLeft >> nComma >> nTop >> nComma >> nWidth >> nComma >> 
nHeight;
+while( *pos != ',' )
+++pos;
+++pos;
+assert(pos < end);
+nPart = rtl_str_toInt64_WithLength(pos, 10, end - pos);
 }
 
 if (nWidth > 0 && nHeight > 0)

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

 vcl/unx/gtk4/convert3to4.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 237308204b75289b7ed53ae6e394312422120368
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 09:32:03 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 11:48:47 2021 +0200

gtk4: set newly available always-show-arrow property

since 4.4

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

diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index b1e1752d8ec4..5ffb37a700f0 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -730,6 +730,12 @@ ConvertResult Convert3To4(const 
css::uno::Reference& xNode
 if (sName == "draw-indicator")
 {
 assert(toBool(xChild->getFirstChild()->getNodeValue()));
+if (GetParentObjectType(xChild) == "GtkMenuButton")
+{
+auto xDoc = xChild->getOwnerDocument();
+auto xAlwaysShowArrow = CreateProperty(xDoc, 
"always-show-arrow", "True");
+xChild->getParentNode()->insertBefore(xAlwaysShowArrow, 
xChild);
+}
 xRemoveList.push_back(xChild);
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/skia

 external/skia/UnpackedTarball_skia.mk|3 ++-
 external/skia/windows-libraries-system32.patch.1 |   13 +
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 754a28a5a0e4cb3eb7ab98dd9d45c992caa0a51f
Author: Luboš Luňák 
AuthorDate: Wed Sep 1 11:00:38 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 11:48:29 2021 +0200

patch Skia to search only system32/ for libraries

LO on Windows defaults to Vulkan, and Skia tries to load the vulkan
DLL, which may not be present on some systems. The library AFAICT
should always be in a system directory, so restrict library
searching to just there to avoid the possibility of DLL hijacking,
just to be safe.

Change-Id: I78ad3c7297e613c0316e82c5ff3c0110a02da337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121437
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122137
Reviewed-by: Caolán McNamara 

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index 319b33716a96..78713aaaefc1 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -36,7 +36,8 @@ skia_patches := \
 c++20.patch.0 \
 constexpr-debug-std-max.patch.1 \
 swap-buffers-rect.patch.1 \
-ubsan.patch.0
+ubsan.patch.0 \
+windows-libraries-system32.patch.1
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/windows-libraries-system32.patch.1 
b/external/skia/windows-libraries-system32.patch.1
new file mode 100644
index ..45c0e35d1cfa
--- /dev/null
+++ b/external/skia/windows-libraries-system32.patch.1
@@ -0,0 +1,13 @@
+diff --git a/src/ports/SkOSLibrary_win.cpp b/src/ports/SkOSLibrary_win.cpp
+index d2dcbe0af6..c288bbf177 100644
+--- a/src/ports/SkOSLibrary_win.cpp
 b/src/ports/SkOSLibrary_win.cpp
+@@ -11,7 +11,7 @@
+ #include "src/ports/SkOSLibrary.h"
+ 
+ void* SkLoadDynamicLibrary(const char* libraryName) {
+-return LoadLibraryA(libraryName);
++return LoadLibraryExA(libraryName, nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+ }
+ 
+ void* SkGetProcedureAddress(void* library, const char* functionName) {

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 92e8706b6de54b0e2e7d5915f5f9ff299727930d
Author: Olivier Hallot 
AuthorDate: Thu Sep 16 07:04:04 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Sep 16 12:04:04 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 446fbc68aaf1ddc03e3b8c176d943c5f5ca09ade
  - tdf#144332 fix bookmark typo + refactors

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

diff --git a/helpcontent2 b/helpcontent2
index 1a62af240032..446fbc68aaf1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1a62af2400327a33a9e51b7d4697364ba14dfa9e
+Subproject commit 446fbc68aaf1ddc03e3b8c176d943c5f5ca09ade

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit b2db17e8c0bb64e33ecf2d074a542568fc66451a
Author: Olivier Hallot 
AuthorDate: Thu Sep 16 07:07:18 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Sep 16 12:07:18 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0730e0e4e05095fba949378e2cc489f31784c7e4
  - tdf#125636 (part) GPG siging works only for ODF

https://bugs.documentfoundation.org/show_bug.cgi?id=125636#c16

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

diff --git a/helpcontent2 b/helpcontent2
index c8c6952d809c..0730e0e4e050 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8c6952d809ccc08b89b8d5ac5e603e5ec00ec20
+Subproject commit 0730e0e4e05095fba949378e2cc489f31784c7e4

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

 source/text/shared/guide/openpgp.xhp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0730e0e4e05095fba949378e2cc489f31784c7e4
Author: Olivier Hallot 
AuthorDate: Wed Sep 15 09:37:15 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Sep 16 12:07:17 2021 +0200

tdf#125636 (part) GPG siging works only for ODF

https://bugs.documentfoundation.org/show_bug.cgi?id=125636#c16

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

diff --git a/source/text/shared/guide/openpgp.xhp 
b/source/text/shared/guide/openpgp.xhp
index 515569b61..f53e4e772 100644
--- a/source/text/shared/guide/openpgp.xhp
+++ b/source/text/shared/guide/openpgp.xhp
@@ -27,6 +27,8 @@
 Encrypting Documents with 
OpenPGP
 %PRODUCTNAME can encrypt documents using 
OpenPGP public key cryptography. The document is encrypted using a symmetric 
encryption algorithm.
 
+According to 
https://bugs.documentfoundation.org/show_bug.cgi?id=125636#c16 , only ODF files 
can be signed with GPG
+GPG signing only works for ODF 
documents.
 
 Choose menu File - Save as, select 
Encrypt with GPG key, Click Save.

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

 i18npool/source/transliteration/transliteration_body.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 16d645e5b8f11b4ddb49a2b58bde388b28960abc
Author: Noel Grandin 
AuthorDate: Thu Sep 16 10:38:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 12:09:23 2021 +0200

speedup Transliteration_body::transliterateImpl

use alloca in Transliteration_body::transliterateImpl to avoid
over-allocating stack-space (which tends to unnecessarily flush some
cache)

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

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 9fd89df75e42..3581212af8b3 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -102,9 +102,12 @@ Transliteration_body::transliterateImpl(
 // Allocate the max possible buffer. Try to use stack instead of heap,
 // which would have to be reallocated most times anyways.
 constexpr sal_Int32 nLocalBuf = 2048;
-sal_Unicode aLocalBuf[ nLocalBuf * NMAPPINGMAX ], *out = aLocalBuf;
+sal_Unicode* out;
 std::unique_ptr pHeapBuf;
-if (nCount > nLocalBuf)
+size_t nBytes = (nCount + 1) * sizeof(sal_Unicode);
+if (nBytes <= nLocalBuf * NMAPPINGMAX)
+out = static_cast(alloca(nBytes));
+else
 {
 pHeapBuf.reset(new sal_Unicode[ nCount * NMAPPINGMAX ]);
 out = pHeapBuf.get();

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

 sw/source/uibase/app/docshini.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e58e828d4877f9068e4a69c52ac9c7fe6e65d032
Author: Caolán McNamara 
AuthorDate: Thu Sep 16 08:48:22 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 16 12:22:56 2021 +0200

ofz#38757 avoid config during fuzzing

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

diff --git a/sw/source/uibase/app/docshini.cxx 
b/sw/source/uibase/app/docshini.cxx
index 6cc2448d5a99..aabd3e8e4eb6 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -107,7 +107,8 @@ bool SwDocShell::InitNew( const uno::Reference < 
embed::XStorage >& xStor )
 SwTransferable::InitOle( this );
 
 // set forbidden characters if necessary
-if (!utl::ConfigManager::IsFuzzing())
+const bool bFuzzing = utl::ConfigManager::IsFuzzing();
+if (!bFuzzing)
 {
 SvxAsianConfig aAsian;
 const Sequence aLocales =  
aAsian.GetStartEndCharLocales();
@@ -236,7 +237,7 @@ bool SwDocShell::InitNew( const uno::Reference < 
embed::XStorage >& xStor )
 sal_uInt16 nFontWhich = RES_CHRATR_FONT;
 sal_uInt16 nFontHeightWhich = RES_CHRATR_FONTSIZE;
 LanguageType eLanguage = m_xDoc->GetDefault( RES_CHRATR_LANGUAGE 
).GetLanguage();
-bool bDisableBuiltinStyles = 
officecfg::Office::Common::Load::DisableBuiltinStyles::get();
+bool bDisableBuiltinStyles = !bFuzzing && 
officecfg::Office::Common::Load::DisableBuiltinStyles::get();
 sal_uInt8 nLimit = bDisableBuiltinStyles ? 0 : 24;
 for(sal_uInt8 nIdx = 0; nIdx < nLimit; nIdx += 2)
 {

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

2021-09-16 Thread Stephan Bergmann (via logerrit)

 sw/source/core/text/porlin.hxx   |2 +-
 sw/source/core/text/pormulti.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6881023d78e7a328b98328d8bf2d4ef9c67c0d68
Author: Stephan Bergmann 
AuthorDate: Wed Sep 15 12:53:28 2021 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 16 11:35:04 2021 +0200

CppunitTest_sw_core_text needs some more RTTI now in UBSan builds

...presumably since 0c3e47cc2f0570a7cd8ff4889763991a86b29f26 "tdf#144305 
sw: fix
rendering of ruby portions with non-default ruby alignment",

> DynamicLibraryManagerException: "Failed to load dynamic library: 
~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so
> ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so: 
undefined symbol: _ZTI13SwLinePortion"

and

> DynamicLibraryManagerException: "Failed to load dynamic library: 
~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so
> ~/lo/core/workdir/LinkTarget/CppunitTest/libtest_sw_core_text.so: 
undefined symbol: _ZTI14SwMultiPortion"

Change-Id: Iaebffc3c9c0245d6092ef1dfc58213fd2d38d303
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122143
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 485add3cd6240a0faceb7a74784d44b1c0a6705e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122117
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index f0efc86e5888..3dc7ff9e287d 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -46,7 +46,7 @@ class SwPortionHandler;
 
 /// Base class for anything that can be part of a line in the Writer layout.
 /// Typically owned by SwLineLayout.
-class SwLinePortion: public SwPosSize
+class SAL_DLLPUBLIC_RTTI SwLinePortion: public SwPosSize
 {
 protected:
 // Here we have areas with different attributes
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 7c17df2e175c..c1df8b0400f2 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -77,7 +77,7 @@ struct SwBracket
 // or phonetics (ruby)
 // or combined characters
 // or a rotated portion.
-class SwMultiPortion : public SwLinePortion
+class SAL_DLLPUBLIC_RTTI SwMultiPortion : public SwLinePortion
 {
 SwLineLayout m_aRoot; // One or more lines
 bool m_bTab1  :1; // First line tabulator

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

 source/text/scalc/guide/pivotchart.xhp |5 +---
 source/text/schart/01/0403.xhp |   26 -
 source/text/swriter/01/accessibility_check.xhp |2 -
 3 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit 446fbc68aaf1ddc03e3b8c176d943c5f5ca09ade
Author: Olivier Hallot 
AuthorDate: Thu Sep 16 06:58:52 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Sep 16 12:04:02 2021 +0200

tdf#144332 fix bookmark typo + refactors

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

diff --git a/source/text/scalc/guide/pivotchart.xhp 
b/source/text/scalc/guide/pivotchart.xhp
index 66d42375c..80dc442ad 100644
--- a/source/text/scalc/guide/pivotchart.xhp
+++ b/source/text/scalc/guide/pivotchart.xhp
@@ -16,18 +16,17 @@
 
 
 
-
 
 chart;pivot chart
 pivot table;pivot chart
 
-Pivot 
Chart
+Pivot 
Chart
 
 A 
pivot chart is a chart with data range and data series of a pivot 
table.
 Different from static sized tables, where the number of rows 
and columns are constant, pivot tables can have varying dimensions, depending 
on the pivot table settings and its data source contents.
 
 Pivot charts track the changes in the data issued from a pivot 
table and adjust the data series and data range accordingly.
-
+
 
 
 
diff --git a/source/text/schart/01/0403.xhp 
b/source/text/schart/01/0403.xhp
index 7afac3f22..8d56974b8 100644
--- a/source/text/schart/01/0403.xhp
+++ b/source/text/schart/01/0403.xhp
@@ -39,8 +39,8 @@
 
 
 
- Data Labels
-
+ Data Labels
+
  Opens the Data Labels dialog, 
which enables you to set the data labels.
 
   
@@ -52,43 +52,43 @@
   
 
 
-Show 
value as number
+Show value as number
   Displays the absolute 
values of the data points.
 
 
-Number 
format
+Number format
   Opens a dialog to select the number format.
 
 
-Show 
value as percentage
+Show value as percentage
   Displays the 
percentage of the data points in each column.
 
 
-Percentage format
+Percentage format
   Opens a dialog to select the percentage format.
 
 
-Show 
category
+Show category
   Shows the data point text 
labels.
 
 
-Show 
legend key
+Show legend key
   Displays the legend icons next 
to each data point label.
 
 
-Separator
+Separator
   Selects the separator between multiple text strings for the same 
object.
 
-
-Placement
+
+Placement
   Selects the placement of data labels relative to the 
objects.
 
 
-Text Direction
+Text Direction
   Specify the text direction for a paragraph that 
uses complex text layout (CTL). This feature is only available if complex text 
layout support is enabled.
 
 
-Rotate Text
+Rotate Text
   Click in the dial to set the text orientation 
for the data labels.
 
 
diff --git a/source/text/swriter/01/accessibility_check.xhp 
b/source/text/swriter/01/accessibility_check.xhp
index d4294669c..10c4dc882 100644
--- a/source/text/swriter/01/accessibility_check.xhp
+++ b/source/text/swriter/01/accessibility_check.xhp
@@ -20,8 +20,8 @@
 accessibility;check in text document
 PDF/UA;check
 
+
 
-
 Accessibility Check
 Review common accessibility problems in the document, and 
support for PDF/UA specifications in the PDF export dialog.

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