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

[Justin Luth (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a2d322c02af05db1b785633ea398fe0b62b67605
Author: Justin Luth 
AuthorDate: Sat Oct 23 13:25:41 2021 +0200
Commit: Justin Luth 
CommitDate: Sat Nov 6 05:06:00 2021 +0100

NFC writerfilter: m_bDiscardHeaderFooter = false in both cases

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e338664d6068..8887a79d65a2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2910,7 +2910,6 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 ? uno::Reference()
 : xText->createTextCursorByRange(xText->getStart())),
 bHeader));
-m_bDiscardHeaderFooter = false; // set only on success!
 }
 // If we have *hidden* header footer
 else
@@ -2931,11 +2930,10 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 TextAppendContext(uno::Reference(xText, 
uno::UNO_QUERY_THROW),
   m_bIsNewDoc ? 
uno::Reference()
   : 
xText->createTextCursorByRange(xText->getStart(;
-m_bDiscardHeaderFooter = false; // set only on success!
 // Restore the original state of the shared prop after we stored 
the necessary values.
 xPageStyle->setPropertyValue(getPropertyName(ePropShared), 
uno::makeAny(bIsShared));
 }
-
+m_bDiscardHeaderFooter = false; // set only on success!
 }
 catch( const uno::Exception& )
 {

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - i18nutil/source include/svx svx/source sw/Module_sw.mk sw/qa sw/UITest_librelogo.mk

[Thorsten Behrens (via logerrit)]

 i18nutil/source/utility/unicode.cxx |   28 +++
 include/svx/strings.hrc |   17 
 svx/source/dialog/charmap.cxx   |   55 +++
 sw/Module_sw.mk |1 
 sw/UITest_librelogo.mk  |   16 
 sw/qa/uitest/librelogo/compile.py   |  132 
 sw/qa/uitest/librelogo/run.py   |  103 
 7 files changed, 100 insertions(+), 252 deletions(-)

New commits:
commit 15abb0672d1d9304c2bfcd13b6b918350188e761
Author: Thorsten Behrens 
AuthorDate: Thu Apr 22 00:51:44 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 03:42:25 2021 +0100

Cleanup unused patches & stale uitests

LibreLogo got removed from build, no point in testing.

Change-Id: I321d7d654c66db65c80aaf39c883e03ff281bdf6

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8c904c7ce197..1b790026efc8 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -145,7 +145,6 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_table \
UITest_findReplace \
UITest_chapterNumbering \
-   UITest_librelogo \
 ))
 endif
 
diff --git a/sw/UITest_librelogo.mk b/sw/UITest_librelogo.mk
deleted file mode 100644
index 35e53641e782..
--- a/sw/UITest_librelogo.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call  gb_UITest_UITest,librelogo))
-
-$(eval $(call gb_UITest_add_modules,librelogo,$(SRCDIR)/sw/qa/uitest,\
-   librelogo/ \
-))
-
-$(eval $(call gb_UITest_set_defs,librelogo, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
-))
diff --git a/sw/qa/uitest/librelogo/compile.py 
b/sw/qa/uitest/librelogo/compile.py
deleted file mode 100644
index 89e538b8c926..
--- a/sw/qa/uitest/librelogo/compile.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import get_state_as_dict, type_text
-
-import time, re
-from uitest.debug import sleep
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import select_pos
-
-class LibreLogoCompileTest(UITestCase):
-   LIBRELOGO_PATH = 
"vnd.sun.star.script:LibreLogo|LibreLogo.py$%s?language=Python&location=share"
-   LS = "#_@L_i_N_e@_#" # LibreLogo line separator for debug feature "jump to 
the bad LibreLogo program line"
-
-   def createMasterScriptProviderFactory(self):
-   xServiceManager = self.xContext.ServiceManager
-   return xServiceManager.createInstanceWithContext(
-   "com.sun.star.script.provider.MasterScriptProviderFactory",
-   self.xContext)
-
-   def getScript(self, command):
-   xMasterScriptProviderFactory = self.createMasterScriptProviderFactory()
-   document = self.ui_test.get_component()
-   xScriptProvider = 
xMasterScriptProviderFactory.createScriptProvider(document)
-   xScript = xScriptProvider.getScript(self.LIBRELOGO_PATH %command)
-   self.assertIsNotNone(xScript, "xScript was not loaded")
-   return xScript
-
-   def test_compile_librelogo(self):
-# XScript interface to LibreLogo Python compiler
-xCompile = self.getScript("__compil__")
-
-for test in (
-# BASE COMMANDS
-("FORWARD 1 forward 1 fd 1", 
"forward(1)\nforward(1)\nforward(1)"),
-("BACK 1 back 1 bk 1", 
"backward(1)\nbackward(1)\nbackward(1)"),
-("RIGHT 1 right 1 rt 1", 
"turnright(1)\nturnright(1)\nturnright(1)"),
-("LEFT 1 left 1 lt 1", 
"turnleft(1)\nturnleft(1)\nturnleft(1)"),
-# COMMENTS
-("fd 1; comment\n; full-line comment", "forward(1)\n" + 
self.LS),
-# MULTI-LINE COMMAND
-("LABEL ~\n10 + 10", "label(10 + 10)\n" + self.LS),
-# UNIT SPECIFIERS
-# check specifier "pt" (point)
-("fd 1pt", "forward(1)"),
-# check specifier "pt" (point)
-("fd 0.5pt", "forward(0.5)"),
-# check "in" (inch)
-("fd 1in", "forward(72.0)"),
-# check "cm" (centimeter)
-("fd 1cm", "forward(%s)" % (1/(2.54/72))),
-# check "mm" (millimeter)
-("fd 10mm", "forward(%s)" % (1/(2.54/72))),
-# angle
-("rt 90°", "turnright(90)"),
-# clock-position
-(

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

[Eike Rathke (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |7 +++
 sc/source/ui/view/gridwin.cxx  |6 +++
 sc/source/ui/view/gridwin4.cxx |   73 +
 sc/source/ui/view/tabview5.cxx |   11 ++
 4 files changed, 97 insertions(+)

New commits:
commit 129c680f02564c8bee93930dec9f2ad80980cc1c
Author: Eike Rathke 
AuthorDate: Wed Aug 18 23:42:45 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:58:02 2021 +0100

Do not count pages for initial page breaks, tdf#124983 follow-up

Use a loaded page size or leave it. Otherwise the previous
implementation could had lead to tremendous waiting time blocking
everything on large data without. See source code comment.

Also trigger updating page breaks only for one grid window, not
multiple repeating everything all over.

Remove bSetup parameter that does nothing but either doing something or
nothing, check in caller instead.

Move member variables to where they belong.

Change-Id: I5efc321e5bc5af075a77631aa9d94b0c50ae6b6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120689
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121845
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 5ebb26241d10..e9363a1f96d2 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -190,6 +190,8 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 
 RfCorneraRFSelectedCorned;
 
+Timer   maShowPageBreaksTimer;
+
 boolbEEMouse:1;   // Edit Engine has mouse
 boolbDPMouse:1;   // DataPilot D&D (new 
Pivot table)
 boolbRFMouse:1;   // RangeFinder drag
@@ -200,6 +202,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 boolbNeedsRepaint:1;
 boolbAutoMarkVisible:1;
 boolbListValButton:1;
+boolbInitialPageBreaks:1;
 
 DECL_LINK( PopupModeEndHdl, FloatingWindow*, void );
 DECL_LINK( PopupSpellingHdl, SpellCallbackInfo&, void );
@@ -288,6 +291,8 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 
 voidGetSelectionRects( ::std::vector< tools::Rectangle >& 
rPixelRects );
 
+voidSetupInitialPageBreaks(const ScDocument& rDoc, SCTAB nTab);
+DECL_LINK(InitiatePageBreaksTimer, Timer*, void);
 
 protected:
 virtual voidPrePaint(vcl::RenderContext& rRenderContext) override;
@@ -462,6 +467,8 @@ public:
 
 void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
 
+void initiatePageBreaks();
+
 protected:
 void ImpCreateOverlayObjects();
 void ImpDestroyOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 99e5ca53eec1..15ae09b7f31c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -482,6 +482,10 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, 
ScViewData* pData, ScSplitPos
 
 SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
 EnableRTL( false );
+
+bInitialPageBreaks = true;
+maShowPageBreaksTimer.SetInvokeHandler(LINK(this, ScGridWindow, 
InitiatePageBreaksTimer));
+maShowPageBreaksTimer.SetTimeout(1);
 }
 
 ScGridWindow::~ScGridWindow()
@@ -491,6 +495,8 @@ ScGridWindow::~ScGridWindow()
 
 void ScGridWindow::dispose()
 {
+maShowPageBreaksTimer.Stop();
+
 ImpDestroyOverlayObjects();
 
 mpFilterBox.disposeAndClear();
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 9426c8842bf0..aa7ad1312acc 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1055,6 +1055,28 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, 
const ScTableInfo& rTableI
 
 if (mpNoteMarker)
 mpNoteMarker->Draw(); // Above the cursor, in drawing map mode
+
+if (bPage && bInitialPageBreaks)
+SetupInitialPageBreaks(rDoc, nTab);
+}
+
+
+void ScGridWindow::SetupInitialPageBreaks(const ScDocument& rDoc, SCTAB nTab)
+{
+// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
+// is enabled, breaks should be visible. If the document is opened the 
first
+// time, the breaks are not calculated yet, so for this initialization
+// a timer will be triggered here.
+std::set aColBreaks;
+std::set aRowBreaks;
+rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
+rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
+if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+{
+maShowPageBreaksTimer.SetPriority(TaskPriority::DEFAULT_IDLE);
+maShowPageBreaksTimer.Start();
+ 

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

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 57dfc4c56baf0a042648d6a796912dd3300c0f7e
Author: Gabor Kelemen 
AuthorDate: Tue Apr 28 18:07:44 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:41:57 2021 +0100

tdf#131366 Update graphite to 1.3.14

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93095
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 835b86437446a81541ab6923f7776a0a71c44ab9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93540
(cherry picked from commit 55e9293c342647ad89c3f081c5b5b677140ac847)

Change-Id: If7abe97a6b8b9a5c8738db9bce1aec7bf1507ba5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124776
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 3092e25d6b52..5bd64aed72be 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+export GRAPHITE_SHA256SUM := 
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
 export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370

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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 5bc79074c3f9fba6947e8b8c746936f0ebfa4464
Author: Miklos Vajna 
AuthorDate: Thu Dec 20 09:11:34 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:40:58 2021 +0100

graphite: update to 1.3.13

Change-Id: I6ceb5b2d6834de5760d7fedd52801f042f827a85
Reviewed-on: https://gerrit.libreoffice.org/65472
Tested-by: Jenkins
Reviewed-by: Martin Hosken 
(cherry picked from commit 6a58a5c449496010742ae8048297b1dd59443a77)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124775
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index f6647d1384b6..3092e25d6b52 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
0ebf80886bfc39e591c59bc975f4bb5dc717da7489eedfdb8acf84435261e7df
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.12.tgz
+export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
 export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
 export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - download.lst external/graphite external/libetonyek solenv/flatpak-manifest.in

[Miklos Vajna (via logerrit)]

 download.lst  |8 +-
 external/graphite/StaticLibrary_graphite.mk   |4 -
 external/graphite/UnpackedTarball_graphite.mk |8 --
 external/graphite/graphite2.issue1115.patch.1 |   22 --
 external/graphite/graphite2.win64.patch.1 |   60 -
 external/graphite/ubsan.patch |   62 --
 external/libetonyek/Library_etonyek.mk|1 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 external/libetonyek/initial-creator.patch.1   |   26 ---
 external/libetonyek/libetonyek-bundled-soname.patch.0 |3 
 solenv/flatpak-manifest.in|6 -
 11 files changed, 9 insertions(+), 192 deletions(-)

New commits:
commit 09a2e6d218ec5d6ad33d05f254919a619783b7de
Author: Miklos Vajna 
AuthorDate: Thu Dec 13 09:13:39 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:40:46 2021 +0100

graphite: update to 1.3.12

Martin Hosken thinks all patches are redundant now, so drop them.

Change-Id: I062168416a1289b7f4dd42d8ae58b7df56a37712
Reviewed-on: https://gerrit.libreoffice.org/65074
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 6b84708914f9c026776b28a300ac6d278272881f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124774
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index 92e64f51f323..f6647d1384b6 100644
--- a/download.lst
+++ b/download.lst
@@ -92,8 +92,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.10.tgz
+export GRAPHITE_SHA256SUM := 
0ebf80886bfc39e591c59bc975f4bb5dc717da7489eedfdb8acf84435261e7df
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.12.tgz
 export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
 export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
diff --git a/external/graphite/StaticLibrary_graphite.mk 
b/external/graphite/StaticLibrary_graphite.mk
index 8c16482ba11b..9eeff041dc28 100644
--- a/external/graphite/StaticLibrary_graphite.mk
+++ b/external/graphite/StaticLibrary_graphite.mk
@@ -44,7 +44,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/gr_segment \
UnpackedTarball/graphite/src/gr_slot \
UnpackedTarball/graphite/src/json \
-   UnpackedTarball/graphite/src/CachedFace \
UnpackedTarball/graphite/src/CmapCache \
UnpackedTarball/graphite/src/Code \
UnpackedTarball/graphite/src/Collider \
@@ -60,9 +59,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,graphite,\
UnpackedTarball/graphite/src/NameTable \
UnpackedTarball/graphite/src/Pass \
UnpackedTarball/graphite/src/Position \
-   UnpackedTarball/graphite/src/SegCache \
-   UnpackedTarball/graphite/src/SegCacheEntry \
-   UnpackedTarball/graphite/src/SegCacheStore \
UnpackedTarball/graphite/src/Segment \
UnpackedTarball/graphite/src/Silf \
UnpackedTarball/graphite/src/Slot \
diff --git a/external/graphite/UnpackedTarball_graphite.mk 
b/external/graphite/UnpackedTarball_graphite.mk
index a162d172b795..0abd4b657d91 100644
--- a/external/graphite/UnpackedTarball_graphite.mk
+++ b/external/graphite/UnpackedTarball_graphite.mk
@@ -11,12 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,graphite))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,graphite,0))
-
-$(eval $(call gb_UnpackedTarball_add_patches,graphite,\
-   external/graphite/graphite2.issue1115.patch.1 \
-external/graphite/graphite2.win64.patch.1 \
-external/graphite/ubsan.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/graphite/graphite2.issue1115.patch.1 
b/external/graphite/graphite2.issue1115.patch.1
deleted file mode 100644
index 454114bb32c9..
--- a/external/graphite/graphite2.issue1115.patch.1
+++ /dev/null
@@ -1,22 +0,0 @@
 graphite/src/Code.cpp
-+++ graphite/src/Code.cpp
-@@ -175,8 +175,8 @@ Machine::Code::Code(bool is_constraint,
- bytecode_end,
- pre_context,
- rule_length,
--silf.numClasses(),
--face.glyphs().numAttrs(),
-+static_cast(silf.numClasses()),
-+static_cast(face.glyphs().numAttrs()),
- face.numFeatures(), 
- 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - download.lst external/libabw external/libcdr solenv/flatpak-manifest.in

[David Tardon (via logerrit)]

 download.lst|8 ++--
 external/libabw/UnpackedTarball_libabw.mk   |4 --
 external/libabw/libabw-msvc.patch.1 |   46 
 external/libcdr/UnpackedTarball_libcdr.mk   |4 ++
 external/libcdr/libcdr-visibility-win.patch |   11 ++
 solenv/flatpak-manifest.in  |   12 +++
 6 files changed, 25 insertions(+), 60 deletions(-)

New commits:
commit 8268439d9ad9d167e4cc4cdbe74e39644a32b7c4
Author: David Tardon 
AuthorDate: Sat Dec 29 14:53:07 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:38:58 2021 +0100

upload libcdr 0.1.5

Reviewed-on: https://gerrit.libreoffice.org/65715
Tested-by: Jenkins
Reviewed-by: David Tardon 
(cherry picked from commit a8965ebc1b29ba578fc3e9cd6915e85e807d9fd6)

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

diff --git a/download.lst b/download.lst
index fcf9c059a7d2..712ea9d0ba52 100644
--- a/download.lst
+++ b/download.lst
@@ -17,8 +17,8 @@ export BZIP2_TARBALL := 
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
 export CAIRO_SHA256SUM := 
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 export CAIRO_VERSION_MICRO := 0
 export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM := 
e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d
-export CDR_TARBALL := libcdr-0.1.4.tar.xz
+export CDR_SHA256SUM := 
6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
+export CDR_TARBALL := libcdr-0.1.5.tar.xz
 export CLUCENE_SHA256SUM := 
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
 export CLUCENE_TARBALL := 
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 export LIBCMIS_SHA256SUM := 
6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk 
b/external/libcdr/UnpackedTarball_libcdr.mk
index 4ca54804e6aa..23874f7d01b5 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+external/libcdr/libcdr-visibility-win.patch \
+))
+
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
diff --git a/external/libcdr/libcdr-visibility-win.patch 
b/external/libcdr/libcdr-visibility-win.patch
new file mode 100644
index ..7700cfd32f2f
--- /dev/null
+++ b/external/libcdr/libcdr-visibility-win.patch
@@ -0,0 +1,11 @@
+--- configure.dt   2018-12-29 16:23:02.355271146 +0100
 configure  2018-12-29 16:23:21.644060142 +0100
+@@ -19116,6 +19116,8 @@
+ 
+ 
+ if test $platform_win32 = yes; then :
++  HAVE_VISIBILITY_TRUE='#'
++  HAVE_VISIBILITY_FALSE=
+ 
+ else
+ 
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7233a24bdaa8..7db6021ece3c 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -243,10 +243,10 @@
 "dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz";,
-"sha256": 
"e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d",
+"url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz";,
+"sha256": 
"6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48",
 "type": "file",
-"dest-filename": "external/tarballs/libcdr-0.1.4.tar.xz"
+"dest-filename": "external/tarballs/libcdr-0.1.5.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz";,
commit 6cf9a05b42fb59fa5ebb06d792d7e733790bdb5d
Author: David Tardon 
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:38:49 2021 +0100

upload libabw 0.1.3

Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon 
(cherry picked from commit 2a733f30cc994ead8cc3d1e64947bba6e8fe3924)

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

diff --git a/download.lst b/download.lst
index b4f7df8d263c..fcf9c059a7d2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM := 
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM := 
e763a9dc21c3d

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - external/icu

[Michael Stahl (via logerrit)]

 external/icu/UnpackedTarball_icu.mk   |1 
 external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 |  106 ++
 2 files changed, 107 insertions(+)

New commits:
commit 105c258fcdd69f617de64b780ffcdb8304ff262c
Author: Michael Stahl 
AuthorDate: Fri Nov 5 18:33:07 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Nov 6 00:36:28 2021 +0100

icu: add patch for CVE-2021-30535

Change-Id: I398596f77aa47ab6d4db01b94422262048cffd3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124779
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 35eef8ec9b122a761400f3c6590ca1f9a187d772)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124701
Reviewed-by: Thorsten Behrens 

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 2e455a7dcc24..b47d519b1ae2 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
+   external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 
b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
new file mode 100644
index ..d23605807f14
--- /dev/null
+++ b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
@@ -0,0 +1,106 @@
+From e450fa50fc242282551f56b941dc93b9a8a0bcbb Mon Sep 17 00:00:00 2001
+From: Frank Tang 
+Date: Tue, 13 Apr 2021 15:16:50 -0700
+Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName
+
+Edge cases not fixed in assign and move assign operator
+while the locale is long and call setKeywordValue with incorrect
+keyword/values.
+---
+ icu4c/source/common/locid.cpp  | 11 +--
+ icu4c/source/test/intltest/loctest.cpp | 26 ++
+ icu4c/source/test/intltest/loctest.h   |  2 ++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
+index 02cd82a7b8e..3c6e5b06690 100644
+--- a/icu4c/source/common/locid.cpp
 b/icu4c/source/common/locid.cpp
