date:20211010

Re: Windows build problem, access denied

2021-10-10 Thread Miklos Vajna

Hi Ilmari,

I have a note from 2020-05 that some kind of cli_ure access denied
problem I had was solved by following the instructions from
.

Give it a try, perhaps it'll help in your case as well.

Regards,

Miklos

[Libreoffice-commits] core.git: 2 commits - solenv/gbuild

2021-10-10 Thread Luboš Luňák (via logerrit)

 solenv/gbuild/platform/com_GCC_defs.mk |6 ++
 solenv/gbuild/platform/solaris.mk  |3 +--
 solenv/gbuild/platform/unxgcc.mk   |1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit c53a8aef805e59bbafb1943e5be49a6529645638
Author: Luboš Luňák 
AuthorDate: Fri Oct 8 12:56:46 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 11 08:16:02 2021 +0200

merge LD_PLUGIN use with other LTO use

It seems LD_PLUGIN predates the other --plugin usage, so make
that one use LD_PLUGIN instead of using --plugin twice.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index a862612a5423..0243ca83961c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -182,7 +182,7 @@ ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
 gb_LTOFLAGS := -flto=thin
 ifeq (,$(index,iOS MACOSX,$(OS)))
-gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
+gb_LTOPLUGINFLAGS := --plugin $(if $(LD_PLUGIN),$(LD_PLUGIN),LLVMgold.so)
 endif
 else
 gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) 
-fuse-linker-plugin -O2
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 686b082a5cf5..829e324a0047 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -144,8 +144,7 @@ endef
 define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