+@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT {
+ if ((baseName != fullName) && (baseName != fullNameBuffer)) 
uprv_free(baseName);
+ if (fullName != fullNameBuffer) uprv_free(fullName);
+ 
+-if (other.fullName == other.fullNameBuffer) {
++if (other.fullName == other.fullNameBuffer || other.baseName == 
other.fullNameBuffer) {
+ uprv_strcpy(fullNameBuffer, other.fullNameBuffer);
++}
++if (other.fullName == other.fullNameBuffer) {
+ fullName = fullNameBuffer;
+ } else {
+ fullName = other.fullName;
+ }
+ 
+-if (other.baseName == other.fullName) {
++if (other.baseName == other.fullNameBuffer) {
++baseName = fullNameBuffer;
++} else if (other.baseName == other.fullName) {
+ baseName = fullName;
+ } else {
+ baseName = other.baseName;
+@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const 
char* keywordValue, UErro
+ if (fullName != fullNameBuffer) {
+ // if full Name is already on the heap, need to free it.
+ uprv_free(fullName);
++if (baseName == fullName) {
++baseName = newFullName; // baseName should not point to freed 
memory.
++}
+ }
+ fullName = newFullName;
+ status = U_ZERO_ERROR;
+diff --git a/icu4c/source/test/intltest/loctest.cpp 
b/icu4c/source/test/intltest/loctest.cpp
+index ce41a4c00e7..5503b008b0c 100644
+--- a/icu4c/source/test/intltest/loctest.cpp
 b/icu4c/source/test/intltest/loctest.cpp
+@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool 
exec, const char* &name, c
+ TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale);
+ TESTCASE_AUTO(TestCanonicalize);
+ TESTCASE_AUTO(TestLeak21419);
++TESTCASE_AUTO(TestLongLocaleSetKeywordAssign);
++TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign);
+ TESTCASE_AUTO_END;
+ }
+ 
+@@ -6520,6 +6522,30 @@ void 
LocaleTest::TestSetUnicodeKeywordValueInLongLocale() {
+ }
+ }
+ 
++void LocaleTest::TestLongLocaleSetKeywordAssign() {
++IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign");
++// A long base name, with an illegal keyword and copy constructor
++icu::Locale l("de_AAA1_AAA2_AAA3_AAA4_AAA5_AAA6_"
++  "AAA7_AAA8_AAA9_AA10_AA11_AA12_"
++  "AA13_AA14_AA15_AA16_A

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

[Julien Nabet (via logerrit)]

 forms/source/component/Button.cxx|5 -
 forms/source/component/CheckBox.cxx  |5 -
 forms/source/component/ComboBox.cxx  |5 -
 forms/source/component/Currency.cxx  |5 -
 forms/source/component/Date.cxx  |5 -
 forms/source/component/Edit.cxx  |5 -
 forms/source/component/File.cxx  |5 -
 forms/source/component/FormComponent.cxx |5 -
 forms/source/component/FormattedField.cxx|5 -
 forms/source/component/ImageButton.cxx   |5 -
 forms/source/component/ImageControl.cxx  |5 -
 forms/source/component/ListBox.cxx   |5 -
 forms/source/component/Numeric.cxx   |5 -
 forms/source/component/Pattern.cxx   |5 -
 forms/source/component/RadioButton.cxx   |5 -
 forms/source/component/Time.cxx  |5 -
 forms/source/component/navigationbar.cxx |5 -
 forms/source/component/refvaluecomponent.cxx |5 -
 forms/source/component/scrollbar.cxx |5 -
 forms/source/component/spinbutton.cxx|5 -
 forms/source/inc/property.hxx|8 
 forms/source/richtext/richtextmodel.cxx  |5 -
 22 files changed, 84 insertions(+), 29 deletions(-)

New commits:
commit 742b8befecbcfc0cfab87cfcd87c83b7d8ef32ab
Author: Julien Nabet 
AuthorDate: Fri Nov 5 22:38:31 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 5 23:38:51 2021 +0100

Replace some macros in forms part 7

Remove BEGIN_DESCRIBE_PROPERTIES
Change-Id: Ic1f52f21037e890c4f7143a1283f34101dbb737a

Change-Id: I1bd902af7f634bb70313dda72b7a008bdda38f75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124782
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/forms/source/component/Button.cxx 
b/forms/source/component/Button.cxx
index b63ba6752192..23b05370c380 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -101,7 +101,10 @@ OButtonModel::~OButtonModel()
 
 void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) 
const
 {
-BEGIN_DESCRIBE_PROPERTIES( 6, OClickableImageBaseModel )
+OClickableImageBaseModel::describeFixedProperties( _rProps );
+sal_Int32 nOldCount = _rProps.getLength();
+_rProps.realloc( nOldCount + 6);
+css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
 DECL_PROP1( BUTTONTYPE, FormButtonType, BOUND 
);
 DECL_PROP1( DEFAULT_STATE,  sal_Int16,  BOUND 
);
 DECL_PROP1( DISPATCHURLINTERNAL,sal_Bool,   BOUND 
);
diff --git a/forms/source/component/CheckBox.cxx 
b/forms/source/component/CheckBox.cxx
index f1ab6469d5e9..033f6013d4ab 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -109,7 +109,10 @@ css::uno::Sequence SAL_CALL 
OCheckBoxModel::getSupportedServiceNames()
 
 void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) 
const
 {
-BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
+OReferenceValueComponent::describeFixedProperties( _rProps );
+sal_Int32 nOldCount = _rProps.getLength();
+_rProps.realloc( nOldCount + 1);
+css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
 DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), 
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
diff --git a/forms/source/component/ComboBox.cxx 
b/forms/source/component/ComboBox.cxx
index 1b50e28ceb02..5145fd084e12 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -291,7 +291,10 @@ sal_Bool OComboBoxModel::convertFastPropertyValue(
 
 void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) 
const
 {
-BEGIN_DESCRIBE_PROPERTIES( 7, OBoundControlModel )
+OBoundControlModel::describeFixedProperties( _rProps );
+sal_Int32 nOldCount = _rProps.getLength();
+_rProps.realloc( nOldCount + 7);
+css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
 DECL_PROP1(LISTSOURCETYPE,  ListSourceType, BOUND);
 DECL_PROP1(LISTSOURCE,  OUString,BOUND);
diff --git a/forms/source/component/Currency.cxx 
b/forms/source/component/Currency.cxx
index 4ef9f5a379ff..4703d57e3220 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -156,7 +156,10 @@ css::uno::Sequence SAL_CALL 
OCurrencyModel::getSupportedServiceNames()
 
 void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) 
const
 {
-BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
+OEditBaseModel::d

[Libreoffice-commits] core.git: helpcontent2

[Ilmari Lauhakangas (via logerrit)]

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

New commits:
commit d84849c5d1fc927d3ce14b81f6c875f3f4223ce6
Author: Ilmari Lauhakangas 
AuthorDate: Sat Nov 6 00:38:36 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Nov 5 23:38:36 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to ea8bee81962bf4a1fa053578c3a21cf55715d483
  - Close navigation menus when clicking outside them

Change-Id: I6d567d7978ed5997b4ca9bf865e9e54d6c67a3a0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124718
Tested-by: Jenkins
Reviewed-by: Ross Johnson 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 03457ee108d2..ea8bee81962b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 03457ee108d22cf4eabf657de3c67968c8f93f36
+Subproject commit ea8bee81962bf4a1fa053578c3a21cf55715d483

[Libreoffice-commits] help.git: help3xsl/help.js

[Ilmari Lauhakangas (via logerrit)]

 help3xsl/help.js |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit ea8bee81962bf4a1fa053578c3a21cf55715d483
Author: Ilmari Lauhakangas 
AuthorDate: Thu Nov 4 19:35:08 2021 +0200
Commit: Olivier Hallot 
CommitDate: Fri Nov 5 23:38:35 2021 +0100

Close navigation menus when clicking outside them

Change-Id: I6d567d7978ed5997b4ca9bf865e9e54d6c67a3a0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/124718
Tested-by: Jenkins
Reviewed-by: Ross Johnson 
Reviewed-by: Olivier Hallot 

diff --git a/help3xsl/help.js b/help3xsl/help.js
index c67581d7b..6adbf2e17 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -233,4 +233,15 @@ if (typeof linkIndex !== "undefined") {
 }
 current.classList.add('contents-current');
 }
+// close navigation menus when clicking anywhere on the page
+// (ignoring menu button clicks and mobile browsing)
+document.addEventListener('click', function(event) {
+let a11yButton = event.target.getAttribute("data-a11y-toggle");
+let vw = Math.max(document.documentElement.clientWidth || 0, 
window.innerWidth || 0);
+if (!a11yButton && vw >= 960) {
+document.querySelectorAll("[data-a11y-toggle] + nav").forEach((el) => {
+el.setAttribute("aria-hidden", true);
+});
+}
+});
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */

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

[Julien Nabet (via logerrit)]

 forms/source/component/Button.cxx|2 +-
 forms/source/component/CheckBox.cxx  |2 +-
 forms/source/component/ComboBox.cxx  |2 +-
 forms/source/component/Currency.cxx  |2 +-
 forms/source/component/DatabaseForm.cxx  |2 +-
 forms/source/component/Date.cxx  |2 +-
 forms/source/component/Edit.cxx  |2 +-
 forms/source/component/File.cxx  |2 +-
 forms/source/component/FormComponent.cxx |4 ++--
 forms/source/component/FormattedField.cxx|2 +-
 forms/source/component/Grid.cxx  |2 +-
 forms/source/component/Hidden.cxx|2 +-
 forms/source/component/ImageButton.cxx   |2 +-
 forms/source/component/ImageControl.cxx  |2 +-
 forms/source/component/ListBox.cxx   |2 +-
 forms/source/component/Numeric.cxx   |2 +-
 forms/source/component/Pattern.cxx   |2 +-
 forms/source/component/RadioButton.cxx   |2 +-
 forms/source/component/Time.cxx  |2 +-
 forms/source/component/navigationbar.cxx |2 +-
 forms/source/component/refvaluecomponent.cxx |2 +-
 forms/source/component/scrollbar.cxx |2 +-
 forms/source/component/spinbutton.cxx|2 +-
 forms/source/inc/property.hxx|3 ---
 forms/source/richtext/richtextmodel.cxx  |2 +-
 25 files changed, 25 insertions(+), 28 deletions(-)

New commits:
commit 642a03393580f142ef4b703b0164b8142c780129
Author: Julien Nabet 
AuthorDate: Fri Nov 5 22:43:14 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 5 23:34:46 2021 +0100

Replace some macros in forms part 8

Remove END_DESCRIBE_PROPERTIES
Change-Id: I844b71cd74f2b2c5306d0ad979ed56480892268c

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

diff --git a/forms/source/component/Button.cxx 
b/forms/source/component/Button.cxx
index a52a423398cf..b63ba6752192 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -108,7 +108,7 @@ void OButtonModel::describeFixedProperties( Sequence< 
Property >& _rProps ) cons
 DECL_PROP1( TARGET_URL, OUString,BOUND );
 DECL_PROP1( TARGET_FRAME,   OUString,BOUND );
 DECL_PROP1( TABINDEX,   sal_Int16,  BOUND 
);
-END_DESCRIBE_PROPERTIES();
+DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), 
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
 
 
diff --git a/forms/source/component/CheckBox.cxx 
b/forms/source/component/CheckBox.cxx
index c91c903e0df5..f1ab6469d5e9 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -111,7 +111,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< 
Property >& _rProps ) co
 {
 BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
-END_DESCRIBE_PROPERTIES();
+DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), 
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
 
 
diff --git a/forms/source/component/ComboBox.cxx 
b/forms/source/component/ComboBox.cxx
index e63997e16294..1b50e28ceb02 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -300,7 +300,7 @@ void OComboBoxModel::describeFixedProperties( Sequence< 
Property >& _rProps ) co
 DECL_PROP1(DEFAULT_TEXT,OUString,BOUND);
 DECL_PROP1(STRINGITEMLIST,  Sequence< OUString >,BOUND);
 DECL_PROP1(TYPEDITEMLIST,   Sequence< Any >,OPTIONAL);
-END_DESCRIBE_PROPERTIES();
+DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), 
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
 
 
diff --git a/forms/source/component/Currency.cxx 
b/forms/source/component/Currency.cxx
index b95d0ad9f74b..4ef9f5a379ff 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -162,7 +162,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< 
Property >& _rProps ) co
 
 DECL_PROP_IMPL(DEFAULT_VALUE, double) 
css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT | 
css::beans::PropertyAttribute::MAYBEVOID);
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
-END_DESCRIBE_PROPERTIES();
+DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), 
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
 
 
diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 62a95776492b..9d0570288caa 100644
--- a/forms/source/component/DatabaseForm.

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - distro-configs/CPLinux.conf

[Andras Timar (via logerrit)]

Rebased ref, commits from common ancestor:
commit b3dace9c22b08f4660ac7c2e1d28db69f044afe6
Author: Andras Timar 
AuthorDate: Thu Nov 4 22:42:18 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 21:53:38 2021 +0100

[cp] --disable-skia, there's not that much point in building that for Linux

Change-Id: I0ccd3e6b544609dcdb6e78ef846adaa0f4d93768

diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index 72fd0b0ffd17..7e586c7410a5 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -45,3 +45,4 @@
 --enable-release-build
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es 
et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn 
oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-symbols
+--disable-skia

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

[Stephan Bergmann (via logerrit)]

 svx/source/dialog/crashreportdlg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09584411ec13f353032c903b20937919987b8d51
Author: Stephan Bergmann 
AuthorDate: Fri Nov 5 20:21:19 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 5 21:45:26 2021 +0100

DECL_DLLPRIVATE_LINK doesn't make sense in a non-DLLPUBLIC class

...and causes "declaration nested in DLLPRIVATE declaration redundantly 
marked
as DLLPRIVATE [loplugin:dllprivate]" from within the macro expansion, so 
revert
that part of 54435d56051e19a408a1fcce16a3e4add185c018 "use more
DECL_DLLPRIVATE_LINK"

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

diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index eb1b0f595bb9..868f86c58e68 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -31,7 +31,7 @@ private:
 
 OUString maSuccessMsg;
 
-DECL_DLLPRIVATE_LINK(BtnHdl, weld::Button&, void);
+DECL_LINK(BtnHdl, weld::Button&, void);
 };
 
 #endif

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

[Michael Stahl (via logerrit)]

 download.lst|4 
-
 external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk |1 
 external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 |   38 
++
 3 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit ebd556220a5045c1c81891b712648d220a168c70
Author: Michael Stahl 
AuthorDate: Fri Nov 5 19:40:49 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 21:09:56 2021 +0100

libjpeg-turbo: add patch for CVE-2020-17541

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

diff --git a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk 
b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
index a99df67bb011..5440d16ecfc1 100644
--- a/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
+++ b/external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libjpeg-turbo,\
external/libjpeg-turbo/jpeg-turbo.build.patch.1 \
$(if $(filter 
WNT,$(OS)),external/libjpeg-turbo/jpeg-turbo.win_build.patch.1) \
external/libjpeg-turbo/ubsan.patch \
+   external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 
\
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1 
b/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
new file mode 100644
index ..cc3da737e7b0
--- /dev/null
+++ b/external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
@@ -0,0 +1,38 @@
+From c76f4a08263b0cea40d2967560ac7c21f6959079 Mon Sep 17 00:00:00 2001
+From: DRC 
+Date: Thu, 5 Dec 2019 13:12:28 -0600
+Subject: [PATCH] Huffman enc.: Fix very rare local buffer overrun
+
+... detected by ASan.  This is a similar issue to the issue that was
+fixed with 402a715f82313384ef4606660c32d8678c79f197.  Apparently it is
+possible to create a malformed JPEG image that exceeds the Huffman
+encoder's 256-byte local buffer when attempting to losslessly tranform
+the image.  That makes sense, given that it was necessary to extend the
+Huffman decoder's local buffer to 512 bytes in order to handle all
+pathological cases (refer to 0463f7c9aad060fcd56e98d025ce16185279e2bc.)
+
+Since this issue affected only lossless transformation, a workflow that
+isn't generally exposed to arbitrary data exploits, and since the
+overrun did not overflow the stack (i.e. it did not result in a segfault
+or other user-visible issue, and valgrind didn't even detect it), it did
+not likely pose a security risk.
+
+Fixes #392
+---
+ ChangeLog.md | 10 ++
+ jchuff.c |  2 +-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/jchuff.c b/jchuff.c
+index 206958e2f..cb05055d9 100644
+--- a/jchuff.c
 b/jchuff.c
+@@ -432,7 +432,7 @@ dump_buffer(working_state *state)
+  * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block
+  * larger than 200 bytes.
+  */
+-#define BUFSIZE (DCTSIZE2 * 4)
++#define BUFSIZE (DCTSIZE2 * 8)
+ 
+ #define LOAD_BUFFER() { \
+   if (state->free_in_buffer < BUFSIZE) { \
commit 7208197a4ac718411fa6e3b4c770fdec8c67557d
Author: Michael Stahl 
AuthorDate: Fri Nov 5 14:03:05 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 21:09:41 2021 +0100

bzip2: upgrade to release 1.0.8

Fixes CVE-2019-12900

Change-Id: If3fcfff78a61c60014ba6d96f1ee0c432ccc52a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124758
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1289125532a029dc80e4ee3d0a49dca253f51888)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124762
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 34bb426c8021..23acc03b2b65 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91
 export BREAKPAD_TARBALL := 
breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
-export BZIP2_SHA256SUM := 
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
+export BZIP2_SHA256SUM := 
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+export BZIP2_TARBALL := bzip2-1.0.8.tar.gz
 export CAIRO_SHA256SUM := 
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
 export CAIRO_VERSION_MICRO := 0
 export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz

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

[Caolán McNamara (via logerrit)]

 sw/uiconfig/swriter/ui/pagestylespanel.ui |  138 +++---
 1 file changed, 69 insertions(+), 69 deletions(-)

New commits:
commit 5e5420f9ea1a46d17305f5a5513a588364963ed2
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 14:23:33 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 21:07:18 2021 +0100

resave with latest glade

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

diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui 
b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index 09f8b5e4d5c9..a60f61f1c339 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -29,75 +29,75 @@
   
   
 True
-False
+False
 
-  
+  
   
 True
-False
+False
 end
 True
 True
-6
-6
-6
+6
+6
+6
 
   
 True
-False
+False
 Number:
-True
-numberbox
+True
+numberbox
 1
   
   
-0
-0
+0
+0
   
 
 
   
 True
-False
+False
 Background:
-True
-bgselect
+True
+bgselect
 1
   
   
-0
-1
+0
+1
   
 
 
   
 True
-False
+False
 True
   
   
-1
-0
+1
+0
   
 
 
   
 True
-False
+False
 Layout:
-True
-layoutbox
+True
+layoutbox
 1
   
   
-0
-6
+0
+6
   
 
 
   
 True
-False
+False
 True
 
   Right and left
@@ -107,28 +107,28 @@
 
   
   
-1
-6
+1
+6
   
 
 
   
 True
-False
+False
 Columns:
-True
-columnbox
+True
+columnbox
 1
   
   
-0
-7
+0
+7
   
 
 
   
 True
-False
+False
 True
 
   1 
Column
@@ -139,18 +139,18 @@
 
   
   
-1
-7
+1
+7
   
 
 
   
 True
-False
+False
 True
 liststore4
-0
-1
+0
+1
 
   
   
@@ -165,18 +165,18 @@
 
   
   
-1
-3
+1
+3
   
 
 
   
 True
-False
+False
 True
 liststore5
-0
-1
+0
+1
 
   
   
@@ -191,70 +191,70 @@
 
   
   
-1
-4
+1
+4
   
 
 
   
-150
+150
 True
-True
-False
-0
+True
+False
 center
 True
-True
+0
+True
 
 
   
 
   
   
-1
-2
+1
+2
   
 
 
   
-150
+150
 True
-True
-False
-0
+True
+False
 center
 True
-True
+0
+True
 
 
   
 
   
   
-1
-5
+1
+5
   
 
 
   
 True
-False
+False
 True
   
   
-1
-1
+1
+1
   
 
 
   
-False
-True
+False
+True
 Custom
   
   
-1
-8
+1
+

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/ods/tdf121260.ods  |binary
 sc/qa/unit/subsequent_export_test2.cxx |   28 
 2 files changed, 28 insertions(+)

New commits:
commit 7f5348e47d56a16c2691d0dffa45bbaf970092ca
Author: Xisco Fauli 
AuthorDate: Fri Nov 5 18:10:24 2021 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 5 21:02:55 2021 +0100

tdf#121260: sc_subsequent_export_test2: Add unittest

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

diff --git a/sc/qa/unit/data/ods/tdf121260.ods 
b/sc/qa/unit/data/ods/tdf121260.ods
new file mode 100644
index ..3b6ab7f10733
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf121260.ods differ
diff --git a/sc/qa/unit/subsequent_export_test2.cxx 
b/sc/qa/unit/subsequent_export_test2.cxx
index 681b05398fa4..025941239507 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -102,6 +102,7 @@ public:
 virtual void tearDown() override;
 
 void testMatrixMultiplicationXLSX();
+void testTdf121260();
 void testTextDirectionXLSX();
 void testTdf120168();
 void testTdf8();
@@ -217,6 +218,7 @@ public:
 CPPUNIT_TEST_SUITE(ScExportTest2);
 
 CPPUNIT_TEST(testMatrixMultiplicationXLSX);
+CPPUNIT_TEST(testTdf121260);
 CPPUNIT_TEST(testTextDirectionXLSX);
 CPPUNIT_TEST(testTdf120168);
 CPPUNIT_TEST(testTdf8);
@@ -545,6 +547,32 @@ void ScExportTest2::testTextDirectionXLSX()
 xDocSh->DoClose();
 }
 