-   $(gb_AR) -rsu $(1) \
-   $(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \
+   $(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4f6315faec68..21ee9458224b 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -161,7 +161,6 @@ define gb_LinkTarget__command_staticlink
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(1) && \
$(gb_AR) $(gb_LTOPLUGINFLAGS) -rsu $(1) \
-   $(if $(LD_PLUGIN),--plugin $(LD_PLUGIN)) \
$(foreach object,$(COBJECTS),$(call 
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call 
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call 
gb_AsmObject_get_target,$(object))) \
commit cca8c5ad553e21bd55aef93757cd31626f9beba1
Author: Luboš Luňák 
AuthorDate: Fri Oct 8 12:52:54 2021 +0200
Commit: Luboš Luňák 
CommitDate: Mon Oct 11 08:15:47 2021 +0200

use ThinLTO for Clang everywhere

No idea why it should be used only on Apple platforms and normal LTO
elsewhere. ThinLTO should build faster and the result should perform
roughly the same.

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

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index da00c5a8ed9e..a862612a5423 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -180,10 +180,8 @@ gb_CFLAGS_COMMON += -std=gnu89
 
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
-ifneq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOFLAGS := -flto=thin
-else
-gb_LTOFLAGS := -flto
+ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
 endif
 else

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

2021-10-10 Thread Luboš Luňák (via logerrit)

 vcl/inc/font/FontSelectPattern.hxx |1 -
 vcl/inc/font/PhysicalFontFace.hxx  |1 -
 vcl/inc/fontinstance.hxx   |1 -
 3 files changed, 3 deletions(-)

New commits:
commit d9275ea76b170e9cd74ebcd5af6255cb28e6cfdb
Author: Luboš Luňák 
AuthorDate: Sun Oct 10 07:32:43 2021 +
Commit: Luboš Luňák 
CommitDate: Mon Oct 11 08:15:12 2021 +0200

remove unused forward declarations

The class has been moved to vcl::font namespace, so these are wrong,
which means they are unused.

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

diff --git a/vcl/inc/font/FontSelectPattern.hxx 
b/vcl/inc/font/FontSelectPattern.hxx
index 78be730130f1..7cf1506b873f 100644
--- a/vcl/inc/font/FontSelectPattern.hxx
+++ b/vcl/inc/font/FontSelectPattern.hxx
@@ -31,7 +31,6 @@
 namespace vcl { class Font; }
 
 class LogicalFontInstance;
-class PhysicalFontFace;
 class Size;
 
 namespace vcl::font
diff --git a/vcl/inc/font/PhysicalFontFace.hxx 
b/vcl/inc/font/PhysicalFontFace.hxx
index 8e44b3bcfe97..d4cb075fcb56 100644
--- a/vcl/inc/font/PhysicalFontFace.hxx
+++ b/vcl/inc/font/PhysicalFontFace.hxx
@@ -35,7 +35,6 @@ namespace vcl::font
 {
 class FontSelectPattern;
 }
-class PhysicalFontFace;
 
 namespace vcl
 {
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index aad22017e0d4..7fe31dbea828 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -40,7 +40,6 @@
 
 class ConvertChar;
 class ImplFontCache;
-class PhysicalFontFace;
 
 // TODO: allow sharing of metrics for related fonts

New Defects reported by Coverity Scan for LibreOffice

2021-10-10 Thread scan-admin

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1492820:  SpotBugs: Performance  (FB.WMI_WRONG_MAP_ITERATOR)
/qadevOOo/tests/java/ifc/text/_NumberingLevel.java: 143 in 
ifc.text._NumberingLevel.testPropertyArray()()



*** CID 1492820:  SpotBugs: Performance  (FB.WMI_WRONG_MAP_ITERATOR)
/qadevOOo/tests/java/ifc/text/_NumberingLevel.java: 143 in 
ifc.text._NumberingLevel.testPropertyArray()()
137 // get rest of properties and check if they are optional
138 if (! NumberingLevel.isEmpty()){
139 for (Iterator e = 
NumberingLevel.keySet().iterator() ; e.hasNext() ;) {
140 String property = e.next();
141 
142 // if some elements are not optional -> failed
>>> CID 1492820:  SpotBugs: Performance  (FB.WMI_WRONG_MAP_ITERATOR)
>>> ifc.text._NumberingLevel.testPropertyArray() makes inefficient use of 
>>> keySet iterator instead of entrySet iterator.
143 if ( ! NumberingLevel.get(property).booleanValue() 
){
144 
145 if ( status ) {
146 log.println("FAILED: 
com.sun.star.text.NumberingLevel -> " +
147 "could not find not optional 
property:");
148 }



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DTst2_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJi-2B3Xj-2BB3rIzdNTPogSmZqCenrqsgmhMvk-2B8-2FHP7Svtlv2Qwtwl8EK-2FjZh5-2BiIJX-2FGHnFA6dV4MbwbY-2ByBuBpShjUvl0SitzzA93IEzgOTUaw2rawkWzfxUtI7D9ipK8Q0LkSMx9KsNd33tE7zCrZlEFWpvwMMuDf-2BkdEGiiRirRQ-3D

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

2021-10-10 Thread Mike Kaganski (via logerrit)

 xmloff/source/core/xmlexp.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5041b1491a183366ca44380bd0f5dfb7c0acc5fb
Author: Mike Kaganski 
AuthorDate: Sun Oct 10 22:07:34 2021 +0200
Commit: Mike Kaganski 
CommitDate: Mon Oct 11 06:14:38 2021 +0200

Drop unused 'using namespace' here

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

diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 0fd65e17d8f2..5e0e46dabeb0 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -98,7 +98,6 @@
 #include 
 #include 
 
-using namespace ::osl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;

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

2021-10-10 Thread Mike Kaganski (via logerrit)

 include/xmloff/XMLFilterServiceNames.h|   30 -
 sw/source/filter/xml/xmltexti.cxx |   50 +++-
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |   41 -
 xmloff/source/core/xmlexp.cxx |   56 +-
 4 files changed, 57 insertions(+), 120 deletions(-)

New commits:
commit 3e11faf2d263f97a96274a8247b5a123ec8fe7c6
Author: Mike Kaganski 
AuthorDate: Sun Oct 10 23:00:45 2021 +0200
Commit: Mike Kaganski 
CommitDate: Mon Oct 11 06:14:19 2021 +0200

Expand some defines and simplify loops

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

diff --git a/include/xmloff/XMLFilterServiceNames.h 
b/include/xmloff/XMLFilterServiceNames.h
index ea98ba8bf47e..31549345bec4 100644
--- a/include/xmloff/XMLFilterServiceNames.h
+++ b/include/xmloff/XMLFilterServiceNames.h
@@ -17,24 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_XMLOFF_XMLFILTERSERVICENAMES_H
-#define INCLUDED_XMLOFF_XMLFILTERSERVICENAMES_H
+#pragma once
 
+#include 
 
-#define XML_IMPORT_FILTER_WRITER"com.sun.star.comp.Writer.XMLOasisImporter"
-#define XML_IMPORT_FILTER_CALC  "com.sun.star.comp.Calc.XMLOasisImporter"
-#define XML_IMPORT_FILTER_DRAW  "com.sun.star.comp.Draw.XMLOasisImporter"
-#define XML_IMPORT_FILTER_IMPRESS   
"com.sun.star.comp.Impress.XMLOasisImporter"
-#define XML_IMPORT_FILTER_MATH  "com.sun.star.comp.Math.XMLImporter"
-#define XML_IMPORT_FILTER_CHART "com.sun.star.comp.Chart.XMLOasisImporter"
+#include 
 
-#define XML_EXPORT_FILTER_WRITER"com.sun.star.comp.Writer.XMLOasisExporter"
-#define XML_EXPORT_FILTER_CALC  "com.sun.star.comp.Calc.XMLOasisExporter"
-#define XML_EXPORT_FILTER_DRAW  "com.sun.star.comp.Draw.XMLOasisExporter"
-#define XML_EXPORT_FILTER_IMPRESS   
"com.sun.star.comp.Impress.XMLOasisExporter"
-#define XML_EXPORT_FILTER_MATH  "com.sun.star.comp.Math.XMLExporter"
-#define XML_EXPORT_FILTER_CHART "com.sun.star.comp.Chart.XMLOasisExporter"
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_WRITER = 
u"com.sun.star.comp.Writer.XMLOasisImporter";
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_CALC = 
u"com.sun.star.comp.Calc.XMLOasisImporter";
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_DRAW = 
u"com.sun.star.comp.Draw.XMLOasisImporter";
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_IMPRESS = 
u"com.sun.star.comp.Impress.XMLOasisImporter";
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_MATH = 
u"com.sun.star.comp.Math.XMLImporter";
+inline constexpr OUStringLiteral XML_IMPORT_FILTER_CHART = 
u"com.sun.star.comp.Chart.XMLOasisImporter";
 
-#endif
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_WRITER = 
u"com.sun.star.comp.Writer.XMLOasisExporter";
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_CALC = 
u"com.sun.star.comp.Calc.XMLOasisExporter";
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_DRAW = 
u"com.sun.star.comp.Draw.XMLOasisExporter";
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_IMPRESS = 
u"com.sun.star.comp.Impress.XMLOasisExporter";
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_MATH = 
u"com.sun.star.comp.Math.XMLExporter";
+inline constexpr OUStringLiteral XML_EXPORT_FILTER_CHART = 
u"com.sun.star.comp.Chart.XMLOasisExporter";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmltexti.cxx 
b/sw/source/filter/xml/xmltexti.cxx
index c4c28b37a40c..d2d4e3e71daf 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -63,6 +63,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -71,33 +73,13 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace xml::sax;
 
-namespace {
-
-struct XMLServiceMapEntry_Impl
-{
-const char *sFilterService;
-sal_Int32   nFilterServiceLen;
-
-sal_uInt32  n1;
-sal_uInt16  n2, n3;
-sal_uInt8   n4, n5, n6, n7, n8, n9, n10, n11;
-};
-
-}
-
-#define SERVICE_MAP_ENTRY( app, s ) \
-{ XML_IMPORT_FILTER_##app, sizeof(XML_IMPORT_FILTER_##app)-1, \
-  SO3_##s##_CLASSID }
-
-const XMLServiceMapEntry_Impl aServiceMap[] =
-{
-SERVICE_MAP_ENTRY( WRITER, SW ),
-SERVICE_MAP_ENTRY( CALC, SC ),
-SERVICE_MAP_ENTRY( DRAW, SDRAW ),
-SERVICE_MAP_ENTRY( IMPRESS, SIMPRESS ),
-SERVICE_MAP_ENTRY( CHART, SCH ),
-SERVICE_MAP_ENTRY( MATH, SM ),
-{ nullptr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+const std::pair aServiceMap[] = {
+{ XML_IMPORT_FILTER_WRITER, { SO3_SW_CLASSID } },
+{ XML_IMPORT_FILTER_CALC, { SO3_SC_CLASSID } },
+{ XML_IMPORT_FILTER_DRAW, { SO3_SDRAW_CLASSID } },
+{ XML_IMPORT_FILTER_IMPRESS, { SO3_SIMPRESS_CLASSID } },
+

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - vcl/inc vcl/source

2021-10-10 Thread Samuel Mehrbrodt (via logerrit)

 vcl/inc/printdlg.hxx   |6 +
 vcl/source/window/printdlg.cxx |   48 +
 2 files changed, 40 insertions(+), 14 deletions(-)

New commits:
commit 9540c1fc15caebd58671e300a529dbfd6d2ab13d
Author: Samuel Mehrbrodt 
AuthorDate: Mon Oct 5 11:09:20 2020 +0200
Commit: Aron Budea 
CommitDate: Mon Oct 11 00:38:41 2021 +0200

Use idle to update preview in print dlg

Otherwise UI blocks while the preview is being updated

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

diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index c313e8fc4856..64e127e43261 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -223,6 +224,11 @@ namespace vcl
 
 Paper   mePaper;
 
+Idle maUpdatePreviewIdle;
+DECL_LINK(updatePreviewIdle, Timer*, void);
+Idle maUpdatePreviewNoCacheIdle;
+DECL_LINK(updatePreviewNoCacheIdle, Timer*, void);
+
 DECL_LINK( ClickHdl, weld::Button&, void );
 DECL_LINK( SelectHdl, weld::ComboBox&, void );
 DECL_LINK( ActivateHdl, weld::Entry&, bool );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7640da4fcd22..120d6a5b6e1c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -578,6 +578,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const 
std::shared_ptrget_label();
@@ -648,6 +650,11 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const 
std::shared_ptrgetMultipage() );
 
 // setup optional UI options set by application
@@ -901,6 +908,16 @@ void PrintDialog::setPreviewText()
 mxNumPagesText->set_label( aNewText );
 }
 
+IMPL_LINK_NOARG(PrintDialog, updatePreviewIdle, Timer*, void)
+{
+preparePreview(true);
+}
+
+IMPL_LINK_NOARG(PrintDialog, updatePreviewNoCacheIdle, Timer*, void)
+{
+preparePreview(false);
+}
+
 void PrintDialog::preparePreview( bool i_bMayUseCache )
 {
 VclPtr aPrt( maPController->getPrinter() );
@@ -1144,7 +1161,10 @@ void PrintDialog::updateNup( bool i_bMayUseCache )
 
 mxNupOrder->setValues( aMPS.nOrder, nCols, nRows );
 
-preparePreview( i_bMayUseCache );
+if (i_bMayUseCache)
+maUpdatePreviewIdle.Start();
+else
+maUpdatePreviewNoCacheIdle.Start();
 }
 
 void PrintDialog::updateNupFromPages( bool i_bMayUseCache )
@@ -1800,7 +1820,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 }
 else if ( &rButton == mxPreviewBox.get() )
 {
-preparePreview( true );
+maUpdatePreviewIdle.Start();
 }
 else if( &rButton == mxForwardBtn.get() )
 {
@@ -1829,7 +1849,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 checkOptionalControlDependencies();
 
 // update preview and page settings
-preparePreview(false);
+maUpdatePreviewNoCacheIdle.Start();
 }
 if( mxBrochureBtn->get_active() )
 {
@@ -1860,7 +1880,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 maPController->setReversePrint( bChecked );
 maPController->setValue( "PrintReverse",
  makeAny( bChecked ) );
-preparePreview( true );
+maUpdatePreviewIdle.Start();
 }
 else if( &rButton == mxBorderCB.get() )
 {
@@ -1900,7 +1920,7 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
 setupPaperSidesBox();
 
 // tdf#63905 don't use cache: page size may change
-preparePreview(false);
+maUpdatePreviewNoCacheIdle.Start();
 }
 checkControlDependencies();
 }
@@ -1924,7 +1944,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, 
void )
 mxOKButton->set_label(maPrintText);
 updatePrinterText();
 setPaperSizes();
-preparePreview(true);
+maUpdatePreviewIdle.Start();
 }
 else // print to file
 {
@@ -1935,7 +1955,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, 
void )
 
 setPaperSizes();
 updateOrientationBox();
-preparePreview( true );
+maUpdatePreviewIdle.Start();
 }
 
 setupPaperSidesBox();
@@ -1979,7 +1999,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox, 
void )
 checkPaperSize( aPaperSize );
 maPController->setPaperSizeFromUser( aPaperSize );
 
-preparePreview(true);
+maUpdatePreviewIdle.Start();
 }
 }
 
@@ -2011,7 +2031,7 @@ IMPL_LINK_NOARG(PrintDialog, ActivateHdl, weld::Entry&, 
bool)
 if (nNewCurPage != mnCurPage)
 {
 mnCurPage = nNewCurPage;
-preparePreview(true);
+

[Libreoffice-commits] core.git: helpcontent2

2021-10-10 Thread Rafael Lima (via logerrit)

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

New commits:
commit 56883788d0090383dad58552f5a11044ffe64a44
Author: Rafael Lima 
AuthorDate: Mon Oct 11 02:05:25 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 11 02:05:25 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 152530c4360c80e9a052c4c883a8e4d53001f364
  - Create documentation for Basic "New" operator

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

diff --git a/helpcontent2 b/helpcontent2
index 79cf3e922b00..152530c4360c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 79cf3e922b00a74a6a29ec324589aab7f05c5886
+Subproject commit 152530c4360c80e9a052c4c883a8e4d53001f364

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

2021-10-10 Thread Rafael Lima (via logerrit)

 AllLangHelp_sbasic.mk |1 
 source/auxiliary/sbasic.tree  |1 
 source/text/sbasic/shared/03102100.xhp|5 +
 source/text/sbasic/shared/03103700.xhp|4 +
 source/text/sbasic/shared/03132400.xhp|   53 +++-
 source/text/sbasic/shared/new_keyword.xhp |   77 ++
 6 files changed, 116 insertions(+), 25 deletions(-)

New commits:
commit 152530c4360c80e9a052c4c883a8e4d53001f364
Author: Rafael Lima 
AuthorDate: Thu Oct 7 20:12:41 2021 +0200
Commit: Olivier Hallot 
CommitDate: Mon Oct 11 02:05:24 2021 +0200

Create documentation for Basic "New" operator

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

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 367bf03c8..dfc04180f 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -387,6 +387,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03170010 \
 helpcontent2/source/text/sbasic/shared/05060700 \
 helpcontent2/source/text/sbasic/shared/is_keyword \
+helpcontent2/source/text/sbasic/shared/new_keyword \
 helpcontent2/source/text/sbasic/shared/calc_functions \
 helpcontent2/source/text/sbasic/shared/code-stubs \
 helpcontent2/source/text/sbasic/shared/classmodule \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 5202b9087..cde86c221 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -227,6 +227,7 @@
 MsgBox 
Function
 MsgBox 
Statement
 Name 
Statement
+New 
Operator
 Not-Operator
 Now 
Function
 NPer 
Function [VBA]
diff --git a/source/text/sbasic/shared/03102100.xhp 
b/source/text/sbasic/shared/03102100.xhp
index 8413c080e..a992f4527 100644
--- a/source/text/sbasic/shared/03102100.xhp
+++ b/source/text/sbasic/shared/03102100.xhp
@@ -153,6 +153,9 @@
   Next 
i
 End 
Sub
 
-
 
+  
+
+  
+
 
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03103700.xhp 
b/source/text/sbasic/shared/03103700.xhp
index 8203a58d5..45f6ce0e0 100644
--- a/source/text/sbasic/shared/03103700.xhp
+++ b/source/text/sbasic/shared/03103700.xhp
@@ -30,7 +30,6 @@
 
 
   Set statement
-  New keyword
   Nothing object
 
 
@@ -69,5 +68,8 @@
 
 New 
creates UNO objects or class module objects, before assigning it to a 
variable.
 
+  
+
+  
 
 
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03132400.xhp 
b/source/text/sbasic/shared/03132400.xhp
index 32c3b0573..665fe359d 100644
--- a/source/text/sbasic/shared/03132400.xhp
+++ b/source/text/sbasic/shared/03132400.xhp
@@ -24,29 +24,36 @@
 /text/sbasic/shared/03132400.xhp
   
 
-
 
-
-
-  CreateObject function
-
-CreateObject Function
-Creates a UNO object. On Windows, can also create OLE 
objects.see i70942
-This method 
creates instances of the type that is passed as parameter.
-
-
-oObj = CreateObject( 
type )
-
-
-Type address
-Name1 As String
-City As String
-End Type
- 
-Sub main
-myaddress = CreateObject("address")
-MsgBox IsObject(myaddress)
-End Sub
-
+  
+
+  CreateObject function
+
+CreateObject 
Function
+Creates a UNO object. On Windows, can also create OLE 
objects.see i70942
+This method 
creates instances of the type that is passed as parameter.
+  
+  
+  
+oObj = CreateObject(type)
+  
+  
+  type: 
the type of the object to be created, as a string.
+  
+  
+Type 
address
+
Name1 As String
+City 
As String
+End 
Type
+ 

+Sub 
main
+
myaddress = CreateObject("address")
+
MsgBox IsObject(myaddress)
+End 
Sub
+  
+
+  
+
+  
 
 
diff --git a/source/text/sbasic/shared/new_keyword.xhp 
b/source/text/sbasic/shared/new_keyword.xhp
new file mode 100644
index 0..95d2ccff8
--- /dev/null
+++ b/source/text/sbasic/shared/new_keyword.xhp
@@ -0,0 +1,77 @@
+
+
+
+
+
+  
+New Operator
+/text/sbasic/shared/new_keyword.xhp
+  
+
+
+  
+
+  New Operator
+
+New 
Operator
+Use the 
New operator to instantiate objects of user-defined types, 
as well as Uno services, structs and enumerations.
+  
+  
+  
+Dim oObj as New ObjectType
+  
+  
+oObj = New ObjectType
+  
+  The New operator can be 
used either during variable declaration or in an assignment operation.
+  
+  The following example 
uses the New operator to create an instance of the 
PropertyValue Uno struct.
+  
+' Instantiating the 
object during variable declaration
+Dim 
oProp1 as New com.sun.star.beans.PropertyValue
+oProp1.Name = "Some name"
+oProp1.Value = 100
+' The same can be 
accomplished with an assignment
+Dim 
oProp2 as Object
+oProp2

[Libreoffice-commits] core.git: helpcontent2

2021-10-10 Thread Alain Romedenne (via logerrit)

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

New commits:
commit 22158900a7398d3648863e8c96d7f99960f63ad3
Author: Alain Romedenne 
AuthorDate: Mon Oct 11 01:28:37 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Oct 11 01:28:37 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 79cf3e922b00a74a6a29ec324589aab7f05c5886
  - Running Python Interactive Console:

- Provide a non ambiguous capture
- Present APSO console as optional
- Provide GNU/Linux appropriate information

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

diff --git a/helpcontent2 b/helpcontent2
index d155b3e2133f..79cf3e922b00 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d155b3e2133f3eb6593d438b69dc3e42d37b11ff
+Subproject commit 79cf3e922b00a74a6a29ec324589aab7f05c5886

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

2021-10-10 Thread Alain Romedenne (via logerrit)

 Package_html_media.mk  |1 
 source/media/helpimg/python/python_interactive_console.png |binary
 source/text/sbasic/python/python_shell.xhp |   38 ++---
 3 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 79cf3e922b00a74a6a29ec324589aab7f05c5886
Author: Alain Romedenne 
AuthorDate: Mon Sep 27 18:30:36 2021 +0200
Commit: Olivier Hallot 
CommitDate: Mon Oct 11 01:28:36 2021 +0200

Running Python Interactive Console:

- Provide a non ambiguous capture
- Present APSO console as optional
- Provide GNU/Linux appropriate information

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

diff --git a/Package_html_media.mk b/Package_html_media.mk
index 625805576..25ddb7910 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -349,6 +349,7 @@ $(eval $(call 
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
 helpimg/starmath/un21214.svg \
 helpimg/starmath/un21215.svg \
 helpimg/starmath/un21221.svg \
+helpimg/python/python_interactive_console.png \
 helpimg/python/python_shell.png \
 helpimg/sw_paste_range.png \
 helpimg/sw_signatureline01.png \
diff --git a/source/media/helpimg/python/python_interactive_console.png 
b/source/media/helpimg/python/python_interactive_console.png
new file mode 100644
index 0..94c9452b2
Binary files /dev/null and 
b/source/media/helpimg/python/python_interactive_console.png differ
diff --git a/source/text/sbasic/python/python_shell.xhp 
b/source/text/sbasic/python/python_shell.xhp
index 0b724b88d..745b22d18 100644
--- a/source/text/sbasic/python/python_shell.xhp
+++ b/source/text/sbasic/python/python_shell.xhp
@@ -20,18 +20,23 @@
 Python Interactive Shell
 
 
-Running Python Interactive Console
+Running Python 
Interactive Console
 
 The Python interactive console, 
also known as Python interpreter or Python shell, provides programmers with a 
quick way to execute commands and try out and test code without creating a 
file. UNO objects introspection as well as %PRODUCTNAME Python modules 
documentation can be obtained from the terminal.
-Using a Basic 
macro:
+
+From a full-featured %PRODUCTNAME 
installed package, use either Basic or Python:
+Using a Basic macro
 
 Sub 
interpreter_console
+ 
   Const UNIX = 4
 ps = 
CreateUnoService("com.sun.star.util.PathSettings")
 install_path 
= ConvertFromURL(ps.Module)
-Shell( 
install_path + GetPathSeparator() + "python" )
+ 
   cmd = IIF(GetGuiType()=UNIX,"x-terminal-emulator -e ","")
+Shell(cmd + 
install_path + GetPathSeparator() + "python" )
 End 
Sub
 
-Using a Python 
macro:
+
+Using a Python macro
 
 # -*- coding: 
utf-8 -*-
 from __future__ 
import unicode_literals
@@ -47,13 +52,30 @@
 
subprocess.Popen(pgm)  # Start Python interactive Shell
 
 
-Usage:
+Example output
 
-Python Interactive Console
+Python Interactive Console
+
+
+
+   
+Using the Terminal
+From a %PRODUCTNAME copy included in a 
GNU/Linux platform, use the terminal as shown:
+whereis or 
type terminal commands help locate Python interactive 
console:
+user@computer:~$ type -p 
python3/usr/bin/python3 user@computer:~$ 
/usr/bin/python3 Python 3.7.5 (default, Nov 20 
2019, 09:21:52)[GCC 9.2.1 20191008] on 
linuxType "help", "copyright", "credits" or "license" for 
more information.>>> import 
uno>>> dir(uno)['Any', 
'Bool', 'ByteSequence', 'Char', 'Enum', 'PY2', 'Type', '_ConstantGroup', 
'__builtin__', '__builtins__', '__cached__', '__doc__', '__file__', 
'__loader__', '__name__', '__package__', '__spec__', '_builtin_import', 
'_component_context', '_impl_getConstantGroupByName', 
'_uno_extract_printable_stacktrace', '_uno_import', '_uno_struct__eq__', 
'_uno_struct__getattr__', '_uno_struct__init__', '_uno_struct__ne__', 
'_uno_struct__repr__', '_u
 no_struct__setattr__', '_uno_struct__str__', 'absolutize', 'createUnoStruct', 
'fileUrlToSystemPath', 'generateUuid', 'getClass', 'getComponentContext', 
'getConstantByName', 'getCurrentContext', 'getTypeByName', 'invoke', 
'isInterface', 'os', 'pyuno', 'setCurrentContext', 'six_string_types', 
'socket', 'sys', 'systemPathToFileUrl', 'traceback', 
'warnings']>>> 
exit()user@computer:~$
+   
+
+  
+Alternative console
+Use https://extensions.libreoffice.org/extensions/apso-alternative-script-organizer-for-Python";
 name="APSO extension">APSO extension console as an 
alternative:
+
+APSO console
 
 
+PythonShell function in ScriptForge.Exception service
 
 
+
 
-
-
+
+
\ No newline at end of file

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sfx2/uiconfig

2021-10-10 Thread Caolán McNamara (via logerrit)

 sfx2/uiconfig/ui/developmenttool.ui |   37 ++--
 1 file changed, 31 insertions(+), 6 deletions(-)

New commits:
commit c3c31ab91c6e3650a881594bf52297947eefa5e2
Author: Caolán McNamara 
AuthorDate: Fri Oct 8 15:38:32 2021 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 11 00:41:21 2021 +0200

fix warnings under gtk on launching development tools

a) "GtkBox does not have a child property called left-attach"

on launching development tools

probably since...

commit 81d6ed89d1e5268c2ea4ff527f3e6087dc1d8ccd
Date:   Mon May 17 13:59:25 2021 +0300

tdf#142276 Use vertical GtkBox insted of horizontal GtkGrid for the 
left side.

Change-Id: I6d4e4a056fb25c6ffb44e0ed734eb7a553a78ba3

b) add mappings for emphasis property

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

diff --git a/sfx2/uiconfig/ui/developmenttool.ui 
b/sfx2/uiconfig/ui/developmenttool.ui
index 476f9ed610cf..08607a0d8c0a 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -9,6 +9,8 @@
   
   
   
+  
+  
 
   
   
@@ -17,6 +19,8 @@
   
   
   
+  
+  
 
   
   
@@ -31,6 +35,14 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -45,6 +57,14 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
 
   
   
@@ -53,6 +73,8 @@
   
   
   
+  
+  
 
   
   
@@ -68,15 +90,14 @@
 270
 True
 
-  
   
 True
 False
-vertical
 6
 6
 6
 6
+vertical
 
   
 True
@@ -125,8 +146,8 @@
 
   
   
-0
-0
+True
+0
   
 
 
@@ -165,8 +186,8 @@
 
   
   
-0
-1
+True
+1
   
 
   
@@ -323,6 +344,7 @@
   
   
 0
+2
   
 
   
@@ -368,6 +390,7 @@
   
   
 0
+2
   
 
   
@@ -422,6 +445,7 @@
   
   
 0
+5
   
 
   
@@ -542,6 +566,7 @@
   
   
 0
+5

[Libreoffice-commits] core.git: include/rtl

2021-10-10 Thread Mike Kaganski (via logerrit)

 include/rtl/ustring.hxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 782836ec8b736e5110b44016be8f73b068444911
Author: Mike Kaganski 
AuthorDate: Sun Oct 10 22:39:36 2021 +0200
Commit: Mike Kaganski 
CommitDate: Mon Oct 11 00:17:26 2021 +0200

Simplify one matchIgnoreAsciiCase overload

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

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 5fbf00d64a6d..e092ff6370d7 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1089,13 +1089,9 @@ public:
 {
 assert(
 libreoffice_internal::ConstCharArrayDetector::isValid(literal));
-return
-rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
-pData->buffer+fromIndex, pData->length-fromIndex,
-libreoffice_internal::ConstCharArrayDetector::toPointer(
-literal),
-libreoffice_internal::ConstCharArrayDetector::length)
-== 0;
+return matchIgnoreAsciiCaseAsciiL(
+
libreoffice_internal::ConstCharArrayDetector::toPointer(literal),
+libreoffice_internal::ConstCharArrayDetector::length, 
fromIndex);
 }
 
 /**

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-0' - 76 commits - configure.ac download.lst external/expat external/icu external/liborcus external/libxml2 external/libxslt external/openssl

2021-10-10 Thread Michael Stahl (via logerrit)

 RepositoryExternal.mk  
|2 
 configure.ac   
|   23 
 download.lst   
|   24 
 external/expat/ExternalProject_expat.mk
|2 
 external/expat/StaticLibrary_expat.mk  
|1 
 external/expat/StaticLibrary_expat_x64.mk  
|1 
 external/expat/UnpackedTarball_expat.mk
|1 
 external/expat/expat-winapi.patch  
|   32 
 external/icu/ExternalProject_icu.mk
|5 
 external/icu/UnpackedTarball_icu.mk
|1 
 external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2  
|   37 
 external/liborcus/UnpackedTarball_liborcus.mk  
|4 
 external/liborcus/allow-utf-8-in-xml-names.patch   
|  263 
 external/libxml2/libxml2-android.patch 
|2 
 external/libxml2/libxml2-config.patch.1
|   50 
 external/libxml2/libxml2-global-symbols.patch  
|4 
 external/libxslt/UnpackedTarball_libxslt.mk
|1 
 external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1  
|   69 
 external/libxslt/libxslt-config.patch.1
|   18 
 external/libxslt/libxslt-internal-symbols.patch.1  
|8 
 external/openssl/UnpackedTarball_openssl.mk
|2 
 external/openssl/ccb0a11145ee72b042d10593a64eaf9e8a55ec12.patch.1  
|   56 
 external/openssl/openssl-1.0.2k-cve-2020-1971.patch.1  
|  578 +
 
external/poppler/0001-Partially-revert-814fbda28cc8a37fed3134c2db8da28f86f.patch.1
 |  999 ++
 
external/poppler/0001-Revert-Make-the-mul-tables-be-calculated-at-compile-.patch.1
 |  169 
 external/poppler/StaticLibrary_poppler.mk  
|   23 
 external/poppler/UnpackedTarball_poppler.mk
|4 
 external/poppler/poppler-c++11.patch.1 
|   16 
 external/poppler/poppler-config.patch.1
|   77 
 
external/python3/0001-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch.1
 |  175 
 external/python3/ExternalProject_python3.mk
|6 
 external/python3/UnpackedTarball_python3.mk
|2 
 external/python3/python-3.3.5-pyexpat-symbols.patch.1  
|   28 
 filter/source/xsltfilter/OleHandler.cxx
|2 
 include/sfx2/objsh.hxx 
|2 
 librelogo/source/LibreLogo/LibreLogo.py
|   51 
 oox/source/crypto/CryptTools.cxx   
|2 
 oox/source/drawingml/shapecontext.cxx  
|4 
 oox/source/shape/WpsContext.cxx
|   13 
 oox/source/vml/vmlshape.cxx
|3 
 sc/source/core/data/column3.cxx
|2 
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx 
|2 
 sc/source/ui/docshell/docsh.cxx
|   13 
 sc/source/ui/docshell/docsh4.cxx   
|   61 
 sc/source/ui/docshell/externalrefmgr.cxx   
|   62 
 sc/source/ui/inc/docsh.hxx 
|2 
 scripting/source/protocolhandler/scripthandler.cxx 
|9 
 scripting/source/pyprov/pythonscript.py
|   21 
 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx   
|2 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx  
|   36 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx  
|   18 
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 
|4 
 sfx2/source/doc/objmisc.cxx
|   52 
 sfx2/source/notify/eventsupplier.cxx

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

2021-10-10 Thread Julien Nabet (via logerrit)

 vcl/source/control/edit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit deae8bab12513ad09f432e5f65ea1768064b4d2e
Author: Julien Nabet 
AuthorDate: Sun Oct 10 23:32:08 2021 +0200
Commit: Julien Nabet 
CommitDate: Sun Oct 10 23:32:45 2021 +0200

Revert "Initialize nDXBuffer array (vcl/edit)"

This reverts commit 00ee02ea26a070d630160ef5c51f36ab093a9b53.

as suggested implicitely

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9b9cec918018..ece46f6ae3a2 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1191,7 +1191,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) 
const
 sal_Int32 nIndex = EDIT_NOLIMIT;
 OUString aText = ImplGetText();
 
-tools::Long   nDXBuffer[256] = {0};
+tools::Long   nDXBuffer[256];
 std::unique_ptr pDXBuffer;
 tools::Long*  pDX = nDXBuffer;
 if( o3tl::make_unsigned(2*aText.getLength()) > SAL_N_ELEMENTS(nDXBuffer) )

Re: How to install LibreOffice?

2021-10-10 Thread Ryhan Kabir

Thanks, I'll check it out. But that's to hard.

On Mon, Oct 11, 2021, 12:24 AM Ilmari Lauhakangas <
ilmari.lauhakan...@libreoffice.org> wrote:

> On 10.10.2021 19.42, Ryhan Kabir wrote:
> > How can I install LibreOffice manually? I read the 'Readme' file but
> > don't understand. Did you write this cow composition or something else!
> > Sorry for my word
>
> For user support, use https://ask.libreoffice.org/
>
> Don't forget to include crucial information like the operating system
> you use.
>
> Ilmari
>

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

2021-10-10 Thread Julien Nabet (via logerrit)

 vcl/source/control/edit.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00ee02ea26a070d630160ef5c51f36ab093a9b53
Author: Julien Nabet 
AuthorDate: Sun Oct 10 21:14:33 2021 +0200
Commit: Julien Nabet 
CommitDate: Sun Oct 10 22:22:31 2021 +0200

Initialize nDXBuffer array (vcl/edit)

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index ece46f6ae3a2..9b9cec918018 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1191,7 +1191,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) 
const
 sal_Int32 nIndex = EDIT_NOLIMIT;
 OUString aText = ImplGetText();
 
-tools::Long   nDXBuffer[256];
+tools::Long   nDXBuffer[256] = {0};
 std::unique_ptr pDXBuffer;
 tools::Long*  pDX = nDXBuffer;
 if( o3tl::make_unsigned(2*aText.getLength()) > SAL_N_ELEMENTS(nDXBuffer) )

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-1' - 2 commits - sfx2/source vcl/headless

2021-10-10 Thread Caolán McNamara (via logerrit)

 sfx2/source/doc/objmisc.cxx |3 ++-
 vcl/headless/svpgdi.cxx |5 +
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 6757821bc10f4d59cfba115651166ac27200a78c
Author: Caolán McNamara 
AuthorDate: Wed Aug 7 12:58:01 2019 +0100
Commit: Andras Timar 
CommitDate: Sun Oct 10 21:24:10 2021 +0200

expand pyuno path separators

Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239
Reviewed-on: https://gerrit.libreoffice.org/77102
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7)
Reviewed-on: https://gerrit.libreoffice.org/77115

diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index f0f5c377bcea..aaafcc58e038 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1366,7 +1366,8 @@ bool SfxObjectShell::UnTrustedScript(const OUString& 
rScriptURL)
 if (!sfUri.is())
 return false;
 
-OUString sScript = sfUri->getName();
+// pyuno encodes path separator as |
+OUString sScript = sfUri->getName().replace('|', '/');
 
 // check if any path portion matches LibreLogo and ban it if it does
 sal_Int32 nIndex = 0;
commit f86dcbc20ceff110ade29c08d0da190de8d790dd
Author: Caolán McNamara 
AuthorDate: Sat Aug 4 15:30:46 2018 +0100
Commit: Andras Timar 
CommitDate: Sun Oct 10 21:23:49 2021 +0200

crashtesting: bubble surface creation failure notification upwards

e.g. on converting moz858095-2.svg to odg

Change-Id: I1a222f1745cff9c4cb225f6c0c216072fb17b4f7
Reviewed-on: https://gerrit.libreoffice.org/58587
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index f4ef3b21fe33..9ee5bc3ab909 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1307,6 +1307,11 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, 
long nWidth, long nHeigh
 }
 
 cairo_surface_t* target = 
SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer());
+if (!target)
+{
+SAL_WARN("vcl.gdi", "SvpSalGraphics::getBitmap, cannot create cairo 
surface");
+return nullptr;
+}
 cairo_t* cr = cairo_create(target);
 
 SalTwoRect aTR(nX, nY, nWidth, nHeight, 0, 0, nWidth, nHeight);

[Libreoffice-commits] core.git: dbaccess/source include/xmloff reportdesign/source sc/source xmloff/qa xmloff/source

2021-10-10 Thread Noel Grandin (via logerrit)

 dbaccess/source/filter/xml/xmlExport.cxx |7 +--
 include/xmloff/xmlaustp.hxx  |8 ++--
 reportdesign/source/filter/xml/xmlExport.cxx |   16 +++-
 sc/source/filter/xml/xmlexprt.cxx|   32 
 xmloff/qa/unit/uxmloff.cxx   |5 +-
 xmloff/source/chart/SchXMLChartContext.cxx   |4 --
 xmloff/source/chart/SchXMLExport.cxx |   52 +--
 xmloff/source/core/RDFaImportHelper.cxx  |8 ++--
 xmloff/source/draw/sdxmlexp.cxx  |2 -
 xmloff/source/draw/shapeexport.cxx   |4 +-
 xmloff/source/forms/layerexport.cxx  |2 -
 xmloff/source/style/XMLPageExport.cxx|6 +--
 xmloff/source/style/impastpl.cxx |   20 +-
 xmloff/source/style/impastpl.hxx |   10 ++---
 xmloff/source/style/xmlaustp.cxx |   16 
 xmloff/source/table/XMLTableExport.cxx   |6 +--
 xmloff/source/text/txtparae.cxx  |8 ++--
 17 files changed, 100 insertions(+), 106 deletions(-)

New commits:
commit f67392948d625db9ce115092e4c9bfd301268a25
Author: Noel Grandin 
AuthorDate: Sun Oct 10 19:59:23 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 21:03:18 2021 +0200

loplugin:moveparam in xmloff

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

diff --git a/dbaccess/source/filter/xml/xmlExport.cxx 
b/dbaccess/source/filter/xml/xmlExport.cxx
index 1e4f79d4ce44..e0c1304c8cc6 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -1071,12 +1071,11 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
 
,TExportPropMapperPair(m_xRowExportHelper,TEnumMapperPair(&m_aRowAutoStyleNames,XmlStyleFamily::TABLE_ROW))
 };
 
-std::vector< XMLPropertyState > aPropertyStates;
 for (const auto & i : pExportHelper)
 {
-aPropertyStates = i.first->Filter(*this, _xProp);
+std::vector< XMLPropertyState > aPropertyStates = 
i.first->Filter(*this, _xProp);
 if ( !aPropertyStates.empty() )
-i.second.first->emplace( _xProp,GetAutoStylePool()->Add( 
i.second.second, aPropertyStates ) );
+i.second.first->emplace( _xProp,GetAutoStylePool()->Add( 
i.second.second, std::move(aPropertyStates) ) );
 }
 
 Reference< XNameAccess > xCollection;
@@ -1148,7 +1147,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp)
 if ( XmlStyleFamily::TABLE_CELL == i.second.second )
 aPropStates.insert( aPropStates.end(), 
m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end() );
 if ( !aPropStates.empty() )
-i.second.first->emplace( _xProp,GetAutoStylePool()->Add( 
i.second.second, aPropStates ) );
+i.second.first->emplace( _xProp,GetAutoStylePool()->Add( 
i.second.second, std::move(aPropStates) ) );
 }
 }
 }
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index ed389d9530bb..1adc3b786a91 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -111,13 +111,13 @@ public:
 css::uno::Sequence const & aNames );
 
 /// Add an item set to the pool and return its generated name.
-OUString Add( XmlStyleFamily nFamily, const ::std::vector< 
XMLPropertyState >& rProperties );
-OUString Add( XmlStyleFamily nFamily, const OUString& rParent, const 
::std::vector< XMLPropertyState >& rProperties, bool bDontSeek = false );
-boolAdd( OUString& rName, XmlStyleFamily nFamily, const OUString& 
rParent, const ::std::vector< XMLPropertyState >& rProperties );
+OUString Add( XmlStyleFamily nFamily, ::std::vector< XMLPropertyState >&& 
rProperties );
+OUString Add( XmlStyleFamily nFamily, const OUString& rParent, 
::std::vector< XMLPropertyState >&& rProperties, bool bDontSeek = false );
+boolAdd( OUString& rName, XmlStyleFamily nFamily, const OUString& 
rParent, ::std::vector< XMLPropertyState >&& rProperties );
 
 /// Add an item set with a pre-defined name (needed for saving sheets 
separately in Calc).
 boolAddNamed( const OUString& rName, XmlStyleFamily nFamily, const 
OUString& rParent,
-  const ::std::vector< XMLPropertyState >& 
rProperties );
+  std::vector< XMLPropertyState >&& rProperties );
 
 /// Find an item set's name.
 OUString Find( XmlStyleFamily nFamily, const OUString& rParent, const 
::std::vector< XMLPropertyState >& rProperties ) const;
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 7968a237ac7c..d9a673e81250 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -453

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-0' - 5 commits - download.lst external/nss

2021-10-10 Thread Michael Stahl (via logerrit)

 download.lst   |4 
 external/nss/ExternalProject_nss.mk|6 
 external/nss/UnpackedTarball_nss.mk|   37 +-
 external/nss/clang-cl.patch.0  |   16 
 external/nss/nsinstall.py  |7 
 external/nss/nss-3.13.5-zlib-werror.patch  |7 
 external/nss/nss-chromium-nss-static.patch |  487 -
 external/nss/nss-more-static.patch |   39 --
 external/nss/nss-win32-make.patch.1|2 
 external/nss/nss.aix.patch |2 
 external/nss/nss.patch |   27 -
 external/nss/nss.vs2015.pdb.patch  |4 
 external/nss/nss.windows.patch |4 
 13 files changed, 53 insertions(+), 589 deletions(-)

New commits:
commit 55facd5b80348ec5621fda3c0c021a4021e1208b
Author: Michael Stahl 
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Andras Timar 
CommitDate: Sun Oct 10 21:02:31 2021 +0200

nss: upgrade to release 3.55.0

Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)

* external/nss/nss.nspr-parallel-win-debug_build.patch:
  remove, merged upstream

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli 
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara 
(cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f)

Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888

diff --git a/download.lst b/download.lst
index 56b2885d968f..af2973526170 100644
--- a/download.lst
+++ b/download.lst
@@ -177,8 +177,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 92902b2da6bf..2e6e7f80e3ee 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/clang-cl.patch.0 \
 external/nss/nss.vs2015.patch \
 external/nss/nss.vs2015.pdb.patch \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch 
b/external/nss/nss.nspr-parallel-win-debug_build.patch
deleted file mode 100644
index 86b55e1ccf7f..
--- a/external/nss/nss.nspr-parallel-win-debug_build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Änderung:4866:23940b78e965
-Nutzer:  Jan-Marek Glogowski 
-Datum:   Fri May 01 22:50:55 2020 +
-Dateien: pr/tests/Makefile.in
-Beschreibung:
-Bug 290526 Write separate PDBs for test OBJs r=glandium
-
-Quite often when running a parallel NSS build, I get the following
-compiler error message, resulting in a build failure, despite
-compiling with the -FS flag:
-
-.../nss/nspr/pr/tests/zerolen.c: fatal error C1041:
-Programmdatenbank "...\nss\nspr\out\pr\tests\vc140.pdb" kann nicht
-ge<94>ffnet werden; verwenden Sie /FS, wenn mehrere CL.EXE in
-dieselbe .PDB-Datei schreiben.
-
-The failing source file is always one of the last test object
-files. But the actual problem is not the compiler accessing the
-PDB file, but the linker already linking the first test
-executables accessing the shared PDB; at least that's my guess.
-
-So instead of using a shared PDB for all test object files, this
-uses -Fd$(@:.$(OBJ_SUFFIX)=.pdb) to write a separate PDB for every
-test's object file. The linker works fine with the shared OBJ PDB.
-
-Differential Revision: https://phabricator.services.mozilla.com/D68693
-
-
-diff -r 219d131499d5 -r 23940b78e965 nss/nspr/pr/tests/Makefile.in
 a/nss/nspr/pr/tests/Makefile.inMon Feb 10 20:58:42 2020 +
-+++ b/nss/nspr/pr/tests/Makefile.inFri May 01 22:50:55 2020 +
-@@ -211,6 +211,7 @@
- else
-   EXTRA_LI

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - 2 commits - download.lst external/nss

2021-10-10 Thread Michael Stahl (via logerrit)

 download.lst  |4 +--
 external/nss/ExternalProject_nss.mk   |   14 +++
 external/nss/UnpackedTarball_nss.mk   |   37 ++
 external/nss/macos-dlopen.patch.0 |   18 +++---
 external/nss/nsinstall.py |7 -
 external/nss/nss-3.13.5-zlib-werror.patch |7 +++--
 external/nss/nss-win32-make.patch.1   |2 -
 external/nss/nss.windows.patch|4 +--
 8 files changed, 51 insertions(+), 42 deletions(-)

New commits:
commit 3d7ffb8f04c84f6ccbd6ec66b660a95d7a674673
Author: Michael Stahl 
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Andras Timar 
CommitDate: Sun Oct 10 20:55:54 2021 +0200

nss: upgrade to release 3.55.0

Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)

* external/nss/nss.nspr-parallel-win-debug_build.patch:
  remove, merged upstream

Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli 
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index fb0e8fceca45..a45ab0225612 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..1cad5852fa89 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.vs2015.pdb.patch \
 external/nss/nss.bzmozilla1238154.patch \
 external/nss/macos-dlopen.patch.0 \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
index 8c484e4c6841..1889b8df7cd3 100644
--- a/external/nss/macos-dlopen.patch.0
+++ b/external/nss/macos-dlopen.patch.0
@@ -1,14 +1,14 @@
 --- nspr/pr/src/linking/prlink.c
 +++ nspr/pr/src/linking/prlink.c
-@@ -793,7 +793,7 @@
- /* ensure the file exists if it contains a slash character i.e. path 
*/
- /* DARWIN's dlopen ignores the provided path and checks for the */
- /* plain filename in DYLD_LIBRARY_PATH */
--if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-+if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0 ||
- PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
- h = dlopen(name, dl_flags);
- }
+@@ -799,7 +799,7 @@
+  * The reason is that DARWIN's dlopen ignores the provided path
+  * and checks for the plain filename in DYLD_LIBRARY_PATH,
+  * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0) {
+   /* no slash, allow to load from any location */
+   okToLoad = PR_TRUE;
+ } else {
 --- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 +++ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 @@ -224,7 +224,11 @@
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch 
b/external/nss/nss.nspr-parallel-win-debug_build.patch
deleted file mode 100644
index 86b55e1ccf7f..
--- a/external/nss/nss.nspr-parallel-win-debug_build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Änderung:4866:23940b78e965
-Nutzer:  Jan-Marek Glogowski 
-Datum:   Fri May 01 22:50:55 2020 +
-Dateien: pr/tests/Makefile.in
-Beschreibung:
-Bug 290526 Write separate PDBs for test OBJs

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - 4 commits - configure.ac download.lst external/icu external/python3 RepositoryExternal.mk shell/source

2021-10-10 Thread Michael Stahl (via logerrit)

 RepositoryExternal.mk |2 
 configure.ac  |2 
 download.lst  |4 
 external/icu/UnpackedTarball_icu.mk   |1 
 external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 |  118 ++
 external/python3/ExternalProject_python3.mk   |6 
 external/python3/UnpackedTarball_python3.mk   |1 
 external/python3/python-3.3.5-pyexpat-symbols.patch.1 |   28 --
 shell/source/win32/SysShExec.cxx  |6 
 9 files changed, 129 insertions(+), 39 deletions(-)

New commits:
commit 85739a186d0089c18e97aa7ac2075d3f74b79e04
Author: Michael Stahl 
AuthorDate: Tue Mar 24 10:48:04 2020 +0100
Commit: Andras Timar 
CommitDate: Sun Oct 10 20:46:19 2021 +0200

icu: add patch to fix CVE-2020-10531

Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90988

diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 9e5f7974a700..a5416b7ee078 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/gcc9.patch \
external/icu/char8_t.patch \
external/icu/CVE-2018-18928.patch.2 \
+   external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 
b/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
new file mode 100644
index ..07b3db6774be
--- /dev/null
+++ b/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
@@ -0,0 +1,118 @@
+From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001
+From: Frank Tang 
+Date: Sat, 1 Feb 2020 02:39:04 +
+Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append
+
+See #971
+---
+ icu4c/source/common/unistr.cpp  |  6 ++-
+ icu4c/source/test/intltest/ustrtest.cpp | 62 +
+ icu4c/source/test/intltest/ustrtest.h   |  1 +
+ 3 files changed, 68 insertions(+), 1 deletion(-)
+
+diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp
+index 901bb3358ba..077b4d6ef20 100644
+--- a/icu4c/source/common/unistr.cpp
 b/icu4c/source/common/unistr.cpp
+@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t 
srcStart, int32_t srcLeng
+   }
+ 
+   int32_t oldLength = length();
+-  int32_t newLength = oldLength + srcLength;
++  int32_t newLength;
++  if (uprv_add32_overflow(oldLength, srcLength, &newLength)) {
++setToBogus();
++return *this;
++  }
+ 
+   // Check for append onto ourself
+   const UChar* oldArray = getArrayStart();
+diff --git a/icu4c/source/test/intltest/ustrtest.cpp 
b/icu4c/source/test/intltest/ustrtest.cpp
+index b6515ea813c..ad38bdf53a3 100644
+--- a/icu4c/source/test/intltest/ustrtest.cpp
 b/icu4c/source/test/intltest/ustrtest.cpp