+void ScExportTest2::testTdf121260()
+{
+ScDocShellRef xDocSh = loadDoc(u"tdf121260.", FORMAT_ODS);
+CPPUNIT_ASSERT(xDocSh.is());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+// change formula syntax (i.e. not string ref syntax) to ExcelA1
+rDoc.SetGrammar(formula::FormulaGrammar::GRAM_NATIVE_XL_A1);
+
+xmlDocUniquePtr pChart1 = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory,
+
"xl/charts/chart1.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pChart1);
+
+// Without the fix in place, this test would have failed with
+// - Expected: Sheet1!$A$1:$A$2
+// - Actual  : sheet1 $A$1:$A$2
+assertXPathContent(pChart1,
+   
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:val/c:numRef/c:f",
+   "Sheet1!$A$1:$A$2");
+assertXPathContent(pChart1,
+   
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:val/c:numRef/c:f",
+   "Sheet1!$B$1:$B$2");
+
+xDocSh->DoClose();
+}
+
 void ScExportTest2::testTdf120168()
 {
 ScDocShellRef xDocSh = loadDoc(u"tdf120168.", FORMAT_XLSX);

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

[Mike Kaganski (via logerrit)]

 ucb/source/ucp/webdav-curl/webdavcontent.cxx|   87 
 ucb/source/ucp/webdav-curl/webdavcontentcaps.cxx|   34 ---
 ucb/source/ucp/webdav-curl/webdavresponseparser.cxx |4 
 3 files changed, 56 insertions(+), 69 deletions(-)

New commits:
commit 7e33e24181ffaddcee4bc1358650a0bac48f8ebd
Author: Mike Kaganski 
AuthorDate: Fri Nov 5 18:26:01 2021 +0300
Commit: Michael Stahl 
CommitDate: Fri Nov 5 20:56:03 2021 +0100

webdav-curl: there's no non-const Sequence::operator[]

... since commit fb3c04bd1930eedacd406874e1a285d62bbf27d9

Change-Id: Ib56e854206074dd247dcd0f876a8a92b3f9af7ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124763
Tested-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx 
b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
index 8baa7b95de46..6d70ff77f8bc 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
@@ -1376,24 +1376,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 // Only DAV resources support PROPFIND
 std::vector< OUString > aPropNames;
 
-uno::Sequence< beans::Property > aProperties(
-rProperties.getLength() );
-
-if ( !m_aFailedPropNames.empty() )
-{
-sal_Int32 nProps = 0;
-sal_Int32 nCount = rProperties.getLength();
-for ( sal_Int32 n = 0; n < nCount; ++n, ++nProps )
-{
-aProperties[ nProps ] = rProperties[ n ];
-}
-
-aProperties.realloc( nProps );
-}
-else
-{
-aProperties = rProperties;
-}
+uno::Sequence< beans::Property > aProperties(rProperties);
 
 if ( aProperties.getLength() > 0 )
 ContentProperties::UCBNamesToDAVNames(
@@ -1739,6 +1722,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 }
 
 uno::Sequence< uno::Any > aRet( rValues.getLength() );
+auto aRetRange = asNonConstRange(aRet);
 uno::Sequence< beans::PropertyChangeEvent > aChanges( rValues.getLength() 
);
 sal_Int32 nChanged = 0;
 
@@ -1776,7 +1760,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 if ( aTmpProp.Attributes & beans::PropertyAttribute::READONLY )
 {
 // Read-only property!
-aRet[ n ] <<= lang::IllegalAccessException(
+aRetRange[ n ] <<= lang::IllegalAccessException(
 "Property is read-only!",
 static_cast< cppu::OWeakObject * >( this ) );
 continue;
@@ -1789,21 +1773,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 if ( rName == "ContentType" )
 {
 // Read-only property!
-aRet[ n ] <<= lang::IllegalAccessException(
+aRetRange[ n ] <<= lang::IllegalAccessException(
 "Property is read-only!",
 static_cast< cppu::OWeakObject * >( this ) );
 }
 else if ( rName == "IsDocument" )
 {
 // Read-only property!
-aRet[ n ] <<= lang::IllegalAccessException(
+aRetRange[ n ] <<= lang::IllegalAccessException(
 "Property is read-only!",
 static_cast< cppu::OWeakObject * >( this ) );
 }
 else if ( rName == "IsFolder" )
 {
 // Read-only property!
-aRet[ n ] <<= lang::IllegalAccessException(
+aRetRange[ n ] <<= lang::IllegalAccessException(
 "Property is read-only!",
 static_cast< cppu::OWeakObject * >( this ) );
 }
@@ -1836,7 +1820,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 }
 catch ( DAVException const & )
 {
-aRet[ n ] <<= lang::IllegalArgumentException(
+aRetRange[ n ] <<= lang::IllegalArgumentException(
 "Invalid content identifier!",
 static_cast< cppu::OWeakObject * >( this ),
 -1 );
@@ -1844,7 +1828,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 }
 else
 {
-aRet[ n ] <<= lang::IllegalArgumentException(
+aRetRange[ n ] <<= lang::IllegalArgumentException(
 "Empty title not allowed!",
 static_cast< cppu::OWeakObject * >( this ),
 -1 );
@@ -1852,7 +1836,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 }
 else
 {
-aRet[ n 

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

[Michael Stahl (via logerrit)]

 external/icu/UnpackedTarball_icu.mk   |1 
 external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 |  106 ++
 2 files changed, 107 insertions(+)

New commits:
commit 35eef8ec9b122a761400f3c6590ca1f9a187d772
Author: Michael Stahl 
AuthorDate: Fri Nov 5 18:33:07 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 5 20:43:18 2021 +0100

icu: add patch for CVE-2021-30535

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

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 2e455a7dcc24..b47d519b1ae2 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
+   external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 
b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
new file mode 100644
index ..d23605807f14
--- /dev/null
+++ b/external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
@@ -0,0 +1,106 @@
+From e450fa50fc242282551f56b941dc93b9a8a0bcbb Mon Sep 17 00:00:00 2001
+From: Frank Tang 
+Date: Tue, 13 Apr 2021 15:16:50 -0700
+Subject: [PATCH] ICU-21587 Fix memory bug w/ baseName
+
+Edge cases not fixed in assign and move assign operator
+while the locale is long and call setKeywordValue with incorrect
+keyword/values.
+---
+ icu4c/source/common/locid.cpp  | 11 +--
+ icu4c/source/test/intltest/loctest.cpp | 26 ++
+ icu4c/source/test/intltest/loctest.h   |  2 ++
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+diff --git a/icu4c/source/common/locid.cpp b/icu4c/source/common/locid.cpp
+index 02cd82a7b8e..3c6e5b06690 100644
+--- a/icu4c/source/common/locid.cpp
 b/icu4c/source/common/locid.cpp
+@@ -469,14 +469,18 @@ Locale& Locale::operator=(Locale&& other) U_NOEXCEPT {
+ if ((baseName != fullName) && (baseName != fullNameBuffer)) 
uprv_free(baseName);
+ if (fullName != fullNameBuffer) uprv_free(fullName);
+ 
+-if (other.fullName == other.fullNameBuffer) {
++if (other.fullName == other.fullNameBuffer || other.baseName == 
other.fullNameBuffer) {
+ uprv_strcpy(fullNameBuffer, other.fullNameBuffer);
++}
++if (other.fullName == other.fullNameBuffer) {
+ fullName = fullNameBuffer;
+ } else {
+ fullName = other.fullName;
+ }
+ 
+-if (other.baseName == other.fullName) {
++if (other.baseName == other.fullNameBuffer) {
++baseName = fullNameBuffer;
++} else if (other.baseName == other.fullName) {
+ baseName = fullName;
+ } else {
+ baseName = other.baseName;
+@@ -2681,6 +2685,9 @@ Locale::setKeywordValue(const char* keywordName, const 
char* keywordValue, UErro
+ if (fullName != fullNameBuffer) {
+ // if full Name is already on the heap, need to free it.
+ uprv_free(fullName);
++if (baseName == fullName) {
++baseName = newFullName; // baseName should not point to freed 
memory.
++}
+ }
+ fullName = newFullName;
+ status = U_ZERO_ERROR;
+diff --git a/icu4c/source/test/intltest/loctest.cpp 
b/icu4c/source/test/intltest/loctest.cpp
+index ce41a4c00e7..5503b008b0c 100644
+--- a/icu4c/source/test/intltest/loctest.cpp
 b/icu4c/source/test/intltest/loctest.cpp
+@@ -284,6 +284,8 @@ void LocaleTest::runIndexedTest( int32_t index, UBool 
exec, const char* &name, c
+ TESTCASE_AUTO(TestSetUnicodeKeywordValueNullInLongLocale);
+ TESTCASE_AUTO(TestCanonicalize);
+ TESTCASE_AUTO(TestLeak21419);
++TESTCASE_AUTO(TestLongLocaleSetKeywordAssign);
++TESTCASE_AUTO(TestLongLocaleSetKeywordMoveAssign);
+ TESTCASE_AUTO_END;
+ }
+ 
+@@ -6520,6 +6522,30 @@ void 
LocaleTest::TestSetUnicodeKeywordValueInLongLocale() {
+ }
+ }
+ 
++void LocaleTest::TestLongLocaleSetKeywordAssign() {
++IcuTestErrorCode status(*this, "TestLongLocaleSetKeywordAssign");
++// A long base name, with an illegal keyword and copy constructor
++icu::Locale l("de_AAA1_AAA2_AAA3_AAA4_AAA5_AAA6_"
++  "AAA7_AAA8_AAA9_AA10_AA11_AA12_"
++  "AA13_AA14_AA15_AA16_AA17_AA18");
++Locale l2;
++l.setUnicodeKeywordValue("co", "12", status); // Cause an error
++status.reset();
++l2 = l; // copy operator on such bogus l

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

[Julien Nabet (via logerrit)]

 forms/source/component/Columns.cxx |3 ++-
 forms/source/component/ComboBox.cxx|3 ++-
 forms/source/component/DatabaseForm.cxx|   18 --
 forms/source/component/Edit.cxx|6 --
 forms/source/component/FormComponent.cxx   |9 ++---
 forms/source/component/FormattedField.cxx  |6 --
 forms/source/component/Grid.cxx|6 --
 forms/source/component/Hidden.cxx  |3 ++-
 forms/source/component/ImageControl.cxx|3 ++-
 forms/source/component/Pattern.cxx |3 ++-
 forms/source/component/formcontrolfont.cxx |6 --
 forms/source/inc/property.hxx  |9 -
 12 files changed, 44 insertions(+), 31 deletions(-)

New commits:
commit 7b6554851fb4cc620f4720f6ad3f394fa0a8995f
Author: Julien Nabet 
AuthorDate: Fri Nov 5 19:12:25 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 5 20:09:24 2021 +0100

Replace some macros in forms part 6

Remove DECL_BOOL_PROP_IMPL + BEGIN_DESCRIBE_BASE_PROPERTIES

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

diff --git a/forms/source/component/Columns.cxx 
b/forms/source/component/Columns.cxx
index 9d44851e6037..bdea1e4009ae 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -348,7 +348,8 @@ void OGridColumn::setOwnProperties(Sequence& 
aDescriptor)
 DECL_PROP1(LABEL,   OUString,BOUND);
 DECL_PROP_IMPL(WIDTH, sal_Int32) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEVOID | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP_IMPL(ALIGN, sal_Int16) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEVOID | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
-DECL_BOOL_PROP_IMPL(HIDDEN) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
+*pProperties++ = css::beans::Property(PROPERTY_HIDDEN, PROPERTY_ID_HIDDEN, 
cppu::UnoType::get(),
+  css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP1(COLUMNSERVICENAME,   OUString,READONLY);
 }
 
diff --git a/forms/source/component/ComboBox.cxx 
b/forms/source/component/ComboBox.cxx
index ce61560f1c70..e63997e16294 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -295,7 +295,8 @@ void OComboBoxModel::describeFixedProperties( Sequence< 
Property >& _rProps ) co
 DECL_PROP1(TABINDEX,sal_Int16,  BOUND);
 DECL_PROP1(LISTSOURCETYPE,  ListSourceType, BOUND);
 DECL_PROP1(LISTSOURCE,  OUString,BOUND);
-DECL_BOOL_PROP_IMPL(EMPTY_IS_NULL) 
css::beans::PropertyAttribute::BOUND);
+*pProperties++ = css::beans::Property(PROPERTY_EMPTY_IS_NULL, 
PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType::get(),
+  
css::beans::PropertyAttribute::BOUND);
 DECL_PROP1(DEFAULT_TEXT,OUString,BOUND);
 DECL_PROP1(STRINGITEMLIST,  Sequence< OUString >,BOUND);
 DECL_PROP1(TYPEDITEMLIST,   Sequence< Any >,OPTIONAL);
diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 0604103f4322..62a95776492b 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1293,7 +1293,8 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
 *pProperties++ = css::beans::Property(PROPERTY_ACTIVE_CONNECTION, 
PROPERTY_ID_ACTIVE_CONNECTION, cppu::UnoType::get(),
   css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::TRANSIENT |
  
css::beans::PropertyAttribute::MAYBEVOID | PropertyAttribute::CONSTRAINED);
-DECL_BOOL_PROP_IMPL(APPLYFILTER) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
+*pProperties++ = css::beans::Property(PROPERTY_APPLYFILTER, 
PROPERTY_ID_APPLYFILTER, cppu::UnoType::get(),
+  css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP1  ( NAME, OUString,BOUND 
 );
 DECL_PROP1  ( MASTERFIELDS, Sequence< OUString >,BOUND 
 );
 DECL_PROP1  ( DETAILFIELDS, Sequence< OUString >,BOUND 
 );
@@ -1301,17 +1302,22 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
 DECL_PROP_IMPL(CYCLE, TabulatorCycle) css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::MAYBEVOID | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP

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

[Julien Nabet (via logerrit)]

 forms/source/component/DatabaseForm.cxx|   11 ++-
 forms/source/component/Date.cxx|3 ++-
 forms/source/component/Edit.cxx|4 ++--
 forms/source/component/FormComponent.cxx   |   10 ++
 forms/source/component/Grid.cxx|   22 +++---
 forms/source/component/Hidden.cxx  |2 +-
 forms/source/component/ImageControl.cxx|3 ++-
 forms/source/component/ListBox.cxx |6 +++---
 forms/source/component/Pattern.cxx |4 ++--
 forms/source/component/Time.cxx|3 ++-
 forms/source/component/formcontrolfont.cxx |6 +++---
 forms/source/component/navigationbar.cxx   |2 +-
 forms/source/component/scrollbar.cxx   |2 +-
 forms/source/component/spinbutton.cxx  |2 +-
 forms/source/inc/property.hxx  |   13 -
 forms/source/richtext/richtextmodel.cxx|2 +-
 16 files changed, 44 insertions(+), 51 deletions(-)

New commits:
commit 5bfbaf3c80987d1f7e6b3d7ffe6896b9bc3687e6
Author: Julien Nabet 
AuthorDate: Fri Nov 5 17:47:23 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 5 18:45:50 2021 +0100

Replace some macros in forms part 5

Remove DECL_IFACE_PROP_IMPL + DECL_PROP0 + DECL_PROP2

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

diff --git a/forms/source/component/DatabaseForm.cxx 
b/forms/source/component/DatabaseForm.cxx
index 814760174d0c..0604103f4322 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1290,22 +1290,23 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
 RemoveProperty( _rAggregateProps, PROPERTY_HAVINGCLAUSE );
 RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER );
 
-DECL_IFACE_PROP_IMPL(ACTIVE_CONNECTION, XConnection) 
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT 
|
+*pProperties++ = css::beans::Property(PROPERTY_ACTIVE_CONNECTION, 
PROPERTY_ID_ACTIVE_CONNECTION, cppu::UnoType::get(),
+  css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::TRANSIENT |
  
css::beans::PropertyAttribute::MAYBEVOID | PropertyAttribute::CONSTRAINED);
 DECL_BOOL_PROP_IMPL(APPLYFILTER) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP1  ( NAME, OUString,BOUND 
 );
 DECL_PROP1  ( MASTERFIELDS, Sequence< OUString >,BOUND 
 );
 DECL_PROP1  ( DETAILFIELDS, Sequence< OUString >,BOUND 
 );
-DECL_PROP2  ( DATASOURCE,   OUString,BOUND, 
CONSTRAINED );
+DECL_PROP_IMPL(DATASOURCE, OUString) css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::CONSTRAINED);
 DECL_PROP_IMPL(CYCLE, TabulatorCycle) css::beans::PropertyAttribute::BOUND 
| css::beans::PropertyAttribute::MAYBEVOID | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
-DECL_PROP2  ( FILTER,   OUString,BOUND, 
MAYBEDEFAULT);
-DECL_PROP2  ( HAVINGCLAUSE, OUString,BOUND, 
MAYBEDEFAULT);
+DECL_PROP_IMPL(FILTER, OUString) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
+DECL_PROP_IMPL(HAVINGCLAUSE, OUString) 
css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_BOOL_PROP_IMPL(INSERTONLY) css::beans::PropertyAttribute::BOUND | 
css::beans::PropertyAttribute::MAYBEDEFAULT);
 DECL_PROP1  ( NAVIGATION,   NavigationBarMode,   BOUND 
 );
 DECL_BOOL_PROP_IMPL(ALLOWADDITIONS) css::beans::PropertyAttribute::BOUND);
 DECL_BOOL_PROP_IMPL(ALLOWEDITS) css::beans::PropertyAttribute::BOUND);
 DECL_BOOL_PROP_IMPL(ALLOWDELETIONS) css::beans::PropertyAttribute::BOUND);
-DECL_PROP2  ( PRIVILEGES,   sal_Int32,   TRANSIENT, 
READONLY);
+DECL_PROP_IMPL(PRIVILEGES, sal_Int32) 
css::beans::PropertyAttribute::TRANSIENT | 
css::beans::PropertyAttribute::READONLY);
 DECL_PROP1  ( TARGET_URL,   OUString,BOUND 
 );
 DECL_PROP1  ( TARGET_FRAME, OUString,BOUND 
 );
 DECL_PROP1  ( SUBMIT_METHOD,FormSubmitMethod,BOUND 
 );
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 503a2e22d17a..6222ad392e2c 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -145,7 +145,8 @@ void ODateModel::describeFixedProperties( Sequence< 
Property >& _rProps ) c

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

[Xisco Fauli (via logerrit)]

 sd/qa/unit/data/odp/tdf111785.odp  |binary
 sd/qa/unit/export-tests-ooxml2.cxx |   16 
 2 files changed, 16 insertions(+)

New commits:
commit 94df9426f557e49c8241fb2f5351a8d4ee801af6
Author: Xisco Fauli 
AuthorDate: Fri Nov 5 16:57:11 2021 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 5 18:24:53 2021 +0100

tdf#111785: sd_export_tests-ooxml2: Add unittest

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

diff --git a/sd/qa/unit/data/odp/tdf111785.odp 
b/sd/qa/unit/data/odp/tdf111785.odp
new file mode 100644
index ..fdb704e4c9fa
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf111785.odp differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index b7994dc0d598..88b305903da4 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -147,6 +147,7 @@ public:
 void testGroupsRotatedPosition();
 void testAccentColor();
 void testThemeColors();
+void testTdf111785();
 void testTdf118825();
 void testTextColumns_tdf140852();
 void testTextColumns_3columns();
@@ -212,6 +213,7 @@ public:
 CPPUNIT_TEST(testGroupsRotatedPosition);
 CPPUNIT_TEST(testAccentColor);
 CPPUNIT_TEST(testThemeColors);
+CPPUNIT_TEST(testTdf111785);
 CPPUNIT_TEST(testTdf118825);
 CPPUNIT_TEST(testTextColumns_tdf140852);
 CPPUNIT_TEST(testTextColumns_3columns);
@@ -1620,6 +1622,20 @@ void SdOOXMLExportTest2::testThemeColors()
 assertXPath(pXmlDocTheme2, 
"/a:theme/a:themeElements/a:clrScheme/a:accent3/a:srgbClr", "val", "a5a5a5");
 }
 
+void SdOOXMLExportTest2::testTdf111785()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf111785.odp"), ODP);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+xmlDocUniquePtr pXmlDocRels = parseExport(tempFile, 
"ppt/slides/slide1.xml");
+
+// Without the fix in place, this test would have failed with
+// - Expected: ed1c24
+// - Actual  : ff
+assertXPath(pXmlDocRels, 
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:pattFill/a:bgClr/a:srgbClr", "val", 
"ed1c24");
+}
 
 void SdOOXMLExportTest2::testTdf118825()
 {

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

[Noel Grandin (via logerrit)]

 dbaccess/source/ui/browser/formadapter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 371a91aaae0500f60f73968ff90a3d61e21b6d1d
Author: Noel Grandin 
AuthorDate: Fri Nov 5 15:54:08 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 17:49:29 2021 +0100

Werror=nonnull in SbaXFormAdapter::cancel

ever since
commit 38d78d3c30183b11f5b643c147667b1d30325784
Author: Ocke Janssen 
Date:   Thu Oct 26 13:46:14 2000 +
new datasource browser

spotted by new gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0

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

diff --git a/dbaccess/source/ui/browser/formadapter.cxx 
b/dbaccess/source/ui/browser/formadapter.cxx
index 4b98babb26c9..a1e9b1f31ecb 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -1305,7 +1305,7 @@ 
IMPLEMENT_PROPERTY_LISTENER_ADMINISTRATION(SbaXFormAdapter, VetoableChangeListen
 void SAL_CALL SbaXFormAdapter::cancel()
 {
 Reference< css::util::XCancellable >  xCancel(m_xMainForm, UNO_QUERY);
-if (xCancel.is())
+if (!xCancel.is())
 return;
 xCancel->cancel();
 }

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

[Noel Grandin (via logerrit)]

 hwpfilter/source/hstyle.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e495d0e5614e08f0eacdb5ea5deb0c1e0a0f3db4
Author: Noel Grandin 
AuthorDate: Fri Nov 5 15:17:42 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 17:49:12 2021 +0100

update diagnostic ignore

problem still present in
   gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0

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

diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index 33f143440c32..fbbe30025d0a 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -70,14 +70,14 @@ void HWPStyle::SetName(int n, char const* name)
 
 if (name)
 {
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 10) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 11) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
 auto const p = DATA[n].name;
 strncpy(p, name, MAXSTYLENAME);
 p[MAXSTYLENAME] = '\0'; // just in case, even though the array is 
zero-initialized
-#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 10) && !defined __clang__
+#if defined __GNUC__ && (__GNUC__ >= 8 && __GNUC__ <= 11) && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
 }

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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/docnode/node.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c255482f1712d539e4be7d581512b21c526af809
Author: Bjoern Michaelsen 
AuthorDate: Sun Oct 31 21:01:39 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 5 17:48:39 2021 +0100

tdf#134294: fix Chapter heading updates

A quick manual recheck seems to confirm, that this does not regress
tdf#118735, tdf#118049. I couldnt quite recheck tdf#118833, the "steps
to reproduce" dont quite work on master -- but I did find any obvious
regression there.

Change-Id: I407ac8c0a8222e3f8c74449a4ec2b9b27e8a3a20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124532
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4a7022c199addb1fbc7445708c0f4801fbf1e47f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124695

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index b8f946bc2871..d2e845d5d200 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1262,6 +1262,8 @@ SwFormatColl *SwContentNode::ChgFormatColl( SwFormatColl 
*pNewColl )
 
 if( !IsModifyLocked() )
 {
+assert(dynamic_cast(pNewColl));
+ChkCondColl(static_cast(pNewColl));
 SwFormatChg aTmp1( pOldColl );
 SwFormatChg aTmp2( pNewColl );
 SwClientNotify( *this, sw::LegacyModifyHint(&aTmp1, &aTmp2) );

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/docnew.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit b22f665e2337ab019ec727f6d4a4d4c3e7b9453b
Author: Michael Stahl 
AuthorDate: Thu Nov 4 19:27:19 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 5 17:48:03 2021 +0100

sw: ~SwDoc: delete TOXTypes after TOXMarks

warn:sw.core:24584:24584:sw/source/core/attr/calbck.cxx:156: lost a client 
of type: 9SwTOXMark at 0x57728d0 still registered on type: 8SwModify at 
0x55a9c70.
soffice.bin: sw/source/core/attr/calbck.cxx:159: virtual 
SwModify::~SwModify(): Assertion `!hasListenersOnDeath' failed.

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

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index c0a03a5b4c18..a59e1687ad67 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -470,11 +470,6 @@ SwDoc::~SwDoc()
 delete pTmp;
 }
 
-for(const auto& pType : *mpTOXTypes)
-pType->CallSwClientNotify(sw::DocumentDyingHint());
-mpTOXTypes->clear();
-mpDefTOXBases.reset();
-
 // Any of the FrameFormats can still have indices registered.
 // These need to be destroyed now at the latest.
 for( SwFrameFormat* pFormat : *mpFrameFormatTable )
@@ -498,6 +493,14 @@ SwDoc::~SwDoc()
 m_pNodes->DelNodes( SwNodeIndex(*m_pNodes), m_pNodes->Count() );
 rUndoNodes.DelNodes( SwNodeIndex( rUndoNodes ), rUndoNodes.Count() );
 
+// clear TOX after nodes - TOXMarks are gone now so SwTOXType has no 
clients
+for (const auto& pType : *mpTOXTypes)
+{
+pType->CallSwClientNotify(sw::DocumentDyingHint());
+}
+mpTOXTypes->clear();
+mpDefTOXBases.reset();
+
 // Delete Formats, make it permanent some time in the future
 
 // Delete for Collections

[Libreoffice-commits] core.git: Branch 'feature/wasm' - desktop/source static/CustomTarget_wasm_fs_image.mk

[Armin Le Grand (Allotropia) (via logerrit)]

 desktop/source/app/cmdlineargs.cxx   |   10 ++
 static/CustomTarget_wasm_fs_image.mk |1 +
 2 files changed, 11 insertions(+)

New commits:
commit 48d3d9600ea0bb45c32bbb1467ded6370dc59463
Author: Armin Le Grand (Allotropia) 
AuthorDate: Fri Nov 5 17:24:14 2021 +0100
Commit: Armin Le Grand (Allotropia) 
CommitDate: Fri Nov 5 17:24:14 2021 +0100

Added loading a test file at WASM startup

file is example.odt which is already part of LO, please
copy to insdir for now by using

cp /android/default-document/example.odt /instdir

this should of course be automated, need to figure
out how instdir is filled.

Change-Id: Icecd700184d2287b30203bd9fc03634b5c787ad8

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index e5f354ac7935..5f495d5105ec 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -296,6 +296,16 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 
 m_bEmpty = false;
 
+const OUString aWasmTestFile("file:///instdir/example.odt");
+::osl::File aFile(aWasmTestFile);
+SAL_INFO("desktop.app", "Testfile: " << aWasmTestFile);
+if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
+{
+SAL_INFO("desktop.app", "Testfile exists :-)");
+aFile.close();
+m_openlist.push_back(aWasmTestFile);
+}
+
 #else
 
 m_cwdUrl = supplier.getCwdUrl();
diff --git a/static/CustomTarget_wasm_fs_image.mk 
b/static/CustomTarget_wasm_fs_image.mk
index b999811be389..1b2d607881b7 100644
--- a/static/CustomTarget_wasm_fs_image.mk
+++ b/static/CustomTarget_wasm_fs_image.mk
@@ -26,6 +26,7 @@ gb_wasm_image_filelist := \
 $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/services.rdb \
 $(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 $(INSTROOT)/$(LIBO_URE_MISC_FOLDER)/services.rdb \
+$(INSTROOT)/example.odt \
 $(INSTROOT)/program/resource/common/fonts/opens___.ttf \
 $(INSTROOT)/program/shell/logo_inverted.svg \
 $(INSTROOT)/program/shell/logo-sc.svg \

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - connectivity/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/parse/sqlbison.y |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9cd691c68dbc2e68085337bdfa8cde7d8a5042e4
Author: Stephan Bergmann 
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Nov 5 17:25:58 2021 +0100

Adapt to Bison 3.8 internal yyn -> yyrule rename

see


"glr2.cc: log the execution of deferred actions" including "Rename argument 
yyn
as yyrule for clarity."

YYBISON was defined as 1 rather than as a representation of the Bison 
version
prior to


"yacc.c: provide the Bison version as an integral macro", which shouldn't 
be a
problem here.  And YYBISON is apparently completely undefined with
/usr/bin/bison on macOS.

(The preceding comment always mentioned "yyi" and "yyrmap" in apparent 
mismatch
with the actually used "yyn" and "yyr1" ever since
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
untouched.)

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

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index a6aa13353584..e520b711870c 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const 
OUString& _newValue,
 
 // yyi is the internal number of the rule that is currently being reduced
 // This can be mapped to external rule number via the yyrmap.
+#if defined YYBISON && YYBISON >= 30800
+#define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyrule])
+#define SQL_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyrule])
+#else
 #define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyn])
 #define SQL_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyn])
 #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyn])
+#endif
 
 
 extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - cppu/qa download.lst external/liborcus external/pdfium i18npool/qa include/vcl sal/qa solenv/flatpak-manifest.in starmat

[Gabor Kelemen (via logerrit)]

 cppu/qa/cppumaker/test_cppumaker.cxx |1 
 cppu/qa/test_any.cxx |1 
 dev/null |binary
 download.lst |4 
 external/liborcus/inc/pch/precompiled_orcus.hxx  |  109 -
 external/pdfium/Library_pdfium.mk|  153 +++-
 external/pdfium/UnpackedTarball_pdfium.mk|   15 
 external/pdfium/build.patch.1|  119 +-
 external/pdfium/c++20-comparison.patch   |   13 
 external/pdfium/configs/build_config.h   |6 
 external/pdfium/msvc2015.patch.1 |  202 ---
 external/pdfium/ubsan.patch  |   26 -
 external/pdfium/visibility.patch.1   |   30 +
 external/pdfium/windows7.patch.1 |   34 -
 i18npool/qa/cppunit/test_breakiterator.cxx   |1 
 include/vcl/filter/PDFiumLibrary.hxx |2 
 sal/qa/rtl/oustring/rtl_OUString2.cxx|2 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx |3 
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx  |1 
 sal/qa/rtl/textenc/rtl_textcvt.cxx   |1 
 solenv/flatpak-manifest.in   |6 
 starmath/qa/cppunit/test_node.cxx|1 
 starmath/qa/extras/mmlexport-test.cxx|2 
 svl/qa/unit/test_lngmisc.cxx |3 
 svx/source/svdraw/svdpdf.cxx |   31 -
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1 
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|1 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |1 
 sw/qa/extras/rtfimport/rtfimport.cxx |2 
 sw/qa/extras/uiwriter/uiwriter.cxx   |1 
 vcl/qa/cppunit/mnemonic.cxx  |3 
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx|   16 
 xmlsecurity/source/pdfio/pdfdocument.cxx |   63 ---
 33 files changed, 241 insertions(+), 613 deletions(-)

New commits:
commit 6209be73adec00901f839c9fa2c97076c7d0ad9f
Author: Gabor Kelemen 
AuthorDate: Thu Nov 4 12:31:02 2021 +0100
Commit: Gabor Kelemen 
CommitDate: Thu Nov 4 12:31:02 2021 +0100

Revert "xmlsecurity: reject a few dangerous annotation types during pdf sig 
verify"

This reverts commit 4ebc328779539d9bc0cb0d7759c27e1e155c129e.

Older pdfium does not have FPDF_ANNOT_REDACT yet

diff --git a/external/liborcus/inc/pch/precompiled_orcus.hxx 
b/external/liborcus/inc/pch/precompiled_orcus.hxx
deleted file mode 100644
index 28e1bc8119d8..
--- a/external/liborcus/inc/pch/precompiled_orcus.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/*
- This file has been autogenerated by update_pch.sh. It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed). All 
such
- manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
- also fixes all possible problems, so it's usually better to use it).
-
- Generated on 2020-02-01 12:22:35 using:
- ./bin/update_pch external/liborcus orcus --cutoff=1 --exclude:system 
--include:module --include:local
-
- If after updating build fails, use the following command to locate 
conflicting headers:
- ./bin/update_pch_bisect ./external/liborcus/inc/pch/precompiled_orcus.hxx 
"make external/liborcus.build" --find-conflicts
-*/
-
-#if PCH_LEVEL >= 1
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif // PCH_LEVEL >= 1
-#if PCH_LEVEL >= 2
-#endif // PCH_LEVEL >= 2
-#if PCH_LEVEL >= 3
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-

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

[Justin Luth (via logerrit)]

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

New commits:
commit 74723bbe6b860e54c26711c108f1e2d2388e8feb
Author: Justin Luth 
AuthorDate: Sat Oct 23 13:02:24 2021 +0200
Commit: Justin Luth 
CommitDate: Fri Nov 5 17:22:59 2021 +0100

NFC writerfilter: simplify logic

if (!A && !B || B) is the same as
if (!A || B)

and the ELSE is also by definition A && !B now.

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index dcec98ed59e0..e338664d6068 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2885,7 +2885,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 {
 bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
 bool bFirst = eType == SectionPropertyMap::PAGE_FIRST;
-if ((!bLeft && !GetSettingsTable()->GetEvenAndOddHeaders()) || 
(GetSettingsTable()->GetEvenAndOddHeaders()))
+if (!bLeft || GetSettingsTable()->GetEvenAndOddHeaders())
 {
 //switch on header/footer use
 xPageStyle->setPropertyValue(
@@ -2913,7 +2913,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 m_bDiscardHeaderFooter = false; // set only on success!
 }
 // If we have *hidden* header footer
-else if (bLeft && !GetSettingsTable()->GetEvenAndOddHeaders())
+else
 {
 bool bIsShared = false;
 // Turn on the headers

[Libreoffice-commits] core.git: dictionaries

[Olivier Hallot (via logerrit)]

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

New commits:
commit b893f5f637306b991f89caa9959b50286b1fd378
Author: Olivier Hallot 
AuthorDate: Fri Nov 5 13:14:44 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Nov 5 17:14:44 2021 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 12c4f7058e7b2d2861ed870ca4c7b46fe3e1f63a
  - Add pt-BR thesaurus collateral information

Change-Id: I85d008af2a584ce10459407ce9e99fe01f354276
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/124768
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/dictionaries b/dictionaries
index 60f4a1dd6b3e..12c4f7058e7b 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 60f4a1dd6b3e8ea15f65488b02487ea95fd1f8e6
+Subproject commit 12c4f7058e7b2d2861ed870ca4c7b46fe3e1f63a

[Libreoffice-commits] dictionaries.git: pt_BR/license-thes.readme pt_BR/thes_data_layout_pt_BR.txt pt_BR/th_gen_idx.pl

[Olivier Hallot (via logerrit)]

 pt_BR/license-thes.readme|   34 ++
 pt_BR/th_gen_idx.pl  |   59 +
 pt_BR/thes_data_layout_pt_BR.txt |  129 +++
 3 files changed, 222 insertions(+)

New commits:
commit 12c4f7058e7b2d2861ed870ca4c7b46fe3e1f63a
Author: Olivier Hallot 
AuthorDate: Fri Nov 5 13:12:11 2021 -0300
Commit: Olivier Hallot 
CommitDate: Fri Nov 5 17:14:43 2021 +0100

Add pt-BR thesaurus collateral information

Change-Id: I85d008af2a584ce10459407ce9e99fe01f354276
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/124768
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/pt_BR/license-thes.readme b/pt_BR/license-thes.readme
new file mode 100644
index 000..b6bf70a
--- /dev/null
+++ b/pt_BR/license-thes.readme
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2003 Kevin B. Hendricks, Stratford, Ontario, Canada
+ * And Contributors.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * 3. All modifications to the source code must be clearly marked as
+ *such.  Binary redistributions based on modified source code
+ *must be clearly marked as modified versions in the documentation
+ *and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS AND CONTRIBUTORS 
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL 
+ * KEVIN B. HENDRICKS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
diff --git a/pt_BR/th_gen_idx.pl b/pt_BR/th_gen_idx.pl
new file mode 100755
index 000..9bdab33
--- /dev/null
+++ b/pt_BR/th_gen_idx.pl
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+
+# perl program to take a thesaurus structured text data file
+# and create the proper sorted index file (.idx)
+#
+# typcially invoked as follows:
+# cat th_en_US_new.dat | ./th_gen_idx.pl > th_en_US_new.idx
+#
+
+sub by_entry {
+my ($aent, $aoff) = split('\|',$a);
+my ($bent, $boff) = split('\|',$b);
+$aent cmp $bent;
+}
+
+# main routine
+my $ne = 0;   # number of entries in index
+my @tindex=();# the index itself
+my $foffset = 0;  # file position offset into thesaurus
+my $rec="";   # current string and related pieces
+my $rl=0; # misc string length
+my $entry=""; # current word being processed
+my $nm=0; # number of meaning for the current word
+my $meaning="";   # current meaning and synonyms
+my $p;# misc uses
+my $encoding; # encoding used by text file
+
+# top line of thesaurus provides encoding
+$encoding=;
+$foffset = $foffset + length($encoding);
+chomp($encoding);
+
+# read thesaurus line by line
+# first line of every block is an entry and meaning count
+while ($rec=){
+$rl = length($rec);
+chomp($rec);
+($entry, $nm) = split('\|',$rec);
+$p = 0;
+while ($p < $nm) {
+$meaning=;
+$rl = $rl + length($meaning);
+chomp($meaning);
+$p++;
+}
+push(@tindex,"$entry|$foffset");
+$ne++;
+$foffset = $foffset + $rl;
+}
+
+# now we have all of the information
+# so sort it and then output the encoding, count and index data
+@tindex = sort by_entry @tindex;
+print STDOUT "$encoding\n";
+print STDOUT "$ne\n";
+foreach $one (@tindex) {
+print STDOUT "$one\n";
+}
+
diff --git a/pt_BR/thes_data_layout_pt_BR.txt b/pt_BR/thes_data_layout_pt_BR.txt
new file mode 100644
index 000..93cfec1
--- /dev/null
+++ b/pt_BR/thes_data_layout_pt_BR.txt
@@ -0,0 +1,129 @@
+Descrição da estrutura dos dados necessários para MyThes
+-- --
+
+MyThes é muito simples. Quase todos os "smarts" são realmente
+no próprio arquivo de dados do dicionário de sinônimos.
+
+O formato deste arquivo é o seguinte:
+
+- sem dados binários
+
+- o final da linha é uma nova linha '\n' e não um retorno de carro/avanços de 
linha
+
+- A linha 1 é uma str

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 58adc139aa5385a07e28c28cbd9317f4cd8aa4d4
Author: Xisco Fauli 
AuthorDate: Fri Nov 5 15:37:00 2021 +0100
Commit: Xisco Fauli 
CommitDate: Fri Nov 5 17:03:49 2021 +0100

tdf#93747: sw_uiwriter2: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 202c6d5855ff..8ab21d4b458a 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -5187,6 +5187,97 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf123218)
 CPPUNIT_ASSERT_EQUAL(chart2::AxisOrientation_REVERSE, 
aScaleData.Orientation);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf93747)
+{
+SwDoc* pDoc = createSwDoc();
+SwWrtShell* pWrtSh = pDoc->GetDocShell()->GetWrtShell();
+
+uno::Sequence aArgs(comphelper::InitPropertySequence(
+{ { "Rows", uno::makeAny(sal_Int32(2)) }, { "Columns", 
uno::makeAny(sal_Int32(2)) } }));
+
+dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+pWrtSh->Insert("Col1");
+
+// Move the cursor to B1
+pWrtSh->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
+
+pWrtSh->Insert("Col2");
+
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+uno::Reference xTextTable(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTextTable->getColumns()->getCount());
+
+uno::Reference xCellA1(xTextTable->getCellByName("A1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Col1"), xCellA1->getString());
+
+uno::Reference xCellB1(xTextTable->getCellByName("B1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Col2"), xCellB1->getString());
+
+// Select backwards B1 and A1
+pWrtSh->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 5, /*bBasicCall=*/false);
+
+// Just select the whole B1
+pWrtSh->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false);
+
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence({
+{ "Style", uno::makeAny(OUString("Heading 1")) },
+{ "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+});
+dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
+
+// Without the fix in place, this test would have failed with
+// - Expected: Table Contents
+// - Actual  : Heading 1
+CPPUNIT_ASSERT_EQUAL(
+OUString("Table Contents"),
+getProperty(getParagraphOfText(1, xCellA1->getText()), 
"ParaStyleName"));
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Heading 1"),
+getProperty(getParagraphOfText(1, xCellB1->getText()), 
"ParaStyleName"));
+
+// Now select A1 again
+pWrtSh->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false);
+
+dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Heading 1"),
+getProperty(getParagraphOfText(1, xCellA1->getText()), 
"ParaStyleName"));
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Heading 1"),
+getProperty(getParagraphOfText(1, xCellB1->getText()), 
"ParaStyleName"));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Table Contents"),
+getProperty(getParagraphOfText(1, xCellA1->getText()), 
"ParaStyleName"));
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Heading 1"),
+getProperty(getParagraphOfText(1, xCellB1->getText()), 
"ParaStyleName"));
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Table Contents"),
+getProperty(getParagraphOfText(1, xCellA1->getText()), 
"ParaStyleName"));
+
+CPPUNIT_ASSERT_EQUAL(
+OUString("Table Contents"),
+getProperty(getParagraphOfText(1, xCellB1->getText()), 
"ParaStyleName"));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf126735)
 {
 SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf39721.fodt");

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

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/numberingwindow.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 315e3af84ff5d101abbeb6746f249fcf4b720fe9
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 14:17:23 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 16:53:53 2021 +0100

set placeholder image

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

diff --git a/svx/uiconfig/ui/numberingwindow.ui 
b/svx/uiconfig/ui/numberingwindow.ui
index 26adebf57c92..b8b6b2c4ac35 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -5,7 +5,7 @@
   
 True
 False
-cmd/sc_outlinebullet.png
+missing-image
   
   
 False

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

[Luboš Luňák (via logerrit)]

 vcl/qa/cppunit/skia/skia.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit c1c88bad3e99dd3740b7833d81350e8dd6e39649
Author: Luboš Luňák 
AuthorDate: Fri Nov 5 13:29:08 2021 +0100
Commit: Luboš Luňák 
CommitDate: Fri Nov 5 16:52:43 2021 +0100

Revert "disable SkiaTest::testMatrixQuality because of tb68"

This got handled properly by 12c6b1ef6a824b09778163ec83fc44bb .

This reverts commit 734f37aaf6027ef2d989b6440370dee46bac0df7.

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

diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx
index 549b7de7b16f..4ff70306b3fe 100644
--- a/vcl/qa/cppunit/skia/skia.cxx
+++ b/vcl/qa/cppunit/skia/skia.cxx
@@ -320,9 +320,6 @@ void SkiaTest::testBitmapCopyOnWrite()
 
 void SkiaTest::testMatrixQuality()
 {
-// This test fails on the tb68 tinderbox for a mysterious reason:
-// https://lists.freedesktop.org/archives/libreoffice/2021-March/086969.html
-#if !(defined(_WIN32) && !defined(_WIN64))
 if (!SkiaHelper::isVCLSkiaEnabled())
 return;
 // Not changing the size (but possibly rotated/flipped) does not need high 
quality transformations.
@@ -334,7 +331,6 @@ void SkiaTest::testMatrixQuality()
 CPPUNIT_ASSERT(SkiaTests::matrixNeedsHighQuality(SkMatrix::Scale(0, -1)));
 CPPUNIT_ASSERT(SkiaTests::matrixNeedsHighQuality(SkMatrix::Scale(2, 1)));
 CPPUNIT_ASSERT(SkiaTests::matrixNeedsHighQuality(SkMatrix::RotateDeg(89)));
-#endif
 }
 
 void SkiaTest::testDelayedScale()

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 71b270fc3fb9c5f5f08cc340e83a3077cae427fd
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 15:46:14 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 16:49:07 2021 +0100

fix --enable-gtk3-kde5 build

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

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index c1491208977e..f9fd85e94b80 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -85,9 +85,10 @@ void readIpcArg(std::istream& stream, 
css::uno::Sequence& seq)
 stream >> numFiles;
 stream.ignore(); // skip space;
 seq.realloc(numFiles);
+OUString* pSeq = seq.getArray();
 for (size_t i = 0; i < numFiles; ++i)
 {
-readIpcArg(stream, seq[i]);
+readIpcArg(stream, pSeq[i]);
 }
 }
 

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

[Michael Weghorn (via logerrit)]

 vcl/qt5/QtInstance.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 324e2a5c3e6355e6b38db0add100465224841364
Author: Michael Weghorn 
AuthorDate: Fri Nov 5 14:00:31 2021 +0100
Commit: Michael Weghorn 
CommitDate: Fri Nov 5 16:17:45 2021 +0100

tdf#144994 QtInstance::CreateMenu needs SolarMutex

It can be called from extensions (as is the case e.g.
for LanguageTool, s. tdf#144994 comment 19; assertion
is hit after clicking around in the menu a bit) and
'RunInMainThread' requires that the SolarMutex
is held.

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

diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index 06840ad7281f..29a7d0e4ddf7 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -358,6 +358,7 @@ QtInstance::CreateVirtualDevice(SalGraphics& rGraphics, 
tools::Long& nDX, tools:
 
 std::unique_ptr QtInstance::CreateMenu(bool bMenuBar, Menu* pVCLMenu)
 {
+SolarMutexGuard aGuard;
 std::unique_ptr pRet;
 RunInMainThread([&pRet, bMenuBar, pVCLMenu]() {
 QtMenu* pSalMenu = new QtMenu(bMenuBar);

[Libreoffice-commits] core.git: download.lst

[Michael Stahl (via logerrit)]

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

New commits:
commit 1289125532a029dc80e4ee3d0a49dca253f51888
Author: Michael Stahl 
AuthorDate: Fri Nov 5 14:03:05 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 5 16:03:14 2021 +0100

bzip2: upgrade to release 1.0.8

Fixes CVE-2019-12900

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

diff --git a/download.lst b/download.lst
index fc95d14dcc95..4ff006673f9f 100644
--- a/download.lst
+++ b/download.lst
@@ -18,8 +18,8 @@ export BREAKPAD_SHA256SUM := 
c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91
 export BREAKPAD_TARBALL := 
breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz
 export BSH_SHA256SUM := 
9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96
 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
-export BZIP2_SHA256SUM := 
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
-export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
+export BZIP2_SHA256SUM := 
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
+export BZIP2_TARBALL := bzip2-1.0.8.tar.gz
 export CAIRO_SHA256SUM := 
74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705
 export CAIRO_VERSION_MICRO := 4
 export CAIRO_TARBALL := cairo-1.17.$(CAIRO_VERSION_MICRO).tar.xz

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf144668.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx  |9 +
 sw/source/filter/ww8/wrtw8num.cxx   |   24 +++-
 sw/source/filter/ww8/ww8par.hxx |2 +-
 sw/source/filter/ww8/ww8par2.cxx|   20 
 5 files changed, 25 insertions(+), 30 deletions(-)

New commits:
commit 6f84c1fda7654c18b1e53de7b1c077e8a31e606f
Author: Vasily Melenchuk 
AuthorDate: Thu Oct 28 13:36:50 2021 +0300
Commit: Xisco Fauli 
CommitDate: Fri Nov 5 15:55:30 2021 +0100

tdf#144668: docx export: simpler way to create lvlText in numberings

Oldr approach with populating ListLabelString with some predefined
values and than replacing them by placeholders is not so good. It
can lead to collisions if we use numbers in format string.

Anow with support of list strings in core we do not need this: it
is enougth to replace LO placeholders %1%, %2%, ... by MS binary
placeholders \0, \1, ...

Additionally added support for list level initialization in DOC
import: that case was still setting just prefix/suffix leaving
list level uninitialized.

Change-Id: Ia85551f46b4e229dea93c663459ec1a8715c8a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124326
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e0b41fcb56e51f20684da4ba44d7ed6e0e1a3234)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124698
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf144668.odt 
b/sw/qa/extras/ooxmlexport/data/tdf144668.odt
new file mode 100644
index ..7504adce400d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf144668.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 5a331a5f505d..900952f90322 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -71,6 +71,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx")
 CPPUNIT_ASSERT_EQUAL( sal_Int16(36), nGridLines);   // was 23, left large 
space before text.
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf144668, "tdf144668.odt")
+{
+uno::Reference xPara1(getParagraph(1, u"level1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("[0001]"), getProperty(xPara1, 
"ListLabelString"));
+
+uno::Reference xPara2(getParagraph(2, u"level2"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("[001]"), getProperty(xPara2, 
"ListLabelString"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index 3ebc95e2407c..19a21f268034 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -435,13 +435,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
 void MSWordExportBase::NumberingLevel(
 SwNumRule const& rRule, sal_uInt8 const nLvl)
 {
-// prepare the NodeNum to generate the NumString
-static const SwNumberTree::tNumberVector aNumVector = [] {
-SwNumberTree::tNumberVector vec(WW8ListManager::nMaxLevel);
-std::iota(vec.begin(), vec.end(), 0);
-return vec;
-}();
-
 // write the static data of the SwNumFormat of this level
 sal_uInt8 aNumLvlPos[WW8ListManager::nMaxLevel] = { 0,0,0,0,0,0,0,0,0 };
 
@@ -503,35 +496,24 @@ void MSWordExportBase::NumberingLevel(
 else
 {
 // Create level string
-// For docx it is not the best way: we can just take it from 
rRule.Get(nLvl).GetListFormat()
-// But for compatibility with doc we follow same routine
 if (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType())
 {
 sal_uInt8* pLvlPos = aNumLvlPos;
-// the numbering string has to be restrict
-// to the level currently working on.
-sNumStr = rRule.MakeNumString(aNumVector, true, true, nLvl);
+sNumStr = rFormat.GetListFormat();
 
 // now search the nums in the string
 for (sal_uInt8 i = 0; i <= nLvl; ++i)
 {
-OUString sSrch(OUString::number(i));
+OUString sSrch("%" + OUString::number(i+1) + "%");
 sal_Int32 nFnd = sNumStr.indexOf(sSrch);
 if (-1 != nFnd)
 {
 *pLvlPos = static_cast(nFnd + 1);
 ++pLvlPos;
-sNumStr = sNumStr.replaceAt(nFnd, 1, 
OUString(static_cast(i)));
+sNumStr = sNumStr.replaceAt(nFnd, sSrch.getLength(), 
OUString(static_cast(i)));
 }
 }
 }
-
-if (!rRule.Get(nLvl).HasListFormat())
-{
-if (!rFormat.GetPrefix().isEmpty())
-sNumStr = rFormat.GetPrefix() + sNumStr;
-sNumStr += rFormat.GetSuffix();
-}
 }
 

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 1e5992c1059866186b5e75a0beb7dd7b892352cf
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:46:09 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 15:16:31 2021 +0100

gtk[3|4] do the same thing to set/get buttons labels for both gtks

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 0e504200917e..3d518a8cbaad 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4620,24 +4620,20 @@ namespace
 
 OUString button_get_label(GtkButton* pButton)
 {
-#if GTK_CHECK_VERSION(4, 0, 0)
 if (GtkLabel* pLabel = get_label_widget(GTK_WIDGET(pButton)))
 return ::get_label(pLabel);
-#endif
 const gchar* pStr = gtk_button_get_label(pButton);
 return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
 }
 
 void button_set_label(GtkButton* pButton, const OUString& rText)
 {
-#if GTK_CHECK_VERSION(4, 0, 0)
 if (GtkLabel* pLabel = get_label_widget(GTK_WIDGET(pButton)))
 {
 ::set_label(pLabel, rText);
 gtk_widget_set_visible(GTK_WIDGET(pLabel), true);
 return;
 }
-#endif
 gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
 }
 

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

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/numberingwindow.ui |6 +++
 vcl/unx/gtk3/gtkinst.cxx   |   56 +++--
 2 files changed, 41 insertions(+), 21 deletions(-)

New commits:
commit 95b283da72eb0cbf85d379bced053e1890d7fabe
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 12:02:00 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 15:15:51 2021 +0100

prepopulate numberingwindow.ui with a placeholder image

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

diff --git a/svx/uiconfig/ui/numberingwindow.ui 
b/svx/uiconfig/ui/numberingwindow.ui
index 0c9b72b5a98c..26adebf57c92 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -2,6 +2,11 @@
 
 
   
+  
+True
+False
+cmd/sc_outlinebullet.png
+  
   
 False
 True
@@ -48,6 +53,7 @@
 True
 True
 True
+image1
 True
 True
   
commit 137e3c89de08d42c97c5675cf3c98011398bccf3
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:58:38 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 15:15:37 2021 +0100

gtk[3|4] update an existing image on changing button image

instead of throwing away all contents and replacing it

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 1888a45ca1ce..0e504200917e 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4618,7 +4618,7 @@ namespace
 #endif
 }
 
-OUString get_button_label(GtkButton* pButton)
+OUString button_get_label(GtkButton* pButton)
 {
 #if GTK_CHECK_VERSION(4, 0, 0)
 if (GtkLabel* pLabel = get_label_widget(GTK_WIDGET(pButton)))
@@ -4628,7 +4628,7 @@ namespace
 return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
 }
 
-void set_button_label(GtkButton* pButton, const OUString& rText)
+void button_set_label(GtkButton* pButton, const OUString& rText)
 {
 #if GTK_CHECK_VERSION(4, 0, 0)
 if (GtkLabel* pLabel = get_label_widget(GTK_WIDGET(pButton)))
@@ -4953,8 +4953,15 @@ namespace
 }
 #endif
 
-void set_from_icon_name(GtkButton* pButton, const OUString& rIconName)
+void button_set_from_icon_name(GtkButton* pButton, const OUString& 
rIconName)
 {
+if (GtkImage* pImage = get_image_widget(GTK_WIDGET(pButton)))
+{
+::image_set_from_icon_name(pImage, rIconName);
+gtk_widget_set_visible(GTK_WIDGET(pImage), true);
+return;
+}
+
 GdkPixbuf* pixbuf = load_icon_by_name(rIconName);
 GtkWidget* pImage;
 if (!pixbuf)
@@ -4971,7 +4978,7 @@ namespace
 #endif
 }
 
-void set_image(GtkButton* pButton, const VirtualDevice* pDevice)
+void button_set_image(GtkButton* pButton, const VirtualDevice* pDevice)
 {
 #if !GTK_CHECK_VERSION(4, 0, 0)
 gtk_button_set_always_show_image(pButton, true);
@@ -4985,8 +4992,15 @@ namespace
 #endif
 }
 
-void set_image(GtkButton* pButton, const 
css::uno::Reference& rImage)
+void button_set_image(GtkButton* pButton, const 
css::uno::Reference& rImage)
 {
+if (GtkImage* pImage = get_image_widget(GTK_WIDGET(pButton)))
+{
+::image_set_from_xgraphic(pImage, rImage);
+gtk_widget_set_visible(GTK_WIDGET(pImage), true);
+return;
+}
+
 GdkPixbuf* pixbuf = getPixbuf(rImage);
 GtkWidget* pImage;
 if (!pixbuf)
@@ -9319,22 +9333,22 @@ public:
 
 virtual void set_label(const OUString& rText) override
 {
-::set_button_label(m_pButton, rText);
+::button_set_label(m_pButton, rText);
 }
 
 virtual void set_image(VirtualDevice* pDevice) override
 {
-::set_image(m_pButton, pDevice);
+::button_set_image(m_pButton, pDevice);
 }
 
 virtual void set_from_icon_name(const OUString& rIconName) override
 {
-::set_from_icon_name(m_pButton, rIconName);
+::button_set_from_icon_name(m_pButton, rIconName);
 }
 
 virtual void set_image(const css::uno::Reference& 
rImage) override
 {
-::set_image(m_pButton, rImage);
+::button_set_image(m_pButton, rImage);
 }
 
 virtual void set_custom_button(VirtualDevice* pDevice) override
@@ -9344,7 +9358,7 @@ public:
 
 virtual OUString get_label() const override
 {
-return ::get_button_label(m_pButton);
+return ::button_get_label(m_pButton);
 }
 
 virtual void set_font(const vcl::Font& rFont) override
@@ -11548,7 +11562,7 @@ public:
 #else
 if (!GTK_IS_BUTTON(pItem))
 return;
-::set_button_label

[Libreoffice-commits] core.git: 2 commits - svx/uiconfig

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/numberingwindow.ui |   29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 69cc0fb6884e8a2324e0605137c41c072522e5cc
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:36:42 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 15:14:58 2021 +0100

add use-underline to label

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

diff --git a/svx/uiconfig/ui/numberingwindow.ui 
b/svx/uiconfig/ui/numberingwindow.ui
index 5ad533181ddd..0c9b72b5a98c 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -48,6 +48,7 @@
 True
 True
 True
+True
 True
   
   
commit bd150e7a8602b58bddca5e1277220e67a7ad5dcd
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:36:26 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 15:14:43 2021 +0100

resave with latest glade

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

diff --git a/svx/uiconfig/ui/numberingwindow.ui 
b/svx/uiconfig/ui/numberingwindow.ui
index fdde9eb88fb2..5ad533181ddd 100644
--- a/svx/uiconfig/ui/numberingwindow.ui
+++ b/svx/uiconfig/ui/numberingwindow.ui
@@ -1,34 +1,34 @@
 
-
+
 
   
   
-False
-True
-4
+False
+True
+4
 
   
 True
-False
+False
 vertical
 6
 
   
 True
-True
+True
 True
 True
-never
-never
-in
+never
+never
+in
 
   
 True
-False
+False
 
   
 True
-True
+True
 GDK_BUTTON_PRESS_MASK | 
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | 
GDK_STRUCTURE_MASK
 True
 True
@@ -46,9 +46,9 @@
 
   
 True
-True
-True
-True
+True
+True
+True
   
   
 False

[Libreoffice-commits] core.git: dbaccess/uiconfig sw/uiconfig

[Ilmari Lauhakangas (via logerrit)]

 dbaccess/uiconfig/ui/ldapconnectionpage.ui |2 +-
 dbaccess/uiconfig/ui/ldappage.ui   |2 +-
 sw/uiconfig/swriter/ui/mailconfigpage.ui   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b820e4fe9ea0be0c2e1a1af19ad7e5f2cf6588df
Author: Ilmari Lauhakangas 
AuthorDate: Fri Nov 5 13:54:44 2021 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Fri Nov 5 15:06:46 2021 +0100

Refer to TLS/SSL in options

Change-Id: I07bddadd9421ee5584f8d978c5c43eab067414af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124745
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Sophie Gautier 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/dbaccess/uiconfig/ui/ldapconnectionpage.ui 
b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
index 5968c1d63ed9..c02c7bdb9f51 100644
--- a/dbaccess/uiconfig/ui/ldapconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/ldapconnectionpage.ui
@@ -172,7 +172,7 @@
 
 
   
-Use _secure connection 
(SSL)
+Use _secure connection 
(TLS/SSL)
 True
 True
 False
diff --git a/dbaccess/uiconfig/ui/ldappage.ui b/dbaccess/uiconfig/ui/ldappage.ui
index 947f0b602627..8cd5bc8b8257 100644
--- a/dbaccess/uiconfig/ui/ldappage.ui
+++ b/dbaccess/uiconfig/ui/ldappage.ui
@@ -66,7 +66,7 @@
 
 
   
-Use secure connection (SSL)
+Use secure connection (TLS/SSL)
 True
 True
 False
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui 
b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index 2a8bc37ae854..f36b6e873bff 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/sw/uiconfig/swriter/ui/mailconfigpage.ui
@@ -287,7 +287,7 @@
 
 
   
-_Use secure connection (SSL)
+_Use secure connection (TLS/SSL)
 True
 True
 False

[Libreoffice-commits] core.git: dictionaries

[Olivier Hallot (via logerrit)]

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

New commits:
commit ae0767b0fbe5d5b56ebe406bf1ee7aca4aaa909f
Author: Olivier Hallot 
AuthorDate: Fri Nov 5 10:42:36 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Nov 5 14:42:36 2021 +0100

Update git submodules

* Update dictionaries from branch 'master'
  to 60f4a1dd6b3e8ea15f65488b02487ea95fd1f8e6
  - Cleanup pt-BR thesaurus (part)

Current thesaurus has many typos and truncated words but cleanup
is a long process and will be carried in chunks.

Change-Id: Idb4da711b3829fefa81bc744ca1a772471edc0a5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/124756
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/dictionaries b/dictionaries
index c3133e367000..60f4a1dd6b3e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c3133e367000907747960c73ed372ecba249e3b1
+Subproject commit 60f4a1dd6b3e8ea15f65488b02487ea95fd1f8e6

[Libreoffice-commits] dictionaries.git: pt_BR/th_pt_BR.dat pt_BR/th_pt_BR.idx

[Olivier Hallot (via logerrit)]

 pt_BR/th_pt_BR.dat |36599 +++-
 pt_BR/th_pt_BR.idx |7 +
 2 files changed, 31636 insertions(+), 84962 deletions(-)

New commits:
commit 60f4a1dd6b3e8ea15f65488b02487ea95fd1f8e6
Author: Olivier Hallot 
AuthorDate: Fri Nov 5 10:36:58 2021 -0300
Commit: Olivier Hallot 
CommitDate: Fri Nov 5 14:42:33 2021 +0100

Cleanup pt-BR thesaurus (part)

Current thesaurus has many typos and truncated words but cleanup
is a long process and will be carried in chunks.

Change-Id: Idb4da711b3829fefa81bc744ca1a772471edc0a5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/124756
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/pt_BR/th_pt_BR.dat b/pt_BR/th_pt_BR.dat
index 3561144..af73904 100644
--- a/pt_BR/th_pt_BR.dat
+++ b/pt_BR/th_pt_BR.dat
@@ -1,37 +1,27 @@
 UTF-8
-{jossante|1
-(Sinônimo)atlético|atlético|{jossante|forçoso|forte|membrudo|robusto|vigoroso
-
+possante|1
+(Sinônimo)atlético|atlético|possante|forçoso|forte|membrudo|robusto|vigoroso
 ©bsi|1
-(Sinônimo)obtubaçao|obtubaçao|©bsi|entupimento
-
-/opressor|1
+(Sinônimo)obtubação|obtubação|©bsi|entupimento
+opressor|1
 
(Sinônimo)tirano|tirano|/opressor|bárbaro|cruel|déspota|despótico|duro|mau|opressor|verdugo
-
-&rente|1
-(Sinônimo)raso|raso|&rente|liso|ordinário|plano|rasteiro|rés
-
+rente|1
+(Sinônimo)raso|raso|rente|liso|ordinário|plano|rasteiro|rés
 °esguelha|1
 (Sinônimo)soslaio|soslaio|°esguelha|detravés|esguelha|través|viés
-
 a|1
 
(Sinônimo)anexar|anexar|a|acrescentar|adicionar|agregar|ajuntar|apensar|filiar|incorporar|juntar|ligar|reunir|unir
-
-aaedo|1
-(Sinônimo)acre|acre|aaedo|acerbo|acético|acetoso|acido|ácido|agre|agro|áspero|avinagrado|azedo|mordaz|picante|queimante
-
-aalma|1
-(Sinônimo)psique|psique|aalma
-
-aantarrão|1
-(Sinônimo)igrejeiro|igrejeiro|aantarrão|beato
-
-aãsolar|1
-(Sinônimo)desolar|desolar|aãsolar|afligir|arrasar|arruinar|consternar|despovoar|devastar|magoar
-
+azedo|1
+(Sinônimo)acre|acre|azedo|acerbo|acético|acetoso|acido|ácido|agre|agro|áspero|avinagrado|azedo|mordaz|picante|queimante
+alma|1
+(Sinônimo)psique|psique|alma
+santarrão|1
+(Sinônimo)igrejeiro|igrejeiro|santarrão|beato
+assolar|1
+(Sinônimo)desolar|desolar|assolar|afligir|arrasar|arruinar|consternar|despovoar|devastar|magoar
 aba|11
-(Sinônimo)amparo|amparo|aba|abrigo|achego|acostamento|adminículo|agasalho|ajuda|anteparo|apadrinhamento|apoio|arrimo|asilo|assistência|auxíjlio|auxílio|baluarte|bordão|broquel|coluna|conchego|defesa|égide|encosto|escora|esteio|favor|fulcro|muro|patrocínio|proteção|proteçâo|resguardo|socorro|sustentáculo|tutela|tutoria
-(Sinônimo)apoio|apoio|aba|adesão|adminículo|amparo|aprovação|arrimo|assentimento|base|bordão|coluna|conchego|descanso|eixo|encosto|escora|espeque|fé|fulcro|proteçâo|proteção|refúgio|socorro|sustentáculo
+(Sinônimo)amparo|amparo|aba|abrigo|achego|acostamento|adminículo|agasalho|ajuda|anteparo|apadrinhamento|apoio|arrimo|asilo|assistência|auxíjlio|auxílio|baluarte|bordão|broquel|coluna|conchego|defesa|égide|encosto|escora|esteio|favor|fulcro|muro|patrocínio|proteção|proteção|resguardo|socorro|sustentáculo|tutela|tutoria
+(Sinônimo)apoio|apoio|aba|adesão|adminículo|amparo|aprovação|arrimo|assentimento|base|bordão|coluna|conchego|descanso|eixo|encosto|escora|espeque|fé|fulcro|proteção|proteção|refúgio|socorro|sustentáculo
 
(Sinônimo)beira|beira|aba|beirada|borda|bordo|cairel|encosta|extremidade|falda|iminência|margem|orla|ourela|proximidade|rai|riba|sopé|vertente
 (Sinônimo)beirada|beirada|aba|beira|encosta|falda|margem|sopé|vertente
 
(Sinônimo)encosta|encosta|aba|beira|beirada|clivo|falda|lomba|sopé|subida|vertente
@@ -41,52 +31,43 @@ aba|11
 
(Sinônimo)proteção|proteção|aba|abrigo|agasalho|ajuda|amparo|apoio|arrimo|asilo|auspiciar|auxílio|bafejo|capa|custódia|defesa|égide|escora|fautoria|favor|fomento|garantia|paládio|patrocínio|pistolão|quartel|refúgio|socorro|tutela|tutoria
 (Sinônimo)sopé|sopé|aba|base|beira|beirada|encosta|falda|fralda|raiz|vertente
 (Sinônimo)vertente|vertente|aba|beira|beirada|declive|encosta|falda|sopé
-
 ababadar|4
 
(Sinônimo)dobrar|dobrar|ababadar|abater|acorcovab|alcachinar|alcatruzar|arquear|arregaçar|aumentar|ceder|corcovar|curvar|domar|duplicar|embrulhar|encurvar|enroscar|flectir|infletsr|preguear|reclinar|recurvar|retorcer|transigir|vergar|virar|voltar
 
(Sinônimo)enrugar|enrugar|ababadar|arrepiar|arrugar|avelar|encarquilhar|encrespar|engelhar|franzir|preguear|sulcar|vincar
 (Sinônimo)franzir|franzir|ababadar|crispar|enrugar|preguear
 (Sinônimo)preguear|preguear|ababadar|dobrar|enrugar|franzir
-
 ababalhado|3
 (Sinônimo)babado|babado|ababalhado|abobado|apaixonado|enamorado|pasmado
 (Sinônimo)babujado|babujado|ababalhado
 (Sinônimo)molhado|molhado|ababalhado|banhado|embebido|ensopado|espargido|regado
-
 ababeíado|1
-(Sinônimo)desordenado|desordenado|ababeíado|ababelado|anárquico|atabalhoado|atrapalhado|atropelado|babélico|babêlico|caótico|con

[Libreoffice-commits] core.git: cui/source include/framework include/sfx2 include/svtools include/svx include/test include/vcl sc/source sd/inc sw/source

[Noel Grandin (via logerrit)]

 cui/source/options/optgdlg.hxx |2 +-
 include/framework/generictoolbarcontroller.hxx |2 +-
 include/sfx2/docfile.hxx   |2 +-
 include/sfx2/notebookbar/SfxNotebookBar.hxx|2 +-
 include/svtools/addresstemplate.hxx|2 +-
 include/svtools/popupmenucontrollerbase.hxx|2 +-
 include/svtools/toolboxcontroller.hxx  |2 +-
 include/svx/ClassificationDialog.hxx   |4 ++--
 include/svx/fmobjfac.hxx   |2 +-
 include/svx/hexcolorcontrol.hxx|2 +-
 include/svx/objfac3d.hxx   |2 +-
 include/test/bootstrapfixture.hxx  |2 +-
 include/vcl/svapp.hxx  |2 +-
 include/vcl/toolkit/button.hxx |2 +-
 sc/source/ui/inc/preview.hxx   |2 +-
 sd/inc/sdmod.hxx   |2 +-
 sw/source/uibase/inc/textsh.hxx|2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit ffd0453810cff76aebb8b0c9e2a5d5fb18ac2591
Author: Noel Grandin 
AuthorDate: Fri Nov 5 11:32:37 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 13:59:10 2021 +0100

use more DECL_DLLPRIVATE_STATIC_LINK

to avoid unnecessarily exporting symbols

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

diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 198ecb50e0e8..75f29c6c5a34 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -55,7 +55,7 @@ private:
 
 DECL_LINK(TwoFigureHdl, weld::SpinButton&, void);
 #if defined(_WIN32)
-DECL_STATIC_LINK(OfaMiscTabPage, FileAssocClick, weld::Button&, void);
+DECL_DLLPRIVATE_STATIC_LINK(OfaMiscTabPage, FileAssocClick, weld::Button&, 
void);
 #endif
 protected:
 virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
diff --git a/include/framework/generictoolbarcontroller.hxx 
b/include/framework/generictoolbarcontroller.hxx
index 8184de97e92f..e177ea5f00a9 100644
--- a/include/framework/generictoolbarcontroller.hxx
+++ b/include/framework/generictoolbarcontroller.hxx
@@ -51,7 +51,7 @@ class FWK_DLLPUBLIC GenericToolbarController final : public 
svt::ToolboxControll
 // XStatusListener
 virtual void SAL_CALL statusChanged( const 
css::frame::FeatureStateEvent& Event ) override;
 
-DECL_STATIC_LINK( GenericToolbarController, ExecuteHdl_Impl, void*, 
void );
+DECL_DLLPRIVATE_STATIC_LINK( GenericToolbarController, 
ExecuteHdl_Impl, void*, void );
 
 struct ExecuteInfo
 {
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 55b31202bcab..5e542fe4648e 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -95,7 +95,7 @@ public:
 
 virtual ~SfxMedium() override;
 
-DECL_STATIC_LINK(SfxMedium, ShowReloadEditableDialog, void*, void);
+DECL_DLLPRIVATE_STATIC_LINK(SfxMedium, ShowReloadEditableDialog, void*, 
void);
 bool CheckCanGetLockfile() const;
 void SetOriginallyReadOnly(bool val);
 void AddToCheckEditableWorkerList();
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index 2fe195f06901..cbf7f92d3b9b 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -76,7 +76,7 @@ private:
 static std::map>
 m_pNotebookBarWeldedWrapper;
 
-DECL_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const SfxViewShell*, void);
+DECL_DLLPRIVATE_STATIC_LINK(SfxNotebookBar, VclDisposeHdl, const 
SfxViewShell*, void);
 };
 
 } // namespace sfx2
diff --git a/include/svtools/addresstemplate.hxx 
b/include/svtools/addresstemplate.hxx
index 6fc723ab63b3..04ce8d9be68d 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -95,7 +95,7 @@ namespace svt
 DECL_DLLPRIVATE_LINK(OnFieldScroll, weld::ScrolledWindow&, void);
 DECL_DLLPRIVATE_LINK(OnFieldSelect, weld::ComboBox&, void);
 DECL_DLLPRIVATE_LINK(OnAdministrateDatasources, weld::Button&, void);
-DECL_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, 
weld::Widget&, void);
+DECL_DLLPRIVATE_STATIC_LINK(AddressBookSourceDialog, OnComboGetFocus, 
weld::Widget&, void);
 DECL_DLLPRIVATE_LINK(OnComboLoseFocus, weld::Widget&, void);
 DECL_DLLPRIVATE_LINK(OnComboSelect, weld::ComboBox&, void);
 DECL_DLLPRIVATE_LINK(OnOkClicked, weld::Button&, void);
diff --git a/include/svtools/popupmenucontrollerbase.hxx 
b/include/svtools/popupmenucontrollerbase.hxx
index 31fc398b513d..6ce19444aa51 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -107,7 +107,7 @@ namespace svt
   

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 848eb0ddecd4ef4c8da06624a5479efd3d73cf64
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 09:42:05 2021 +
Commit: Miklos Vajna 
CommitDate: Fri Nov 5 13:58:02 2021 +0100

crashtesting: downgrade assert on bookmark missing from input docx to a 
warning

The docx bugdoc is "generated by ComMA version 3.3.0" and has a pair of
bookmarkEnd/bookmarkStart in a non-conformant order, like so...


...


both bookmarkStart and bookmarkEnd are mapped to the same
DomainMapper_Impl::StartOrEndBookmark
(without a distinction made between begin/end) which assumes the first
time it's called for an id that it's a bookmark start, and the second
time for an id that it's a bookmark end and that there will have been a
w:name seen between the 1st and 2nd calls to be used as the name for the
bookmark to use at the 2nd call.

That there is no bookmark name is a problem in the input docx rather
than the import logic so turn this assert into a warning

$ wget https://bugs.documentfoundation.org/attachment.cgi?id=157489 -O 
tdf130241-1.docx
$ ./instdir/program/soffice --headless --convert-to pdf ./tdf130241-1.docx

https: 
//dev-builds.libreoffice.org/crashtest/b6ef68cdaa51ca5c9fdab40ade97f4a0f18da51b/backtraces/task815-core.backtrace.txt
Change-Id: Id389d186ea825f515c2638a76c9bba00666e0686
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124734
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9bc82dfb6c92..dcec98ed59e0 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -7099,7 +7099,7 @@ void DomainMapper_Impl::StartOrEndBookmark( const 
OUString& rId )
 xCursor->goLeft( 1, false );
 }
 uno::Reference< container::XNamed > xBkmNamed( xBookmark, 
uno::UNO_QUERY_THROW );
-assert(!aBookmarkIter->second.m_sBookmarkName.isEmpty());
+SAL_WARN_IF(aBookmarkIter->second.m_sBookmarkName.isEmpty(), 
"writerfilter.dmapper", "anonymous bookmark");
 //todo: make sure the name is not used already!
 xBkmNamed->setName( aBookmarkIter->second.m_sBookmarkName );
 xTextAppend->insertTextContent( uno::Reference< 
text::XTextRange >( xCursor, uno::UNO_QUERY_THROW), xBookmark, 
!xCursor->isCollapsed() );

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

[Mike Kaganski (via logerrit)]

 oox/source/token/propertynames.cxx |   14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 3032fc36eaca2840a9e42207b5e8e88e248a439d
Author: Mike Kaganski 
AuthorDate: Fri Nov 5 13:21:42 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Nov 5 13:38:33 2021 +0100

Simplify oox::PropertyNameVector ctor

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

diff --git a/oox/source/token/propertynames.cxx 
b/oox/source/token/propertynames.cxx
index dc0d9ed42b53..b7c5e544143c 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -22,17 +22,11 @@
 namespace oox
 {
 PropertyNameVector::PropertyNameVector()
-{
-static const char* sppcPropertyNames[] = {
-// include auto-generated C array with property names as C strings
+: ::std::vector{
+// include auto-generated C array with property names as C strings
 #include 
-""
-};
-
-size_t nArraySize = SAL_N_ELEMENTS(sppcPropertyNames) - 1;
-reserve(nArraySize);
-for (size_t nIndex = 0; nIndex < nArraySize; ++nIndex)
-push_back(OUString::createFromAscii(sppcPropertyNames[nIndex]));
+}
+{
 }
 
 } // namespace oox

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   54 ++-
 1 file changed, 40 insertions(+), 14 deletions(-)

New commits:
commit 8bd46187e355f2da76812d38d0fa36cc255a841b
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:19:37 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 13:34:37 2021 +0100

gtk[3|4] add find_image_widget

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3469ff87049b..1888a45ca1ce 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4560,6 +4560,30 @@ namespace
 
 return pChild;
 }
+
+GtkWidget* find_image_widget(GtkContainer* pContainer)
+{
+GList* pChildren = gtk_container_get_children(pContainer);
+
+GtkWidget* pChild = nullptr;
+for (GList* pCandidate = pChildren; pCandidate; pCandidate = 
pCandidate->next)
+{
+if (GTK_IS_IMAGE(pCandidate->data))
+{
+pChild = GTK_WIDGET(pCandidate->data);
+break;
+}
+else if (GTK_IS_CONTAINER(pCandidate->data))
+{
+pChild = find_image_widget(GTK_CONTAINER(pCandidate->data));
+if (pChild)
+break;
+}
+}
+g_list_free(pChildren);
+
+return pChild;
+}
 #endif
 
 GtkLabel* get_label_widget(GtkWidget* pButton)
@@ -4578,6 +4602,21 @@ namespace
 #endif
 }
 
+GtkImage* get_image_widget(GtkWidget *pButton)
+{
+#if !GTK_CHECK_VERSION(4, 0, 0)
+GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(pButton));
+
+if (GTK_IS_CONTAINER(pChild))
+pChild = find_image_widget(GTK_CONTAINER(pChild));
+else if (!GTK_IS_IMAGE(pChild))
+pChild = nullptr;
+
+return GTK_IMAGE(pChild);
+#else
+return GTK_IMAGE(find_image_widget(pButton));
+#endif
+}
 
 OUString get_button_label(GtkButton* pButton)
 {
@@ -9929,19 +9968,6 @@ private:
 gtk_widget_show(GTK_WIDGET(m_pImage));
 }
 
-static void find_image(GtkWidget *pWidget, gpointer user_data)
-{
-GtkImage **ppImage = static_cast(user_data);
-if (GTK_IS_IMAGE(pWidget))
-*ppImage = GTK_IMAGE(pWidget);
-#if GTK_CHECK_VERSION(4, 0, 0)
-*ppImage = GTK_IMAGE(find_image_widget(pWidget));
-#else
-if (GTK_IS_CONTAINER(pWidget))
-gtk_container_forall(GTK_CONTAINER(pWidget), find_image, 
user_data);
-#endif
-}
-
 static void signalFlagsChanged(GtkToggleButton* pToggleButton, 
GtkStateFlags flags, gpointer widget)
 {
 GtkInstanceMenuButton* pThis = 
static_cast(widget);
@@ -9988,7 +10014,7 @@ public:
 m_nToggledSignalId = g_signal_connect(m_pToggleButton, 
"state-flags-changed", G_CALLBACK(signalFlagsChanged), this);
 
 m_pLabel = gtk_bin_get_child(GTK_BIN(m_pMenuButton));
-find_image(GTK_WIDGET(m_pMenuButton), &m_pImage);
+m_pImage = get_image_widget(GTK_WIDGET(m_pMenuButton));
 m_pBox = formatMenuButton(m_pLabel);
 #else
 GtkWidget* pToggleButton = 
gtk_widget_get_first_child(GTK_WIDGET(m_pMenuButton));

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |  182 ---
 1 file changed, 81 insertions(+), 101 deletions(-)

New commits:
commit d13712200e2c0cfee56afb6796f35e0fd15186e1
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 11:03:43 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 13:34:23 2021 +0100

gtk4: move find_image_widget into utilities

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 9c0ee3c1144d..3469ff87049b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4515,6 +4515,27 @@ namespace
 }
 return pLabel;
 }
+
+GtkWidget* find_image_widget(GtkWidget* pContainer)
+{
+GtkWidget* pImage = nullptr;
+for (GtkWidget* pChild = gtk_widget_get_first_child(pContainer);
+ pChild; pChild = gtk_widget_get_next_sibling(pChild))
+{
+if (GTK_IS_IMAGE(pChild))
+{
+pImage = pChild;
+break;
+}
+else
+{
+pImage = find_image_widget(pChild);
+if (pImage)
+break;
+}
+}
+return pImage;
+}
 #else
 GtkWidget* find_label_widget(GtkContainer* pContainer)
 {
@@ -9908,29 +9929,6 @@ private:
 gtk_widget_show(GTK_WIDGET(m_pImage));
 }
 
-#if GTK_CHECK_VERSION(4, 0, 0)
-static GtkWidget* find_image_widget(GtkWidget* pContainer)
-{
-GtkWidget* pImage = nullptr;
-for (GtkWidget* pChild = gtk_widget_get_first_child(pContainer);
- pChild; pChild = gtk_widget_get_next_sibling(pChild))
-{
-if (GTK_IS_IMAGE(pChild))
-{
-pImage = pChild;
-break;
-}
-else
-{
-pImage = find_image_widget(pChild);
-if (pImage)
-break;
-}
-}
-return pImage;
-}
-#endif
-
 static void find_image(GtkWidget *pWidget, gpointer user_data)
 {
 GtkImage **ppImage = static_cast(user_data);
commit 55bdb61f5219ea93dee00ab1a8a9735ca2ea7976
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 10:50:24 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 13:34:09 2021 +0100

gtk[3|4] merge label search code

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a0678b789283..9c0ee3c1144d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4495,28 +4495,73 @@ namespace
 }
 
 #if GTK_CHECK_VERSION(4, 0, 0)
-GtkLabel* get_button_label_widget(GtkButton* pButton)
+GtkWidget* find_label_widget(GtkWidget* pContainer)
 {
-GtkWidget* pChild = gtk_button_get_child(pButton);
-GtkLabel* pLabel = GTK_IS_LABEL(pChild) ? GTK_LABEL(pChild) : nullptr;
-if (!pLabel && pChild)
+GtkWidget* pLabel = nullptr;
+for (GtkWidget* pChild = gtk_widget_get_first_child(pContainer);
+ pChild; pChild = gtk_widget_get_next_sibling(pChild))
 {
-for (GtkWidget* pBoxChild = gtk_widget_get_first_child(pChild);
- pBoxChild; pBoxChild = gtk_widget_get_next_sibling(pBoxChild))
+if (GTK_IS_LABEL(pChild))
 {
-pLabel = GTK_IS_LABEL(pBoxChild) ? GTK_LABEL(pBoxChild) : 
nullptr;
+pLabel = pChild;
+break;
+}
+else
+{
+pLabel = find_label_widget(pChild);
 if (pLabel)
 break;
 }
 }
 return pLabel;
 }
+#else
+GtkWidget* find_label_widget(GtkContainer* pContainer)
+{
+GList* pChildren = gtk_container_get_children(pContainer);
+
+GtkWidget* pChild = nullptr;
+for (GList* pCandidate = pChildren; pCandidate; pCandidate = 
pCandidate->next)
+{
+if (GTK_IS_LABEL(pCandidate->data))
+{
+pChild = GTK_WIDGET(pCandidate->data);
+break;
+}
+else if (GTK_IS_CONTAINER(pCandidate->data))
+{
+pChild = find_label_widget(GTK_CONTAINER(pCandidate->data));
+if (pChild)
+break;
+}
+}
+g_list_free(pChildren);
+
+return pChild;
+}
+#endif
+
+GtkLabel* get_label_widget(GtkWidget* pButton)
+{
+#if !GTK_CHECK_VERSION(4, 0, 0)
+GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(pButton));
+
+if (GTK_IS_CONTAINER(pChild))
+pChild 

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

[Mike Kaganski (via logerrit)]

 oox/source/drawingml/customshapeproperties.cxx |   27 +++--
 1 file changed, 4 insertions(+), 23 deletions(-)

New commits:
commit 97cc576a4aebd9b0c0b34b62f562f0386a137332
Author: Mike Kaganski 
AuthorDate: Fri Nov 5 12:58:56 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Nov 5 13:12:40 2021 +0100

Drop code that modifies unused variable

aPropertyMap is not used after line 154

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

diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 0aba70b7a337..e1d32a992619 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -154,32 +154,13 @@ void CustomShapeProperties::pushToPropSet(
 Sequence< PropertyValue > aSeq = 
aPropertyMap.makePropertyValueSequence();
 aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
 
-static const OUStringLiteral 
sCustomShapeGeometry(u"CustomShapeGeometry");
-static const OUStringLiteral sAdjustmentValues(u"AdjustmentValues");
-uno::Any aGeoPropSet = xPropSet->getPropertyValue( 
sCustomShapeGeometry );
-uno::Sequence< beans::PropertyValue > aGeoPropSeq;
-
-// ToDo: Using sAdjustmentValues in this "if" looks nonsense.
-// It was introduced in revision acd2c909, which introduced the 
property "PresetTextWarp"
-// for interoperability with Word.
-if (aGeoPropSet >>= aGeoPropSeq)
-{
-for ( const auto& rGeoProp : std::as_const(aGeoPropSeq) )
-{
-if ( rGeoProp.Name == sAdjustmentValues )
-{
-OUString presetTextWarp;
-if ( rGeoProp.Value >>= presetTextWarp )
-{
-aPropertyMap.setProperty( PROP_PresetTextWarp, 
presetTextWarp );
-}
-}
-}
-}
-
 if ( !maAdjustmentGuideList.empty() )
 {
+static const OUStringLiteral 
sCustomShapeGeometry(u"CustomShapeGeometry");
+static const OUStringLiteral 
sAdjustmentValues(u"AdjustmentValues");
 static const OUStringLiteral sType = u"Type";
+uno::Any aGeoPropSet = xPropSet->getPropertyValue( 
sCustomShapeGeometry );
+uno::Sequence< beans::PropertyValue > aGeoPropSeq;
 if ( aGeoPropSet >>= aGeoPropSeq )
 {
 // aGeoPropSeq gets modified in the loop, and gets copied 
elsewhere;

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.2.8.2.M7'

[Andras Timar (via logerrit)]

Tag 'mimo-6.2.8.2.M7' created by Andras Timar  at 
2021-11-05 11:35 +

mimo-6.2.8.2.M7

Changes since mimo-6.2.8.2.M6-4:
---
 0 files changed
---

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit b6c3adf356ca5f7b6f3d80e6062b58c92e6e2a11
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 10:41:57 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 12:35:06 2021 +0100

gtk4: return existing label widget text on querying button label text

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a5a1e37ce93a..a0678b789283 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4494,15 +4494,9 @@ namespace
 gtk_label_set_label(pLabel, MapToGtkAccelerator(rText).getStr());
 }
 
-OUString get_button_label(GtkButton* pButton)
-{
-const gchar* pStr = gtk_button_get_label(pButton);
-return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
-}
-
-void set_button_label(GtkButton* pButton, const OUString& rText)
-{
 #if GTK_CHECK_VERSION(4, 0, 0)
+GtkLabel* get_button_label_widget(GtkButton* pButton)
+{
 GtkWidget* pChild = gtk_button_get_child(pButton);
 GtkLabel* pLabel = GTK_IS_LABEL(pChild) ? GTK_LABEL(pChild) : nullptr;
 if (!pLabel && pChild)
@@ -4515,16 +4509,31 @@ namespace
 break;
 }
 }
-if (pLabel)
+return pLabel;
+}
+#endif
+
+OUString get_button_label(GtkButton* pButton)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+if (GtkLabel* pLabel = get_button_label_widget(pButton))
+return ::get_label(pLabel);
+#endif
+const gchar* pStr = gtk_button_get_label(pButton);
+return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
+}
+
+void set_button_label(GtkButton* pButton, const OUString& rText)
+{
+#if GTK_CHECK_VERSION(4, 0, 0)
+if (GtkLabel* pLabel = get_button_label_widget(pButton))
 {
 ::set_label(pLabel, rText);
 gtk_widget_set_visible(GTK_WIDGET(pLabel), true);
+return;
 }
-else
-gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
-#else
-gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
 #endif
+gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
 }
 
 #if GTK_CHECK_VERSION(4, 0, 0)
commit 9cfa15e06ed6d6c5c555fa5623c0d962bceee30e
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 10:33:45 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 12:34:48 2021 +0100

gtk4: update an existing label on changing button label text

instead of throwing away all contents and replacing with a label e.g.
for color selector keep the optional image in "automatic"/"no fill"

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8d7bc7077a28..a5a1e37ce93a 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4502,7 +4502,29 @@ namespace
 
 void set_button_label(GtkButton* pButton, const OUString& rText)
 {
+#if GTK_CHECK_VERSION(4, 0, 0)
+GtkWidget* pChild = gtk_button_get_child(pButton);
+GtkLabel* pLabel = GTK_IS_LABEL(pChild) ? GTK_LABEL(pChild) : nullptr;
+if (!pLabel && pChild)
+{
+for (GtkWidget* pBoxChild = gtk_widget_get_first_child(pChild);
+ pBoxChild; pBoxChild = gtk_widget_get_next_sibling(pBoxChild))
+{
+pLabel = GTK_IS_LABEL(pBoxChild) ? GTK_LABEL(pBoxChild) : 
nullptr;
+if (pLabel)
+break;
+}
+}
+if (pLabel)
+{
+::set_label(pLabel, rText);
+gtk_widget_set_visible(GTK_WIDGET(pLabel), true);
+}
+else
+gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
+#else
 gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
+#endif
 }
 
 #if GTK_CHECK_VERSION(4, 0, 0)

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 569781b501be2f238c84c0d9184be0338827268b
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:34:39 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:34:39 2021 +0100

Bump product version to 6.2.8.2.M7

Change-Id: I1bdeca6613e1365a5f93b291b8e69f1b14dda862

diff --git a/configure.ac b/configure.ac
index 8dc8b4f93a41..786f9dce9054 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.2.8.2.M6],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.8.2.M7],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 85676ff5ba14832f10613aa74528f402d65974e4
Author: Caolán McNamara 
AuthorDate: Fri Nov 5 10:18:40 2021 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 12:34:27 2021 +0100

gtk[3|4] set button text via the same function

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

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b98dc7fdf3c4..8d7bc7077a28 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4494,13 +4494,13 @@ namespace
 gtk_label_set_label(pLabel, MapToGtkAccelerator(rText).getStr());
 }
 
-OUString get_label(GtkButton* pButton)
+OUString get_button_label(GtkButton* pButton)
 {
 const gchar* pStr = gtk_button_get_label(pButton);
 return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
 }
 
-void set_label(GtkButton* pButton, const OUString& rText)
+void set_button_label(GtkButton* pButton, const OUString& rText)
 {
 gtk_button_set_label(pButton, MapToGtkAccelerator(rText).getStr());
 }
@@ -9246,7 +9246,7 @@ public:
 
 virtual void set_label(const OUString& rText) override
 {
-::set_label(m_pButton, rText);
+::set_button_label(m_pButton, rText);
 }
 
 virtual void set_image(VirtualDevice* pDevice) override
@@ -9271,7 +9271,7 @@ public:
 
 virtual OUString get_label() const override
 {
-return ::get_label(m_pButton);
+return ::get_button_label(m_pButton);
 }
 
 virtual void set_font(const vcl::Font& rFont) override
@@ -11511,7 +11511,7 @@ public:
 #else
 if (!GTK_IS_BUTTON(pItem))
 return;
-gtk_button_set_label(GTK_BUTTON(pItem), 
MapToGtkAccelerator(rLabel).getStr());
+::set_button_label(GTK_BUTTON(pItem), rLabel);
 #endif
 }
 
@@ -11525,7 +11525,7 @@ public:
 #else
 if (!pItem || !GTK_IS_BUTTON(pItem))
 return;
-gtk_button_set_label(GTK_BUTTON(pItem), 
MapToGtkAccelerator(rLabel).getStr());
+::set_button_label(GTK_BUTTON(pItem), rLabel);
 #endif
 }
 
@@ -11760,12 +11760,12 @@ public:
 
 virtual void set_label(const OUString& rText) override
 {
-::set_label(GTK_BUTTON(m_pButton), rText);
+::set_button_label(GTK_BUTTON(m_pButton), rText);
 }
 
 virtual OUString get_label() const override
 {
-return ::get_label(GTK_BUTTON(m_pButton));
+return ::get_button_label(GTK_BUTTON(m_pButton));
 }
 
 virtual void set_uri(const OUString& rText) override
@@ -11867,7 +11867,7 @@ public:
 #if GTK_CHECK_VERSION(4, 0, 0)
 gtk_check_button_set_label(m_pCheckButton, 
MapToGtkAccelerator(rText).getStr());
 #else
-::set_label(GTK_BUTTON(m_pCheckButton), rText);
+::set_button_label(GTK_BUTTON(m_pCheckButton), rText);
 #endif
 }
 
@@ -11877,7 +11877,7 @@ public:
 const gchar* pStr = gtk_check_button_get_label(m_pCheckButton);
 return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
 #else
-return ::get_label(GTK_BUTTON(m_pCheckButton));
+return ::get_button_label(GTK_BUTTON(m_pCheckButton));
 #endif
 }
 
@@ -22091,9 +22091,9 @@ private:
 GtkButton* pButton = GTK_BUTTON(pWidget);
 if (m_pStringReplace)
 {
-OUString aLabel(get_label(pButton));
+OUString aLabel(get_button_label(pButton));
 if (!aLabel.isEmpty())
-set_label(pButton, (*m_pStringReplace)(aLabel));
+set_button_label(pButton, (*m_pStringReplace)(aLabel));
 }
 if (gtk_button_get_use_underline(pButton))
 m_aMnemonicButtons.push_back(pButton);
@@ -22283,7 +22283,7 @@ public:
 {
 MnemonicGenerator aMnemonicGenerator('_');
 for (const auto a : m_aMnemonicButtons)
-aMnemonicGenerator.RegisterMnemonic(get_label(a));
+aMnemonicGenerator.RegisterMnemonic(get_button_label(a));
 #if GTK_CHECK_VERSION(4, 0, 0)
 for (const auto a : m_aMnemonicCheckButtons)
 aMnemonicGenerator.RegisterMnemonic(get_label(a));
@@ -22293,11 +22293,11 @@ public:
 
 for (const auto a : m_aMnemonicButtons)
 {
-OUString aLabel(get_label(a));
+OUString aLabel(get_button_label(a));
 OUString aNewLabel = aMnemonicGenerator.CreateMnemonic(aLabel);
 if (aLabel == aNewLabel)
 continue;
-set_label(a, aNewLabel);
+set_button_label(a, aNewLabel);
 }
 #if GTK_CHECK_VERSION(4, 0, 0)
 for (const auto a : m_aMnemonicCheckButtons)

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.3.6.2.M2'

[Andras Timar (via logerrit)]

Tag 'mimo-6.3.6.2.M2' created by Andras Timar  at 
2021-11-05 11:33 +

mimo-6.3.6.2.M2

Changes since mimo-6.3.6.2.M1-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 2dd773743fd9a11aa52043133be93266cffd2127
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:32:55 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:32:55 2021 +0100

Bump product version to 6.3.6.2.M2

Change-Id: Ib9e7204c6fc18f14ec091817013f7d752b2e6c1d

diff --git a/configure.ac b/configure.ac
index 14de6af60a79..a9e375192510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.6.2.M1],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.2.M2],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.3.6.2.M1'

[Michael Stahl (via logerrit)]

Tag 'mimo-6.3.6.2.M1' created by Andras Timar  at 
2021-11-05 11:31 +

mimo-6.3.6.2.M1

Changes since mimo-6-3-branch-point-45:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'refs/tags/MIMO-6.3.6.2.M1' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:

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

[Mike Kaganski (via logerrit)]

 include/com/sun/star/uno/Sequence.h|2 ++
 include/com/sun/star/uno/Sequence.hxx  |2 ++
 oox/source/drawingml/customshapeproperties.cxx |   15 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit fb3c04bd1930eedacd406874e1a285d62bbf27d9
Author: Mike Kaganski 
AuthorDate: Fri Oct 29 10:30:22 2021 +0300
Commit: Mike Kaganski 
CommitDate: Fri Nov 5 12:30:28 2021 +0100

Drop non-const Sequence::operator[] in internal code

This makes all non-const operations on Sequence explicit, to avoid
repeated COW checks in loops. Generally it would be desirable to
replace uses of Sequence with general-purpose containers wherever
possible, and only use Sequence for UNO API calls.

This change uncovered a very serious pre-existing problem inherent
to the Sequences used e.g. in range-based loops in our code: taking
a non-const reference to elements of a sequence, and then modifying
them at some later stage, brings a danger to also modify copies of
the Sequence, that were created between the points of taking the
reference and modifying it. This caused the change to
oox/source/drawingml/customshapeproperties.cxx, where
CustomShapeProperties::pushToPropSet took begin()/end() non-const
iterators to aGeoPropSeq at the start of the loop, and then in the
loop modified its elements and copied the Sequence passing it to
XPropertySet::setPropertyValue. This was the same also prior to
2484de6728bd11bb7949003d112f1ece2223c7a1, and only happened to not
cause problems because of *accidental* use of non-const operator[]
on the copy of the Sequence inside SdrCustomShapeGeometryItem ctor,
which *inadvertently* triggered COW, detaching the two copies one
from another.
This only emphasizes that we should minimize use of Sequences in
the codebase. I anticipate other similar problems uncovered by this
change, that happened to not break existing unit tests.

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

diff --git a/include/com/sun/star/uno/Sequence.h 
b/include/com/sun/star/uno/Sequence.h
index cc2c515f1322..b557ec87b4ca 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -217,6 +217,7 @@ public:
 */
 inline E const * end() const;
 
+#if !defined LIBO_INTERNAL_ONLY
 /** Non-const index operator: Obtains a reference to element indexed at
 given position.
 The implementation does not check for array bounds!
@@ -228,6 +229,7 @@ public:
 @return non-const C++ reference to element
 */
 inline E & SAL_CALL operator [] ( sal_Int32 nIndex );
+#endif
 
 /** Const index operator: Obtains a reference to element indexed at
 given position.  The implementation does not check for array bounds!
diff --git a/include/com/sun/star/uno/Sequence.hxx 
b/include/com/sun/star/uno/Sequence.hxx
index 73e51a9bc7f5..7aa873e91223 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -180,6 +180,7 @@ template E * Sequence::end() { return begin() + 
getLength(); }
 template E const * Sequence::end() const
 { return begin() + getLength(); }
 
+#if !defined LIBO_INTERNAL_ONLY
 template< class E >
 inline E & Sequence< E >::operator [] ( sal_Int32 nIndex )
 {
@@ -187,6 +188,7 @@ inline E & Sequence< E >::operator [] ( sal_Int32 nIndex )
 assert(nIndex >= 0 && static_cast(nIndex) < 
static_cast(getLength()));
 return getArray()[ nIndex ];
 }
+#endif
 
 template< class E >
 inline const E & Sequence< E >::operator [] ( sal_Int32 nIndex ) const
diff --git a/oox/source/drawingml/customshapeproperties.cxx 
b/oox/source/drawingml/customshapeproperties.cxx
index 37c42b5119dc..0aba70b7a337 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -182,8 +182,11 @@ void CustomShapeProperties::pushToPropSet(
 static const OUStringLiteral sType = u"Type";
 if ( aGeoPropSet >>= aGeoPropSeq )
 {
-for ( auto& rGeoProp : asNonConstRange(aGeoPropSeq) )
+// aGeoPropSeq gets modified in the loop, and gets copied 
elsewhere;
+// don't use range-based for here
+for ( sal_Int32 i = 0; i < aGeoPropSeq.getLength(); ++i )
 {
+const auto& rGeoProp = aGeoPropSeq[i];
 if ( rGeoProp.Name == sAdjustmentValues )
 {
 uno::Sequence< 
css::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
@@ -216,16 +219,20 @@ void CustomShapeProperties::pushToPropSet(
 }
 }
 }
-rGe

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.4.7.2.M4'

[Andras Timar (via logerrit)]

Tag 'mimo-6.4.7.2.M4' created by Andras Timar  at 
2021-11-05 11:29 +

mimo-6.4.7.2.M4

Changes since mimo-6.4.7.2.M3-5:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-4' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 990e3526a388b520c339211a30af3574d423c4f5
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:28:26 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:28:26 2021 +0100

Bump product version to 6.4.7.2.M4

Change-Id: I44d6e115b462e996bb989315e76f542db700ece8

diff --git a/configure.ac b/configure.ac
index f9ae0c1093f1..91000ab78666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.4.7.2.M3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M4],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M6'

[Andras Timar (via logerrit)]

Tag 'mimo-7.0.7.0.M6' created by Andras Timar  at 
2021-11-05 11:25 +

mimo-7.0.7.0.M6

Changes since mimo-7.0.7.0.M5-4:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 2193db210309cebcf4da3c63fdf9194fd7ea9038
Author: Andras Timar 
AuthorDate: Fri Nov 5 12:25:27 2021 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 5 12:25:27 2021 +0100

Bump version to 7.0.7.0.M6

Change-Id: Ice8339c03f2383be2c9440dc22f5693e05689347

diff --git a/configure.ac b/configure.ac
index 3453c65554d8..17b81ded2c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.0.7.0.M5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.7.0.M6],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'refs/tags/MIMO-7.0.7.0.M5' - 0 commits -

[(via logerrit)]

Rebased ref, commits from common ancestor:

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-7.0.7.0.M5'

[Andras Timar (via logerrit)]

Tag 'mimo-7.0.7.0.M5' created by Andras Timar  at 
2021-11-05 11:23 +

mimo-7.0.7.0.M5

Changes since mimo-7.0.7.0.M4-1:
---
 0 files changed
---

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 1a62041a44be435b2588680c94294c0f0cbf13c8
Author: Stephan Bergmann 
AuthorDate: Fri Nov 5 10:49:31 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 5 12:13:34 2021 +0100

Missing test dependency

> sw/qa/extras/uiwriter/uiwriter4.cxx:3453:SwUiWriterTest4::testTdf133524
> equality assertion failed
> - Expected: »word« „Sentence and »word«.” →
> - Actual  : »word« „Sentence and »word«.” -->

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

diff --git a/sw/CppunitTest_sw_uiwriter4.mk b/sw/CppunitTest_sw_uiwriter4.mk
index 8614c3746008..55fd504431c0 100644
--- a/sw/CppunitTest_sw_uiwriter4.mk
+++ b/sw/CppunitTest_sw_uiwriter4.mk
@@ -11,4 +11,6 @@
 
 $(eval $(call sw_uiwriter_test,4))
 
+$(call gb_CppunitTest_get_target,sw_uiwriter4): $(call 
gb_Package_get_target,extras_autocorr)
+
 # vim: set noet sw=4 ts=4:

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf144668.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx  |9 +
 sw/source/filter/ww8/wrtw8num.cxx   |   24 +++-
 sw/source/filter/ww8/ww8par.hxx |2 +-
 sw/source/filter/ww8/ww8par2.cxx|   20 
 5 files changed, 25 insertions(+), 30 deletions(-)

New commits:
commit e0b41fcb56e51f20684da4ba44d7ed6e0e1a3234
Author: Vasily Melenchuk 
AuthorDate: Thu Oct 28 13:36:50 2021 +0300
Commit: Michael Stahl 
CommitDate: Fri Nov 5 10:54:47 2021 +0100

tdf#144668: docx export: simpler way to create lvlText in numberings

Oldr approach with populating ListLabelString with some predefined
values and than replacing them by placeholders is not so good. It
can lead to collisions if we use numbers in format string.

Anow with support of list strings in core we do not need this: it
is enougth to replace LO placeholders %1%, %2%, ... by MS binary
placeholders \0, \1, ...

Additionally added support for list level initialization in DOC
import: that case was still setting just prefix/suffix leaving
list level uninitialized.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf144668.odt 
b/sw/qa/extras/ooxmlexport/data/tdf144668.odt
new file mode 100644
index ..7504adce400d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf144668.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 77645a84aefb..36555f71a671 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -115,6 +115,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx")
 CPPUNIT_ASSERT_EQUAL( sal_Int16(36), nGridLines);   // was 23, left large 
space before text.
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf144668, "tdf144668.odt")
+{
+uno::Reference xPara1(getParagraph(1, u"level1"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("[0001]"), getProperty(xPara1, 
"ListLabelString"));
+
+uno::Reference xPara2(getParagraph(2, u"level2"), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("[001]"), getProperty(xPara2, 
"ListLabelString"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index ae67e973c98a..bb61901d24ae 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -412,13 +412,6 @@ void MSWordExportBase::AbstractNumberingDefinitions()
 void MSWordExportBase::NumberingLevel(
 SwNumRule const& rRule, sal_uInt8 const nLvl)
 {
-// prepare the NodeNum to generate the NumString
-static const SwNumberTree::tNumberVector aNumVector = [] {
-SwNumberTree::tNumberVector vec(WW8ListManager::nMaxLevel);
-std::iota(vec.begin(), vec.end(), 0);
-return vec;
-}();
-
 // write the static data of the SwNumFormat of this level
 sal_uInt8 aNumLvlPos[WW8ListManager::nMaxLevel] = { 0,0,0,0,0,0,0,0,0 };
 
@@ -480,35 +473,24 @@ void MSWordExportBase::NumberingLevel(
 else
 {
 // Create level string
-// For docx it is not the best way: we can just take it from 
rRule.Get(nLvl).GetListFormat()
-// But for compatibility with doc we follow same routine
 if (SVX_NUM_NUMBER_NONE != rFormat.GetNumberingType())
 {
 sal_uInt8* pLvlPos = aNumLvlPos;
-// the numbering string has to be restrict
-// to the level currently working on.
-sNumStr = rRule.MakeNumString(aNumVector, true, true, nLvl);
+sNumStr = rFormat.GetListFormat();
 
 // now search the nums in the string
 for (sal_uInt8 i = 0; i <= nLvl; ++i)
 {
-OUString sSrch(OUString::number(i));
+OUString sSrch("%" + OUString::number(i+1) + "%");
 sal_Int32 nFnd = sNumStr.indexOf(sSrch);
 if (-1 != nFnd)
 {
 *pLvlPos = static_cast(nFnd + 1);
 ++pLvlPos;
-sNumStr = sNumStr.replaceAt(nFnd, 1, 
OUString(static_cast(i)));
+sNumStr = sNumStr.replaceAt(nFnd, sSrch.getLength(), 
OUString(static_cast(i)));
 }
 }
 }
-
-if (!rRule.Get(nLvl).HasListFormat())
-{
-if (!rFormat.GetPrefix().isEmpty())
-sNumStr = rFormat.GetPrefix() + sNumStr;
-sNumStr += rFormat.GetSuffix();
-}
 }
 
 if (SVX_NUM_CHAR_SPECIAL == rFormat.GetNumberingType() ||
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 3d640b8485de..1

Re: Missing dependency for SwUiWriterTest4::testTdf133524

[Stephan Bergmann]

On 04/11/2021 10:06, Ilmari Lauhakangas wrote:
E:/sources/libo-core/sw/qa/extras/uiwriter/uiwriter4.cxx(3453) : error : 
Assertion

Test name: SwUiWriterTest4::testTdf133524
equality assertion failed
- Expected: »word« „Sentence and »word«.” →
- Actual  : »word« „Sentence and »word«.” -->

The failure does not appear, if he runs make first, so there appears to 
be a missing dependency for the test.


 "Missing test dependency"

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

[Bjoern Michaelsen (via logerrit)]

 sw/source/core/docnode/node.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4a7022c199addb1fbc7445708c0f4801fbf1e47f
Author: Bjoern Michaelsen 
AuthorDate: Sun Oct 31 21:01:39 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 5 10:48:52 2021 +0100

tdf#134294: fix Chapter heading updates

A quick manual recheck seems to confirm, that this does not regress
tdf#118735, tdf#118049. I couldnt quite recheck tdf#118833, the "steps
to reproduce" dont quite work on master -- but I did find any obvious
regression there.

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

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 20fa89f3fb70..c9b4a41f42fe 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1262,6 +1262,8 @@ SwFormatColl *SwContentNode::ChgFormatColl( SwFormatColl 
*pNewColl )
 
 if( !IsModifyLocked() )
 {
+assert(dynamic_cast(pNewColl));
+ChkCondColl(static_cast(pNewColl));
 SwFormatChg aTmp1( pOldColl );
 SwFormatChg aTmp2( pNewColl );
 SwClientNotify( *this, sw::LegacyModifyHint(&aTmp1, &aTmp2) );

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

[Noel Grandin (via logerrit)]

 framework/source/dispatch/popupmenudispatcher.cxx |   92 +++---
 1 file changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 9ffbbd9dba5f12be2914ebbf01ebdd303b695e46
Author: Noel Grandin 
AuthorDate: Fri Nov 5 10:16:47 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 10:41:03 2021 +0100

flatten PopupMenuDispatcher::queryDispatch

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

diff --git a/framework/source/dispatch/popupmenudispatcher.cxx 
b/framework/source/dispatch/popupmenudispatcher.cxx
index a79ffe35e6b8..0333c0698fe6 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -98,57 +98,57 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
 const OUString& sTarget ,
 sal_Int32  nFlags  )
 {
-css::uno::Reference< css::frame::XDispatch > xDispatch;
+if ( !rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
+return {};
 
-if ( rURL.Complete.startsWith( "vnd.sun.star.popup:" ) )
-{
-// --- SAFE ---
-SolarMutexClearableGuard aGuard;
-impl_RetrievePopupControllerQuery();
-if ( !m_xUriRefFactory.is() )
-m_xUriRefFactory = css::uri::UriReferenceFactory::create( 
m_xContext );
+// --- SAFE ---
+SolarMutexClearableGuard aGuard;
+impl_RetrievePopupControllerQuery();
+if ( !m_xUriRefFactory.is() )
+m_xUriRefFactory = css::uri::UriReferenceFactory::create( m_xContext );
+
+css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery( 
m_xPopupCtrlQuery );
+aGuard.clear();
+// --- SAFE ---
+
+if ( !xPopupCtrlQuery.is() )
+return {};
 
-css::uno::Reference< css::container::XNameAccess > xPopupCtrlQuery( 
m_xPopupCtrlQuery );
-aGuard.clear();
-// --- SAFE ---
+css::uno::Reference< css::frame::XDispatch > xDispatch;
 
-if ( xPopupCtrlQuery.is() )
+try
+{
+// Just use the main part of the URL for popup menu controllers
+sal_Int32 nSchemePart( 0 );
+OUString aBaseURL( "vnd.sun.star.popup:" );
+OUString aURL( rURL.Complete );
+
+nSchemePart = aURL.indexOf( ':' );
+if (( nSchemePart > 0 ) &&
+( aURL.getLength() > ( nSchemePart+1 )))
 {
-try
-{
-// Just use the main part of the URL for popup menu controllers
-sal_Int32 nSchemePart( 0 );
-OUString aBaseURL( "vnd.sun.star.popup:" );
-OUString aURL( rURL.Complete );
-
-nSchemePart = aURL.indexOf( ':' );
-if (( nSchemePart > 0 ) &&
-( aURL.getLength() > ( nSchemePart+1 )))
-{
-sal_Int32 nQueryPart  = aURL.indexOf( '?', nSchemePart );
-if ( nQueryPart > 0 )
-aBaseURL += aURL.subView( nSchemePart+1, 
nQueryPart-(nSchemePart+1) );
-else if ( nQueryPart == -1 )
-aBaseURL += aURL.subView( nSchemePart+1 );
-}
-
-css::uno::Reference< css::frame::XDispatchProvider > 
xDispatchProvider;
-
-// Find popup menu controller using the base URL
-xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
-
-// Ask popup menu dispatch provider for dispatch object
-if ( xDispatchProvider.is() )
-xDispatch = xDispatchProvider->queryDispatch( rURL, 
sTarget, nFlags );
-}
-catch ( const RuntimeException& )
-{
-throw;
-}
-catch ( const Exception& )
-{
-}
+sal_Int32 nQueryPart  = aURL.indexOf( '?', nSchemePart );
+if ( nQueryPart > 0 )
+aBaseURL += aURL.subView( nSchemePart+1, 
nQueryPart-(nSchemePart+1) );
+else if ( nQueryPart == -1 )
+aBaseURL += aURL.subView( nSchemePart+1 );
 }
+
+css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider;
+
+// Find popup menu controller using the base URL
+xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
+
+// Ask popup menu dispatch provider for dispatch object
+if ( xDispatchProvider.is() )
+xDispatch = xDispatchProvider->queryDispatch( rURL, sTarget, 
nFlags );
+}
+catch ( const RuntimeException& )
+{
+throw;
+}
+catch ( const Exception& )
+{
 }
 return xDispatch;
 }

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

[Noel Grandin (via logerrit)]

 framework/source/dispatch/popupmenudispatcher.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 03b476c0da596545bd9b99cc744a5fb56bfb797a
Author: Noel Grandin 
AuthorDate: Fri Nov 5 10:12:14 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 10:40:43 2021 +0100

[-Werror=nonnull] ‘this’ pointer is null

gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0
is now complaining about a double-unlock

Which has been there ever since
commit fb6c93aed8d3d7468e4c9b412e432633c36e68fc
Date:   Wed Dec 13 14:05:51 2006 +
INTEGRATION: CWS fwk54 (1.1.2); FILE ADDED
2006/11/10 12:54:27 cd 1.1.2.1: #i65187# Protocol handler for
vnd.sun.star.popup URLs to support dispatch by popup menu controller

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

diff --git a/framework/source/dispatch/popupmenudispatcher.cxx 
b/framework/source/dispatch/popupmenudispatcher.cxx
index 154b9df688b4..a79ffe35e6b8 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -136,7 +136,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
 
 // Find popup menu controller using the base URL
 xPopupCtrlQuery->getByName( aBaseURL ) >>= xDispatchProvider;
-aGuard.clear();
 
 // Ask popup menu dispatch provider for dispatch object
 if ( xDispatchProvider.is() )

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

[Caolán McNamara (via logerrit)]

 sw/inc/PostItMgr.hxx |3 ++-
 sw/source/uibase/docvw/PostItMgr.cxx |   15 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 0e83cdaf8a96fa06b95219e581fc2eed7df39c26
Author: Caolán McNamara 
AuthorDate: Thu Nov 4 12:06:58 2021 +
Commit: Michael Stahl 
CommitDate: Fri Nov 5 10:30:49 2021 +0100

Resolves: tdf#143643 ensure relayout on undo of insert comment

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

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 760fc7f8abe7..5b12063d2eef 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -153,7 +153,8 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public 
SfxListener
 boolLayoutByPage( 
std::vector &aVisiblePostItList,
   const tools::Rectangle& rBorder,
   tools::Long lNeededHeight);
-voidCheckForRemovedPostIts();
+// return true if a postit was found to have been removed
+boolCheckForRemovedPostIts();
 boolArrowEnabled(sal_uInt16 aDirection,tools::ULong aPage) 
const;
 boolBorderOverPageBorder(tools::ULong aPage) const;
 boolHasScrollbars() const;
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx 
b/sw/source/uibase/docvw/PostItMgr.cxx
index d8b79c6e9d7e..f1b3a329f937 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -238,7 +238,7 @@ SwPostItMgr::~SwPostItMgr()
 mPages.clear();
 }
 
-void SwPostItMgr::CheckForRemovedPostIts()
+bool SwPostItMgr::CheckForRemovedPostIts()
 {
 IDocumentRedlineAccess const& 
rIDRA(mpWrtShell->getIDocumentRedlineAccess());
 bool bRemoved = false;
@@ -260,7 +260,7 @@ void SwPostItMgr::CheckForRemovedPostIts()
 }
 
 if ( !bRemoved )
-return;
+return false;
 
 // make sure that no deleted items remain in page lists
 // todo: only remove deleted ones?!
@@ -270,9 +270,13 @@ void SwPostItMgr::CheckForRemovedPostIts()
 PrepareView();
 }
 else
-// if postits are their make sure that page lists are not empty
+{
+// if postits are there make sure that page lists are not empty
 // otherwise sudden paints can cause pain (in BorderOverPageBorder)
 CalcRects();
+}
+
+return true;
 }
 
 SwSidebarItem* SwPostItMgr::InsertItem(SfxBroadcaster* pItem, bool 
bCheckExistence, bool bFocus)
@@ -370,7 +374,10 @@ void SwPostItMgr::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 {
 if (!pField)
 {
-CheckForRemovedPostIts();
+const bool bWasRemoved = CheckForRemovedPostIts();
+// tdf#143643 ensure relayout on undo of insert comment
+if (bWasRemoved)
+mbLayout = true;
 break;
 }
 RemoveItem(pField);

[Libreoffice-commits] core.git: cui/source sc/inc sc/source sd/inc sd/source svx/source sw/inc sw/source vcl/inc writerperfect/inc

[Noel Grandin (via logerrit)]

 cui/source/inc/dlgname.hxx   |2 +-
 sc/inc/arealink.hxx  |2 +-
 sc/inc/cellsuno.hxx  |2 +-
 sc/inc/chartlis.hxx  |2 +-
 sc/inc/externalrefmgr.hxx|2 +-
 sc/inc/scmod.hxx |4 ++--
 sc/source/ui/inc/docsh.hxx   |6 +++---
 sc/source/ui/inc/gridwin.hxx |6 +++---
 sc/source/ui/inc/namemgrtable.hxx|4 ++--
 sc/source/ui/inc/prevwsh.hxx |4 ++--
 sc/source/ui/inc/tabvwsh.hxx |   12 ++--
 sd/inc/CustomAnimationEffect.hxx |2 +-
 sd/inc/sdmod.hxx |2 +-
 sd/source/ui/inc/DrawDocShell.hxx|4 ++--
 sd/source/ui/inc/DrawViewShell.hxx   |8 
 sd/source/ui/inc/View.hxx|   10 +-
 sd/source/ui/inc/ViewShell.hxx   |4 ++--
 sd/source/ui/inc/ViewShellImplementation.hxx |2 +-
 sd/source/ui/inc/navigatr.hxx|   14 +++---
 sd/source/ui/inc/sdtreelb.hxx|   14 +++---
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx |2 +-
 svx/source/dialog/crashreportdlg.hxx |2 +-
 sw/inc/AnnotationWin.hxx |   14 +++---
 sw/inc/PostItMgr.hxx |2 +-
 sw/inc/doc.hxx   |4 ++--
 sw/inc/docsh.hxx |2 +-
 sw/inc/view.hxx  |   10 +-
 sw/source/uibase/inc/basesh.hxx  |4 ++--
 sw/source/uibase/inc/chldwrap.hxx|2 +-
 sw/source/uibase/inc/edtwin.hxx  |8 
 sw/source/uibase/inc/mailmergehelper.hxx |2 +-
 sw/source/uibase/inc/textsh.hxx  |4 ++--
 sw/source/uibase/inc/wrtsh.hxx   |2 +-
 vcl/inc/qt5/QtInstance.hxx   |2 +-
 vcl/inc/salvtables.hxx   |2 +-
 vcl/inc/unx/fontmanager.hxx  |2 +-
 writerperfect/inc/WPFTEncodingDialog.hxx |2 +-
 37 files changed, 86 insertions(+), 86 deletions(-)

New commits:
commit 54435d56051e19a408a1fcce16a3e4add185c018
Author: Noel Grandin 
AuthorDate: Thu Nov 4 10:10:19 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 10:20:29 2021 +0100

use more DECL_DLLPRIVATE_LINK

to avoid unnecessarily exporting symbols

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

diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 06e70562fc8d..0baa56b61948 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -42,7 +42,7 @@ public:
 field is changed.  The Link result determines whether the OK
 Button is enabled (> 0) or disabled (== 0).
 
-@param rLink a Callback declared with DECL_LINK and implemented with
+@param rLink a Callback declared with DECL_DLLPRIVATE_LINK and 
implemented with
IMPL_LINK, that is executed on modification.
 
 @param bCheckImmediately If true, the Link is called directly after
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index a2b3a5d73b2e..80e165bb89e3 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -71,7 +71,7 @@ public:
 const OUString& GetSource() const   { return aSourceArea;   }
 const ScRange&  GetDestArea() const { return aDestArea; }
 
-DECL_LINK( RefreshHdl, Timer*, void );
+DECL_DLLPRIVATE_LINK( RefreshHdl, Timer*, void );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 1d104fa27ed8..a0d5b3e8971c 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -193,7 +193,7 @@ private:
 boolbGotDataChangedHint;
 XModifyListenerArr_Impl aValueListeners;
 
-DECL_LINK( ValueListenerHdl, const SfxHint&, void );
+DECL_DLLPRIVATE_LINK( ValueListenerHdl, const SfxHint&, void );
 
 private:
 voidPaintGridRanges_Impl();
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index dd8b397c8dcb..3273a61a1da2 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -140,7 +140,7 @@ private:
 IdleaIdle;
 ScDocument& rDoc;
 
-DECL_LINK(TimerHdl, Timer *, void);
+  

[Libreoffice-commits] core.git: unotools/Library_utl.mk unotools/source

[Stephan Bergmann (via logerrit)]

 unotools/Library_utl.mk |7 +--
 unotools/source/i18n/resmgr.cxx |3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit d7f64593db4afdf2a7e77ca9147f6495e69912fd
Author: Stephan Bergmann 
AuthorDate: Fri Nov 5 08:12:56 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 5 10:09:24 2021 +0100

The std::auto_ptr workarounds should only be necessary for Boost < 1.67.0

...see the commit message of f8b10b76bc3000eab3269de4472d6c28bd308059 "The
std::auto_ptr workarounds should no longer be necessary" for details.  (The
removed settings in 52a26b146542526dc4f6bb193ffb4fd95e4f79fd "fix
unotools/source/i18n/resmgr.cxx build with PCH on Mac" might still 
theoretically
be necessary for macOS and Windows builds against the baseline Boost 
1.66.0, but
it is unlikely that anybody does such builds against anything other than our
Boost 1.76.0 exteranl/boost, anyway.)

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

diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 66c08480db69..07603acb5213 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/i18n/intlwrapper \
 unotools/source/i18n/localedatawrapper \
 unotools/source/i18n/nativenumberwrapper \
+unotools/source/i18n/resmgr \
 unotools/source/i18n/textsearch \
 unotools/source/i18n/transliterationwrapper \
 unotools/source/misc/closeveto \
@@ -116,10 +117,4 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
 unotools/source/ucbhelper/xtempfile \
 ))
 
-# see the source file
-$(eval $(call gb_Library_add_exception_objects,utl,\
-unotools/source/i18n/resmgr, \
--D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR= -D_HAS_AUTO_PTR_ETC=1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 62991153f01c..a10b4710ad8d 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+#if BOOST_VERSION < 106700
 // Needed when #include  below includes Boost 1.65.1
 // workdir/UnpackedTarball/boost/boost/locale/format.hpp using 
"std::auto_ptr d;", but must
 // come very early here in case  is already (indirectly) included 
earlier:
@@ -26,6 +28,7 @@
 #elif defined _MSC_VER
 #define _HAS_AUTO_PTR_ETC 1
 #endif
+#endif
 
 #include 
 

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

[Stephan Bergmann (via logerrit)]

 sw/source/core/crsr/findtxt.cxx|4 
 sw/source/core/inc/txtfrm.hxx  |5 -
 sw/source/core/layout/calcmove.cxx |   13 -
 sw/source/core/layout/flowfrm.cxx  |8 
 4 files changed, 30 deletions(-)

New commits:
commit 7190e6f114eccd921e6cb6beef793b053cf50856
Author: Stephan Bergmann 
AuthorDate: Fri Nov 5 08:22:35 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 5 10:09:01 2021 +0100

Remove conditional code for Boost < 1.56.0

...after 0b9a6cfc443d84158fb0db6f40b953e1410178d8 "Set Boost baseline to 
1.66,
and enforce it"

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

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index f4ecf1eafce6..6e29c3614e55 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -153,11 +153,7 @@ public:
 {
 if (pFrame)
 {
-#if BOOST_VERSION < 105600
-m_oMergedIter.reset(*pFrame);
-#else
 m_oMergedIter.emplace(*pFrame);
-#endif
 }
 }
 
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index fa1d9be39a0f..f1016eb9a1e0 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -984,13 +984,8 @@ struct MergedPara
 class MergedAttrIterBase
 {
 protected:
-#if BOOST_VERSION < 105600
-sw::MergedPara const* m_pMerged;
-SwTextNode const* m_pNode;
-#else
 sw::MergedPara const*const m_pMerged;
 SwTextNode const*const m_pNode;
-#endif
 size_t m_CurrentExtent;
 size_t m_CurrentHint;
 MergedAttrIterBase(SwTextFrame const& rFrame);
diff --git a/sw/source/core/layout/calcmove.cxx 
b/sw/source/core/layout/calcmove.cxx
index a87b50adcae4..1bc2506a72f4 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -409,31 +409,18 @@ void SwFrame::PrepareCursor()
 const bool bTab = IsTabFrame();
 bool bNoSect = IsInSct();
 
-#if BOOST_VERSION < 105600
-std::list tabGuard;
-std::list rowGuard;
-#else
 std::optional tabGuard;
 std::optional rowGuard;
-#endif
 SwFlowFrame* pThis = bCnt ? static_cast(this) : 
nullptr;
 
 if ( bTab )
 {
-#if BOOST_VERSION < 105600
-tabGuard.emplace_back(static_cast(this)); // 
tdf#125741
-#else
 tabGuard.emplace(static_cast(this)); // tdf#125741
-#endif
 pThis = static_cast(this);
 }
 else if (IsRowFrame())
 {
-#if BOOST_VERSION < 105600
-rowGuard.emplace_back(this); // tdf#125741 keep this alive
-#else
 rowGuard.emplace(this); // tdf#125741 keep this alive
-#endif
 }
 else if( IsSctFrame() )
 {
diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 2ad57e726bc8..53f3881f1d56 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2618,11 +2618,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
 
 {
 auto const pOld = m_rThis.GetUpper();
-#if BOOST_VERSION < 105600
-std::list g;
-#else
 ::std::optional g;
-#endif
 if (m_rThis.GetUpper()->IsCellFrame())
 {
 // note: IsFollowFlowRow() is never set for new-style tables
@@ -2632,11 +2628,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
 && pTabFrame->GetFirstNonHeadlineRow() == 
m_rThis.GetUpper()->GetUpper())
 {
 // lock follow-flow-row (similar to sections above)
-#if BOOST_VERSION < 105600
-g.emplace_back(m_rThis.GetUpper()->GetUpper());
-#else
 g.emplace(m_rThis.GetUpper()->GetUpper());
-#endif
 
assert(m_rThis.GetUpper()->GetUpper()->IsDeleteForbidden());
 }
 }

Re: Tests for improvement in rendering

[Tomaž Vajngerl]

Hi Regina,

On Thu, Nov 4, 2021 at 7:54 PM Regina Henschel 
wrote:

> Hi all,
>
> I have a first version of a patch for
> https://bugs.documentfoundation.org/show_bug.cgi?id=140321
> "Fontwork: Change in surface has no effect"
> in Gerrit
> https://gerrit.libreoffice.org/c/core/+/124720
>
> The improvements are about rendering. I'm looking for a partner, who can
> write tests for it.
> Solved problems are:
> Shape was rendered with specular light, should be matte.
> Shape was rendered the same in surface 'matte', 'plastic' and 'metal'.
> Should be three different renderings.
> Shape was rendered with shade mode 'flat' in all cases, which produces
> steps. Should be rendered smooth in case of shade mode 'gouraud'.
>

I guess rendering the shape to primitives and then dumping the primitives
to an xml and asserting the values should do it, however the
Primitive2dXmlDump will probably need to be extended for 3D primitives.
I'll try to make a test that will cover some of the rendering aspects for
fontworks.


> Kind regards,
> Regina
>

Best regards,
Tomaž

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

[Noel Grandin (via logerrit)]

 include/svx/svdedxv.hxx   |4 -
 svx/source/svdraw/svdedxv.cxx |   89 ++
 2 files changed, 50 insertions(+), 43 deletions(-)

New commits:
commit 8dcdad359207c237155292b74b2db77365a3c8ff
Author: Noel Grandin 
AuthorDate: Fri Nov 5 09:37:47 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 09:54:46 2021 +0100

rename mxTextEditObj -> mxWeakTextEditObj

because it helps me keep the referencing counting strategy in my head
when reading the code

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

diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index ef2936c944eb..ed8f0c08939a 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -80,7 +80,7 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public 
SdrGlueEditView, public EditView
 
 protected:
 // TextEdit
-tools::WeakReference mxTextEditObj; // current object in 
TextEdit
+tools::WeakReference mxWeakTextEditObj; // current object in 
TextEdit
 SdrPageView* mpTextEditPV;
 std::unique_ptr mpTextEditOutliner; // outliner for the 
TextEdit
 OutlinerView* mpTextEditOutlinerView; // current view of the outliners
@@ -230,7 +230,7 @@ public:
 bool IsTextEditInSelectionMode() const;
 
 // If sb needs the object out of the TextEdit:
-SdrTextObj* GetTextEditObject() const { return mxTextEditObj.get(); }
+SdrTextObj* GetTextEditObject() const { return mxWeakTextEditObj.get(); }
 
 // info about TextEditPageView. Default is 0L.
 SdrPageView* GetTextEditPageView() const;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c10d8573c1bd..f046fb185057 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -242,13 +242,13 @@ void SdrObjEditView::Notify(SfxBroadcaster& rBC, const 
SfxHint& rHint)
 void SdrObjEditView::ModelHasChanged()
 {
 SdrGlueEditView::ModelHasChanged();
-if (mxTextEditObj.is() && !mxTextEditObj->IsInserted())
+if (mxWeakTextEditObj.is() && !mxWeakTextEditObj->IsInserted())
 SdrEndTextEdit(); // object deleted
 // TextEditObj changed?
 if (!IsTextEdit())
 return;
 
-SdrTextObj* pTextObj = mxTextEditObj.get();
+SdrTextObj* pTextObj = mxWeakTextEditObj.get();
 if (pTextObj != nullptr)
 {
 size_t nOutlViewCnt = mpTextEditOutliner->GetViewCount();
@@ -855,7 +855,7 @@ OutlinerView* 
SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, OutlinerVie
 {
 // background
 Color aBackground(GetTextEditBackgroundColor(*this));
-SdrTextObj* pText = mxTextEditObj.get();
+SdrTextObj* pText = mxWeakTextEditObj.get();
 bool bTextFrame = pText != nullptr && pText->IsTextFrame();
 bool bContourFrame = pText != nullptr && pText->IsContourTextFrame();
 // create OutlinerView
@@ -910,7 +910,7 @@ IMPL_LINK(SdrObjEditView, ImpOutlinerStatusEventHdl, 
EditStatus&, rEditStat, voi
 {
 if (mpTextEditOutliner)
 {
-SdrTextObj* pTextObj = mxTextEditObj.get();
+SdrTextObj* pTextObj = mxWeakTextEditObj.get();
 if (pTextObj)
 {
 pTextObj->onEditOutlinerStatusEvent(&rEditStat);
@@ -923,7 +923,7 @@ void SdrObjEditView::ImpChainingEventHdl()
 if (!mpTextEditOutliner)
 return;
 
-SdrTextObj* pTextObj = mxTextEditObj.get();
+SdrTextObj* pTextObj = mxWeakTextEditObj.get();
 OutlinerView* pOLV = GetTextEditOutlinerView();
 if (pTextObj && pOLV)
 {
@@ -999,10 +999,10 @@ IMPL_LINK_NOARG(SdrObjEditView, 
ImpAfterCutOrPasteChainingEventHdl, LinkParamNon
 
 void SdrObjEditView::ImpMoveCursorAfterChainingEvent(TextChainCursorManager* 
pCursorManager)
 {
-if (!mxTextEditObj.is() || !pCursorManager)
+if (!mxWeakTextEditObj.is() || !pCursorManager)
 return;
 
-SdrTextObj* pTextObj = mxTextEditObj.get();
+SdrTextObj* pTextObj = mxWeakTextEditObj.get();
 
 // Check if it has links to move it to
 if (!pTextObj || !pTextObj->IsChainable())
@@ -1022,7 +1022,7 @@ IMPL_LINK(SdrObjEditView, ImpOutlinerCalcFieldValueHdl, 
EditFieldInfo*, pFI, voi
 bool bOk = false;
 OUString& rStr = pFI->GetRepresentation();
 rStr.clear();
-SdrTextObj* pTextObj = mxTextEditObj.get();
+SdrTextObj* pTextObj = mxWeakTextEditObj.get();
 if (pTextObj != nullptr)
 {
 std::optional pTxtCol;
@@ -1142,7 +1142,7 @@ bool SdrObjEditView::SdrBeginTextEdit(SdrObject* pObj_, 
SdrPageView* pPV, vcl::W
 {
 mpTextEditWin = pWin;
 mpTextEditPV = pPV;
-mxTextEditObj.reset(pObj);
+mxWeakTextEditObj.reset(pObj);
 if (pGivenOutliner)
 {
 mpTextEditOutliner.reset(pGivenOutliner);
@@ -1150,7 +1150,7 @@ bool SdrObjEditView::SdrBeginTextEdit(SdrObject* pObj_, 
SdrPageView* pPV, vcl::W
 }
 else
 mpTextEdi

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

[Noel Grandin (via logerrit)]

 include/svx/svdoutl.hxx   |2 +-
 svx/source/svdraw/svdoutl.cxx |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 02ff8b2fbf1c3d47a08e6a6da4e301d304c15b31
Author: Noel Grandin 
AuthorDate: Fri Nov 5 09:49:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 5 09:44:50 2021 +0100

rename mpTextObj -> mxWeakTextObj

because it helps me keep the referencing counting strategy in my head
when reading the code

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

diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index 453d3b4ba3a7..f706d85bdaa3 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -28,7 +28,7 @@ class SdrPage;
 
 class SVXCORE_DLLPUBLIC SdrOutliner : public Outliner
 {
-tools::WeakReference mpTextObj;
+tools::WeakReference mxWeakTextObj;
 const SdrPage* mpVisualizedPage;
 
 public:
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index f13129a6d798..3737b1fdf268 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -39,7 +39,7 @@ SdrOutliner::~SdrOutliner()
 
 void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 {
-if( pObj && pObj != mpTextObj.get() )
+if( pObj && pObj != mxWeakTextObj.get() )
 {
 SetUpdateLayout(false);
 OutlinerMode nOutlinerMode2 = OutlinerMode::OutlineObject;
@@ -61,12 +61,12 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
 ClearPolygon();
 }
 
-mpTextObj.reset( const_cast< SdrTextObj* >(pObj) );
+mxWeakTextObj.reset( const_cast< SdrTextObj* >(pObj) );
 }
 
 void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
 {
-mpTextObj.reset( const_cast< SdrTextObj* >(pObj) );
+mxWeakTextObj.reset( const_cast< SdrTextObj* >(pObj) );
 }
 
 OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 
nPara, sal_Int32 nPos,
@@ -75,8 +75,8 @@ OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& 
rField, sal_Int32 nPara
 bool bOk = false;
 OUString aRet;
 
-if(mpTextObj.is())
-bOk = mpTextObj->CalcFieldValue(rField, nPara, nPos, false, 
rpTxtColor, rpFldColor, aRet);
+if(mxWeakTextObj.is())
+bOk = mxWeakTextObj->CalcFieldValue(rField, nPara, nPos, false, 
rpTxtColor, rpFldColor, aRet);
 
 if (!bOk)
 aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, 
rpFldColor);
@@ -86,7 +86,7 @@ OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& 
rField, sal_Int32 nPara
 
 const SdrTextObj* SdrOutliner::GetTextObj() const
 {
-return mpTextObj.get();
+return mxWeakTextObj.get();
 }
 
 bool SdrOutliner::hasEditViewCallbacks() const

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

[Michael Stahl (via logerrit)]

 sw/source/uibase/uno/unotxdoc.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 73d3639304100d50422435745f8ecc7ff1583de1
Author: Michael Stahl 
AuthorDate: Thu Nov 4 18:50:42 2021 +0100
Commit: Caolán McNamara 
CommitDate: Fri Nov 5 09:38:52 2021 +0100

tdf#144989 sw: disable idle jobs during printing or PDF export

The problem is that (with the kde5 and WNT vclplugs) the idle jobs
update fields and un-hides every section, which destroys the layout
that SwXTextDocument::getRendererCount() finalised with great effort.

This doesn't seem to happen with gtk3 or gen vclplugs.

 6  SwSectionNode::MakeOwnFrames(SwNodeIndex*, SwNodeIndex*)
 7  SwSectionFormat::MakeFrames()
 8  SwSection::ImplSetHiddenFlag(bool, bool)
 9  SwSection::SetCondHidden(bool)
 10 SwDocUpdateField::MakeFieldList_(SwDoc&, int)
 11 SwDocUpdateField::MakeFieldList(SwDoc&, bool, int)
 12 sw::DocumentFieldsManager::UpdateExpFields(SwTextField*, bool)
 13 sw::DocumentTimerManager::DoIdleJobs(Timer*)
 14 sw::DocumentTimerManager::LinkStubDoIdleJobs(void*, Timer*)
 15 Link::Call(Timer*) const
 16 Timer::Invoke()
 17 Scheduler::CallbackTaskScheduling() ()
 18 SalTimer::CallCallback()
 19 QtTimer::timeoutActivated()
 20 QtTimer::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)
 21 void doActivate(QObject*, int, void**) ()
 22 QTimer::timeout(QTimer::QPrivateSignal) ()
 23 QObject::event(QEvent*) ()
 24 QApplicationPrivate::notify_helper(QObject*, QEvent*) ()
 25 QCoreApplication::notifyInternal2(QObject*, QEvent*) ()
 26 QTimerInfoList::activateTimers() ()
 27 timerSourceDispatch()
 28 g_main_context_dispatch ()
 29 g_main_context_iterate.constprop ()
 30 g_main_context_iteration ()
 31 
QEventDispatcherGlib::processEvents(QFlags) ()
 32 QtInstance::ImplYield(bool, bool)
 33 QtInstance::DoYield(bool, bool)
 34 ImplYield(bool, bool)
 35 Application::Reschedule(bool)
 36 framework::StatusIndicatorFactory::impl_reschedule(bool)
 37 framework::StatusIndicatorFactory::setValue()
 38 framework::StatusIndicator::setValue(int)
 39 PDFExport::ExportSelection()
 40 PDFExport::Export()

Reportedly this started to happen with commit
4184569b963877c2a488ff05766654b9db194798 - presumably before that the
word counting was so slow that the idle didn't progress to updating
fields.

There is little point in running idle jobs during printing anyway as in
the best case it will just slow down the process.

So temporarily disable the idle jobs in getRendererCount() and
enable it again in render() with "IsLastPage" set.

Change-Id: I6359592aefeec298c5e58d44bef5ef16c583ddac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124721
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 20ddabc88b6b45ea3efcc44ede5244ea526b09c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124693
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 890ccdd8fcc3..326787dea7b5 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2635,6 +2635,10 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 }
 }
 OSL_ENSURE( nRet >= 0, "negative number of pages???" );
+// tdf#144989 the layout is complete now - prevent DoIdleJobs() from
+// messing it up, particulary SwDocUpdateField::MakeFieldList_() unhiding
+// sections
+pDoc->getIDocumentTimerAccess().BlockIdling();
 
 return nRet;
 }
@@ -3060,6 +3064,8 @@ void SAL_CALL SwXTextDocument::render(
 {
 m_pRenderData.reset();
 m_pPrintUIOptions.reset();
+// tdf#144989 enable DoIdleJobs() again after last page
+pDoc->getIDocumentTimerAccess().UnblockIdling();
 }
 }
 

[Libreoffice-commits] core.git: configure.ac

[Stephan Bergmann (via logerrit)]

 configure.ac |   20 ++--
 1 file changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 9ee124ac454177c85d7e928a35d2b533dac33d9c
Author: Stephan Bergmann 
AuthorDate: Fri Nov 5 08:20:01 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 5 09:35:31 2021 +0100

Simplify code checking for Boost < 1.50

...after 0b9a6cfc443d84158fb0db6f40b953e1410178d8 "Set Boost baseline to 
1.66,
and enforce it"

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

diff --git a/configure.ac b/configure.ac
index 112b82b14384..6144dab8ba48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10649,27 +10649,11 @@ dnl 
===
 libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.17 >= 0.17.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
-# ===
-# Determine if we are going to need to link with Boost.System
-# ===
+dnl Link with Boost.System
 dnl This seems to be necessary since boost 1.50 (1.48 does not need it,
 dnl 1.49 is untested). The macro BOOST_THREAD_DONT_USE_SYSTEM mentioned
 dnl in documentation has no effect.
-AC_MSG_CHECKING([if we need to link with Boost.System])
-AC_LANG_PUSH([C++])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-@%:@include 
-]],[[
-#if BOOST_VERSION >= 105000
-#   error yes, we need to link with Boost.System
-#endif
-]])],[
-AC_MSG_RESULT([no])
-],[
-AC_MSG_RESULT([yes])
-AX_BOOST_SYSTEM
-])
-AC_LANG_POP([C++])
+AX_BOOST_SYSTEM
 fi
 fi
 dnl FIXME by renaming SYSTEM_LIBORCUS to SYSTEM_ORCUS in the build system world

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

[Miklos Vajna (via logerrit)]

 sw/source/uibase/shells/langhelper.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 5ce91c5efb73c2d9be809fa82425ae8f2048d7a5
Author: Miklos Vajna 
AuthorDate: Thu Nov 4 20:23:05 2021 +0100
Commit: Miklos Vajna 
CommitDate: Fri Nov 5 09:15:54 2021 +0100

sw: remove useless debug code in SwLangHelper

Looks like leftover throwaway debug code that was committed by accident.

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

diff --git a/sw/source/uibase/shells/langhelper.cxx 
b/sw/source/uibase/shells/langhelper.cxx
index 501f39ce83ba..de01e243399c 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -568,11 +568,6 @@ namespace SwLangHelper
 rWrtSh.SwapPam();
 if (!rWrtSh.IsEndPara())
 rWrtSh.MovePara( GoCurrPara, fnParaEnd );
-#if OSL_DEBUG_LEVEL > 1
-OUString aSelText;
-rWrtSh.GetSelectedText( aSelText );
-(void) aSelText;
-#endif
 }
 }