+@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool 
exec, const char* &
+ TESTCASE_AUTO(TestWCharPointers);
+ TESTCASE_AUTO(TestNullPointers);
+ TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf);
++TESTCASE_AUTO(TestLargeAppend);
+ TESTCASE_AUTO_END;
+ }
+ 
+@@ -2310,3 +2311,64 @@ void 
UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
+ str.insert(2, sub);
+ assertEquals("", u"abbcdcde", str);
+ }
++
++void UnicodeStringTest::TestLargeAppend() {
++if(quick) return;
++
++IcuTestErrorCode status(*this, "TestLargeAppend");
++// Make a large UnicodeString
++int32_t len = 0xAFF;
++UnicodeString str;
++char16_t *buf = str.getBuffer(len);
++// A fast way to set buffer to valid Unicode.
++// 4E4E is a valid unicode character
++uprv_memset(buf, 0x4e, len * 2);
++str.releaseBuffer(len);
++UnicodeString dest;
++// Append it 16 times
++// 0xAFF times 16 is 0xA4F1,
++// which is greater than INT32_MAX, which is 0x7FFF.
++int64_t total = 0;
++for (int32_t i = 0; i < 16; i++) {
++dest.append(str);
++total += len;
++if (total <= INT32_MAX) {
++assertFalse("dest is not bogus", dest.isBogus());
++} else {
++assertTrue("dest should be bogus", dest.isBogus());
++}
++}
++dest.remove();
++tota

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

2021-10-10 Thread Caolán McNamara (via logerrit)

 include/vcl/metaact.hxx|   12 
 vcl/inc/unx/gtk/gtksalmenu.hxx |1 
 vcl/unx/gtk3/gtksalmenu.cxx|   60 -
 3 files changed, 43 insertions(+), 30 deletions(-)

New commits:
commit 210bbdead214531172d74d0d2975f47cf973bc69
Author: Caolán McNamara 
AuthorDate: Sun Oct 10 18:07:31 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 10 20:32:47 2021 +0200

gtk4: popdown context menu when radio/check is toggled

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

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index f001a17c75d8..818cdcd9b57f 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1416,7 +1416,9 @@ void GtkSalMenu::DispatchCommand(const gchar *pCommand)
 }
 if (pTopLevel->mpMenuWidget)
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+gtk_popover_popdown(GTK_POPOVER(pTopLevel->mpMenuWidget));
+#else
 gtk_menu_shell_deactivate(GTK_MENU_SHELL(pTopLevel->mpMenuWidget));
 #endif
 }
commit 4a9ecab08c1ea6879919cb807e243ac1899f61f3
Author: Rene Engelhard 
AuthorDate: Sun Oct 10 08:20:57 2021 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Oct 10 20:32:40 2021 +0200

fix (cppunit test) build with --enable-mergelibs

S=/home/rene/LibreOffice/git/master && I=$S/instdir && W=$S/workdir &&  
/usr/bin/ccache x86_64-linux-gnu-g++ -pthread -shared -Wl,-z,noexecstack   
-Wl,-z,origin '-Wl,-rpath,$ORIGIN/../Library' -Wl,-rpath-link,$I/program  
-Wl,-z,defs -Wl,-rpath-link,/lib:/usr/lib -Wl,-z,combreloc  
-Wl,--hash-style=gnu  -Wl,-Bsymbolic-functions -L$W/LinkTarget/StaticLibrary 
-L$I/sdk/lib  -L$I/program  -L$I/program  -L$W/LinkTarget/Library -Wl,-z,relro  
  $W/CxxObject/vcl/qa/cppunit/BackendTest.o  -Wl,--start-group  -lcppunit   
-Wl,--end-group -Wl,--no-as-needed -lmergedlo -luno_cppu -luno_cppuhelpergcc3 
-luno_sal -ltest -lunotest  -o 
$W/LinkTarget/CppunitTest/libtest_vcl_backend_test.so

/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawPixel()':
././vcl/qa/cppunit/outdev.cxx:1091: undefined reference to `typeinfo for 
MetaPixelAction'
/usr/bin/ld: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawRect()':
././vcl/qa/cppunit/outdev.cxx:1203: undefined reference to `typeinfo for 
MetaRoundRectAction'
/usr/bin/ld: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawEllipse()':
././vcl/qa/cppunit/outdev.cxx:1225: undefined reference to `typeinfo for 
MetaEllipseAction'
/usr/bin/ld: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawPie()':
././vcl/qa/cppunit/outdev.cxx:1243: undefined reference to `typeinfo for 
MetaPieAction'
/usr/bin/ld: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawChord()':
././vcl/qa/cppunit/outdev.cxx:1263: undefined reference to `typeinfo for 
MetaChordAction'
/usr/bin/ld: 
/home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/qa/cppunit/outdev.o: in 
function `VclOutdevTest::testDrawArc()':
././vcl/qa/cppunit/outdev.cxx:1284: undefined reference to `typeinfo for 
MetaArcAction'

Change-Id: I65f79d726de553d894c848a89cf1dd97d5e45b54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123329
Tested-by: Jenkins
Reviewed-by: Chris Sherlock 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index dc14179712e1..ca977a18e1e9 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -101,7 +101,7 @@ protected:
 static void WriteColor(SvStream& rIStm, ::Color aColor);
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaPixelAction final : public MetaAction
+class VCL_DLLPUBLIC MetaPixelAction final : public MetaAction
 {
 private:
 Point   maPt;
@@ -218,7 +218,7 @@ public:
 voidSetRect(const tools::Rectangle& rRect) { maRect = 
rRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaRoundRectAction final : public 
MetaAction
+class VCL_DLLPUBLIC MetaRoundRectAction final : public MetaAction
 {
 private:
 
@@ -252,7 +252,7 @@ public:
 voidSetVertRound(sal_uInt32 rVertRound) { mnVertRound = 
rVertRound; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaEllipseAction final : public 
MetaAction
+class VCL_DLLPUBLIC MetaEllipseAction final : public MetaAction
 {
 private:
 
@@ -279,7 +279,7 @@ public:
 voidSetRect(const tools::Rectangle& rRect) { maRect = 
rRect; }
 };
 
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetaArcAction final : public Me

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

2021-10-10 Thread Caolán McNamara (via logerrit)

 vcl/inc/unx/gtk/gtkdata.hxx |3 +++
 vcl/unx/gtk3/gtkinst.cxx|4 
 vcl/unx/gtk3/gtksalmenu.cxx |   19 ++-
 3 files changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 522983d79aa03bd5cc83a8a8b5b385f3b6cfe998
Author: Caolán McNamara 
AuthorDate: Sun Oct 10 17:40:39 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 10 20:32:18 2021 +0200

gtk[3|4] use set_buildable_id and get_buildable_id

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

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 185a000e0398..5299d15a2088 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -192,6 +192,9 @@ inline GdkGLContext* surface_create_gl_context(GdkSurface* 
pSurface)
 #endif
 }
 
+void set_buildable_id(GtkBuildable* pWidget, const OString& rId);
+OString get_buildable_id(GtkBuildable* pWidget);
+
 #if !GTK_CHECK_VERSION(4, 0, 0)
 typedef GtkClipboard GdkClipboard;
 #endif
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index ec87c2785741..c648bfee534d 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2495,6 +2495,8 @@ void set_cursor(GtkWidget* pWidget, const char *pName)
 #endif
 }
 
+}
+
 OString get_buildable_id(GtkBuildable* pWidget)
 {
 #if GTK_CHECK_VERSION(4, 0, 0)
@@ -2515,6 +2517,8 @@ void set_buildable_id(GtkBuildable* pWidget, const 
OString& rId)
 #endif
 }
 
+namespace {
+
 class GtkInstanceWidget : public virtual weld::Widget
 {
 protected:
diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 1ef9dfc88137..a202f75760e3 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -787,12 +787,7 @@ namespace
 
 static void MenuButtonClicked(GtkWidget* pWidget, gpointer pMenu)
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
-const gchar* pStr = gtk_buildable_get_name(GTK_BUILDABLE(pWidget));
-#else
-const char* pStr = gtk_buildable_get_buildable_id(GTK_BUILDABLE(pWidget));
-#endif
-OString aId(pStr, pStr ? strlen(pStr) : 0);
+OString aId(get_buildable_id(GTK_BUILDABLE(pWidget)));
 static_cast(pMenu)->HandleMenuButtonEvent(aId.toUInt32());
 }
 
@@ -829,9 +824,7 @@ bool GtkSalMenu::AddMenuBarButton(const SalMenuButtonItem& 
rNewItem)
 
 maExtraButtons.emplace_back(rNewItem.mnId, pButton);
 
-#if !GTK_CHECK_VERSION(4, 0, 0)
-gtk_buildable_set_name(GTK_BUILDABLE(pButton), 
OString::number(rNewItem.mnId).getStr());
-#endif
+set_buildable_id(GTK_BUILDABLE(pButton), 
OString::number(rNewItem.mnId).getStr());
 
 gtk_widget_set_tooltip_text(pButton, 
rNewItem.maToolTipText.toUtf8().getStr());
 
commit 44583c313aad7076d67f868379e9b6616485b299
Author: Caolán McNamara 
AuthorDate: Sun Oct 10 17:34:01 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 10 20:32:04 2021 +0200

gtk4: this is fixed now by at least >= gtk4-4.4.0

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

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index ed67e7d30d88..1ef9dfc88137 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1233,14 +1233,6 @@ void GtkSalMenu::NativeSetItemText( unsigned nSection, 
unsigned nItemPos, const
 OUString aText = rText.replaceAll( "_", "__" );
 // Replace the LibreOffice hotkey identifier with an underscore
 aText = aText.replace( '~', '_' );
-// quick and easy replacement of & to & etc, for e.g. "Zoom & Pa_n" in 
impress
-#if GTK_CHECK_VERSION(4, 0, 0)
-{
-OUString aTempString;
-vcl::escapeStringXML(aText, aTempString);
-aText = aTempString;
-}
-#endif
 OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 );
 
 // Update item text only when necessary.

Re: How to install LibreOffice?

2021-10-10 Thread Ilmari Lauhakangas


On 10.10.2021 19.42, Ryhan Kabir wrote:
How can I install LibreOffice manually? I read the 'Readme' file but 
don't understand. Did you write this cow composition or something else!

Sorry for my word


For user support, use https://ask.libreoffice.org/

Don't forget to include crucial information like the operating system 
you use.


Ilmari

How to install LibreOffice?

2021-10-10 Thread Ryhan Kabir

How can I install LibreOffice manually? I read the 'Readme' file but don't
understand. Did you write this cow composition or something else!
Sorry for my word

[Libreoffice-commits] core.git: sal/osl

2021-10-10 Thread Arnaud Versini (via logerrit)

 sal/osl/all/debugbase.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 96726f4a7f2f23972c987e9a4be75539f24fb0b7
Author: Arnaud Versini 
AuthorDate: Sat Oct 9 20:45:49 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 19:46:36 2021 +0200

OSL : remove useless rtl::Static in debugbase

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

diff --git a/sal/osl/all/debugbase.cxx b/sal/osl/all/debugbase.cxx
index 209dc55e1e32..208fa3e92a92 100644
--- a/sal/osl/all/debugbase.cxx
+++ b/sal/osl/all/debugbase.cxx
@@ -56,8 +56,6 @@ bool isSubStr( char const* pStr, OString const& subStr )
 return rtl_str_indexOfStr( pStr, subStr.getStr() ) >= 0;
 }
 
-struct DebugBaseMutex : rtl::Static {};
-
 } // anon namespace
 
 extern "C" {
@@ -72,7 +70,8 @@ extern "C" {
 osl::Mutex & SAL_CALL osl_detail_ObjectRegistry_getMutex()
 SAL_THROW_EXTERN_C()
 {
-return DebugBaseMutex::get();
+static osl::Mutex aMutex;
+return aMutex;
 }
 #ifdef __clang__
 #pragma clang diagnostic pop

[Libreoffice-commits] core.git: 2 commits - basegfx/source desktop/source include/basegfx include/xmlscript svgio/source vcl/skia xmlscript/qa xmlscript/source

2021-10-10 Thread Noel Grandin (via logerrit)

 basegfx/source/polygon/b2dpolypolygoncutter.cxx   |4 
++--
 desktop/source/deployment/registry/configuration/dp_configuration.cxx |2 +-
 desktop/source/deployment/registry/dp_backenddb.cxx   |2 +-
 include/basegfx/polygon/b2dpolypolygoncutter.hxx  |2 +-
 include/xmlscript/xml_helper.hxx  |2 +-
 svgio/source/svgreader/svgclippathnode.cxx|2 +-
 svgio/source/svgreader/svgstyleattributes.cxx |4 
++--
 vcl/skia/gdiimpl.cxx  |4 
++--
 xmlscript/qa/cppunit/test.cxx |2 +-
 xmlscript/source/xml_helper/xml_byteseq.cxx   |   10 
+-
 xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx  |8 

 11 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit eea7af10d9ff1407c90abc233f6ea470fa832b1c
Author: Noel Grandin 
AuthorDate: Sun Oct 10 14:40:50 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 19:46:01 2021 +0200

loplugin:moveparam in basegfx

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

diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx 
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index f314fcb716cc..9d3cd7b450df 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -1067,9 +1067,9 @@ namespace basegfx::utils
 }
 }
 
-B2DPolyPolygon mergeToSinglePolyPolygon(const B2DPolyPolygonVector& 
rInput)
+B2DPolyPolygon mergeToSinglePolyPolygon(B2DPolyPolygonVector&& rInput)
 {
-B2DPolyPolygonVector aInput(rInput);
+B2DPolyPolygonVector aInput(std::move(rInput));
 
 // first step: prepareForPolygonOperation and simple merge of 
non-overlapping
 // PolyPolygons for speedup; this is possible for the wanted 
OR-operation
diff --git a/include/basegfx/polygon/b2dpolypolygoncutter.hxx 
b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
index a5f4ba6626af..864d84643281 100644
--- a/include/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/include/basegfx/polygon/b2dpolypolygoncutter.hxx
@@ -136,7 +136,7 @@ namespace basegfx::utils
 
 @return A single tools::PolyPolygon containing the Or-merged result
 */
-BASEGFX_DLLPUBLIC B2DPolyPolygon mergeToSinglePolyPolygon(const 
B2DPolyPolygonVector& rInput);
+BASEGFX_DLLPUBLIC B2DPolyPolygon 
mergeToSinglePolyPolygon(B2DPolyPolygonVector&& rInput);
 
 } // end of namespace basegfx::utils
 
diff --git a/svgio/source/svgreader/svgclippathnode.cxx 
b/svgio/source/svgreader/svgclippathnode.cxx
index 31ac632d33dc..7f4b4beae8ec 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -148,7 +148,7 @@ namespace svgio::svgreader
 if(nSize > 1)
 {
 // merge to single clipPolyPolygon
-aClipPolyPolygon = 
basegfx::utils::mergeToSinglePolyPolygon(rResult);
+aClipPolyPolygon = 
basegfx::utils::mergeToSinglePolyPolygon(std::vector(rResult));
 }
 else
 {
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 62133fbb11fb..8a61d2e9dfe6 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -303,7 +303,7 @@ namespace svgio::svgreader
 
 if(!aTextFillVector.empty())
 {
-aMergedArea = 
basegfx::utils::mergeToSinglePolyPolygon(aTextFillVector);
+aMergedArea = 
basegfx::utils::mergeToSinglePolyPolygon(std::move(aTextFillVector));
 }
 }
 
@@ -762,7 +762,7 @@ namespace svgio::svgreader
 {
 const basegfx::B2DPolyPolygon aMergedArea(
 basegfx::utils::mergeToSinglePolyPolygon(
-rLineFillVector));
+std::vector(rLineFillVector)));
 
 if(aMergedArea.count())
 {
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index c580471a9608..00bbbe6660c3 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1070,8 +1070,8 @@ void SkiaSalGraphicsImpl::checkPendingDrawing()
 {
 for (basegfx::B2DPolyPolygon& p : polygons)
 roundPolygonPoints(p);
-
performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons), 
transparency,
-   true);
+
performDrawPolyPolygon(basegfx::utils::

[Libreoffice-commits] core.git: 2 commits - cui/source editeng/inc editeng/source include/editeng include/svx sc/source sd/source svx/source sw/source

2021-10-10 Thread Noel Grandin (via logerrit)

 cui/source/tabpages/numfmt.cxx |2 +-
 editeng/inc/edtspell.hxx   |2 +-
 editeng/source/accessibility/AccessibleParaManager.cxx |4 ++--
 editeng/source/editeng/edtspell.cxx|4 ++--
 editeng/source/editeng/impedit4.cxx|2 +-
 include/editeng/AccessibleParaManager.hxx  |2 +-
 include/svx/AccessibleTextHelper.hxx   |2 +-
 include/svx/ClassificationDialog.hxx   |2 +-
 include/svx/numinf.hxx |2 +-
 include/svx/sdr/overlay/overlayselection.hxx   |2 +-
 include/svx/svdmrkv.hxx|2 +-
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx   |2 +-
 sd/source/ui/view/Outliner.cxx |4 ++--
 sd/source/ui/view/drviews2.cxx |2 +-
 svx/source/accessibility/AccessibleTextHelper.cxx  |   10 +-
 svx/source/dialog/ClassificationDialog.cxx |4 ++--
 svx/source/dialog/imapdlg.cxx  |6 ++
 svx/source/dialog/imapwnd.cxx  |2 +-
 svx/source/dialog/imapwnd.hxx  |2 +-
 svx/source/form/filtnav.cxx|2 +-
 svx/source/form/fmshell.cxx|2 +-
 svx/source/form/fmshimp.cxx|8 
 svx/source/form/navigatortree.cxx  |6 +++---
 svx/source/inc/filtnav.hxx |2 +-
 svx/source/inc/fmshimp.hxx |2 +-
 svx/source/items/numinf.cxx|4 ++--
 svx/source/sdr/overlay/overlayselection.cxx|4 ++--
 svx/source/svdraw/svdedxv.cxx  |2 +-
 svx/source/svdraw/svdmrkv.cxx  |4 ++--
 svx/source/svdraw/svdobj.cxx   |2 +-
 sw/source/core/crsr/viscrs.cxx |2 +-
 sw/source/uibase/app/docsh2.cxx|4 ++--
 32 files changed, 50 insertions(+), 52 deletions(-)

New commits:
commit fa311ad62f935d6469b77936d477125d98dbee60
Author: Noel Grandin 
AuthorDate: Sun Oct 10 14:13:55 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 19:45:34 2021 +0200

loplugin:moveparam in svx

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

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 21f60f29e598..3eab0a4e6219 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -713,7 +713,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* 
rCoreAttrs )
 if ( !aDelFormats.empty() )
 {
 
-pNumItem->SetDelFormats( aDelFormats );
+pNumItem->SetDelFormats( std::vector(aDelFormats) );
 
 if(bNumItemFlag)
 {
diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index b83068ba1c1e..d018662b5366 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -87,7 +87,7 @@ public:
 ~ClassificationDialog() override;
 
 std::vector getResult();
-void setupValues(std::vector const& rInput);
+void setupValues(std::vector&& rInput);
 };
 
 } // end svx namespace
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 2002638d794d..ef1219988e04 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -56,7 +56,7 @@ public:
 double  GetValueDouble() const  { return nDoubleVal; }
 
 const std::vector & GetDelFormats() const { return 
mvDelFormats; }
-voidSetDelFormats( std::vector const & );
+voidSetDelFormats( std::vector && );
 
 SvxNumberValueType  GetValueType() const { return eValueType; }
 
diff --git a/include/svx/sdr/overlay/overlayselection.hxx 
b/include/svx/sdr/overlay/overlayselection.hxx
index f2402500b8d5..d456ac6bf11b 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -67,7 +67,7 @@ namespace sdr::overlay
 virtual drawinglayer::primitive2d::Primitive2DContainer 
getOverlayObjectPrimitive2DSequence() const override;
 
 // data write access
-void setRanges(const std::vector< basegfx::B2DRange >& rNew);
+void setRanges(std::vector< basegfx::B2DRange >&& rNew);
 };
 } // end of namespace sdr::overlay
 
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 9b33b07c3a22..d4ece164bece 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -310,7 +310,7 @@ public:
 // Just objects are marked which are inclosed completely
 void Ma

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

2021-10-10 Thread Caolán McNamara (via logerrit)

 sc/source/filter/excel/xiescher.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3fc69457d6b43f88c7540b39564a914648e7f3f
Author: Caolán McNamara 
AuthorDate: Sun Oct 10 15:07:59 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 10 18:26:53 2021 +0200

ofz: Integer-overflow

seeing as GetHmmFromInch is already using limit_cast, use saturating_add 
here

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

diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 6677578801e4..0cf6fb125971 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1824,8 +1824,8 @@ void XclImpChartObj::FinalizeTabChart()
 tools::Long nHeight = XclTools::GetHmmFromTwips( aPaperSize.Height() );
 
 // subtract page margins, give some more extra space
-nWidth -= (XclTools::GetHmmFromInch( rPageData.mfLeftMargin + 
rPageData.mfRightMargin ) + 2000);
-nHeight -= (XclTools::GetHmmFromInch( rPageData.mfTopMargin + 
rPageData.mfBottomMargin ) + 1000);
+nWidth -= 
o3tl::saturating_add(XclTools::GetHmmFromInch(rPageData.mfLeftMargin + 
rPageData.mfRightMargin), static_cast(2000));
+nHeight -= 
o3tl::saturating_add(XclTools::GetHmmFromInch(rPageData.mfTopMargin + 
rPageData.mfBottomMargin), static_cast(1000));
 
 // print column/row headers?
 if( rPageData.mbPrintHeadings )

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

2021-10-10 Thread Noel Grandin (via logerrit)

 comphelper/source/misc/simplefileaccessinteraction.cxx |2 +-
 comphelper/source/misc/stillreadwriteinteraction.cxx   |2 +-
 include/comphelper/traceevent.hxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c954552a8255188779b9021cc9acaa13c5e3c679
Author: Noel Grandin 
AuthorDate: Sun Oct 10 16:52:52 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 18:25:02 2021 +0200

loplugin:moveparam in comphelper

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

diff --git a/comphelper/source/misc/simplefileaccessinteraction.cxx 
b/comphelper/source/misc/simplefileaccessinteraction.cxx
index 2840e3dad0e7..48c99598fac5 100644
--- a/comphelper/source/misc/simplefileaccessinteraction.cxx
+++ b/comphelper/source/misc/simplefileaccessinteraction.cxx
@@ -66,7 +66,7 @@ SimpleFileAccessInteraction::SimpleFileAccessInteraction(
 lInterceptions.push_back(aInterceptedRequest);
 
 setInterceptedHandler(xHandler);
-setInterceptions(lInterceptions);
+setInterceptions(std::move(lInterceptions));
 }
 
 SimpleFileAccessInteraction::~SimpleFileAccessInteraction() {}
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx 
b/comphelper/source/misc/stillreadwriteinteraction.cxx
index 0efec31b160b..d9333f389166 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -63,7 +63,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const 
css::uno::Reference<
 lInterceptions.push_back(aInterceptedRequest);
 
 setInterceptedHandler(xHandler);
-setInterceptions(lInterceptions);
+setInterceptions(std::move(lInterceptions));
 }
 
 void StillReadWriteInteraction::resetInterceptions()
diff --git a/include/comphelper/traceevent.hxx 
b/include/comphelper/traceevent.hxx
index 0bf4428b73ac..a111be0b9e63 100644
--- a/include/comphelper/traceevent.hxx
+++ b/include/comphelper/traceevent.hxx
@@ -91,7 +91,7 @@ protected:
 {
 }
 
-TraceEvent(std::map aArgs)
+TraceEvent(const std::map& aArgs)
 : TraceEvent(createArgsString(aArgs))
 {
 }

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

2021-10-10 Thread Noel Grandin (via logerrit)

 include/svl/sharecontrolfile.hxx   |2 +-
 svl/source/misc/sharecontrolfile.cxx   |9 +
 svl/source/passwordcontainer/passwordcontainer.cxx |2 +-
 svl/source/passwordcontainer/passwordcontainer.hxx |   10 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit d035f86de21f9508bc5ea0f35071873c0fd4c8c8
Author: Noel Grandin 
AuthorDate: Sun Oct 10 16:57:19 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 18:24:35 2021 +0200

loplugin:moveparam in svl

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

diff --git a/include/svl/sharecontrolfile.hxx b/include/svl/sharecontrolfile.hxx
index ddd29717a3d1..97c1c2e4729e 100644
--- a/include/svl/sharecontrolfile.hxx
+++ b/include/svl/sharecontrolfile.hxx
@@ -56,7 +56,7 @@ public:
 virtual ~ShareControlFile() override;
 
 std::vector< LockFileEntry > GetUsersData();
-void SetUsersDataAndStore( const std::vector< LockFileEntry >& aUserNames 
);
+void SetUsersDataAndStore( std::vector< LockFileEntry >&& aUserNames );
 LockFileEntry InsertOwnEntry();
 bool HasOwnEntry();
 void RemoveEntry( const LockFileEntry& aOptionalSpecification );
diff --git a/svl/source/misc/sharecontrolfile.cxx 
b/svl/source/misc/sharecontrolfile.cxx
index 0ddc3efddd25..a7bdf7af85f6 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -174,7 +174,7 @@ std::vector< o3tl::enumarray< LockFileComponent, OUString > 
> ShareControlFile::
 }
 
 
-void ShareControlFile::SetUsersDataAndStore( const std::vector< LockFileEntry 
>& aUsersData )
+void ShareControlFile::SetUsersDataAndStore( std::vector< LockFileEntry >&& 
aUsersData )
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -243,7 +243,7 @@ LockFileEntry ShareControlFile::InsertOwnEntry()
 if ( !bExists )
 aNewData.push_back( aNewEntry );
 
-SetUsersDataAndStore( aNewData );
+SetUsersDataAndStore( std::move(aNewData) );
 
 return aNewEntry;
 }
@@ -301,9 +301,10 @@ void ShareControlFile::RemoveEntry( const LockFileEntry& 
aEntry )
 }
 }
 
-SetUsersDataAndStore( aNewData );
+const bool bNewDataEmpty = aNewData.empty();
+SetUsersDataAndStore( std::move(aNewData) );
 
-if ( aNewData.empty() )
+if ( bNewDataEmpty )
 {
 // try to remove the file if it is empty
 RemoveFile();
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx 
b/svl/source/passwordcontainer/passwordcontainer.cxx
index 749f4c226a60..cbe36add1bb2 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -607,7 +607,7 @@ void PasswordContainer::PrivateAdd( const OUString& Url, 
const OUString& UserNam
 if( Mode == PERSISTENT_RECORD )
 aRecord.SetPersistentPasswords( EncodePasswords( aStorePass, 
GetMasterPassword( aHandler ) ) );
 else if( Mode == MEMORY_RECORD )
-aRecord.SetMemoryPasswords( aStorePass );
+aRecord.SetMemoryPasswords( std::move(aStorePass) );
 else
 {
 OSL_FAIL( "Unexpected persistence status!" );
diff --git a/svl/source/passwordcontainer/passwordcontainer.hxx 
b/svl/source/passwordcontainer/passwordcontainer.hxx
index 2687298ea23c..8bafeaa2d6fc 100644
--- a/svl/source/passwordcontainer/passwordcontainer.hxx
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
@@ -54,7 +54,7 @@ class NamePasswordRecord
 boolm_bHasPersistentPassword;
 OUStringm_aPersistentPassword;
 
-void InitArrays( bool bHasMemoryList, const ::std::vector< OUString >& 
aMemoryList,
+void InitArrays( bool bHasMemoryList, ::std::vector< OUString >&& 
aMemoryList,
  bool bHasPersistentList, const OUString& aPersistentList )
 {
 m_bHasMemoryPasswords = bHasMemoryList;
@@ -88,7 +88,7 @@ public:
 , m_bHasMemoryPasswords( false )
 , m_bHasPersistentPassword( false )
 {
-InitArrays( aRecord.m_bHasMemoryPasswords, aRecord.m_aMemoryPasswords, 
aRecord.m_bHasPersistentPassword, aRecord.m_aPersistentPassword );
+InitArrays( aRecord.m_bHasMemoryPasswords, 
std::vector(aRecord.m_aMemoryPasswords), aRecord.m_bHasPersistentPassword, 
aRecord.m_aPersistentPassword );
 }
 
 NamePasswordRecord& operator=( const NamePasswordRecord& aRecord )
@@ -99,7 +99,7 @@ public:
 
 m_aMemoryPasswords.clear();
 m_aPersistentPassword.clear();
-InitArrays( aRecord.m_bHasMemoryPasswords, 
aRecord.m_aMemoryPasswords, aRecord.m_bHasPersistentPassword, 
aRecord.m_aPersistentPassword );
+InitArrays( aRecord.m_bHasMemoryPasswords, 
std::vector(aRecord.m_aMemoryPasswords), aRecord.m_bHasPersistentPassword, 
aRecord.m_aPersistentPassword );
 }
 return *this;

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

2021-10-10 Thread Noel Grandin (via logerrit)

 include/ucbhelper/interceptedinteraction.hxx   |2 +-
 ucbhelper/source/client/interceptedinteraction.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0ff2a432f776d878fc17af5442f14844a9970bf7
Author: Noel Grandin 
AuthorDate: Sun Oct 10 16:54:30 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 18:23:20 2021 +0200

loplugin:moveparam in ucbhelper

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

diff --git a/include/ucbhelper/interceptedinteraction.hxx 
b/include/ucbhelper/interceptedinteraction.hxx
index 85699c1d534b..b94f51cf9bb2 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -160,7 +160,7 @@ class UCBHELPER_DLLPUBLIC InterceptedInteraction : public 
InterceptedInteraction
 @param  lInterceptions
 the list of intercepted requests.
  */
-void setInterceptions(const ::std::vector< InterceptedRequest >& 
lInterceptions);
+void setInterceptions(::std::vector< InterceptedRequest >&& 
lInterceptions);
 
 
 /** @short  extract a requested continuation from the list of 
available ones.
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx 
b/ucbhelper/source/client/interceptedinteraction.cxx
index 682732958aee..96b3fd32cb41 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -32,9 +32,9 @@ void InterceptedInteraction::setInterceptedHandler(const 
css::uno::Reference< cs
 m_xInterceptedHandler = xInterceptedHandler;
 }
 
-void InterceptedInteraction::setInterceptions(const ::std::vector< 
InterceptedRequest >& lInterceptions)
+void InterceptedInteraction::setInterceptions(::std::vector< 
InterceptedRequest >&& lInterceptions)
 {
-m_lInterceptions = lInterceptions;
+m_lInterceptions = std::move(lInterceptions);
 }
 
 InterceptedInteraction::EInterceptionState InterceptedInteraction::intercepted(

Kangmin Han license statement

2021-10-10 Thread 한강민

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

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

2021-10-10 Thread Caolán McNamara (via logerrit)

 sw/source/core/text/itradj.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4dc362917597f0e3b890ef7d8d190749b20abce4
Author: Caolán McNamara 
AuthorDate: Sat Oct 9 19:32:39 2021 +0100
Commit: Caolán McNamara 
CommitDate: Sun Oct 10 15:50:38 2021 +0200

cid#1492337 Unintended sign extension

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

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 8c96cf56222d..35f88bb46326 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -509,7 +509,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent 
)
 {
 if ( pPos->InTextGrp() )
 {
-const sal_uInt16 nMinWidth = pPos->Width();
+const SwTwips nMinWidth = pPos->Width();
 
 // get maximum portion width from info structure, calculated
 // during text formatting
@@ -524,7 +524,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent 
)
 }
 else if( pPos->InGlueGrp() && pPos->InFixMargGrp() )
 {
-pPos->Width( o3tl::narrowing(pPos->Width() - 
nDecompress) );
+pPos->Width(pPos->Width() - nDecompress);
 
 if ( pPos->InTabGrp() )
 // set fix width to width

[Libreoffice-commits] core.git: sal/osl

2021-10-10 Thread Arnaud Versini (via logerrit)

 sal/osl/unx/backtraceapi.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 82bc337c979f6d74cb08d0332b44f26b155f9554
Author: Arnaud Versini 
AuthorDate: Sat Oct 9 20:51:27 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Oct 10 14:43:21 2021 +0200

OSL : use std::mutex in backtraceapi

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

diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index 79fa3adf7296..e98d8d663f39 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -68,7 +69,7 @@ struct FrameData
 };
 
 typedef o3tl::lru_map FrameCache;
-osl::Mutex frameCacheMutex;
+std::mutex frameCacheMutex;
 FrameCache frameCache( 256 );
 
 void process_file_addr2line( const char* file, std::vector& 
frameData )
@@ -164,7 +165,7 @@ void process_file_addr2line( const char* file, 
std::vector& frameData
 frame.info = function + " in " + file;
 else
 frame.info = function + " at " + source;
-osl::MutexGuard guard(frameCacheMutex);
+std::lock_guard guard(frameCacheMutex);
 frameCache.insert( { frame.addr, frame.info } );
 }
 }
@@ -183,9 +184,9 @@ OUString sal::backtrace_to_string(BacktraceState* 
backtraceState)
 {
 Dl_info dli;
 void* addr = backtraceState->buffer[i];
-osl::ClearableMutexGuard guard(frameCacheMutex);
+std::unique_lock guard(frameCacheMutex);
 auto it = frameCache.find(addr);
-guard.clear();
+guard.release();
 if( it != frameCache.end())
 {
 frameData[ i ].info = it->second;

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

2021-10-10 Thread Julien Nabet (via logerrit)

 sc/source/filter/html/htmlpars.cxx  |2 +-
 sd/source/filter/html/htmlex.cxx|2 +-
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 +-
 sw/source/core/text/frmcrsr.cxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cf22245d49df8abab904f28b1fab514bde197f2b
Author: Julien Nabet 
AuthorDate: Sun Oct 10 11:50:23 2021 +0200
Commit: Julien Nabet 
CommitDate: Sun Oct 10 13:28:02 2021 +0200

Typo: brake(s)->break(s) (I let the right use of "brake" of course)

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

diff --git a/sc/source/filter/html/htmlpars.cxx 
b/sc/source/filter/html/htmlpars.cxx
index 85cdff23a885..b6945b7dc639 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1476,7 +1476,7 @@ void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo 
)
 {
 if ( bInTitle && !aString.isEmpty() )
 {
-// Remove blanks from line brakes
+// Remove blanks from line breaks
 aString = aString.trim();
 uno::Reference xDPS(
 mpDoc->GetDocumentShell()->GetModel(),
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index dee808cc1823..2bd1d11c5e53 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -647,7 +647,7 @@ void HtmlExport::ExportSingleDocument()
 OUString sTitleText(CreateTextForTitle(pOutliner, pPage, 
pPage->GetPageBackgroundColor()));
 OUString sStyle;
 
-if (nSdPage != 0) // First page - no need for a page brake here
+if (nSdPage != 0) // First page - no need for a page break here
 sStyle += "page-break-before:always; ";
 sStyle += getParagraphStyle(pOutliner, 0);
 
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 36c7f33d1c17..f42131cc8d14 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -2163,7 +2163,7 @@ bool DocumentContentOperationsManager::DelFullPara( 
SwPaM& rPam )
 }
 }
 
-// Move hard page brakes to the following Node.
+// Move hard page breaks to the following Node.
 bool bSavePageBreak = false, bSavePageDesc = false;
 
 /* #i9185# This would lead to a segmentation fault if not caught above. */
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7a3dd914e28c..f9319a54770b 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -1319,7 +1319,7 @@ void SwTextFrame::FillCursorPos( SwFillData& rFill ) const
 nNextCol = 0;
 }
 else
-++nNextCol; // Empty columns require column brakes
+++nNextCol; // Empty columns require column breaks
 }
 if( pTmp != GetUpper()->GetUpper() ) // Did we end up in another 
column?
 {

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

2021-10-10 Thread Noel Grandin (via logerrit)

 chart2/source/controller/main/DrawCommandDispatch.cxx   |7 --
 chart2/source/controller/main/ShapeController.cxx   |6 -
 sw/inc/fesh.hxx |2 
 sw/source/core/access/accpara.cxx   |   26 +++
 sw/source/core/attr/format.cxx  |2 
 sw/source/core/crsr/crstrvl.cxx |9 --
 sw/source/core/crsr/findattr.cxx|3 
 sw/source/core/crsr/viscrs.cxx  |5 -
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   43 +---
 sw/source/core/doc/DocumentDeviceManager.cxx|   12 +--
 sw/source/core/doc/DocumentFieldsManager.cxx|3 
 sw/source/core/doc/DocumentRedlineManager.cxx   |7 --
 sw/source/core/doc/docfly.cxx   |4 -
 sw/source/core/doc/docfmt.cxx   |   19 ++---
 sw/source/core/doc/docnew.cxx   |2 
 sw/source/core/doc/docsort.cxx  |7 --
 sw/source/core/doc/tblcpy.cxx   |3 
 sw/source/core/doc/tblrwcl.cxx  |3 
 sw/source/core/docnode/ndtbl.cxx|   22 +++---
 sw/source/core/docnode/node.cxx |8 +-
 sw/source/core/draw/dcontact.cxx|   14 +---
 sw/source/core/draw/dflyobj.cxx |2 
 sw/source/core/edit/acorrect.cxx|4 -
 sw/source/core/edit/autofmt.cxx |   11 +--
 sw/source/core/edit/edfmt.cxx   |3 
 sw/source/core/fields/cellfml.cxx   |3 
 sw/source/core/frmedt/fecopy.cxx|5 -
 sw/source/core/frmedt/fefly1.cxx|4 -
 sw/source/core/frmedt/feshview.cxx  |   12 +--
 sw/source/core/layout/anchoreddrawobject.cxx|2 
 sw/source/core/layout/fly.cxx   |3 
 sw/source/core/text/redlnitr.cxx|2 
 sw/source/core/text/txtfld.cxx  |2 
 sw/source/core/text/txtfrm.cxx  |9 +-
 sw/source/core/txtnode/ndtxt.cxx|   30 +++-
 sw/source/core/txtnode/thints.cxx   |5 -
 sw/source/core/undo/untbl.cxx   |   37 +++---
 sw/source/core/unocore/SwXTextDefaults.cxx  |2 
 sw/source/core/unocore/unodraw.cxx  |6 -
 sw/source/core/unocore/unoframe.cxx |   32 -
 sw/source/core/unocore/unoobj.cxx   |   18 ++---
 sw/source/core/unocore/unoport.cxx  |6 -
 sw/source/core/unocore/unosect.cxx  |7 --
 sw/source/core/unocore/unostyle.cxx |   11 +--
 sw/source/core/unocore/unotbl.cxx   |   49 ++
 sw/source/filter/basflt/fltshell.cxx|2 
 sw/source/filter/html/css1atr.cxx   |   26 +++
 sw/source/filter/html/htmlatr.cxx   |3 
 sw/source/filter/html/htmlctxt.cxx  |7 --
 sw/source/filter/html/htmldrawreader.cxx|9 +-
 sw/source/filter/html/htmlfldw.cxx  |   10 +-
 sw/source/filter/html/htmlflywriter.cxx |3 
 sw/source/filter/html/htmlforw.cxx  |3 
 sw/source/filter/html/htmlgrin.cxx  |3 
 sw/source/filter/html/htmlplug.cxx  |6 -
 sw/source/filter/html/htmlsect.cxx  |9 --
 sw/source/filter/html/htmltab.cxx   |   17 ++--
 sw/source/filter/html/swhtml.cxx|5 -
 sw/source/filter/ww8/wrtw8nds.cxx   |7 --
 sw/source/filter/ww8/wrtw8num.cxx   |3 
 sw/source/filter/ww8/wrtw8sty.cxx   |2 
 sw/source/filter/ww8/wrtww8.cxx |2 
 sw/source/filter/ww8/ww8atr.cxx |8 --
 sw/source/filter/ww8/ww8graf.cxx|   12 +--
 sw/source/filter/ww8/ww8graf2.cxx   |6 -
 sw/source/filter/ww8/ww8par.cxx |6 -
 sw/source/filter/ww8/ww8par2.cxx|5 -
 sw/source/filter/ww8/ww8par2.hxx|4 -
 sw/source/filter/ww8/ww8par3.cxx|5 -
 sw/source/filter/ww8/ww8par5.cxx|5 -
 sw/source/filter/ww8/ww8par6.cxx|   10 +-
 sw/source/filter/xml/xmltexti.cxx   |   15 +---
 sw/source/ui/chrdlg/pardlg.cxx  |6 -
 sw/source/ui/config/optpage.cxx |6 -
 sw/source/ui/dbui/dbinsdlg.cxx

getProgrammaticFuntionName typo in offapi/com/sun/star/sheet/XAddIn.idl

2021-10-10 Thread Julien Nabet


Hello,

I noticed a typo in function name "getProgrammaticFuntionName" instead 
of "getProgrammaticFunctionName".


(see 
https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/sheet/XAddIn.idl?r=2b383d19#51).


Usually I would have supposed we're stuck since it's in a public 
interface but the current implementations just return an empty OUString 
(unless I missed something) so wonder if it's really used.


Julien

PS : "Errare humanum est" but just wonder why these function names 
aren't double/triple-checked by at least 2 people before being published...

Re: [SOLVED sort of ]

2021-10-10 Thread Uwe Brauer

>>> "RE" == Rene Engelhard  writes:

> Hi,
>> I hoped that

>> sudo add-apt-repository ppa:gnome3-team/gnome3-staging
>> sudo add-apt-repository ppa:gnome3-team/gnome3

> Maybe you just shouldn't use a ~ 7.5 years old release?
Yeah I know, I have my reasons believe me, but I have to resolve this issue.

> Even the various "current" LTSes contain 3.22:

I finally managed to install 3.20.8 which is sufficient


smime.p7s
Description: S/MIME cryptographic signature

Re: [SOLVED sort of ] (was: LO does not run on Ubuntu 16.04)

2021-10-10 Thread Rene Engelhard

Hi,


> I hoped that

> sudo add-apt-repository ppa:gnome3-team/gnome3-staging
> sudo add-apt-repository ppa:gnome3-team/gnome3

Maybe you just shouldn't use a ~ 7.5 years old release?

Even the various "current" LTSes contain 3.22:

https://packages.ubuntu.com/search?keywords=libgtk-3-0


Regards,


Rene

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-2' - 7 commits - download.lst external/nss

2021-10-10 Thread Michael Stahl (via logerrit)

 download.lst|4 -
 external/nss/ExternalProject_nss.mk |   16 +++---
 external/nss/UnpackedTarball_nss.mk |   37 +++--
 external/nss/clang-cl.patch.0   |2 
 external/nss/macos-dlopen.patch.0   |   25 +
 external/nss/nsinstall.py   |7 ++
 external/nss/nss-3.13.5-zlib-werror.patch   |7 +-
 external/nss/nss-android.patch.1|   53 +---
 external/nss/nss-bz1646594.patch.1  |   16 ++
 external/nss/nss-win32-make.patch.1 |2 
 external/nss/nss.aix.patch  |2 
 external/nss/nss.bzmozilla1238154.patch |   12 
 external/nss/nss.fix-freebl-add-lcc-support.patch.1 |   11 
 external/nss/nss.patch  |   15 +++--
 external/nss/nss.vs2015.pdb.patch   |4 -
 external/nss/nss.windows.patch  |4 -
 16 files changed, 155 insertions(+), 62 deletions(-)

New commits:
commit 145e7ab456868ca52c84f7c774ebf6d56e65bf7c
Author: Michael Stahl 
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Andras Timar 
CommitDate: Sun Oct 10 09:14:43 2021 +0200

nss: upgrade to release 3.55.0

Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)

* external/nss/nss.nspr-parallel-win-debug_build.patch:
  remove, merged upstream

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli 
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara 
(cherry picked from commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f)

Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100864
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100903
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 7602108d03d3..3840aa7ffdca 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 92902b2da6bf..8fa1edd530cc 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -21,7 +21,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/clang-cl.patch.0 \
 external/nss/nss.vs2015.patch \
 external/nss/nss.vs2015.pdb.patch \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
+external/nss/nss.bzmozilla1238154.patch \
+   external/nss/nss-bz1646594.patch.1 \
+external/nss/macos-dlopen.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
new file mode 100644
index ..1889b8df7cd3
--- /dev/null
+++ b/external/nss/macos-dlopen.patch.0
@@ -0,0 +1,25 @@
+--- nspr/pr/src/linking/prlink.c
 nspr/pr/src/linking/prlink.c
+@@ -799,7 +799,7 @@
+  * The reason is that DARWIN's dlopen ignores the provided path
+  * and checks for the plain filename in DYLD_LIBRARY_PATH,
+  * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0) {
+   /* no slash, allow to load from any location */
+   okToLoad = PR_TRUE;
+ } else {
+--- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+@@ -224,7 +224,11

[SOLVED sort of ] (was: LO does not run on Ubuntu 16.04)

2021-10-10 Thread Uwe Brauer

>>> "CM" == Caolán McNamara  writes:

   > On Sat, 2021-10-09 at 18:25 +0200, Uwe Brauer wrote:
   >> /opt/libreoffice7.2/program/soffice.bin: symbol lookup error:
   >> /opt/libreoffice7.2/program/libvclplug_gtk3lo.so: undefined symbol:
   >> gtk_widget_path_iter_set_object_name

   > You need gtk3 >= 3.20.0


I hoped that 
sudo add-apt-repository ppa:gnome3-team/gnome3-staging
sudo add-apt-repository ppa:gnome3-team/gnome3

Would resolve it, it seems not to be the case, however:

For tcsh 

setenv SAL_USE_VCLPLUGIN gen

For bash
export SAL_USE_VCLPLUG=gen

«Solved»  the issue.

BTW, LO 7.2 seems to start much faster than LO 6.2

The converter to docx concerning images still does not work flawlessly. 
Shall I open an issue, or is this well known


smime.p7s
Description: S/MIME cryptographic signature

43 matches

Mail list logo