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

[Libreoffice Gerrit user]

 ucb/source/ucp/gio/gio_content.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit ca0308797df86ebece19260f3ca438a0cb437208
Author: Stephan Bergmann 
AuthorDate: Tue Nov 13 08:13:00 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 13 08:13:00 2018 +0100

tdf#121337: Fail on GIO error in GIO UCP getPropertyValue

Change-Id: I10ffe50be56ed99539f59f043a710863652d2394

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index bc840e699fe5..a581c34adb2a 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -544,7 +544,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 const uno::Sequence< beans::Property >& rProperties,
 const uno::Reference< ucb::XCommandEnvironment >& xEnv )
 {
-GFileInfo *pInfo = getGFileInfo(xEnv);
+GError * err = nullptr;
+GFileInfo *pInfo = getGFileInfo(xEnv, &err);
+if (pInfo == nullptr && !mbTransient) {
+ucbhelper::cancelCommandExecution(mapGIOError(err), xEnv);
+}
+assert(err == nullptr);
 return getPropertyValuesFromGFileInfo(pInfo, m_xContext, xEnv, 
rProperties);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/dialogs/SignSignatureLineDialog.cxx |4 ++--
 xmlsecurity/source/gpg/CertificateImpl.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b7d0b49f5708b55e24aabb719e26ce5ec8628161
Author: Samuel Mehrbrodt 
AuthorDate: Mon Nov 12 08:30:46 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Nov 13 08:03:32 2018 +0100

Related tdf#118581 Use subject name, not issuer name for signature line

And map the gpg user also the the subject name

Change-Id: I1db7b93b6bfc82304924d6ef90db18ff4f97e13c
Reviewed-on: https://gerrit.libreoffice.org/63278
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx 
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index a3230eedcfb2..d35c5db3f98b 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -141,7 +141,7 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, 
weld::Button&, void)
 {
 m_xSelectedCertifate = xSignCertificate;
 m_xBtnChooseCertificate->set_label(
-xmlsec::GetContentPart(xSignCertificate->getIssuerName()));
+xmlsec::GetContentPart(xSignCertificate->getSubjectName()));
 }
 ValidateFields();
 }
@@ -180,7 +180,7 @@ SignSignatureLineDialog::getSignedGraphic(bool bValid)
 aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", 
getCDataString(m_xEditName->get_text()));
 OUString aIssuerLine
 = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
-  .replaceFirst("%1", 
xmlsec::GetContentPart(m_xSelectedCertifate->getIssuerName()));
+  .replaceFirst("%1", 
xmlsec::GetContentPart(m_xSelectedCertifate->getSubjectName()));
 aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", 
getCDataString(aIssuerLine));
 if (bValid)
 aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
diff --git a/xmlsecurity/source/gpg/CertificateImpl.cxx 
b/xmlsecurity/source/gpg/CertificateImpl.cxx
index 4a2934a9779c..72fed74b949e 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.cxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.cxx
@@ -61,8 +61,8 @@ OUString SAL_CALL CertificateImpl::getIssuerName()
 
 OUString SAL_CALL CertificateImpl::getSubjectName()
 {
-// Empty for gpg
-return OUString();
+// Samue as issuer name (user ID)
+return getIssuerName();
 }
 
 namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/graphicfilter/itiff/itiff.cxx |   11 +++
 filter/source/msfilter/escherex.cxx |   11 +--
 2 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 4bf2b13647030d4e5a44d6a23d5570aeea70c333
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 21:22:03 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 13 07:27:08 2018 +0100

Clamp equation values when exporting to binary MS format

CppunitTest_sw_ooxmlexport failed under
-fsanitize=implicit-signed-integer-truncation when writing 10 (from the
triangle equation in 
oox/source/drawingml/customshapes/oox-drawingml-cs-presets)
as a 16-bit value (see below), and as discussed at FreeNode 
#libreoffice-dev:

Nov 12 09:12:32  sberg: ah, that's custom shape equation, read from
 ooxml but then written to ms binary format; i'm not sure if there is a 
better
 option there other than just clamping the value.
Nov 12 09:14:33  sberg: i would expect that information is 1) used 
in
 general when writing drawingml+vml markup for a shape (where the vml 
fallback
 is not read by LO nor by MSO) and 2) i don't expect that our poor vml 
export
 actually reads those equations. so the vml export builds on top of the 
binary
 export, but at the end probably that information (equations) is not read by
 anyone

(At least for CppunitTest_sw_ooxmlexport, equation.nPara[1] never needed 
such
clamping, just nPara[0] and nPara[2].)

> filter/source/msfilter/escherex.cxx:2929:50: runtime error: implicit 
conversion from type 'sal_Int32' (aka 'int') of value 10 (32-bit, signed) 
to type 'sal_Int16' (aka 'short') changed the value to -31072 (16-bit, signed)
>  #0 in EscherPropertyContainer::CreateCustomShapeProperties(MSO_SPT, 
com::sun::star::uno::Reference const&) at 
filter/source/msfilter/escherex.cxx:2929:50 (instdir/program/libmsfilterlo.so 
+0x54f1e6)
>  #1 in ImplEESdrWriter::ImplWriteShape(ImplEESdrObject&, 
EscherSolverContainer&, bool) at filter/source/msfilter/eschesdo.cxx:283:26 
(instdir/program/libmsfilterlo.so +0x67a775)
>  #2 in ImplEESdrWriter::ImplWriteTheShape(ImplEESdrObject&, bool) at 
filter/source/msfilter/eschesdo.cxx:932:12 (instdir/program/libmsfilterlo.so 
+0x69059d)
>  #3 in EscherEx::AddSdrObject(SdrObject const&, bool) at 
filter/source/msfilter/eschesdo.cxx:951:35 (instdir/program/libmsfilterlo.so 
+0x691064)
>  #4 in oox::vml::VMLExport::AddSdrObject(SdrObject const&, short, short, 
short, short, bool) at oox/source/export/vmlexport.cxx:1425:15 
(instdir/program/libooxlo.so +0x2ab3157)
>  #5 in DocxSdrExport::writeVMLDrawing(SdrObject const*, SwFrameFormat 
const&) at sw/source/filter/ww8/docxsdrexport.cxx:772:38 
(instdir/program/libmswordlo.so +0x168bfb2)
>  #6 in DocxSdrExport::writeDMLAndVMLDrawing(SdrObject const*, 
SwFrameFormat const&, int) at sw/source/filter/ww8/docxsdrexport.cxx:975:9 
(instdir/program/libmswordlo.so +0x16938f5)
>  #7 in DocxAttributeOutput::OutputFlyFrame_Impl(ww8::Frame const&, Point 
const&) at sw/source/filter/ww8/docxattributeoutput.cxx:5357:57 
(instdir/program/libmswordlo.so +0x1371a67)
>  #8 in AttributeOutputBase::OutputFlyFrame(ww8::Frame const&) at 
sw/source/filter/ww8/wrtw8nds.cxx:3173:5 (instdir/program/libmswordlo.so 
+0x1befe5a)
>  #9 in SwWW8AttrIter::OutFlys(int) at 
sw/source/filter/ww8/wrtw8nds.cxx:667:41 (instdir/program/libmswordlo.so 
+0x1beeb70)
>  #10 in MSWordExportBase::OutputTextNode(SwTextNode&) at 
sw/source/filter/ww8/wrtw8nds.cxx:2275:42 (instdir/program/libmswordlo.so 
+0x1c32e4d)
>  #11 in MSWordExportBase::OutputContentNode(SwContentNode&) at 
sw/source/filter/ww8/wrtw8nds.cxx:3237:13 (instdir/program/libmswordlo.so 
+0x1c5c7e4)
>  #12 in MSWordExportBase::WriteText() at 
sw/source/filter/ww8/wrtww8.cxx:2725:13 (instdir/program/libmswordlo.so 
+0x1efcdc2)
>  #13 in DocxExport::WriteMainText() at 
sw/source/filter/ww8/docxexport.cxx:1453:5 (instdir/program/libmswordlo.so 
+0x1607d1f)
>  #14 in DocxExport::ExportDocument_Impl() at 
sw/source/filter/ww8/docxexport.cxx:514:5 (instdir/program/libmswordlo.so 
+0x1604baf)
>  #15 in MSWordExportBase::ExportDocument(bool) at 
sw/source/filter/ww8/wrtww8.cxx:3206:19 (instdir/program/libmswordlo.so 
+0x1f3f022)
>  #16 in DocxExportFilter::exportDocument() at 
sw/source/filter/ww8/docxexportfilter.cxx:86:17 (instdir/program/libmswordlo.so 
+0x166b5e3)
>  #17 in 
oox::core::FilterBase::filter(com::sun::star::uno::Sequence
 const&) at oox/source/core/filterbase.cxx:489:55 (instdir/program/libooxlo.so 
+0x1bc3880)
>  #18 in 
WriterFilter::filter(com::sun::star::uno::Sequence
 const&) at writerfilter/source/filter/WriterFilter.cxx:144:23 
(instdir/program/libwriterfilterlo.so +0x1a250bf)
>  #19 in SfxObjectShell::ExportTo(SfxMedium&) at 
sfx2/source/doc/objstor.cxx:2441:25 (instdir/program/libsfxlo.so +0x38d1352)
>  #20 in SfxObject

[Libreoffice-commits] core.git: qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa

[Libreoffice Gerrit user]

 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv |2 
 qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java|  277 
--
 sc/qa/unoapi/sc_4.sce   |1 
 4 files changed, 281 deletions(-)

New commits:
commit d30d050c2febe7043d0f70f954ee06e28c4115d9
Author: Jens Carl 
AuthorDate: Mon Nov 12 20:26:07 2018 +
Commit: Jens Carl 
CommitDate: Tue Nov 13 06:54:17 2018 +0100

tdf#45904 Remove obsolete _XNamed tests

The _XNamed tests are already written in C++ since commit
1b973485e63717e875347f0ad33c8137f4bc05c7 for ScDataPilotTableObj.

Change-Id: I877b548678d40916b406ddffdd4f209bfe4c4a8e
Reviewed-on: https://gerrit.libreoffice.org/63314
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 3991a157096f..bd528d0cc5f1 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -982,7 +982,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScDataPilotFieldsObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
-qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj \
 qadevOOo/tests/java/mod/_sc/ScDataPilotTablesObj \
 qadevOOo/tests/java/mod/_sc/ScDDELinkObj \
 qadevOOo/tests/java/mod/_sc/ScDDELinksObj \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv
deleted file mode 100644
index b946708afac7..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScDataPilotTableObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScDataPilotTableObj";"com::sun::star::container::XNamed";"getName()"
-"ScDataPilotTableObj";"com::sun::star::container::XNamed";"setName()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java 
b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
deleted file mode 100644
index ea8273180868..
--- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.TableFilterField;
-import com.sun.star.sheet.XDataPilotDescriptor;
-import com.sun.star.sheet.XDataPilotTables;
-import com.sun.star.sheet.XDataPilotTablesSupplier;
-import com.sun.star.sheet.XSheetFilterDescriptor;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.CellAddress;
-import com.sun.star.table.CellRangeAddress;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Exception;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* com.sun.star.sheet.DataPilotTable. 
-* Object implements the following interfaces :
-* 
-*   com::sun::star::container::XNamed
-*   com::sun::star::sheet::XDataPilotTable
-*   com::sun::star::sheet::XDataPilotDescriptor
-* 
-* @see com.sun.star.sheet.DataPilotTable
-* @see com.sun.star.container.XNamed
-* @see com.sun.star.sheet.XDataPilotTable
-* @see com.sun.star.sheet.XDataPilotDescriptor
-* @see ifc.container._XNamed
-* @see ifc.sheet._XDataPilotTable
-* @see ifc.sheet._XDataPilotDescriptor
-*/
-public class ScDataPilotTableObj extends TestCase {
-private XSpreadsheetDocument xSheetDoc = null;
-
-/**
-* Creates Spreadsheet document.
-*/
-@Override
-protected void initialize( TestParameters tParam, PrintWriter log ) throws 
Exception {
-SOfficeFactory SOF = SOfficeFactory.getFactory( tParam.getMSF() );
-log.println( "creating a Spreadsheet document" );
-xSheetDoc = SOF.creat

Re: Please update XML Security Library to 1.2.27 for LibreOffice 6.2/6.1.4/5.5 from Windows/Linux.

[Kaganski Mike]

Hi,

On 12.11.2018 19:50, maxbook2020 maxbook2020 wrote:
> Please update XML Security Library for LibreOffice version 6.2/6.1.4/5.5 
> from Windows/Linux.
> 
> Current xmlsec 1.2.23 to new xmlsec 1.2.27.
> 
> Because now is old
> 
> https://wiki.documentfoundation.org/ReleaseNotes/5.3
> 
> 
>   Document signing
> 
>   * The bundled libxmlsec library has been upgraded to 1.2.23, including
> our "OOXML Relationships Transform Algorithm" implementation
> upstream. blog entry
>  (Miklos Vajna,
> Collabora)

... 
https://git.libreoffice.org/core/+/ad319fdfcaaa6092ea1ff76935e088c5122e0d2e 
(May 10 2017) "Upgrade libxmlsec to 1.2.24"

... 
https://git.libreoffice.org/core/+/321c2d4426bf9f856e780c3ad089286d92265047 
(Sep 20 2017) "Upgrade libxmlsec to 1.2.25"

... 
https://git.libreoffice.org/core/+/71198fe7d9539859883b6226738fbea52a08a5c4 
(Jun 20 2018) "xmlsec: update to 1.2.26"

... 
https://git.libreoffice.org/core/+/9630a2dfc79b08e3417e6e69b083f5124614499c 
(Oct 30 2018) "external: upgrade libxmlsec to 1.2.27"

:-) Please don't worry about xmlsec - it's secure in LibreOffice

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[Libreoffice Gerrit user]

 icon-themes/elementary/chart2/res/donut3d_52x60.png   |binary
 icon-themes/elementary/chart2/res/donut3dexploded_52x60.png   |binary
 icon-themes/elementary/chart2/res/pie3d_52x60.png |binary
 icon-themes/elementary/chart2/res/pie3dexploded_52x60.png |binary
 icon-themes/elementary/cmd/32/grid.png|binary
 icon-themes/elementary/cmd/32/inscellsctrl.png|binary
 icon-themes/elementary/cmd/32/insertctrl.png  |binary
 icon-themes/elementary/cmd/lc_grid.png|binary
 icon-themes/elementary/cmd/lc_inscellsctrl.png|binary
 icon-themes/elementary/cmd/lc_insertctrl.png  |binary
 icon-themes/elementary/cmd/sc_grid.png|binary
 icon-themes/elementary/cmd/sc_inscellsctrl.png|binary
 icon-themes/elementary/cmd/sc_insertctrl.png  |binary
 icon-themes/elementary/cmd/sc_viewformasgrid.png  |binary
 icon-themes/elementary/links.txt  |   14 
 icon-themes/elementary/sw/res/nc20001.png |binary
 icon-themes/elementary_svg/chart2/res/areas3d_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/areas_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/areasfull3d_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/areasfull_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/areaspiled3d_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/areaspiled_52x60.svg|2 
 icon-themes/elementary_svg/chart2/res/bar3ddeep_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/barpercent3d_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/barstack3d_52x60.svg|2 
 icon-themes/elementary_svg/chart2/res/columnpercent3d_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/columns3d_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/columns3ddeep_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/columns_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/columnstack3d_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/cone_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/conedeep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/conehorideep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/conehoripercent_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/conepercent_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/conestack_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/cylinder_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/cylinderdeep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/cylinderhori_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/cylinderhorideep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/cylinderpercent_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/cylinderstack_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/dataeditor_icon09.svg   |  174 
--
 icon-themes/elementary_svg/chart2/res/donut3d_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/donut3dexploded_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/netlinepoint_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/netlinepointstack_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/nostackdirectpoints_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/pie3d_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/pie3dexploded_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/pyramind_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/pyraminddeep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/pyramindhorideep_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/pyramindhoripercent_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/pyramindpercent_52x60.svg   |2 
 icon-themes/elementary_svg/chart2/res/pyramindstack_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/stackdirectpoints_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/stockblock_52x60.svg|2 
 icon-themes/elementary_svg/chart2/res/stockcolumns_52x60.svg  |2 
 icon-themes/elementary_svg/chart2/res/stockcolumnsattach_52x60.svg|2 
 icon-themes/elementary_svg/chart2/res/valueaxisdirect3d_52x60.svg |2 
 icon-themes/elementary_svg/chart2/res/valueaxisdirectpoints_52x60.svg |2 
 icon-themes/elementary_svg/cmd/32/grid.svg|1 
 icon-themes/el

Please update XML Security Library to 1.2.27 for LibreOffice 6.2/6.1.4/5.5 from Windows/Linux.

[maxbook2020 maxbook2020]

Hello!


Please update XML Security Library for LibreOffice version 6.2/6.1.4/5.5 from 
Windows/Linux.

Current xmlsec 1.2.23 to new xmlsec 1.2.27.

Because now is old

https://wiki.documentfoundation.org/ReleaseNotes/5.3  
Document signing
*  The bundled libxmlsec library has been upgraded to 1.2.23, including our 
"OOXML Relationships Transform Algorithm" implementation upstream.  blog entry  
(Miklos Vajna, Collabora)




Changelog:



October 23 2018
The  XML Security Library 1.2.27

https://www.aleksey.com/xmlsec/news.html  



*  October 23 2018
The  XML Security Library 1.2.27  release includes the following changes:
*  Added AES-GCM support for OpenSSL and MSCNG (snargit).
*  Added DSA-SHA256 and ECDSA-SHA384 support for NSS (vmiklos).
*  Added RSA-OAEP support for MSCNG (vmiklos).
*  Continuous build integration in Travis and Appveyor.
*  Several other small fixes ( more details ).
*  June 5 2018
The  XML Security Library 1.2.26  release includes the following changes:
*  Added xmlsec-mscng module based on  Microsoft Cryptography API: Next 
Generation  (vmiklos).
*  Added support for GOST 2012 and fixed CryptoPro CSP provider for GOST R 
34.10-2001 in xmlsec-mscrypto (ipechorin).
*  Added LibreSSL 2.7 support (vishwin).
*  Upgraded documentation build process to support the latest gtk-doc.
*  Several other small fixes ( more details ).
*  September 12 2017
The  XML Security Library 1.2.25  release includes the following changes:
*  Removed OpenSSL 0.9.8 support and several previously deprecated functions.
*  Added SHA224 support for xmlsec-nss (vmiklos).
*  Added configurable default linefeed for xmltree module (pablogallardo).
*  Several other small fixes ( more details ).
*  April 20 2017
The  XML Security Library 1.2.24  release includes the following changes:
*  Added ECDSA-SHA1, ECDSA-SHA256, ECDSA-SHA512 support for xmlsec-nss 
(vmiklos).
*  Fixed XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS handling (vmiklos).
*  Disabled external entities loading by xmlsec utility app by default to 
prevent XXE attacks (d-hat).
*  Improved OpenSSL version and features detection.
*  Cleaned up, simplified, and standardized internal error reporting.
*  Marked as deprecated all the functions in xmlsec/soap.h file and a couple 
other functions no longer required by xmlsec. These functions will be removed 
in the future releases.
*  Fixed a few Coverity-discovered bugs ( report ).
*  Several other small fixes ( more details ). Please note that OpenSSL 0.9.8 
support will be removed in the next release of XMLSec library.
*  October 16 2016
The  XML Security Library 1.2.23  release includes the following changes:
*  Full support for OpenSSL 1.1.0.
*  Several other small fixes ( more details ).
*  April 20 2016
The  XML Security Library 1.2.22  release includes the following changes:
*  Restored SOAP parser to support backward compatibility for Lasso project.
*  April 12 2016
The  XML Security Library 1.2.21  release includes the following changes:
*  Added OOXML Relationships Transform Algorithm (patch from  Miklos Vajna ).
*  Added experimental GOST2012 support for xmlsec-openssl (patch from Nikolay 
Shaplov).
*  Migrated XMLSec to  GitHub .
*  Added OpenSSL 1.1.0 (pre 2) API support (major re-factoring for all OpenSSL 
based implementations of the block ciphers and the DSA/ECDSA signatures).
*  Removed support for legacy OpenSSL 0.9.6 (last release: March, 2004) and 
0.9.7 (last release: February, 2007).
*  Completely revamped manpages/documentation build to completely pass 'make 
distcheck' tests.
*  Deprecated XMLSEC_CRYPTO define in favor of xmlSecGetDefaultCrypto() 
function.
*  Implemented several other smaller features; fixed several other minor bugs, 
code cleanups: ( more details ).

Thanks.


-- 
maxbook2020 maxbook2020___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga

[Libreoffice Gerrit user]

 icon-themes/elementary/cmd/32/checkbox.png |binary
 icon-themes/elementary/cmd/32/renameobject.png |binary
 icon-themes/elementary/cmd/lc_checkbox.png |binary
 icon-themes/elementary/cmd/lc_renameobject.png |binary
 icon-themes/elementary/cmd/sc_renameobject.png |binary
 icon-themes/elementary/links.txt   |   69 +
 icon-themes/elementary_svg/cmd/32/checkbox.svg |3 
 icon-themes/elementary_svg/cmd/32/renameobject.svg |  235 +++
 icon-themes/elementary_svg/cmd/lc_checkbox.svg |3 
 icon-themes/elementary_svg/cmd/lc_renameobject.svg |  251 +
 icon-themes/elementary_svg/cmd/sc_renameobject.svg |  148 
 icon-themes/karasa_jaga/cmd/32/renameobject.png|binary
 icon-themes/karasa_jaga/cmd/lc_renameobject.png|binary
 icon-themes/karasa_jaga/cmd/sc_renameobject.png|binary
 icon-themes/karasa_jaga/links.txt  |   41 +++
 15 files changed, 744 insertions(+), 6 deletions(-)

New commits:
commit 8666a6fb4666d554ab2eadad72c1422de181890b
Author: Rizal Muttaqin 
AuthorDate: Mon Nov 12 15:30:11 2018 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Nov 13 01:06:09 2018 +0100

elementary & KJ: Add Draw's right clik/context menu icons

Change-Id: Id3a3241af83f769fc60f67e01c9129d6f4b5c2ad
Reviewed-on: https://gerrit.libreoffice.org/63282
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/elementary/cmd/32/checkbox.png 
b/icon-themes/elementary/cmd/32/checkbox.png
index 3548191e98b5..973945f09047 100644
Binary files a/icon-themes/elementary/cmd/32/checkbox.png and 
b/icon-themes/elementary/cmd/32/checkbox.png differ
diff --git a/icon-themes/elementary/cmd/32/renameobject.png 
b/icon-themes/elementary/cmd/32/renameobject.png
new file mode 100644
index ..68a74e3d6eee
Binary files /dev/null and b/icon-themes/elementary/cmd/32/renameobject.png 
differ
diff --git a/icon-themes/elementary/cmd/lc_checkbox.png 
b/icon-themes/elementary/cmd/lc_checkbox.png
index bc19815c1c55..86df3abdb418 100644
Binary files a/icon-themes/elementary/cmd/lc_checkbox.png and 
b/icon-themes/elementary/cmd/lc_checkbox.png differ
diff --git a/icon-themes/elementary/cmd/lc_renameobject.png 
b/icon-themes/elementary/cmd/lc_renameobject.png
new file mode 100644
index ..b4a2b6114b4e
Binary files /dev/null and b/icon-themes/elementary/cmd/lc_renameobject.png 
differ
diff --git a/icon-themes/elementary/cmd/sc_renameobject.png 
b/icon-themes/elementary/cmd/sc_renameobject.png
new file mode 100644
index ..8ab3198a0460
Binary files /dev/null and b/icon-themes/elementary/cmd/sc_renameobject.png 
differ
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 3ce756b528b0..00736b996494 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -93,6 +93,9 @@ cmd/32/numericfield.png cmd/32/numberformatstandard.png
 cmd/32/repaginate.png cmd/32/insertpagenumberfield.png
 cmd/32/showchanges.png cmd/32/addwatch.png
 cmd/32/tracechangemode.png cmd/32/trackchanges.png
+cmd/32/charactermenu.png cmd/32/fontdialog.png
+cmd/32/paragraphmenu.png cmd/32/paragraphdialog.png
+cmd/32/numberingmenu.png cmd/32/outlinebullet.png
 
 cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
 cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
@@ -149,6 +152,9 @@ cmd/lc_numericfield.png cmd/lc_numberformatstandard.png
 cmd/lc_repaginate.png cmd/lc_insertpagenumberfield.png
 cmd/lc_showchanges.png cmd/lc_addwatch.png
 cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
+cmd/lc_charactermenu.png cmd/lc_fontdialog.png
+cmd/lc_paragraphmenu.png cmd/lc_paragraphdialog.png
+cmd/lc_numberingmenu.png cmd/lc_outlinebullet.png
 
 cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
 cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png
@@ -291,15 +297,15 @@ cmd/lc_optionstreedialog.png cmd/lc_controlproperties.png
 cmd/sc_optionstreedialog.png cmd/sc_controlproperties.png
 
 # Track Change
-cmd/32/acceptchanges.png cmd/32/accepttrackedchange.png
+cmd/32/acceptchanges.png cmd/32/accepttrackedchanges.png
 cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png 
 cmd/32/commentchange.png cmd/32/commentchangetracking.png
 
-cmd/lc_acceptchanges.png cmd/lc_accepttrackedchange.png
+cmd/lc_acceptchanges.png cmd/lc_accepttrackedchanges.png
 cmd/lc_accepttracedchange.png cmd/lc_accepttrackedchange.png 
 cmd/lc_commentchange.png cmd/lc_commentchangetracking.png
 
-cmd/sc_acceptchanges.png cmd/sc_accepttrackedchange.png
+cmd/sc_acceptchanges.png cmd/sc_accepttrackedchanges.png
 cmd/sc_accepttracedchange.png cmd/sc_accepttrackedchange.png 
 cmd/sc_commentchange.png cmd/sc_commentchangetracking.png
 
@@ -508,10 +514,17 @@ cmd/sc_symbolshapes.png cmd/sc_symbolshapes.smiley.png
 cmd/sc_square_rounded.png cmd/sc_basicshapes.round-quadrat.png
 
 # Sheet
+cmd/32/sheetlefttoright.png cmd/32/paralefttoright.png
+cmd/32/sheetrighttoleft.png cmd/32/parar

[Libreoffice-commits] core.git: translations

[Libreoffice Gerrit user]

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

New commits:
commit 401e6cde49af5820df90efc9219c94a2c54b5f45
Author: Christian Lohmaier 
AuthorDate: Mon Nov 12 23:58:17 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Nov 13 00:08:08 2018 +0100

Update git submodules

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

and force-fix errors using pocheck

Change-Id: I6b444d20d156df412efaeb30a0902054362b

diff --git a/translations b/translations
index f14221545cf5..dee42a39ff84 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f14221545cf5a1be2c6f74915bcaff29db79a85d
+Subproject commit dee42a39ff84aae292b56cf83137983da5c28975
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr4.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 32d846dc84c8ab5bf947ab3e20f353bf403372eb
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 19:42:57 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 13 00:06:15 2018 +0100

Silence -fsanitize=implicit-signed-integer-truncation

...as happens during CppunitTest_sc_logical_functions_test (see below), by 
not
relying on wrap-around of

  nStackBase = sp - pCur->GetParamCount();

during underflow.  (Though I have no idea whether the excited "underflow?!?"
comment means that underflow is indeed expected and harmless, or rather
indicates a severe problem elsewhere; at least, it does happen during
CppunitTest_sc_logical_functions_test as shown below).

> sc/source/core/tool/interpr4.cxx:3965:34: runtime error: implicit 
conversion from type 'int' of value -2 (32-bit, signed) to type 'sal_uInt16' 
(aka 'unsigned short') changed the value to 65534 (16-bit, unsigned)
>  #0 in ScInterpreter::Interpret() at 
sc/source/core/tool/interpr4.cxx:3965:34 (instdir/program/libsclo.so +0xab8f35e)
>  #1 in ScFormulaCell::InterpretTail(ScInterpreterContext&, 
ScFormulaCell::ScInterpretTailParameter) at 
sc/source/core/data/formulacell.cxx:1866:23 (instdir/program/libsclo.so 
+0x9bce713)
>  #2 in ScFormulaCell::Interpret() at 
sc/source/core/data/formulacell.cxx:1577:13 (instdir/program/libsclo.so 
+0x9bc4611)
>  #3 in ScFormulaCell::MaybeInterpret() at 
sc/source/core/data/formulacell.cxx:2673:9 (instdir/program/libsclo.so 
+0x9bb04f0)
>  #4 in ScFormulaCell::GetErrCode() at 
sc/source/core/data/formulacell.cxx:2912:5 (instdir/program/libsclo.so 
+0x9beab05)
>  #5 in ScCellFormat::GetString(ScRefCellValue&, unsigned int, 
rtl::OUString&, Color**, SvNumberFormatter&, ScDocument const*, bool, bool, 
bool) at sc/source/core/tool/cellform.cxx:79:59 (instdir/program/libsclo.so 
+0xa42272b)
>  #6 in ScColumn::UpdateScriptType(sc::CellTextAttr&, int, 
mdds::detail::mtv::iterator_base, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait, 
mdds::detail::mtv::private_data_forward_update > >&) at 
sc/source/core/data/column3.cxx:534:5 (instdir/program/libsclo.so +0x8b81f94)
>  #7 in 
ScColumn::GetRangeScriptType(mdds::detail::mtv::iterator_base >, mdds::detail::mtv::event_func>::iterator_trait, 
mdds::detail::mtv::private_data_forward_update > >&, int, int, 
mdds::detail::mtv::iterator_base, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait, 
mdds::detail::mtv::private_data_forward_update > > const&) at 
sc/source/core/data/column2.cxx:2010:17 (instdir/program/libsclo.so +0x8aa4973)
>  #8 in (anonymous namespace)::FindEditCellsHandler::operator()(unsigned 
long, ScFormulaCell const*) at sc/source/core/data/column.cxx:3036:46 
(instdir/program/libsclo.so +0x8873d9b)
>  #9 in 
std::pair, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::const_iterator, unsigned long> 
sc::CheckElem, 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>, (anonymous 
namespace)::FindEditCellsHandler>(mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent> const&, mdds::multi_type_v
 ector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::const_iterator const&, unsigned long, 
unsigned long, (anonymous namespace)::FindEditCellsHandler&) at 
sc/inc/mtvfunctions.hxx:139:13 (instdir/program/libsclo.so +0x8872c89)
>  #10 in 
std::pair, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::const_iterator, 
mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::size_type> 
sc::FindElement2, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>, 
mdds::mtv::noncopyable_managed_element_block<53, EditTextObject>, 
mdds::mtv::noncopyable_managed_element_block<54, ScFormulaCell>, (ano
 nymous namespace)::FindEditCellsHandler, (anonymous 
namespace)::FindEditCellsHandler>(mdds::multi_type_vector, mdds::mtv::noncopyable_managed_element_

[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell

[Libreoffice Gerrit user]

 configure.ac   
   |2 
 download.lst   
   |4 
 
external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
 |   55 
 
external/hunspell/0001-Extend-dotless-i-and-dotted-I-rules-to-Crimean-Tatar.patch
 |   66 
 external/hunspell/0001-FORBIDDENWORD-precedes-BREAK.patch  
   |   27 
 external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch 
   |  175 
 external/hunspell/0001-Recent-Hunspell-fixes-and-improvements.patch
   | 1605 
 external/hunspell/0001-Remove-forbidden-words-from-dash-suggestion-list.patch  
   |   29 
 external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch   
   |61599 --
 
external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
 |   40 
 
external/hunspell/0001-fix-compound-handling-for-new-Hungarian-orthography.patch
  |   43 
 external/hunspell/0001-fix-compound-word-part-pa.patch 
   |   26 
 
external/hunspell/0001-recent-Hunspell-fixes-for-suggestion-spelling-and-an.patch
 | 1166 
 
external/hunspell/0001-tdf-116586-fix-LibreOffice-crash-by-Hungarian-person.patch
 |   62 
 external/hunspell/UnpackedTarball_hunspell.mk  
   |   12 
 15 files changed, 3 insertions(+), 64908 deletions(-)

New commits:
commit a20a2d7e0d28658f2d9089da076961a599833a28
Author: László Németh 
AuthorDate: Wed Nov 7 13:18:36 2018 +0100
Commit: László Németh 
CommitDate: Mon Nov 12 23:30:20 2018 +0100

bump hunspell to 1.7

Change-Id: Ia8d1f4831e651b3a8d5115f78e5a5239b56c71c4
Reviewed-on: https://gerrit.libreoffice.org/63015
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/configure.ac b/configure.ac
index 45e1fe83876e..442ada332ada 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9614,7 +9614,7 @@ else
 if test "$COM" = "MSC"; then
 HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
 else
-
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.6"
+
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.7"
 fi
 BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index a09ba1a7444b..cf56a183c165 100644
--- a/download.lst
+++ b/download.lst
@@ -100,8 +100,8 @@ export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45
 export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
-export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
+export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
+export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_SHA256SUM := 
05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
diff --git 
a/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
 
b/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
deleted file mode 100644
index b4b04385c935..
--- 
a/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 88cf975c295e3ec808efb77bb1a2a031d77f0c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?=
- 
-Date: Thu, 5 Oct 2017 12:24:02 +0200
-Subject: [PATCH] Allow dotted I in dictionary, and disable bad capitalization
- of i.
-
-Dictionary words weren't recognized with dotted I, but dictionary
-words with the letter i were recognized with dotted I, too.

- src/hunspell/hunspell.cxx | 18 +-
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx
-index 1ef11df..5c98f8a 100644
 a/src/hunspell/hunspell.cxx
-+++ b/src/hunspell/hunspell.cxx
-@@ -562,11 +562,15 @@ bool HunspellImpl::spell(const std::string& word, int* 
info, std::string* root)
-   }
- }
- case INITCAP: {
--
-+  // handle special capitalization of dotted I
-+  bool Idot = (utf8 && (unsigned char) scw[0] == 0xc4 && (unsigned char) 
scw[1] == 0xb0);
-   *info += SPELL_ORIGCAP;
--  mkallsmall2(scw, sunicw);
--  std::string u8buffer(scw);
--  mkinitcap2(scw, sunicw);
-+  if (captype == ALLCAP) {
-+  mkallsmall2(scw, sunicw);
-+  mkinitcap2(scw, sunicw);
-+  if (Idot)
-+ scw.replace(0, 1, "\xc4\xb0");
-+  }
- 

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit c4ebcb211c715ce31dfede0ca96f2eb592efadc5
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 20:03:46 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Mon Nov 12 23:19:45 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix Help contents, after translators review (3)

Change-Id: Ic43e0c195ec61c8cbdd69494cde41790333c2e94
Reviewed-on: https://gerrit.libreoffice.org/63312
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c8ada911a3ca..420130d09fb3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c8ada911a3ca0efdfbdff4bca936638899eb3250
+Subproject commit 420130d09fb311ec0d6250a5df5df3f13141bddc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/00/0401.xhp  |2 +-
 source/text/shared/00/0403.xhp  |4 ++--
 source/text/shared/00/0406.xhp  |3 +--
 source/text/shared/00/00040502.xhp  |7 +++
 source/text/shared/01/ref_epub_export.xhp   |2 +-
 source/text/shared/guide/gallery_insert.xhp |2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 420130d09fb311ec0d6250a5df5df3f13141bddc
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 20:03:46 2018 -0200
Commit: Olivier Hallot 
CommitDate: Mon Nov 12 23:19:45 2018 +0100

Fix Help contents, after translators review (3)

Change-Id: Ic43e0c195ec61c8cbdd69494cde41790333c2e94
Reviewed-on: https://gerrit.libreoffice.org/63312
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index e3c04ed08..7ee478558 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -243,7 +243,7 @@
 Choose File - Export.
 
 
-   Choose File - Export as EPUB.
+   Choose File - Export As - Export as 
EPUB.



diff --git a/source/text/shared/00/0403.xhp 
b/source/text/shared/00/0403.xhp
index f3d08e1fc..23be211f2 100644
--- a/source/text/shared/00/0403.xhp
+++ b/source/text/shared/00/0403.xhp
@@ -112,7 +112,7 @@
 
 
 
-Choose View - Grid (Impress or 
Draw).
-Choose View - Snap Lines (Impress or 
Draw).
+Choose View - Grid and Helplines (Impress or 
Draw).
+Choose View - Snap Guides (Impress or 
Draw).
 
 
diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index 9ab83301f..1456031b9 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -82,7 +82,7 @@
   
   Choose Tools - Macros - Organize 
Macros - %PRODUCTNAME Basic,click the Organizer 
button,click the Libraries tab,and then click the 
Password button.
   Choose Tools - Extension 
Manager.
-  Choose Tools - 
Extension Manager, click Updates 
button.
+  Choose Tools - 
Extension Manager, click Check for Updates 
button.
   Choose Tools - XML Filter 
Settings.
   Choose Tools - XML Filter 
Settings, then click New or 
Edit.
   Choose Tools - XML Filter 
Settings, then click Test XSLTs.
@@ -111,7 +111,6 @@
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - 
$[officename].
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - User 
Data.
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
General.
-  Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Memory.
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
View.
   Choose %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Print.
 
diff --git a/source/text/shared/00/00040502.xhp 
b/source/text/shared/00/00040502.xhp
index d69dd9901..bcd5da281 100644
--- a/source/text/shared/00/00040502.xhp
+++ b/source/text/shared/00/00040502.xhp
@@ -28,8 +28,8 @@
 Format 
Menu
 
 Choose 
Format - Line (Impress and 
Draw).i64150
-Choose 
Format - Object - Line (Writer).
-Choose 
Format - Graphic - Line (Calc).
+Choose 
Format - Text Box and Shape - Line (Writer).
+Choose 
Format - Object - Line (Calc).
 On Line 
and Filling bar, click
 
 
@@ -45,8 +45,7 @@
 
 
 
-Choose 
Format - Object - 
-Graphic - 
Line - Line tab.
+Choose 
Format - Text Box and Shape - Object - Line - 
Line tab.
 Choose 
View - Styles - open context menu and choose Modify/New - 
Line tab (presentation documents).
 Choose 
Format - Title - Borders tab (charts).
 Choose 
Format - Legend - Borders tab (charts).
diff --git a/source/text/shared/01/ref_epub_export.xhp 
b/source/text/shared/01/ref_epub_export.xhp
index 689800465..38f11f822 100644
--- a/source/text/shared/01/ref_epub_export.xhp
+++ b/source/text/shared/01/ref_epub_export.xhp
@@ -39,7 +39,7 @@
 
 Export as 
EPUB
 Export the 
current file to EPUB.
-
+
 
 
 
diff --git a/source/text/shared/guide/gallery_insert.xhp 
b/source/text/shared/guide/gallery_insert.xhp
index 26949d5f0..aaa8cebb1 100644
--- a/source/text/shared/guide/gallery_insert.xhp
+++ b/source/text/shared/guide/gallery_insert.xhp
@@ -63,7 +63,7 @@
   Inserting an object as a link
   

-Open the 
Gallery by clicking the Gallery icon on the Standard 
bar, or by selecting Tools - Gallery.
+Open the 
Gallery by clicking the Gallery icon on the Standard 
bar, or by choosing Insert - Media - Gallery.


 Select a 
theme.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 16398d1176cd08694edb59eed5a0755636415516
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 18:22:47 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Mon Nov 12 23:18:00 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix Contents, after translators review (2)

Change-Id: Ia1038fbfc054efa457fae5d28d1a2e737dba1d45
Reviewed-on: https://gerrit.libreoffice.org/63308
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index b002784630b0..c8ada911a3ca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b002784630b05664795a96132edb1177ac9b916f
+Subproject commit c8ada911a3ca0efdfbdff4bca936638899eb3250
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/00/0405.xhp |   24 
 source/text/scalc/02/0213.xhp |4 ++--
 source/text/swriter/00/stylesmenu.xhp |2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c8ada911a3ca0efdfbdff4bca936638899eb3250
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 18:22:47 2018 -0200
Commit: Olivier Hallot 
CommitDate: Mon Nov 12 23:18:00 2018 +0100

Fix Contents, after translators review (2)

Change-Id: Ia1038fbfc054efa457fae5d28d1a2e737dba1d45
Reviewed-on: https://gerrit.libreoffice.org/63308
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/00/0405.xhp 
b/source/text/scalc/00/0405.xhp
index 58c0ff157..6da09aa4f 100644
--- a/source/text/scalc/00/0405.xhp
+++ b/source/text/scalc/00/0405.xhp
@@ -31,25 +31,25 @@
 Format 
Menu
 Choose Format - Cells.
 Choose Format - Cells - Cell Protection 
tab.
-Choose Format - Row.
-Choose Format - Row - Optimal 
Height.
+Choose Format - Rows.
+Choose Format - Rows - Optimal 
Height.
 
-Choose 
Format - Row - Hide.
-Choose 
Format - Column - Hide.
-Choose 
Format - Sheet - Hide.
+Choose 
Format - Rows - Hide.
+Choose 
Format - Columns - Hide.
+Choose 
Sheet - Hide Sheet.
 
 
-Choose 
Format - Row - Show.
-Choose 
Format - Column - Show.
+Choose 
Format - Rows - Show.
+Choose 
Format - Columns - Show.
 
-Choose Format - Column.
+Choose Format - Columns.
 
-Choose 
Format - Column - Optimal Width.
+Choose 
Format - Columns - Optimal Width.
 Double-click 
right column separator in column headers.
 
-Choose Format - Sheet.
-Choose Format - Sheet - Rename.
-Choose Format - Sheet - Show.
+Choose Sheet.
+Choose Sheet - Rename Sheet.
+Choose Sheet - Show Sheet.
 Choose Format - Page.
 Choose Format - Page - Sheet 
tab.
 Choose Format - Print Ranges.
diff --git a/source/text/scalc/02/0213.xhp 
b/source/text/scalc/02/0213.xhp
index 352490647..b465c7b47 100644
--- a/source/text/scalc/02/0213.xhp
+++ b/source/text/scalc/02/0213.xhp
@@ -44,7 +44,7 @@

 
  
-  Icon
+  Currency Number Format Icon
  
  
   Number 
Format: Currency
@@ -54,7 +54,7 @@
   
   
   
-  Format - Cell 
- Numbers.
+  Format - 
Cells - Numbers.
   
  
 
diff --git a/source/text/swriter/00/stylesmenu.xhp 
b/source/text/swriter/00/stylesmenu.xhp
index 781e56275..373e76ad7 100644
--- a/source/text/swriter/00/stylesmenu.xhp
+++ b/source/text/swriter/00/stylesmenu.xhp
@@ -16,7 +16,7 @@
 
 
 
-Choose Styles - Edit 
Styles.
+Choose Styles - Edit 
Styles
 Choose Styles - Update Style 
or CommandCtrl+
 Shift + F11.
 Choose Styles - New Style or 
Shift + F11.
 Choose Styles - Load 
Styles.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/scalc/00/0412.xhp   |2 +-
 source/text/scalc/06/calcsamplefiles.xhp|8 
 source/text/scalc/guide/database_filter.xhp |6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b002784630b05664795a96132edb1177ac9b916f
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 17:34:11 2018 -0200
Commit: Olivier Hallot 
CommitDate: Mon Nov 12 23:16:42 2018 +0100

Fix contents, after translators review.

Change-Id: I142b6ec74d06d1153675c50079ebda6273e44414
Reviewed-on: https://gerrit.libreoffice.org/63305
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/00/0412.xhp 
b/source/text/scalc/00/0412.xhp
index 3274de79a..39d3ae987 100644
--- a/source/text/scalc/00/0412.xhp
+++ b/source/text/scalc/00/0412.xhp
@@ -145,7 +145,7 @@
 
 
 Choose Data - Group and Outline - 
AutoOutline.
-Choose Data - Group and Outline - 
Remove.
+Choose Data - Group and Outline - Remove 
Outline.
 Choose Data - Group and Outline - Show Details (for 
some pivot tables).
 Choose Data - Pivot Table.
 Choose Insert - Pivot Table.
diff --git a/source/text/scalc/06/calcsamplefiles.xhp 
b/source/text/scalc/06/calcsamplefiles.xhp
index e79e02bfc..17e7260f5 100644
--- a/source/text/scalc/06/calcsamplefiles.xhp
+++ b/source/text/scalc/06/calcsamplefiles.xhp
@@ -15,16 +15,16 @@
 
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
 
diff --git a/source/text/scalc/guide/database_filter.xhp 
b/source/text/scalc/guide/database_filter.xhp
index 4a7ffe949..2da674b8f 100644
--- a/source/text/scalc/guide/database_filter.xhp
+++ b/source/text/scalc/guide/database_filter.xhp
@@ -40,7 +40,7 @@
 Click in a cell range.
  
  
-Choose Data - Filter - Standard 
Filter.
+Choose Data - More Filters - Standard 
Filter.
  
  
 In 
the Standard Filter dialog, specify the filter options that you 
want.
@@ -57,7 +57,7 @@
 If you 
want to apply multiple AutoFilters to the same sheet, you must first define 
database ranges, then apply the AutoFilters to the database ranges.
  
  
-Choose Data - Filter - 
AutoFilter.
+Choose Data - 
AutoFilter.
 An 
arrow button is added to the head of each column in the database 
range.
  
  
@@ -85,4 +85,4 @@
  https://wiki.documentfoundation.org/Documentation/How_Tos/Defining_a_Data_Range";
 name="wiki.documentfoundation.org Defining a Data Range">Wiki page about 
defining a data range
   

-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit ed4b3df423b3597f42ce68173f966a1919dda1f2
Author: Olivier Hallot 
AuthorDate: Mon Nov 12 17:34:11 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Mon Nov 12 23:16:42 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix contents, after translators review.

Change-Id: I142b6ec74d06d1153675c50079ebda6273e44414
Reviewed-on: https://gerrit.libreoffice.org/63305
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0413070a6d53..b002784630b0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0413070a6d537f40219035cf155a7897e143cdbd
+Subproject commit b002784630b05664795a96132edb1177ac9b916f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Instance.hxx  |1 +
 vcl/inc/qt5/Qt5Menu.hxx  |3 +++
 vcl/qt5/Qt5Instance.cxx  |8 
 vcl/qt5/Qt5Menu.cxx  |   11 ++-
 vcl/unx/kde5/KDE5SalInstance.cxx |8 
 vcl/unx/kde5/KDE5SalInstance.hxx |5 -
 6 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 927f58bd997b6c1b60e354ee247a119d3f0af64b
Author: Katarina Behrens 
AuthorDate: Thu Nov 1 13:57:56 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Nov 12 23:04:54 2018 +0100

tdf#119856: thread-proof creating frames and setting menus

This finally enables opening a new frame and setting its menu from
an extension, but it is still far from stable, loads of threading
landmines like this all over the code

Change-Id: Icf4b67796b0669425ecb7c2c142c21e184024534
Reviewed-on: https://gerrit.libreoffice.org/62737
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 473f26c58b13..254c81445997 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -52,6 +52,7 @@ private Q_SLOTS:
 
 Q_SIGNALS:
 bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents);
+std::unique_ptr createMenuSignal(bool, Menu*);
 
 public:
 explicit Qt5Instance(bool bUseCairo = false);
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index f3111d01aa8a..366b68307182 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -59,6 +59,9 @@ public:
 unsigned GetItemCount() { return maItems.size(); }
 Qt5MenuItem* GetItemAtPos(unsigned nPos) { return maItems[nPos]; }
 
+Q_SIGNALS:
+void setFrameSignal(const SalFrame* pFrame);
+
 private slots:
 void slotMenuTriggered(Qt5MenuItem* pQItem);
 };
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index f780860dccc5..8215b67b71ea 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -64,6 +64,8 @@ Qt5Instance::Qt5Instance(bool bUseCairo)
 // is processed before the thread emitting the signal continues
 connect(this, SIGNAL(ImplYieldSignal(bool, bool)), this, 
SLOT(ImplYield(bool, bool)),
 Qt::BlockingQueuedConnection);
+connect(this, &Qt5Instance::createMenuSignal, this, 
&Qt5Instance::CreateMenu,
+Qt::BlockingQueuedConnection);
 }
 
 Qt5Instance::~Qt5Instance()
@@ -119,6 +121,12 @@ Qt5Instance::CreateVirtualDevice(SalGraphics* pGraphics, 
long& nDX, long& nDY, D
 
 std::unique_ptr Qt5Instance::CreateMenu(bool bMenuBar, Menu* pVCLMenu)
 {
+if (qApp->thread() != QThread::currentThread())
+{
+SolarMutexReleaser aReleaser;
+return Q_EMIT createMenuSignal(bMenuBar, pVCLMenu);
+}
+
 Qt5Menu* pSalMenu = new Qt5Menu(bMenuBar);
 pSalMenu->SetMenu(pVCLMenu);
 return std::unique_ptr(pSalMenu);
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 17578ef4ce24..5005755e574b 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -24,6 +24,7 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 , mpFrame(nullptr)
 , mbMenuBar(bMenuBar)
 {
+connect(this, &Qt5Menu::setFrameSignal, this, &Qt5Menu::SetFrame, 
Qt::BlockingQueuedConnection);
 }
 
 Qt5Menu::~Qt5Menu() { maItems.clear(); }
@@ -64,6 +65,12 @@ void Qt5Menu::SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* 
pSubMenu, unsigned)
 
 void Qt5Menu::SetFrame(const SalFrame* pFrame)
 {
+if (qApp->thread() != QThread::currentThread())
+{
+SolarMutexReleaser aReleaser;
+return Q_EMIT setFrameSignal(pFrame);
+}
+
 SolarMutexGuard aGuard;
 assert(mbMenuBar);
 mpFrame = const_cast(static_cast(pFrame));
@@ -72,9 +79,11 @@ void Qt5Menu::SetFrame(const SalFrame* pFrame)
 
 Qt5MainWindow* pMainWindow = mpFrame->GetTopLevelWindow();
 if (pMainWindow)
+{
 mpQMenuBar = pMainWindow->menuBar();
 
-DoFullMenuUpdate(mpVCLMenu);
+DoFullMenuUpdate(mpVCLMenu);
+}
 }
 
 void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu)
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index 7c8f27802147..484920d01e97 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -46,12 +46,20 @@ KDE5SalInstance::KDE5SalInstance()
 pSVData->maAppData.mxToolkitName = OUString("kde5");
 
 KDE5SalData::initNWF();
+
+connect(this, &KDE5SalInstance::createFrameSignal, this, 
&KDE5SalInstance::CreateFrame,
+Qt::BlockingQueuedConnection);
 connect(this, &KDE5SalInstance::createFilePickerSignal, this,
 &KDE5SalInstance::createFilePicker, Qt::BlockingQueuedConnection);
 }
 
 SalFrame* KDE5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags 
nState)
 {
+if (!IsMainThread())
+{
+SolarMutexReleaser aReleaser;
+return Q_EMIT createFrameSignal(pParent, nState);
+}
 return new KDE5SalFrame(static_cast(pParent), nState, true);
 }

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

[Libreoffice Gerrit user]

 vcl/unx/kde5/KDE5FilePicker.hxx  |1 +
 vcl/unx/kde5/KDE5FilePicker2.cxx |   12 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 8fb0881a3e5b2c5120af18823f6f58a1bda7cadd
Author: Katarina Behrens 
AuthorDate: Thu Nov 1 11:12:59 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Nov 12 23:03:55 2018 +0100

tdf#119856: thread-proof kde5 fpicker execute() and getFiles()

so they can be called from extensions

Change-Id: I58b4ee25ef9a58a8d051ffd542119984973095f0
Reviewed-on: https://gerrit.libreoffice.org/62728
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index df7d8499ecae..8179170e831d 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -185,6 +185,7 @@ Q_SIGNALS:
  const 
css::uno::Sequence& rFilters);
 void setCurrentFilterSignal(const OUString& rFilter);
 OUString getCurrentFilterSignal();
+css::uno::Sequence getFilesSignal();
 css::uno::Sequence getSelectedFilesSignal();
 void setMultiSelectionSignal(bool bMulti);
 
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 576318e18799..553ed8500c84 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -106,7 +106,8 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
 
 connect(_dialog, &QFileDialog::filterSelected, this, 
&KDE5FilePicker::filterChanged);
 connect(_dialog, &QFileDialog::fileSelected, this, 
&KDE5FilePicker::selectionChanged);
-connect(this, &KDE5FilePicker::executeSignal, this, 
&KDE5FilePicker::execute);
+connect(this, &KDE5FilePicker::executeSignal, this, 
&KDE5FilePicker::execute,
+Qt::BlockingQueuedConnection);
 
 // XExecutableDialog
 connect(this, &KDE5FilePicker::setTitleSignal, this, 
&KDE5FilePicker::setTitleSlot,
@@ -147,6 +148,8 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
 // XFilePicker2
 connect(this, &KDE5FilePicker::getSelectedFilesSignal, this,
 &KDE5FilePicker::getSelectedFilesSlot, 
Qt::BlockingQueuedConnection);
+connect(this, &KDE5FilePicker::getFilesSignal, this, 
&KDE5FilePicker::getFiles,
+Qt::BlockingQueuedConnection);
 
 qApp->installEventFilter(this);
 }
@@ -186,6 +189,7 @@ sal_Int16 SAL_CALL KDE5FilePicker::execute()
 {
 if (qApp->thread() != QThread::currentThread())
 {
+//SolarMutexReleaser aReleaser;
 return Q_EMIT executeSignal();
 }
 
@@ -250,6 +254,12 @@ OUString SAL_CALL KDE5FilePicker::getDisplayDirectory()
 
 uno::Sequence SAL_CALL KDE5FilePicker::getFiles()
 {
+if (qApp->thread() != QThread::currentThread())
+{
+//SolarMutexReleaser aReleaser;
+return Q_EMIT getFilesSignal();
+}
+
 uno::Sequence seq = getSelectedFiles();
 if (seq.getLength() > 1)
 seq.realloc(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar.ui|2 +-
 sd/uiconfig/simpress/ui/notebookbar.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 77b5271dc9f397233f3583c4b1827404d5730bc1
Author: andreas kainz 
AuthorDate: Mon Nov 12 09:14:06 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Nov 12 22:21:49 2018 +0100

NB Tabbed draw: Typefix InsertLayer with CapturePoint

Change-Id: Ic2e3bfc7986f16fee02d356df3cf0e9fa55ab5a6
Reviewed-on: https://gerrit.libreoffice.org/63294
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index afc3345787f7..fcc38d94417b 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -3735,7 +3735,7 @@
   
 
 
-  
+  
 True
 False
 .uno:CapturePoint
commit c740ee1ef31a5bedb9b29536798f95557ceadc2f
Author: andreas kainz 
AuthorDate: Mon Nov 12 09:15:36 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Nov 12 22:21:37 2018 +0100

NB Tabbed Impress: fix context menu for 3DObject

Change-Id: I0b78f3c4ad3c180ddae51cf8d163f6649c42ea67
Reviewed-on: https://gerrit.libreoffice.org/63296
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 245630ed77cc..0a6ca3bfc998 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -11474,7 +11474,7 @@
 
   
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - Mobile/Mobile

[Libreoffice Gerrit user]

 Mobile/Mobile/Info.plist.in |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit aea3d28fed8ff91f5930b9c9d69b0b3d74434d72
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 23:12:58 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 23:13:48 2018 +0200

Bump CFBundleVersion to 5

Change-Id: I5566ff9e1f4aafa303f35482cb2e30ad4866813c

diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index 6beb6aaca..cf878cdf3 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -177,7 +177,7 @@
 CFBundleShortVersionString
 0.1
 CFBundleVersion
-4
+5
 LSRequiresIPhoneOS
 
 UIFileSharingEnabled
commit d4553d6a9a08046af689122a71a35ff7df0059df
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 23:11:49 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 23:13:48 2018 +0200

Add CFBundleLocalizations

Change-Id: I16d63860f63fd52cbaf574ac555654fecc273e8a

diff --git a/Mobile/Mobile/Info.plist.in b/Mobile/Mobile/Info.plist.in
index b54a079af..6beb6aaca 100644
--- a/Mobile/Mobile/Info.plist.in
+++ b/Mobile/Mobile/Info.plist.in
@@ -2,6 +2,15 @@
 http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
 
 
+   CFBundleLocalizations
+   
+   en
+   de
+   fi
+   fr
+   it
+   sv
+   
 CFBundleDevelopmentRegion
 $(DEVELOPMENT_LANGUAGE)
 CFBundleDisplayName
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/js loleaflet/Makefile.am loleaflet/util

[Libreoffice Gerrit user]

 loleaflet/Makefile.am|   22 ++
 loleaflet/js/global.js   |   13 +++
 loleaflet/util/create-l10n-all-js.pl |  114 +++
 3 files changed, 146 insertions(+), 3 deletions(-)

New commits:
commit 6d2a60643b93a5652ebe8e87f8d7a9c8982999d2
Author: Tor Lillqvist 
AuthorDate: Fri Nov 9 22:28:46 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 22:55:03 2018 +0200

Make l10n of the messages from our JS code work in the mobile app

The l10n-for-node code does not work in the app. Instead of loading
the required JSON files at run-time, include all those translations
that seem complete enough as JavaScript code in the bundle.js. Use a
manaully curated list of translations, in a Perl script that generates
the JavaScript code in question.

Change-Id: I45d5cda477140ee63bb3fc8d9f1f4260bcdb97a7

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 9b61070c2..25db749f6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -3,9 +3,26 @@ DRAW_VERSION=0.2.4
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
 
+if !ENABLE_IOSAPP
 if !ENABLE_GTKAPP
 L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
 endif
+endif
+
+if ENABLE_IOSAPP
+L10N_IOS_ALL_JS = $(builddir)/dist/l10n-all.js
+L10N_JSON = $(L10N_IOS_ALL_JS)
+
+$(L10N_IOS_ALL_JS) : $(wildcard $(srcdir)/po/ui-*.po) $(shell find 
$(srcdir)/l10n -name '*.*')
+   for F in $(wildcard $(srcdir)/po/ui-*.po); do \
+   $(srcdir)/util/po2json.py $$F -o $$F.json; \
+   done
+   @mkdir -p $(dir $@)
+   perl $(srcdir)/util/create-l10n-all-js.pl >$@
+   for F in $(wildcard $(srcdir)/po/ui-*.po); do \
+   rm $$F.json; \
+   done
+endif
 
 JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
 JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
@@ -15,7 +32,9 @@ LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name 
'*.*')
 LOLEAFLET_IMAGES_DST = $(patsubst 
$(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC))
 
 LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*')
+if !ENABLE_IOSAPP
 LOLEAFLET_L10N_DST =  $(patsubst 
$(srcdir)/l10n/%,$(builddir)/dist/l10n/%,$(LOLEAFLET_L10N_SRC))
+endif
 
 LOLEAFLET_DRAW_JS_SRC = $(shell find 
$(srcdir)/plugins/draw-$(DRAW_VERSION)/src -name '*.js')
 LOLEAFLET_DRAW_JS_DST = $(patsubst 
$(srcdir)/plugins/%.js,$(builddir)/dist/plugins/%.js,$(LOLEAFLET_DRAW_JS_SRC))
@@ -186,8 +205,9 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js
@echo "Uglify loleaflet js files..."
-   @NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
+   NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
$(srcdir)/js/global.js \
+   $(L10N_IOS_ALL_JS) \
$(NODE_MODULES_JS) \
$(srcdir)/js/w2ui-1.5.rc1.js \
$(builddir)/build/dist/loleaflet-src.js \
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 9640a44dd..a0e4c2ce1 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -30,8 +30,17 @@ global.getParameterByName = function (name) {
 
 global._ = function (string) {
// In the mobile app case we can't use the stuff from l10n-for-node, as 
that assumes HTTP.
-   // So bail out for now.
-   if (window.ThisIsAMobileApp) {
+   if (window.ThisIsTheiOSApp) {
+   // We use another approach just for iOS for now.
+   if (window.LOCALIZATIONS.hasOwnProperty(string)) {
+   // window.webkit.messageHandlers.debug.postMessage('_(' 
+ string + '): YES: ' + window.LOCALIZATIONS[string]);
+   return window.LOCALIZATIONS[string];
+   } else {
+   // window.webkit.messageHandlers.debug.postMessage('_(' 
+ string + '): NO');
+   return string;
+   }
+   } else if (window.ThisIsAMobileApp) {
+   // And bail out without translations on other mobile platforms.
return string;
} else {
return string.toLocaleString();
diff --git a/loleaflet/util/create-l10n-all-js.pl 
b/loleaflet/util/create-l10n-all-js.pl
new file mode 100644
index 0..293cdb1e9
--- /dev/null
+++ b/loleaflet/util/create-l10n-all-js.pl
@@ -0,0 +1,114 @@
+#!/bin/perl -w
+
+use strict;
+
+sub readwhole($) {
+my ($file) = @_;
+local $/;
+open(my $fh, '<', $file) || die "Cannot open $file";
+return <$fh>;
+}
+
+sub insert($) {
+my ($locale) = @_;
+my $ui = readwhole("po/ui-$locale.po.json");
+# Different convention: Change underscore to hyphen.
+$locale =~ s/_/-/;
+my $uno = readwhole("l10n/uno/$locale.json");
+my $locore = readwhole("l10n/locore/$locale.json");
+# Merge the fields of all three obje

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

[Libreoffice Gerrit user]

 source/text/shared/optionen/01010100.xhp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0413070a6d537f40219035cf155a7897e143cdbd
Author: Mike Kaganski 
AuthorDate: Tue Nov 6 10:15:12 2018 +0100
Commit: Mike Kaganski 
CommitDate: Mon Nov 12 21:56:15 2018 +0100

Add usage info about user data

Change-Id: Ib9ba84836dd13e5858eeae4bd24a6e10f7b89319
Reviewed-on: https://gerrit.libreoffice.org/62938
Tested-by: Jenkins
Reviewed-by: Sophia Schröder 
Reviewed-by: Mike Kaganski 

diff --git a/source/text/shared/optionen/01010100.xhp 
b/source/text/shared/optionen/01010100.xhp
index 4a2161300..92d395224 100644
--- a/source/text/shared/optionen/01010100.xhp
+++ b/source/text/shared/optionen/01010100.xhp
@@ -45,6 +45,7 @@
 
 User data is 
used by templates and Wizards in $[officename]. For example, the "First name" 
and "Last name" data fields are used to automatically insert your name as the 
author of a new document. You can see this under File - 
Properties.
 Some of the 
user data is included automatically in an internal dictionary so that it is 
recognized by the spellchecker. If typing errors are made, the program can use 
this data to suggest replacements. Note that changes to data take effect only 
after $[officename] is restarted.
+User data is 
also used when commenting and in tracking changes mode, to identify 
comments/edits author; and to mark last edit position in document, so that when 
author opens the document later, it opens at the last edit position.
 Address
 Use the 
Address field to enter and edit your personal user 
data.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit fc3b21d97073ba88b6b7ee20588331a813946a86
Author: Mike Kaganski 
AuthorDate: Tue Nov 6 10:15:12 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Nov 12 21:56:15 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add usage info about user data

Change-Id: Ib9ba84836dd13e5858eeae4bd24a6e10f7b89319
Reviewed-on: https://gerrit.libreoffice.org/62938
Tested-by: Jenkins
Reviewed-by: Sophia Schröder 
Reviewed-by: Mike Kaganski 

diff --git a/helpcontent2 b/helpcontent2
index 4f351cf5ffbb..0413070a6d53 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4f351cf5ffbba2877b16593ab9ebb76c6d723980
+Subproject commit 0413070a6d537f40219035cf155a7897e143cdbd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - ios/CustomTarget_iOS_setup.mk sal/osl

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |1 +
 sal/osl/unx/nlsupport.cxx |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 6604227399fb9b1cec2f6f8962573124ee3cc676
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 20:06:20 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 22:44:10 2018 +0200

We need share/liblangtag, too

Otherwise i18nlantag works weirdly.

Change-Id: Ic5bf2007e586e6bb53a9e89782c2b05f73e348e3

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index a7f9a714f531..6d2591a1ac4f 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -46,6 +46,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
 
# Set up rc, the "inifile". See getIniFileName_Impl().
echo '[Bootstrap]' > $(IOSRES)/rc
commit 54e6c774a19972a97b716d86783bdd2c3b10498b
Author: Tor Lillqvist 
AuthorDate: Sat Nov 10 01:16:22 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 22:44:11 2018 +0200

Don't bother setting LC_ALL, LC_CTYPE, and LANG on iOS

An iOS app might itself, for testing and debugging purposes, look for
LANG in the environment (passed to by the developer in Xcode; the OS
does not set such an environment variable). It is confusing if that
then gets (re-)set during the execution of core code.

(cherry picked from commit f1801432abaaa6c6137d62319d855b6a3599e182)

Change-Id: I9dcf44090aed84b55fd4240bda2562026cd8dacb

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 5300752335af..8b520f85f60a 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -834,9 +834,11 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
 /* return the locale */
 *ppLocale = parse_locale( locale.getStr() );
 
+#ifndef IOS
 setenv( "LC_ALL", locale.getStr(), 1);
 setenv("LC_CTYPE", locale.getStr(), 1 );
 setenv("LANG", locale.getStr(), 1 );
+#endif
 }
 #else
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

[Libreoffice Gerrit user]

 docker/scripts/run-lool.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c1639750d94db05f9ff3dfd8856f5a8f7c20bc3
Author: Andras Timar 
AuthorDate: Mon Nov 12 21:22:51 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Nov 12 21:22:51 2018 +0100

pass extra loolwsd command line parameter via environment variable

docker run  -e "extra_params=." .

For example it makes sense to start loolwsd without SSL, when you test
or develop. In this case the syntax is: -e 
"extra_params=--o:ssl.enable=false"

Change-Id: Iaa9eafc1e1d3f2d24009321760d1b7d6a9998450

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index c85983b2b..71f14396a 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -34,4 +34,4 @@ perl -pi -e "s/.*<\/username>/${username}<\/username
 perl -pi -e "s/.*<\/password>/${password}<\/password>/" /etc/loolwsd/loolwsd.xml
 
 # Start loolwsd
-su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd" -s /bin/bash lool
+su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd ${extra_params}" -s /bin/bash lool
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/wrtww8.cxx |4 ++--
 sw/source/filter/ww8/wrtww8.hxx |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a1f23b1fc4814bb857bb433570ed25c11594d583
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 19:29:59 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 21:13:43 2018 +0100

Silence -fsanitize=implicit-signed-integer-truncation

...as happens during CppunitTest_sw_ww8export (see below), by keeping
nTableOffset of signed type.

It is beneficial to introduce InsInt16 (internally doing the cast to 
sal_uInt16)
instead of casting nTableOffset to sal_uInt16 at the call site, so that
-fsanitize=implicit-signed-integer-truncation can still warn about bad
nTableOffset values outside the sal_Int16 range being passed to InsInt16.

> sw/source/filter/ww8/wrtww8.cxx:2392:34: runtime error: implicit 
conversion from type 'int' of value 67140 (32-bit, signed) to type 'sal_uInt16' 
(aka 'unsigned short') changed the value to 1604 (16-bit, unsigned)
>  #0 in 
WW8AttributeOutput::TableDefinition(std::shared_ptr)
 at sw/source/filter/ww8/wrtww8.cxx:2392:34 (instdir/program/libmswordlo.so 
+0x1f12f98)
>  #1 in 
WW8AttributeOutput::TableInfoRow(std::shared_ptr) 
at sw/source/filter/ww8/wrtww8.cxx:2058:13 (instdir/program/libmswordlo.so 
+0x1f06ccf)
>  #2 in 
WW8AttributeOutput::EndParagraph(std::shared_ptr) 
at sw/source/filter/ww8/ww8atr.cxx:998:13 (instdir/program/libmswordlo.so 
+0x208fe56)
>  #3 in MSWordExportBase::OutputTextNode(SwTextNode&) at 
sw/source/filter/ww8/wrtw8nds.cxx:2966:22 (instdir/program/libmswordlo.so 
+0x1c4d259)
>  #4 in MSWordExportBase::OutputContentNode(SwContentNode&) at 
sw/source/filter/ww8/wrtw8nds.cxx:3237:13 (instdir/program/libmswordlo.so 
+0x1c5a3b4)
>  #5 in MSWordExportBase::WriteText() at 
sw/source/filter/ww8/wrtww8.cxx:2725:13 (instdir/program/libmswordlo.so 
+0x1efa992)
>  #6 in WW8Export::WriteMainText() at 
sw/source/filter/ww8/wrtww8.cxx:2845:5 (instdir/program/libmswordlo.so 
+0x1f2101e)
>  #7 in WW8Export::StoreDoc1() at sw/source/filter/ww8/wrtww8.cxx:3005:5 
(instdir/program/libmswordlo.so +0x1f31acf)
>  #8 in WW8Export::ExportDocument_Impl() at 
sw/source/filter/ww8/wrtww8.cxx:3367:5 (instdir/program/libmswordlo.so 
+0x1f46dd2)
>  #9 in MSWordExportBase::ExportDocument(bool) at 
sw/source/filter/ww8/wrtww8.cxx:3206:19 (instdir/program/libmswordlo.so 
+0x1f3cbf2)
>  #10 in SwWW8Writer::WriteStorage() at 
sw/source/filter/ww8/wrtww8.cxx:3545:23 (instdir/program/libmswordlo.so 
+0x1f50966)
>  #11 in StgWriter::Write(SwPaM&, SotStorage&, rtl::OUString const*) at 
sw/source/filter/writer/writer.cxx:511:20 (instdir/program/libswlo.so 
+0xcc770c4)
>  #12 in Writer::Write(SwPaM&, SvStream&, rtl::OUString const*) at 
sw/source/filter/writer/writer.cxx:254:23 (instdir/program/libswlo.so 
+0xcc6cc1f)
>  #13 in Writer::Write(SwPaM&, SfxMedium&, rtl::OUString const*) at 
sw/source/filter/writer/writer.cxx:289:12 (instdir/program/libswlo.so 
+0xcc6e1cc)
>  #14 in SwWW8Writer::Write(SwPaM&, SfxMedium&, rtl::OUString const*) at 
sw/source/filter/ww8/wrtww8.cxx:3562:31 (instdir/program/libmswordlo.so 
+0x1f513ff)
>  #15 in SwWriter::Write(tools::SvRef const&, rtl::OUString 
const*) at sw/source/filter/basflt/shellio.cxx:851:28 
(instdir/program/libswlo.so +0xc56906f)
>  #16 in SwDocShell::ConvertTo(SfxMedium&) at 
sw/source/uibase/app/docsh.cxx:813:27 (instdir/program/libswlo.so +0xd038645)
>  #17 in SfxObjectShell::SaveTo_Impl(SfxMedium&, SfxItemSet const*) at 
sfx2/source/doc/objstor.cxx:1537:19 (instdir/program/libsfxlo.so +0x38c0383)
>  #18 in SfxObjectShell::PreDoSaveAs_Impl(rtl::OUString const&, 
rtl::OUString const&, SfxItemSet const&) at sfx2/source/doc/objstor.cxx:2848:39 
(instdir/program/libsfxlo.so +0x38ef860)
>  #19 in SfxObjectShell::CommonSaveAs_Impl(INetURLObject const&, 
rtl::OUString const&, SfxItemSet&) at sfx2/source/doc/objstor.cxx:2705:9 
(instdir/program/libsfxlo.so +0x38e8e40)
>  #20 in SfxObjectShell::APISaveAs_Impl(rtl::OUString const&, SfxItemSet&) 
at sfx2/source/doc/objserv.cxx:308:19 (instdir/program/libsfxlo.so +0x38651b3)
>  #21 in SfxBaseModel::impl_store(rtl::OUString const&, 
com::sun::star::uno::Sequence const&, 
bool) at sfx2/source/doc/sfxbasemodel.cxx:2969:46 (instdir/program/libsfxlo.so 
+0x3a3ae5e)
>  #22 in SfxBaseModel::storeToURL(rtl::OUString const&, 
com::sun::star::uno::Sequence const&) at 
sfx2/source/doc/sfxbasemodel.cxx:1639:13 (instdir/program/libsfxlo.so 
+0x3a40fa5)
>  #23 in SwModelTestBase::reload(char const*, char const*, char const*) at 
sw/qa/extras/inc/swmodeltestbase.hxx:797:20 
(workdir/LinkTarget/CppunitTest/libtest_sw_ww8export.so +0x3b3fb1)
>  #24 in SwModelTestBase::executeImportExportImportTest(char const*, char 
const*) at sw/qa/extras/inc/swmodeltestbase.hxx:283:9 
(workdir/LinkTarget/CppunitTest/libtest_sw_ww8export

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

[Libreoffice Gerrit user]

 include/svtools/strings.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eef0f6cd6b6317a6704ed43aff58b52c51397119
Author: Takeshi Abe 
AuthorDate: Fri Nov 9 14:47:21 2018 +0900
Commit: Andras Timar 
CommitDate: Mon Nov 12 21:08:48 2018 +0100

Mythes -> MyThes

as seen in its README.

Change-Id: I0fef39484967e9de8dc7076fb3b7a2d0e55c801f
Reviewed-on: https://gerrit.libreoffice.org/63147
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index a616b2a6bd56..3325069ddfee 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -357,7 +357,7 @@
 
 #define STR_DESCRIPTION_HUNSPELL
NC_("STR_DESCRIPTION_HUNSPELL", "Hunspell SpellChecker")
 #define STR_DESCRIPTION_LIBHYPHEN   
NC_("STR_DESCRIPTION_LIBHYPHEN", "Libhyphen Hyphenator")
-#define STR_DESCRIPTION_MYTHES  NC_("STR_DESCRIPTION_MYTHES", 
"Mythes Thesaurus")
+#define STR_DESCRIPTION_MYTHES  NC_("STR_DESCRIPTION_MYTHES", 
"MyThes Thesaurus")
 #define STR_DESCRIPTION_IGNOREALLLIST   
NC_("STR_DESCRIPTION_IGNOREALLLIST", "List of Ignored Words")
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/doc/docftn.cxx |   71 ++
 1 file changed, 51 insertions(+), 20 deletions(-)

New commits:
commit e9bf0102783e23cf8b7c609a9a5265ab436dc90e
Author: Bjoern Michaelsen 
AuthorDate: Sat Nov 10 20:22:50 2018 +0100
Commit: Björn Michaelsen 
CommitDate: Mon Nov 12 21:03:54 2018 +0100

tdf#120115: Dont crash on Footnote/Table undo/redo

brown paperbag commit:

- for one, we only want to use the anchor format when we dont have
  another one, not the other way around
- also we want to update the anchor format (not the char format) when it
  tells us so.
- finally, keep the selected Char and AnchorFormat in Sync between
  SwEndnoteInfo and the underlying DocumentStylePoolManager

Change-Id: Ic599dc1290c4e30d1746e5eefe6fed27b0ccdfe9
Reviewed-on: https://gerrit.libreoffice.org/63249
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index b2055f8afcdd..c302eb6c35eb 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -138,39 +138,69 @@ void SwEndNoteInfo::SetFootnoteTextColl(SwTextFormatColl& 
rFormat)
 aDepends.StartListening(pTextFormatColl);
 }
 
-SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc& rDoc) const
 {
-if (!pCharFormat)
+auto pCharFormatFromDoc = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
+m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
+if (pCharFormat != pCharFormatFromDoc)
 {
-pCharFormat = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
-m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
-aDepends.StartListening(pCharFormat);
+aDepends.EndListening(pCharFormat);
+aDepends.StartListening(pCharFormatFromDoc);
+pCharFormat = pCharFormatFromDoc;
 }
 return pCharFormat;
 }
 
-void SwEndNoteInfo::SetCharFormat( SwCharFormat* pChFormat )
+namespace
 {
-aDepends.EndListening(pCharFormat);
-pCharFormat = pChFormat;
-aDepends.StartListening(pCharFormat);
+void lcl_ResetPoolIdForDocAndSync(const sal_uInt16 nId, SwCharFormat* 
pFormat, SwEndNoteInfo& rInfo)
+{
+auto pDoc = pFormat->GetDoc();
+if(!pDoc)
+return;
+for(auto pDocFormat : *pDoc->GetCharFormats())
+{
+if(pDocFormat == pFormat)
+pDocFormat->SetPoolFormatId(nId);
+else if(pDocFormat->GetPoolFormatId() == nId)
+pDocFormat->SetPoolFormatId(0);
+}
+rInfo.GetCharFormat(*pDoc);
+rInfo.GetAnchorCharFormat(*pDoc);
+}
+}
+
+void SwEndNoteInfo::SetCharFormat(SwCharFormat* pFormat)
+{
+lcl_ResetPoolIdForDocAndSync(
+static_cast(m_bEndNote
+? RES_POOLCHR_ENDNOTE
+: RES_POOLCHR_FOOTNOTE),
+pFormat,
+*this);
 }
 
 SwCharFormat* SwEndNoteInfo::GetAnchorCharFormat(SwDoc& rDoc) const
 {
-if(!pAnchorFormat)
+auto pAnchorFormatFromDoc = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
+m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : RES_POOLCHR_FOOTNOTE_ANCHOR 
) );
+if(pAnchorFormat != pAnchorFormatFromDoc)
 {
-pAnchorFormat = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
-m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : 
RES_POOLCHR_FOOTNOTE_ANCHOR ) );
-aDepends.StartListening(pAnchorFormat);
+aDepends.EndListening(pAnchorFormat);
+aDepends.StartListening(pAnchorFormatFromDoc);
+pAnchorFormat = pAnchorFormatFromDoc;
 }
 return pAnchorFormat;
 }
 
 void SwEndNoteInfo::SetAnchorCharFormat(SwCharFormat* pFormat)
 {
-pAnchorFormat = pFormat;
-aDepends.StartListening(pAnchorFormat);
+lcl_ResetPoolIdForDocAndSync(
+static_cast(m_bEndNote
+? RES_POOLCHR_ENDNOTE_ANCHOR
+: RES_POOLCHR_FOOTNOTE_ANCHOR),
+pFormat,
+*this);
 }
 
 SwCharFormat* SwEndNoteInfo::GetCurrentCharFormat(const bool bAnchor) const
@@ -187,7 +217,7 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& 
rModify, const SfxHint& rHin
 const sal_uInt16 nWhich = pLegacyHint->m_pOld ? 
pLegacyHint->m_pOld->Which() : pLegacyHint->m_pNew ? 
pLegacyHint->m_pNew->Which() : 0 ;
 if (RES_ATTRSET_CHG == nWhich || RES_FMT_CHG == nWhich)
 {
-auto pFormat = GetCurrentCharFormat(pCharFormat != nullptr);
+auto pFormat = GetCurrentCharFormat(pCharFormat == nullptr);
 if (!pFormat || !aDepends.IsListeningTo(pFormat) || 
pFormat->IsFormatInDTOR())
 return;
 SwDoc* pDoc = pFormat->GetDoc();
@@ -207,14 +237,15 @@ void SwEndNoteInfo::SwClien

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

[Libreoffice Gerrit user]

 sw/CppunitTest_sw_ooxmlimport2.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 9c4a7dfe9e2a51aeec047feba7b4ac1d79c8586a
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 19:24:16 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 20:57:46 2018 +0100

Missing test dependency

Change-Id: I8ce7fab21cf2e6c47c955201eee87e8890b3a47a
Reviewed-on: https://gerrit.libreoffice.org/63300
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk 
b/sw/CppunitTest_sw_ooxmlimport2.mk
index 1d41899668af..c269c7282028 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -108,4 +108,8 @@ $(eval $(call 
gb_CppunitTest_use_components,sw_ooxmlimport2,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlimport2))
 
+# At least testTdf115094::Import (sw/qa/extras/ooxmlimport/ooxmlimport2.cxx) 
depends on TIFFReader
+# from Library_gie, which is loaded dynamically in 
vcl/source/filter/graphicfilter.cxx:
+$(call gb_CppunitTest_get_target,sw_ooxmlimport2): $(call 
gb_Library_get_target,gie)
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source package/source sd/source sot/source svtools/source svx/source sw/source testtools/source vcl/source

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx   |2 +-
 package/source/zippackage/ZipPackageStream.cxx  |2 +-
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx |2 +-
 sot/source/sdstor/ucbstorage.cxx|2 +-
 svtools/source/control/toolbarmenu.cxx  |2 +-
 svx/source/fmcomp/gridctrl.cxx  |2 +-
 sw/source/core/crsr/pam.cxx |2 +-
 sw/source/core/undo/untbl.cxx   |4 ++--
 testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs |2 +-
 vcl/source/control/tabctrl.cxx  |2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 69b46d7a3b7cd1f0f398ec18583a7383deef25d8
Author: Andrea Gelmini 
AuthorDate: Mon Nov 12 17:05:25 2018 +0100
Commit: Julien Nabet 
CommitDate: Mon Nov 12 20:44:39 2018 +0100

Fix typos

Change-Id: Ibb94b2b16afbcca84dd55ae51fde6fd27afede3a
Reviewed-on: https://gerrit.libreoffice.org/63297
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 2f1a87c961f9..521dccd6dae1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -631,7 +631,7 @@ unsigned char *  codeSnippet( unsigned char * code, 
sal_Int32 functionIndex, sal
 
 // #now load up the pointer to the saved fpr registers
 //  addir6,r1,-2016
-// if no dedicated floating point registers are used than we have NULL
+// if no dedicated floating point registers are used then we have NULL
 // pointer there
 //  li  r6, 0
 
diff --git a/package/source/zippackage/ZipPackageStream.cxx 
b/package/source/zippackage/ZipPackageStream.cxx
index 5fe4d0ef80c5..6dad7d6f8b07 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -621,7 +621,7 @@ bool ZipPackageStream::saveChild(
 // at position zero...otherwise, assert and skip this stream...
 if ( IsPackageMember() )
 {
-// if the password has been changed than the stream should 
not be package member any more
+// if the password has been changed then the stream should 
not be package member any more
 if ( m_bIsEncrypted && m_bToBeEncrypted )
 {
 // Should be handled close to the raw stream handling
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx 
b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index dfdbdea5690a..2ad10b77aac6 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -53,7 +53,7 @@ namespace accessibility {
 
 The different view modes of the Draw and Impress applications
 are made accessible by derived classes.  When the view mode is
-changed than the object representing the document view is
+changed then the object representing the document view is
 disposed and replaced by a new instance of the then appropriate
 derived class.
 
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 05027ed580b2..98633c9fec72 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -733,7 +733,7 @@ bool UCBStorageStream_Impl::Init()
 }
 else
 {
-// if the new file is edited than no source exist
+// if the new file is edited then no source exist
 m_bSourceRead = false;
 //SetError( SVSTREAM_CANNOT_MAKE );
 }
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index b64c0b788442..824de42d35ca 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -965,7 +965,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, 
bool bHomeEnd )
 else
 {
 // if we have a currently selected entry and
-// cursor keys are used than check if this entry
+// cursor keys are used then check if this entry
 // has a control that can use those cursor keys
 ToolbarMenuEntry* pData = mpImpl->maEntryVector[n].get();
 if( pData && pData->mpControl && !pData->mbHasText )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 325d2b2957ef..a0e898c3d571 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2666,7 +2666,7 @@ sal_uInt32 DbGridControl::GetTotalCellWidth(long nRow, 
sal_uInt16 nColId)
 void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& 
rMenu)
 {
 bool bDelete = (m_nOptions & DbGridControlOption

Where starts an ellipse?

[Regina Henschel]

Hi all,

I want to work on bug 121305. I know already, that I have to replace 
EnhancedCustomShape2d#1691-1725 with a solution with more segments. My 
idea is to use a 12-segment solution from basegfx. That works in 
principle as I have tested already.


My question is, where the ellipse should start. For a solid stroke it 
makes no difference, but if you use e.g. a dash-dash-dot stroke, you get 
different solutions.


Currently we have:
primitive (legacy) ellipse: start at 6 o'clock.
custom shape ellipse: start at 12 o'clock.
primitive (legacy) rounded rectangle: start at 3 o'clock
import from PowerPoint 365: start at 9 o'clock
import from Inkscape: start at 3 o'clock

The method basegfx::utils::createPolygonFromEllipse would generate a 
start a 3 o'clock. But it would be no problem to use a solution with 6, 
9, or 12 o'clock.


Which start do you want me to use?

Kind regards
Regina


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/qa/extras/odfimport/data/tdf120677.fodt |   13 +
 sw/qa/extras/odfimport/odfimport.cxx   |5 +
 sw/source/core/text/guess.cxx  |   20 
 3 files changed, 30 insertions(+), 8 deletions(-)

New commits:
commit 4bb28ad217ea9d6511b6921dcd3d28328edcb4d6
Author: Mike Kaganski 
AuthorDate: Mon Nov 12 15:07:58 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Nov 12 20:02:46 2018 +0100

tdf#120677: restore treatment of blanks in SwTextGuess::Guess

Before commit 0be3db28a4db4d2c81a5cb2edd48711eec55b51b, all non-breakable
spaces were converted to plain spaces in SwTextSlot::SwTextSlot (see
pInf->SetText call there). The mentioned commit has changed that to allow
differentiating non-breakable spaces from other types of spaces (related
to the fix of tdf#115067). This broke following processing of the NBSPs
when they don't fit to line, causing infinite layout loop leading to OOM.

This allows to restore old behavior to not call the break iterator for
NBSP by explicitly checking for it.

Change-Id: I36ab06abb66bbe65a5fc542c41e816a9f20a2dcf
Reviewed-on: https://gerrit.libreoffice.org/63290
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/odfimport/data/tdf120677.fodt 
b/sw/qa/extras/odfimport/data/tdf120677.fodt
new file mode 100644
index ..b2006828fb10
--- /dev/null
+++ b/sw/qa/extras/odfimport/data/tdf120677.fodt
@@ -0,0 +1,13 @@
+
+
+
+ 
+  
+   
+ 
+  . 
+ 
+
+  
+ 
+
\ No newline at end of file
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index bd31b56d3e76..160f72028f51 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -910,5 +910,10 @@ DECLARE_ODFIMPORT_TEST(testTdf116195, "tdf116195.odt")
 );
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf120677, "tdf120677.fodt")
+{
+// The document used to hang the layout, consuming memory until OOM
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 96f82ae8dd5e..f24fdef51094 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -40,7 +40,14 @@ using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
 
-#define CH_FULL_BLANK 0x3000
+namespace{
+
+const sal_Unicode CH_FULL_BLANK = 0x3000;
+const sal_Unicode CH_NB_SPACE = 0xA0;
+
+bool IsBlank(sal_Unicode ch) { return ch == CH_BLANK || ch == CH_FULL_BLANK || 
ch == CH_NB_SPACE; }
+
+}
 
 // provides information for line break calculation
 // returns true if no line break has to be performed
@@ -243,7 +250,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 sal_Unicode cCutChar = nCutPos < TextFrameIndex(rInf.GetText().getLength())
 ? rInf.GetText()[sal_Int32(nCutPos)]
 : 0;
-if( CH_BLANK == cCutChar || CH_FULL_BLANK == cCutChar )
+if (IsBlank(cCutChar))
 {
 nBreakPos = nCutPos;
 TextFrameIndex nX = nBreakPos;
@@ -253,23 +260,20 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 // we step back until a non blank character has been found
 // or there is only one more character left
 while (nX && TextFrameIndex(rInf.GetText().getLength()) < 
nBreakPos &&
-   ( CH_BLANK == ( cCutChar = rInf.GetChar( --nX ) ) ||
- CH_FULL_BLANK == cCutChar ) )
+   IsBlank(rInf.GetChar(--nX)))
 --nBreakPos;
 }
 else // #i20878#
 {
 while (nX && nBreakPos > rInf.GetLineStart() + TextFrameIndex(1) &&
-   ( CH_BLANK == ( cCutChar = rInf.GetChar( --nX ) ) ||
- CH_FULL_BLANK == cCutChar ) )
+   IsBlank(rInf.GetChar(--nX)))
 --nBreakPos;
 }
 
 if( nBreakPos > rInf.GetIdx() )
 nPorLen = nBreakPos - rInf.GetIdx();
 while (++nCutPos < TextFrameIndex(rInf.GetText().getLength()) &&
-   ( CH_BLANK == ( cCutChar = rInf.GetChar( nCutPos ) ) ||
- CH_FULL_BLANK == cCutChar ) )
+   IsBlank(rInf.GetChar(nCutPos)))
 ; // nothing
 
 nBreakStart = nCutPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/uitest/table/tableProperties.py |  248 ++
 1 file changed, 248 insertions(+)

New commits:
commit e4d8c97efe620bc8ca40c29977516ea9fdb62b04
Author: Zdeněk Crhonek 
AuthorDate: Mon Nov 12 18:46:16 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Nov 12 19:58:57 2018 +0100

uitest Writer - Table properties dialog

Change-Id: I1706c19c9636ba43f5b64a0691c108b1b76293c2
Reviewed-on: https://gerrit.libreoffice.org/63299
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/table/tableProperties.py 
b/sw/qa/uitest/table/tableProperties.py
new file mode 100644
index ..009a807aa4b0
--- /dev/null
+++ b/sw/qa/uitest/table/tableProperties.py
@@ -0,0 +1,248 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Writer Table Properties
+
+class tableProperties(UITestCase):
+def test_table_properties(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tableToText.odt"))
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#set cm
+self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")  
#optionsdialog
+xDialog = self.xUITest.getTopFocusWindow()
+
+xPages = xDialog.getChild("pages")
+xWriterEntry = xPages.getChild('3') # Writer
+xWriterEntry.executeAction("EXPAND", tuple())
+xWriterGeneralEntry = xWriterEntry.getChild('0')
+xWriterGeneralEntry.executeAction("SELECT", tuple())  #General
+xMetric = xDialog.getChild("metric")
+props = {"TEXT": "Centimeter"}
+actionProps = mkPropertyValues(props)
+xMetric.executeAction("SELECT", actionProps)
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+#dialog Table Properties - Table
+self.ui_test.execute_dialog_through_command(".uno:TableDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+tabcontrol = xDialog.getChild("tabcontrol")
+select_pos(tabcontrol, "0")
+
+name = xDialog.getChild("name")
+free = xDialog.getChild("free")
+widthmf = xDialog.getChild("widthmf")
+leftmf = xDialog.getChild("leftmf")
+rightmf = xDialog.getChild("rightmf")
+abovemf = xDialog.getChild("abovemf")
+belowmf = xDialog.getChild("belowmf")
+textdirection = xDialog.getChild("textdirection")
+
+name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+name.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+name.executeAction("TYPE", mkPropertyValues({"TEXT":"NewName"}))
+free.executeAction("CLICK", tuple())
+widthmf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+widthmf.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+widthmf.executeAction("TYPE", mkPropertyValues({"TEXT":"15"}))
+leftmf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+leftmf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+leftmf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
+rightmf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+rightmf.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+rightmf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
+abovemf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+abovemf.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+abovemf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
+belowmf.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
+belowmf.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+belowmf.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
+props = {"TEXT": "Left-to-right (LTR)"}
+actionProps = mkPropertyValues(props)
+textdirection.executeAction("SELECT", actionProps)
+xOKBtn = xDialog.getChi

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4122e02986f3f67e7c97eda914869f3ae23a5e2c
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 20:06:20 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 20:20:52 2018 +0200

We need share/liblangtag, too

Otherwise i18nlantag works weirdly.

Change-Id: Ic5bf2007e586e6bb53a9e89782c2b05f73e348e3

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 85fbbad4c727..642c6d969c77 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -64,6 +64,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+   cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and 
versionrc.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - Mobile/Mobile Mobile/Mobile.xcodeproj

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |   12 
 Mobile/Mobile/Document.mm   |3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 705bf6e8dc4637c1cee17236733af5ead64ebaff
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 20:13:23 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 20:14:10 2018 +0200

What we want is [[NSLocale preferredLanguages] firstObject]

Not [NSLocale currentLocale]. See

https://stackoverflow.com/questions/3910244/getting-current-device-language-in-ios
 .

Change-Id: I14490f6b8c910c3fc1a0b7780bcfdd6b53553678

diff --git a/Mobile/Mobile/Document.mm b/Mobile/Mobile/Document.mm
index d27bf2092..c2614f253 100644
--- a/Mobile/Mobile/Document.mm
+++ b/Mobile/Mobile/Document.mm
@@ -15,6 +15,7 @@
 
 #define LIBO_INTERNAL_ONLY
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -50,7 +51,7 @@
 if (lang != nullptr)
 locale = [NSString stringWithUTF8String:lang];
 else
-locale = [NSLocale currentLocale].languageCode;
+locale = [[NSLocale preferredLanguages] firstObject];
 
 
comphelper::LibreOfficeKit::setLanguageTag(LanguageTag(OUString::fromUtf8(OString([locale
 UTF8String])), true));
 
commit 139809286f892ba4b06c48f8f60b2b8628628d12
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 20:09:26 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 20:14:10 2018 +0200

Add two source files from i18nlangtag

Change-Id: Ic0b24d395dd8f74ce7d18a6e16cd5f61da4b4c01

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 4ac376418..a3adce50a 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -455,6 +455,8 @@
BEA8CD7D21959343009FE17E /* localedatawrapper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
localedatawrapper.cxx; path = 
"../../ios-device/unotools/source/i18n/localedatawrapper.cxx"; sourceTree = 
""; };
BEA8CD7E21959343009FE17E /* resmgr.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = resmgr.cxx; 
path = "../../ios-device/unotools/source/i18n/resmgr.cxx"; sourceTree = 
""; };
BEA8CDC32199AC9D009FE17E /* lok.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lok.cxx; path 
= "../../ios-device/comphelper/source/misc/lok.cxx"; sourceTree = ""; };
+   BEA8CDC52199E621009FE17E /* languagetagicu.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
languagetagicu.cxx; path = 
"../../ios-device/i18nlangtag/source/languagetag/languagetagicu.cxx"; 
sourceTree = ""; };
+   BEA8CDC62199E621009FE17E /* languagetag.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
languagetag.cxx; path = 
"../../ios-device/i18nlangtag/source/languagetag/languagetag.cxx"; sourceTree = 
""; };
BEB6521C216F5D8B00B8C09A /* file_path_helper.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
file_path_helper.hxx; path = 
"../../ios-device/sal/osl/unx/file_path_helper.hxx"; sourceTree = ""; };
BEB6521D216F5D8B00B8C09A /* file_error_transl.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
file_error_transl.hxx; path = 
"../../ios-device/sal/osl/unx/file_error_transl.hxx"; sourceTree = ""; };
BEB6521E216F5D8B00B8C09A /* nlsupport.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = nlsupport.hxx; 
path = "../../ios-device/sal/osl/unx/nlsupport.hxx"; sourceTree = ""; };
@@ -946,6 +948,7 @@
children = (
BEA8CDC12199AC7A009FE17E /* comphelper */,
BE34D182218CFC6C00815297 /* desktop */,
+   BEA8CDC42199E5ED009FE17E /* i18nlangtag */,
BEB6521A216F5D4600B8C09A /* sal */,
BE93D43C216D555C007A39F4 /* sfx2 */,
BE34D1892190712C00815297 /* sc */,
@@ -1168,6 +1171,15 @@
name = misc;
sourceTree = "";
};
+   BEA8CDC42199E5ED009FE17E /* i18nlangtag */ = {
+   isa = PBXGroup;
+   children = (
+   BEA8CDC62199E621009FE17E /* languagetag.cxx */,
+   BEA8CDC52199E621009FE17E /* languagetagicu.cxx 
*/,
+   );
+   name = i18nlangtag;
+   sourceTree = "";
+   };
BEB6521A216F5D4600B8C09A /* sal */ = {
isa = PBXGroup;
children = (
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fre

Re: Android Build Error at ./autogen.sh

[Christian Lohmaier]

Hi *,
On Mon, Nov 12, 2018 at 4:22 PM ツ  wrote:
>
> I'm trying to build the Android version of LibreOffice but I get the
> following error when running ./autogen.sh :
>
> "configure: error: Unrecognized Android NDK. Missing RELEASE.TXT or
> source.properties file in ~/home/brenda/Android/Sdk/ndk-bundle/.
> Error running configure at ./autogen.sh line 296."
>
> I have updated my autogen.input to reflect the correct SDK and NDK path.
> I have also checked the ndk-bundle folder and source.properties file
> exists. I'm using ndk revision 18.
>
> Does anyone have any suggestions as to how I can solve this?

The check fails because it checks for
"$ANDROID_NDK_HOME/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_ARCH}/usr/lib/libc.a"

api-level is set to 14 currently - but NDK 18 dropped support for
anything older than 16.

→ So change it to  ANDROID_API_LEVEL=16 in configure.ac

(not that you'll also need to adjust android/source/build.gradle and
external/owncloud-android-lib/build.gradle accordingly)

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: autogen.sh : libEGL required

[Christian Lohmaier]

Hi *,
On Mon, Nov 12, 2018 at 5:47 PM Patrick Jaap  wrote:
>
> A try to build LibreOffice on an Ubuntu 18.04 machine and ./autogen.sh
> stops with
>
> [..]
> checking for gobject-introspection... yes
> checking for eglMakeCurrent in -lEGL... no
> configure: error: libEGL required.
> Error running configure at ./autogen.sh line 296.
>
> On my system are
>
> libegl1-mesa-dev
> libegl-mesa0
> libegl1
> libegl1-mesa
> libnvidia-gl-390
>
> installed. I have some trouble with my nvidia driver. Can this cause the
> error?

No idea about possible conflicts with nvidia driver, but my distro
calls the package libmesaegl1-devel / query your packages for the
pkg-config file egl.pc or eglplatform.h header file

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: bundled/include kit/ChildSession.cpp kit/KitHelper.hpp tools/KitClient.cpp wsd/protocol.txt

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h  |9 +++
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx|   24 ---
 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |   14 +++
 bundled/include/LibreOfficeKit/LibreOfficeKitInit.h  |3 --
 kit/ChildSession.cpp |   15 +++
 kit/KitHelper.hpp|   10 +++
 tools/KitClient.cpp  |2 -
 wsd/protocol.txt |   10 +++
 8 files changed, 74 insertions(+), 13 deletions(-)

New commits:
commit efe291c320f04db6ca664dcdb5f3ce76d700e65d
Author: Jan Holesovsky 
AuthorDate: Tue Nov 6 11:21:35 2018 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Nov 12 18:10:57 2018 +0100

Notify about the editing context.

And also:

* Hint the compiler to warn about the missing callbacks.
* Add few missing ones.
* Update the bundled headers.

Change-Id: I8d31363eaaea289e8a517c0b9b1142b33ce3027e

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index e052765ac..27d968c4a 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -309,6 +309,15 @@ struct _LibreOfficeKitDocumentClass
 /// @see lok::Document::getPartInfo().
 char* (*getPartInfo) (LibreOfficeKitDocument* pThis, int nPart);
 
+/// Paints window with given id to the buffer with the give DPI scale
+/// (every pixel is dpiscale-times larger).
+/// @see lok::Document::paintWindow().
+void (*paintWindowDPI) (LibreOfficeKitDocument* pThis, unsigned nWindowId,
+unsigned char* pBuffer,
+const int x, const int y,
+const int width, const int height,
+const double dpiscale);
+
 #ifdef IOS
 /// @see lok::Document::paintTileToCGContext().
 void (*paintTileToCGContext) (LibreOfficeKitDocument* pThis,
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 4057686a9..4a0ec6784 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -164,16 +164,23 @@ public:
  * @param y y-coordinate from where the dialog should start painting
  * @param width The width of the dialog image to be painted
  * @param height The height of the dialog image to be painted
+ * @param dpiscale The dpi scale value used by the client.  Please note
+ * that the x, y, width, height are supposed to be the
+ * values with dpiscale applied (ie. dialog covering
+ * 100x100 "normal" pixels with dpiscale '2' will have
+ * 200x200 width x height), so that it is easy to compute
+ * the buffer sizes etc.
  */
 void paintWindow(unsigned nWindowId,
  unsigned char* pBuffer,
  const int x,
  const int y,
  const int width,
- const int height)
+ const int height,
+ const double dpiscale = 1.0)
 {
-return mpDoc->pClass->paintWindow(mpDoc, nWindowId, pBuffer,
-  x, y, width, height);
+return mpDoc->pClass->paintWindowDPI(mpDoc, nWindowId, pBuffer,
+ x, y, width, height, dpiscale);
 }
 
 /**
@@ -582,13 +589,13 @@ public:
  *  Insert certificate (in binary form) to the certificate store.
  */
 bool insertCertificate(const unsigned char* pCertificateBinary,
-   const int nCertificateBinarySize,
+   const int pCertificateBinarySize,
const unsigned char* pPrivateKeyBinary,
const int nPrivateKeyBinarySize)
 {
 return mpDoc->pClass->insertCertificate(mpDoc,
-pCertificateBinary, nCertificateBinarySize,
-pPrivateKeyBinary, nPrivateKeyBinarySize);
+pCertificateBinary, 
pCertificateBinarySize,
+pPrivateKeyBinary, 
nPrivateKeyBinarySize);
 }
 
 /**
@@ -596,9 +603,10 @@ public:
  *
  */
 bool addCertificate(const unsigned char* pCertificateBinary,
-const int pCertificateBinarySize)
+ const int pCertificateBinarySize)
 {
-return mpDoc->pClass->addCertificate(mpDoc, pCertificateBinary, 
pCertificateBinarySize);
+return mpDoc->pClass->addCertificate(mpDoc,
+ pCertificateBinary, 
pCertificateBinarySize);
 }
 

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

[Libreoffice Gerrit user]

 sc/qa/uitest/statistics/exponentialSmoothing.py |3 +--
 sc/qa/uitest/statistics/sampling.py |2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit eb9a223151a00d11ed89a42465663b6e5cd75bd9
Author: Zdeněk Crhonek 
AuthorDate: Mon Nov 12 17:17:58 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Nov 12 18:23:13 2018 +0100

uitest cleaning 01

Change-Id: Iae30d2bef4bba232d5e5a042d1c736e36496ce1c
Reviewed-on: https://gerrit.libreoffice.org/63298
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/statistics/exponentialSmoothing.py 
b/sc/qa/uitest/statistics/exponentialSmoothing.py
index 83ff5a9f76fc..aac281d22af8 100644
--- a/sc/qa/uitest/statistics/exponentialSmoothing.py
+++ b/sc/qa/uitest/statistics/exponentialSmoothing.py
@@ -21,7 +21,6 @@ class exponentialSmoothing(UITestCase):
 gridwin = xCalcDoc.getChild("grid_window")
 document = self.ui_test.get_component()
 #fill data
-sleep(30)
 enter_text_to_cell(gridwin, "A1", "1")
 enter_text_to_cell(gridwin, "A2", "0")
 enter_text_to_cell(gridwin, "A3", "0")
@@ -181,4 +180,4 @@ class exponentialSmoothing(UITestCase):
 self.assertEqual(get_cell_by_position(document, 0, 5, 0).getString(), 
"")
 
 self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/statistics/sampling.py 
b/sc/qa/uitest/statistics/sampling.py
index cf084b50dde4..da69e03ae864 100644
--- a/sc/qa/uitest/statistics/sampling.py
+++ b/sc/qa/uitest/statistics/sampling.py
@@ -71,10 +71,8 @@ class sampling(UITestCase):
 xperiodspin.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
 xperiodspin.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
 xperiodspin.executeAction("TYPE", mkPropertyValues({"TEXT":"2"}))
-sleep(5)
 xOKBtn = xDialog.getChild("ok")
 self.ui_test.close_dialog_through_button(xOKBtn)
-sleep(5)
 #Verify
 self.assertEqual(get_cell_by_position(document, 0, 5, 0).getValue(), 
12)
 self.assertEqual(get_cell_by_position(document, 0, 5, 1).getValue() , 
14)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: autogen.sh : libEGL required

[Jan-Marek Glogowski]

Hi Patrick,

Am 12.11.18 um 17:47 schrieb Patrick Jaap:
> A try to build LibreOffice on an Ubuntu 18.04 machine and ./autogen.sh stops 
> with
> 
> [..]
> checking for gobject-introspection... yes
> checking for eglMakeCurrent in -lEGL... no
> configure: error: libEGL required.
> Error running configure at ./autogen.sh line 296.
> 
> 
> On my system are
> 
> libegl1-mesa-dev
> libegl-mesa0
> libegl1
> libegl1-mesa
> libnvidia-gl-390
> 
> installed. I have some trouble with my nvidia driver. Can this cause the 
> error? I don't know how to
> continue here... I reinstalled the libraries and nvidia driver. Maybe someone 
> knows something!

The NVIDIA binary drivers replace all OpenGL libraries.

They have to bring the same symbols, so I don't know why "eglMakeCurrent in 
-lEGL" fails. Maybe they
split the libraries and used different dependencies to work correctly. I guess 
configure just uses
objdump to look for the symbol, which won't (can't?) follow depending library 
chains.

My suggestion would be: use schroot and build LO in a clean environment. My 
build schroot is ~3GB
size. That way the LO build won't interact with your main system and you should 
be able to still use
the NVIDIA binary driver on the host.

Jan-Marek
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 i18npool/source/characterclassification/cclass_unicode_parser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc63974e9d82a6ff7954618add266f967fa428eb
Author: Mike Kaganski 
AuthorDate: Sun Nov 11 23:03:45 2018 +0300
Commit: Eike Rathke 
CommitDate: Mon Nov 12 18:19:08 2018 +0100

tdf#120703 PVS: V560 Properly compare current to cDecimalSepAlt

V560 A part of conditional expression is always false: current == 
cDecimalSep.

Assuming a copypaste error in commit 
21052ba2edeef9e16bf90fea62f007b1131c73c0.
Compare to a similar case below (line 817).

Change-Id: Iebd84aa8df3e37b9a5e4fdc7ce7a25a0704a260f
Reviewed-on: https://gerrit.libreoffice.org/63269
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx 
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 96882a8ef3c2..8cca988607fd 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -745,7 +745,7 @@ void cclass_Unicode::parseText( ParseResult& r, const 
OUString& rText, sal_Int32
 else
 r.TokenType = KParseType::ASC_NUMBER;
 }
-else if (current == cDecimalSep || (bDecSepAltUsed = 
(cDecimalSepAlt && current == cDecimalSep)))
+else if (current == cDecimalSep || (bDecSepAltUsed = 
(cDecimalSepAlt && current == cDecimalSepAlt)))
 {
 if (nextChar)
 ++nDecSeps;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 i18npool/source/transliteration/transliteration_Numeric.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b8b72cbdc6407bf806eab14b2d29bb72cf21cd6
Author: Noel Grandin 
AuthorDate: Mon Nov 12 14:03:31 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 12 18:15:46 2018 +0100

fix missing "else" in transliterateBullet

ever since

commit f1830339193643466c1dd76dc37594c21ab3ac4f
Date:   Tue Apr 8 15:07:08 2003 +
INTEGRATION: CWS calc06 (1.2.44); FILE MERGED

not it will make much difference to the logic

found by experimental loplugin:indentation

Change-Id: I2d724ababa1664a87f2822ed8b59f3e3cd50e5e4
Reviewed-on: https://gerrit.libreoffice.org/63287
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx 
b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 733f3f7dc100..4550026153d5 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.cxx
@@ -84,7 +84,7 @@ transliteration_Numeric::transliterateBullet( const OUString& 
inStr, sal_Int32 s
 if (useOffset)
 offset[j] = startPos;
 out[j++] = NUMBER_ZERO;
-} if (number > tableSize && !recycleSymbol) {
+} else if (number > tableSize && !recycleSymbol) {
 for (sal_Int32 k = startPos; k < i; k++) {
 if (useOffset)
 offset[j] = k;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

autogen.sh : libEGL required

[Patrick Jaap]

Hi there!

A try to build LibreOffice on an Ubuntu 18.04 machine and ./autogen.sh 
stops with


[..]
checking for gobject-introspection... yes
checking for eglMakeCurrent in -lEGL... no
configure: error: libEGL required.
Error running configure at ./autogen.sh line 296.


On my system are

libegl1-mesa-dev
libegl-mesa0
libegl1
libegl1-mesa
libnvidia-gl-390

installed. I have some trouble with my nvidia driver. Can this cause the 
error? I don't know how to continue here... I reinstalled the libraries 
and nvidia driver. Maybe someone knows something!


Regards,
Patrick

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 7eb71f84db2f2d9a6e79a42d25bb676cf1018a90
Author: Caolán McNamara 
AuthorDate: Mon Nov 12 13:31:13 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 12 17:29:24 2018 +0100

honor getNumDecimalSep for keypad input in native gtk3 dialogs

Change-Id: Ibbd37f18ee97eb6ded0ab90cd70b777ffd20f91d
Reviewed-on: https://gerrit.libreoffice.org/63291
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 3c3e5d25588f..86a6f4882a94 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1187,6 +1187,7 @@ private:
 bool m_bFrozen;
 gulong m_nFocusInSignalId;
 gulong m_nFocusOutSignalId;
+gulong m_nKeyPressSignalId;
 
 static void signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
 {
@@ -1202,6 +1203,17 @@ private:
 pThis->signal_focus_out();
 }
 
+static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer)
+{
+// #i1820# use locale specific decimal separator
+if (pEvent->keyval == GDK_KEY_KP_Decimal)
+{
+OUString 
aSep(Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep());
+pEvent->keyval = aSep[0];
+}
+return false;
+}
+
 public:
 GtkInstanceWidget(GtkWidget* pWidget, bool bTakeOwnership)
 : m_pWidget(pWidget)
@@ -1209,6 +1221,7 @@ public:
 , m_bFrozen(false)
 , m_nFocusInSignalId(0)
 , m_nFocusOutSignalId(0)
+, m_nKeyPressSignalId(g_signal_connect(pWidget, "key-press-event", 
G_CALLBACK(signalKeyPress), this))
 {
 }
 
@@ -1509,6 +1522,7 @@ public:
 
 virtual ~GtkInstanceWidget() override
 {
+g_signal_handler_disconnect(m_pWidget, m_nKeyPressSignalId);
 if (m_nFocusInSignalId)
 g_signal_handler_disconnect(m_pWidget, m_nFocusInSignalId);
 if (m_nFocusOutSignalId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: master build problems with en_US.utf8 locale

[rene . engelhard]

Am 12. November 2018 08:49:37 MEZ schrieb Stephan Bergmann 
:
>On 31/10/2018 17:04, Stephan Bergmann wrote:
>> On 31/10/2018 16:33, Patrick Jaap wrote:
>>> Why is the en_US.utf8 locale necessary?
>> 
>> See the discussion that ensued in the comments at 
>> , and 
>>  "Don't depend
>on 
>> en_US.UTF-8 locale" to address the one problem in
>externallibnumbertext. 
>>   I haven't yet checked whether there's more such issues, but my
>intend 
>> is to get those fixed and eventually revert the above configure.ac
>check 
>> again.
>
>done now,  "Revert 'Add check for
>
>en_US.utf8 locale'"
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/libreoffice

Hi,

And what about the tests which explicitly set en_US.utf8 too?

Regards

René
-- 
Diese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Android Build Error at ./autogen.sh

[ツ]

I'm trying to build the Android version of LibreOffice but I get the 
following error when running ./autogen.sh :


"configure: error: Unrecognized Android NDK. Missing RELEASE.TXT or 
source.properties file in ~/home/brenda/Android/Sdk/ndk-bundle/.

Error running configure at ./autogen.sh line 296."

I have updated my autogen.input to reflect the correct SDK and NDK path. 
I have also checked the ndk-bundle folder and source.properties file 
exists. I'm using ndk revision 18.


Does anyone have any suggestions as to how I can solve this?

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: 2 commits - Mobile/Mobile Mobile/Mobile.xcodeproj

[Libreoffice Gerrit user]

 Mobile/Mobile.xcodeproj/project.pbxproj |   20 
 Mobile/Mobile/Document.mm   |   11 +++
 2 files changed, 31 insertions(+)

New commits:
commit 94f491f2954728662bdc19921ba13f602fc45754
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 15:17:24 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 17:18:52 2018 +0200

Call comphelper::LibreOfficeKit::setLanguageTag() to avoid assertion failure

The locale / language tag dance is a bit confusing. Let's hope it now
works sanely.

Without this change, if I as a test in Xcode set the LANG environment
variable when running the app to "de", to match the case where the
user is using their device in a German locale, and then open a
non-trivial .odt document, close it, and open it again, I get an
assertion failure in sw, in SwXPageStyle::GetPropertyValues_Impl().

(Note that the LANG environment variable is not set by the system on
iOS; in this app LANG is just an arbitrary (but familiar) name for an
environment variable used only when debugging in Xcode. Maybe I should
have called it something else to avoid confusing code readers who
might think it has the same meaning as in POSIX systems.)

The above assertion failure does not happen if I don't set LANG. I
don't really fully understand the convoluted mechanisms involved, but
explicitly re-setting the  concept of (global)
language tag each time before opening a document seems to help. Note
that if I set LANG to just "de", the code then later while handling
setView() calls in ChildSession::loadDocument(), sets it to "de-DE"
anyway. But that doesn't seem to harm.

Change-Id: Ic697ed44b4ace488782ebee3aa2e7610bb02e93c

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 650213253..4ac376418 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -1534,6 +1534,7 @@
"$(LOSRCDIR)/include",

"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/CustomTarget/ios",

"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnpackedTarball/libpng",
+   
"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/udkapi/comprehensive",
"$(SOURCE_ROOT)/../pocoinclude-symlink",
);
INFOPLIST_FILE = Mobile/Info.plist;
@@ -1591,6 +1592,7 @@
"$(LOSRCDIR)/include",

"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/CustomTarget/ios",

"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnpackedTarball/libpng",
+   
"$(SOURCE_ROOT)/../lobuilddir-symlink/workdir/UnoApiHeadersTarget/udkapi/comprehensive",
"$(SOURCE_ROOT)/../pocoinclude-symlink",
);
INFOPLIST_FILE = Mobile/Info.plist;
diff --git a/Mobile/Mobile/Document.mm b/Mobile/Mobile/Document.mm
index a14871a42..d27bf2092 100644
--- a/Mobile/Mobile/Document.mm
+++ b/Mobile/Mobile/Document.mm
@@ -10,6 +10,15 @@
 
 #import 
 
+// This is not "external" code in the UNO-based extensions sense. To be able 
to include
+// , we must #define LIBO_INTERNAL_ONLY.
+
+#define LIBO_INTERNAL_ONLY
+#include 
+#include 
+#include 
+#include 
+
 #import "ios.h"
 #import "AppDelegate.h"
 #import "Document.h"
@@ -43,6 +52,8 @@
 else
 locale = [NSLocale currentLocale].languageCode;
 
+
comphelper::LibreOfficeKit::setLanguageTag(LanguageTag(OUString::fromUtf8(OString([locale
 UTF8String])), true));
+
 NSURL *url = [[NSBundle mainBundle] URLForResource:@"loleaflet" 
withExtension:@"html"];
 NSURLComponents *components = [NSURLComponents componentsWithURL:url 
resolvingAgainstBaseURL:NO];
 components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"file_path" 
value:uri],
commit 653d24f91393482899ea4b558a427a020c6f5dc8
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 14:52:14 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 17:18:52 2018 +0200

Add lok.cxx from comphelper

Change-Id: If7627ecf4ca6771ecbba51ecde69160ab959be46

diff --git a/Mobile/Mobile.xcodeproj/project.pbxproj 
b/Mobile/Mobile.xcodeproj/project.pbxproj
index 5a749f2ab..650213253 100644
--- a/Mobile/Mobile.xcodeproj/project.pbxproj
+++ b/Mobile/Mobile.xcodeproj/project.pbxproj
@@ -454,6 +454,7 @@
BEA8CD7C21959343009FE17E /* readwritemutexguard.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
readwritemutexguard.cxx; path = 
"../../ios-device/unotools/source/i18n/readwritemutexguard.cxx"; sourceTree = 
"";

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

[Libreoffice Gerrit user]

 scripting/source/basprov/basprov.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c846e85f03b635c88e043166a352a42eeae39304
Author: Jan-Marek Glogowski 
AuthorDate: Mon Nov 12 13:02:13 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Nov 12 15:37:26 2018 +0100

Guard listener cleanup of BasicProviderImpl

Otherwise JunitTest_sfx2_complex dbgutil asserts especially on
Windows with:

ucrtbased!get_wide_winmain_command_line+0x296
ucrtbased!get_wide_winmain_command_line+0xe4
ucrtbased!wassert+0x1a
vcllo!ImplDbgTestSolarMutex+0x43
tllo!DbgTestSolarMutex+0x11d
svllo!SfxBroadcaster::RemoveListener+0x2e
svllo!SfxListener::~SfxListener+0x8f
basprovlo!basprov::BasicProviderImpl::~BasicProviderImpl+0x8f
...

Change-Id: Ia183436a92bc70ed5208364987b3e97e27b5bd6e
Reviewed-on: https://gerrit.libreoffice.org/63289
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/scripting/source/basprov/basprov.cxx 
b/scripting/source/basprov/basprov.cxx
index 6c856d5a5a24..1055b57bd7d0 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -101,6 +101,8 @@ namespace basprov
 
 BasicProviderImpl::~BasicProviderImpl()
 {
+SolarMutexGuard aGuard;
+EndListeningAll();
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 comphelper/source/misc/lok.cxx |4 
 include/sal/log-areas.dox  |1 +
 2 files changed, 5 insertions(+)

New commits:
commit 88f55bea92cee46738b7fe6f206f0597edfadce5
Author: Tor Lillqvist 
AuthorDate: Mon Nov 12 16:01:22 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Nov 12 16:02:22 2018 +0200

Add a SAL_INFO() when changing the global "lok" language tag

Change-Id: I229bb2cce38c3f67724802e31edff73e313b7457

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 2f6a2c151370..5934ed58c297 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -133,7 +134,10 @@ bool isLocalRendering()
 void setLanguageTag(const LanguageTag& languageTag)
 {
 if (g_aLanguageTag != languageTag)
+{
+SAL_INFO("comphelper.lok", "setLanguageTag: from " << 
g_aLanguageTag.getBcp47() << " to " << languageTag.getBcp47());
 g_aLanguageTag = languageTag;
+}
 }
 
 const LanguageTag& getLanguageTag()
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 7acc54463d0e..c2ff84627248 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -98,6 +98,7 @@ certain functionality.
 @li @c comphelper.backupfilehelper
 @li @c comphelper.container - EmbeddedObjectContainer
 @li @c comphelper.crypto
+@li @c comphelper.lok
 
 @section cppu
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source cui/source include/comphelper include/unotools solenv/clang-format unotools/source xmlsecurity/inc xmlsecurity/Librar

[Libreoffice Gerrit user]

 comphelper/Library_comphelper.mk   |1 
 comphelper/source/misc/xmlsechelper.cxx|   33 +
 cui/source/dialogs/SignSignatureLineDialog.cxx |   10 +-
 include/comphelper/xmlsechelper.hxx|   47 +
 include/unotools/datetime.hxx  |5 +
 solenv/clang-format/blacklist  |3 
 unotools/source/misc/datetime.cxx  |   23 ++
 xmlsecurity/Library_xmlsecurity.mk |1 
 xmlsecurity/inc/resourcemanager.hxx|   32 
 xmlsecurity/source/component/documentdigitalsignatures.cxx |1 
 xmlsecurity/source/dialogs/certificatechooser.cxx  |   12 +--
 xmlsecurity/source/dialogs/certificateviewer.cxx   |   29 
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |9 +-
 xmlsecurity/source/dialogs/macrosecurity.cxx   |   10 +-
 14 files changed, 126 insertions(+), 90 deletions(-)

New commits:
commit 9c5d3e5c59a9d0ffcb5fd99f5d4c98b0f6b5560e
Author: Samuel Mehrbrodt 
AuthorDate: Fri Nov 9 16:42:16 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Nov 12 14:52:09 2018 +0100

tdf#118581 Correctly display issuer name in signature line

Move the xmlsec helper methods to comphelper so that we can use them in cui

Change-Id: If9b10cfff5f5abd6b16e48f043af7959edbb1142
Reviewed-on: https://gerrit.libreoffice.org/63198
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 04b333db9af9..a5275f971be4 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -143,6 +143,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/types \
 comphelper/source/misc/weak \
 comphelper/source/misc/weakeventlistener \
+comphelper/source/misc/xmlsechelper \
 comphelper/source/officeinstdir/officeinstallationdirectories \
 comphelper/source/processfactory/processfactory \
 comphelper/source/property/ChainablePropertySet \
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx 
b/comphelper/source/misc/xmlsechelper.cxx
similarity index 94%
rename from xmlsecurity/source/dialogs/resourcemanager.cxx
rename to comphelper/source/misc/xmlsechelper.cxx
index 16ca346bcbc3..84ccd203092f 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/comphelper/source/misc/xmlsechelper.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include 
+#include 
 
 #include 
 #include 
@@ -30,34 +30,10 @@
 
 using namespace std;
 
-namespace XmlSec
+namespace comphelper
+{
+namespace xmlsec
 {
-const LocaleDataWrapper&GetLocaleData()
-{
-static SvtSysLocale ourSysLocale;
-
-return ourSysLocale.GetLocaleData();
-}
-
-DateTime GetDateTime( const css::util::DateTime& _rDT )
-{
-return DateTime(_rDT);
-}
-
-OUString GetDateTimeString( const css::util::DateTime& _rDT )
-{
-// String with date and time information (#i20172#)
-DateTime aDT( GetDateTime( _rDT ) );
-const LocaleDataWrapper& rLoDa = GetLocaleData();
-
-return  rLoDa.getDate( aDT ) + " " + rLoDa.getTime( aDT );
-}
-
-OUString GetDateString( const css::util::DateTime& _rDT )
-{
-return GetLocaleData().getDate( GetDateTime( _rDT ) );
-}
-
 OUString GetCertificateKind( const css::security::CertificateKind &rKind )
 {
 switch (rKind)
@@ -354,5 +330,6 @@ vector< pair< OUString, OUString> > parseDN(const OUString& 
rRawString)
 return aStr.makeStringAndClear();
 }
 }
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx 
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index a6e5ae4d6642..a3230eedcfb2 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -16,6 +16,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -40,6 +41,7 @@
 #include 
 #include 
 
+using namespace comphelper;
 using namespace css;
 using namespace css::uno;
 using namespace css::beans;
@@ -138,7 +140,8 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, 
weld::Button&, void)
 if (xSignCertificate.is())
 {
 m_xSelectedCertifate = xSignCertificate;
-m_xBtnChooseCertificate->set_label(xSignCertificate->getIssuerName());
+m_xBtnChooseCertificate->set_label(
+xmlsec::GetContentPart(xSignCertificate->getIssuerName()));
 }
 ValidateFields();
 }
@@ -175,8 +178,9 @@ SignSignatureLineDialog::getSignedGraphic(bool bValid)
 aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", 
getCDataString(m_aSuggestedSignerTitle));
 
 aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", 
getCDataString(m_xEditName->get_text()));
-O

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unnecessaryparen.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 3d885f20269dd4b7485fbe09c70014646e799366
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 12:01:53 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 14:19:29 2018 +0100

Adapt to new ConstantExpr in Clang trunk towards Clang 8

After  "Compound literals, enums, et al 
require
const expr" (making use of ConstantExpr recently introduced with
 "Create ConstantExpr class",
CompilerTest_compilerplugins_clang started to fail with

> [CPT] compilerplugins/clang/test/unnecessaryparen.cxx
> error: 'error' diagnostics expected but not seen:
>   File 
/data/sbergman/lo-clang2/core/compilerplugins/clang/test/unnecessaryparen.cxx 
Line 35: parentheses immediately inside case statement 
[loplugin:unnecessaryparen]
> error: 'error' diagnostics seen but not expected:
>   File 
/data/sbergman/lo-clang2/core/compilerplugins/clang/test/unnecessaryparen.cxx 
Line 35: unnecessary parentheses around identifier [loplugin:unnecessaryparen]
> 2 errors generated.

Change-Id: Iebcfcd9af30e26df02819fbffb105599fa6a1701
Reviewed-on: https://gerrit.libreoffice.org/63285
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/unnecessaryparen.cxx 
b/compilerplugins/clang/unnecessaryparen.cxx
index 1a26ed21c7fb..b2ad2951ec90 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -15,6 +15,9 @@
 #include 
 
 #include 
+
+#include "config_clang.h"
+
 #include "compat.hxx"
 #include "plugin.hxx"
 
@@ -52,6 +55,11 @@ Expr const * ignoreAllImplicit(Expr const * expr) {
 expr = ce->getImplicitObjectArgument();
 }
 }
+#if CLANG_VERSION >= 8
+else if (auto const e = dyn_cast(expr)) {
+expr = e->getSubExpr();
+}
+#endif
 if (expr == oldExpr)
 return expr;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 configure.ac |8 
 1 file changed, 8 deletions(-)

New commits:
commit d89b5f3a5440cf890cf6977ef84e3419dd23e668
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 08:45:15 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 14:11:20 2018 +0100

Revert "Add check for en_US.utf8 locale"

This reverts commit 6b56ca7a9bf67bcada666f4cb1c2e20e7c0d512e, which is no 
longer
necessary after cfdcb1bb0cf3a9fa2b342109cd581d3211e965bf
"external/libnumbertext: Don't depend on en_US.UTF-8 locale".  I have seen a
full `make check screenshot` succeed on a Debian 9 without any en_US locale.

Change-Id: I2037af478d9bc5017c7263bb45effd3e9ccde0d3
Reviewed-on: https://gerrit.libreoffice.org/63279
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 5e2524745005..45e1fe83876e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2411,14 +2411,6 @@ if test -z "$BASH"; then
 fi
 AC_SUBST(BASH)
 
-AC_MSG_CHECKING([for en_US.utf8 locale])
-if locale -a | egrep -q 'en_US\.(UTF-8|utf8)'; then
-AC_MSG_RESULT(present)
-else
-AC_MSG_RESULT(absent)
-AC_MSG_ERROR([you need en_US.utf8 locale to build])
-fi
-
 AC_MSG_CHECKING([for GNU or BSD tar])
 for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do
 $a --version 2> /dev/null | egrep "GNU|bsdtar"  2>&1 > /dev/null
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/IwyuFilter_sd.yaml sd/source

[Libreoffice Gerrit user]

 sd/IwyuFilter_sd.yaml|
3 +
 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx |
1 
 sd/source/ui/slidesorter/controller/SlsListener.cxx  |
2 
 sd/source/ui/slidesorter/controller/SlsListener.hxx  |
2 
 sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx  |
1 
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx|
2 
 sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx   |
5 +-
 sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx  |
1 
 sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx|   
22 +++---
 sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx |
4 -
 sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx  |
6 +-
 sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx |
9 
 sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx   |
1 
 sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx |
7 +--
 sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx  |
1 
 sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx  |
7 +--
 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx |
5 --
 sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx  |
5 --
 sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx |
2 
 sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx   |
4 -
 sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx  |
1 
 sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx|
5 +-
 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx  |
7 +--
 sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx |
6 +-
 sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx|
4 -
 sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx|
2 
 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx|   
18 +---
 sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx|
1 
 sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx   |
1 
 sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx   |
7 ---
 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx|   
14 ++
 sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx  |
2 
 sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx   |
6 +-
 sd/source/ui/slidesorter/inc/view/SlsTheme.hxx   |
6 --
 sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx |
3 -
 sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx|
1 
 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx  |
1 
 sd/source/ui/slidesorter/view/SlsLayouter.cxx|
2 
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx   |
1 
 sd/source/ui/slidesorter/view/SlsToolTip.cxx |
2 
 40 files changed, 83 insertions(+), 97 deletions(-)

New commits:
commit 2b39827a0ef0ee3065e3e6abed371cd68c38e83d
Author: Gabor Kelemen 
AuthorDate: Wed Oct 31 01:07:00 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Nov 12 14:10:51 2018 +0100

tdf#42949 Fix IWYU warnings in sd/source/ui/slidesorter/inc/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I48e3c5a62314baa11d6c53ce41311a9a0f1c661b
Reviewed-on: https://gerrit.libreoffice.org/62678
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 0e1203fbe981..b0d04bbbf022 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -186,3 +186,6 @@ blacklist:
 sd/source/ui/inc/tools/SlotStateListener.hxx:
 # base class has to be a complete type
 - com/sun/star/frame/XStatusListener.hpp
+sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:
+# Needed for template
+- o3tl/deleter.hxx
diff --git 
a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx 
b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 4d468944..6a691e4219f9 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx 
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 7e9e05c097a5..d65299ae7b

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/charmap.src |   73 -
 1 file changed, 36 insertions(+), 37 deletions(-)

New commits:
commit 799a1eacbc82c3c78bcade367fe80e6f61cc9f0f
Author: Matthias Seidel 
AuthorDate: Mon Nov 12 12:03:43 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Nov 12 12:03:43 2018 +

Cleaned up resource file

diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src
index b8cc8766ec04..5a0d6537a40f 100644
--- a/cui/source/dialogs/charmap.src
+++ b/cui/source/dialogs/charmap.src
@@ -21,115 +21,114 @@
 
 
 
- // include ---
-
+// include ---
 #include 
 #include "charmap.hrc"
 #include "helpid.hrc"
 #include  // for RID_SVXDLG_CHARMAP
 
- // RID_SVXDLG_CHARMAP 
+// RID_SVXDLG_CHARMAP 
 ModalDialog RID_SVXDLG_CHARMAP
 {
 HelpId = CMD_SID_CHARMAP ;
 SvLook = TRUE ;
-Text [ en-US ] = "Special Characters";
-Size = MAP_APPFONT ( 297 , 153 ) ;
+Text [ en-US ] = "Special Characters" ;
+Size = MAP_APPFONT ( 297, 153 ) ;
 OutputSize = TRUE ;
 Moveable = TRUE ;
 Control CT_SHOWSET
 {
 HelpId = HID_CHARMAP_CTL_SHOWSET ;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 24 ) ;
-Size = MAP_APPFONT ( 230 , 112 ) ;
+Pos = MAP_APPFONT ( 6, 24 ) ;
+Size = MAP_APPFONT ( 230, 112 ) ;
 TabStop = TRUE ;
 Group = TRUE ;
 };
 FixedText FT_FONT
 {
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 33 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 8 ) ;
+Size = MAP_APPFONT ( 33, 8 ) ;
 Text [ en-US ] = "~Font" ;
 Left = TRUE ;
 Group = TRUE ;
 };
 ListBox LB_FONT
 {
-HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT";
-Pos = MAP_APPFONT ( 42 , 6 ) ;
-Size = MAP_APPFONT ( 70 , 58 ) ;
+HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT" ;
+Pos = MAP_APPFONT ( 42, 6 ) ;
+Size = MAP_APPFONT ( 70, 58 ) ;
 Sort = TRUE ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
 FixedText FT_SUBSET
 {
-Pos = MAP_APPFONT ( 118 , 8 ) ;
-Size = MAP_APPFONT ( 42 , 8 ) ;
-Text [ en-US ] = "~Subset";
+Pos = MAP_APPFONT ( 118, 8 ) ;
+Size = MAP_APPFONT ( 42, 8 ) ;
+Text [ en-US ] = "~Subset" ;
 };
 ListBox LB_SUBSET
 {
-HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET";
-Pos = MAP_APPFONT ( 161 , 6 ) ;
-Size = MAP_APPFONT ( 63 , 68 ) ;
+HelpID = "cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET" ;
+Pos = MAP_APPFONT ( 161, 6 ) ;
+Size = MAP_APPFONT ( 63, 68 ) ;
 Sort = FALSE ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
 FixedText FT_SYMBOLE
 {
-Pos = MAP_APPFONT ( 6 , 140 ) ;
-Size = MAP_APPFONT ( 38 , 8 ) ;
+Pos = MAP_APPFONT ( 6, 140 ) ;
+Size = MAP_APPFONT ( 38, 8 ) ;
 Left = TRUE ;
-Text [ en-US ] = "Characters:";
+Text [ en-US ] = "Characters:" ;
 };
 Control CT_SHOWTEXT
 {
 HelpId = HID_CHARMAP_CTL_SHOWTEXT ;
-Pos = MAP_APPFONT ( 46 , 137 ) ;
-Size = MAP_APPFONT ( 244 , 16 ) ;
+Pos = MAP_APPFONT ( 46, 137 ) ;
+Size = MAP_APPFONT ( 244, 16 ) ;
 Group = TRUE ;
 };
 Control CT_SHOWCHAR
 {
 HelpId = HID_CHARMAP_CTL_SHOWCHAR ;
-Pos = MAP_APPFONT ( 241 , 79 ) ;
-Size = MAP_APPFONT ( 50 , 44 ) ;
+Pos = MAP_APPFONT ( 241, 79 ) ;
+Size = MAP_APPFONT ( 50, 44 ) ;
 Group = TRUE ;
 };
 FixedText FT_CHARCODE
 {
-Pos = MAP_APPFONT ( 241 , 126 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
+Pos = MAP_APPFONT ( 241, 126 ) ;
+Size = MAP_APPFONT ( 50, 8 ) ;
 Center = TRUE ;
 };
 OKButton BTN_CHAR_OK
 {
-Pos = MAP_APPFONT ( 242 , 6 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 6 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 DefButton = TRUE ;
 };
 CancelButton BTN_CHAR_CANCEL
 {
-Pos = MAP_APPFONT ( 242 , 23 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 23 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 HelpButton BTN_CHAR_HELP
 {
-Pos = MAP_APPFONT ( 242 , 43 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
+Pos = MAP_APPFONT ( 242, 43 ) ;
+Size = MAP_APPFONT ( 50, 14 ) ;
 TabStop = TRUE ;
 };
 PushButton BTN_DELETE
 {
-HelpID = "cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE";
-Pos = MAP_APPFONT ( 242 , 63 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-   

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

[Libreoffice Gerrit user]

 cui/inc/strings.hrc|1 -
 cui/source/inc/treeopt.hxx |1 -
 cui/source/options/treeopt.cxx |1 -
 3 files changed, 3 deletions(-)

New commits:
commit 5d43a4d941b34cb076a6a2463dccd327ff83e7b9
Author: Stephan Bergmann 
AuthorDate: Mon Nov 12 13:20:42 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Nov 12 13:20:42 2018 +0100

-Werror,-Wunused-private-field

...since 9eb81304989acb16c61c15b211dd124548ffb85f "tdf#120703 PVS: drop the
unused code".  And which now removes the sole use of RID_SVXSTR_LOAD_ERROR.

Change-Id: If8afa7595a449cb8677b03a159a452b73fed110e

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index f8cc42be3fcb..db0c46269e29 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -362,7 +362,6 @@
 #define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES 
NC_("RID_SVXSTR_DEL_SPACES_BETWEEN_LINES", "Delete spaces and tabs at end and 
start of line")
 #define RID_SVXSTR_CONNECTOR
NC_("RID_SVXSTR_CONNECTOR", "Connector")
 #define RID_SVXSTR_DIMENSION_LINE   
NC_("RID_SVXSTR_DIMENSION_LINE", "Dimension line")
-#define RID_SVXSTR_LOAD_ERROR   
NC_("RID_SVXSTR_LOAD_ERROR", "The selected module could not be loaded.")
 #define RID_SVXSTR_STARTQUOTE   
NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
 #define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE", 
"End Quote")
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 1def2d942eb4..96267575333a 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -133,7 +133,6 @@ private:
 SvTreeListEntry*   pCurrentPageEntry;
 
 OUString   sTitle;
-OUString   sNotLoadedError;
 
 bool   bForgetSelection;
 bool   bIsFromExtensionManager;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 62179f315de4..a0ced4fccd16 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -482,7 +482,6 @@ struct OptionsGroupInfo
 m_pParent   ( pParent ),\
 pCurrentPageEntry   ( nullptr ),\
 sTitle  ( GetText() ),\
-sNotLoadedError (   CuiResId( RID_SVXSTR_LOAD_ERROR ) ),\
 bForgetSelection( false ),\
 bIsFromExtensionManager( false ), \
 bIsForSetDocumentLanguage( false ), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlexp.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 8d2abb388b0a2423c9b7e1f52373e1b06dd9786f
Author: Miklos Vajna 
AuthorDate: Mon Nov 5 21:07:42 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Nov 12 13:10:06 2018 +0100

tdf#120515 ODT filter: relax layout requirement before export

This reverts commit 343af46fc301a984929e071d477b8fb9f211e289 (ODT
filter: make sure we have a layout before export, 2017-11-29) as it
causes a performance problem with large documents (see bugreport).

I added it initially for the EPUB export, but there this is no longer
needed as commit 3ed8466b55ace15a28761e06b6bb76ebd8758106 (EPUB export,
fixed layout: switch to a metafile-based approach, 2017-12-01) switched
to the better metafile-based approach.

(cherry picked from commit e83c1f0ef999bdedaf9a5d5903aa5423c40f6d95)

Change-Id: Ie404e23db77b8ded1d29f42b6279a3cd06a574b5
Reviewed-on: https://gerrit.libreoffice.org/62963
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index eb13bc3db732..7537d13ffb34 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -128,11 +128,6 @@ ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
 if (!pDoc)
 return ERR_SWG_WRITE_ERROR;
 
-// Make sure the layout is available to have more stability in the output
-// markup.
-if (SwViewShell* pViewShell = 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell())
-pViewShell->CalcLayout();
-
 if( getExportFlags() & 
(SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
 
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bedd49e6b40c1a51459f9a0dfa0c0ed0d0b8ae2e
Author: Michael Weghorn 
AuthorDate: Fri Nov 9 12:21:08 2018 +0100
Commit: Caolán McNamara 
CommitDate: Mon Nov 12 13:09:39 2018 +0100

tdf#121276 gtk3_kde5: Don't prevent creating new files

This takes over for gtk3_kde5 what was done for kde5 in commit
c0f45c89063fa5c4334ff9e624d24d48638ffb4d.

Change-Id: Ieca71498bd0cc00ca07b83f6e1178d983169d5be
Reviewed-on: https://gerrit.libreoffice.org/63172
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit a6318cb430fd8f90b760f7dc36f4eacd3904e22e)
Reviewed-on: https://gerrit.libreoffice.org/63193
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index e5bdd7e2646c..42e278aa3d0e 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -88,6 +88,9 @@ bool KDE5FilePicker::execute()
 
 void KDE5FilePicker::setMultiSelectionMode(bool multiSelect)
 {
+if (_dialog->acceptMode() == QFileDialog::AcceptSave)
+return;
+
 _dialog->setFileMode(multiSelect ? QFileDialog::ExistingFiles : 
QFileDialog::ExistingFile);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - include/vcl vcl/inc vcl/source

[Libreoffice Gerrit user]

 include/vcl/window.hxx   |2 ++
 vcl/inc/messagedialog.hxx|2 ++
 vcl/source/window/layout.cxx |   14 ++
 3 files changed, 18 insertions(+)

New commits:
commit 8ef6623c71317448acc74d5dc8648211673dce76
Author: Caolán McNamara 
AuthorDate: Thu Nov 8 17:21:30 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 12 13:09:14 2018 +0100

Resolves: tdf#121181 expand message boxes to show full title

as MsgBox used to do

Change-Id: I03d459b8c18f60a19ea5b0034a8d98f6aa4f5ce4
Reviewed-on: https://gerrit.libreoffice.org/63159
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8ba941422514..3a3ea99d2c0f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -443,6 +443,7 @@ class SystemWindow;
 class WorkWindow;
 class Dialog;
 class MessBox;
+class MessageDialog;
 class DockingWindow;
 class FloatingWindow;
 class GroupBox;
@@ -505,6 +506,7 @@ class VCL_DLLPUBLIC Window : public ::OutputDevice
 friend class ::WorkWindow;
 friend class ::Dialog;
 friend class ::MessBox;
+friend class ::MessageDialog;
 friend class ::DockingWindow;
 friend class ::FloatingWindow;
 friend class ::GroupBox;
diff --git a/vcl/inc/messagedialog.hxx b/vcl/inc/messagedialog.hxx
index cf1df6ed68aa..7b191e538704 100644
--- a/vcl/inc/messagedialog.hxx
+++ b/vcl/inc/messagedialog.hxx
@@ -35,6 +35,8 @@ private:
 friend class VclPtr;
 MessageDialog(vcl::Window* pParent, WinBits nStyle);
 
+virtual void StateChanged(StateChangedType nType) override;
+
 public:
 MessageDialog(vcl::Window* pParent, const OUString& rMessage, 
VclMessageType eMessageType,
   VclButtonsType eButtonsType);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 44b8777dba78..6b7e13b63e00 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2492,6 +2492,20 @@ void MessageDialog::set_secondary_text(const OUString 
&rSecondaryString)
 }
 }
 
+void MessageDialog::StateChanged(StateChangedType nType)
+{
+if (nType == StateChangedType::InitShow)
+{
+// MessageBox should be at least as wide as to see the title
+auto nTitleWidth = CalcTitleWidth();
+// Extra-Width for Close button
+nTitleWidth += mpWindowImpl->mnTopBorder;
+if (get_preferred_size().Width() < nTitleWidth)
+set_width_request(nTitleWidth);
+}
+Dialog::StateChanged(nType);
+}
+
 VclVPaned::VclVPaned(vcl::Window *pParent)
 : VclContainer(pParent, WB_HIDE | WB_CLIPCHILDREN)
 , m_pSplitter(VclPtr::Create(this, WB_VSCROLL))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/cursor.hxx |1 
 include/vcl/tabctrl.hxx|1 
 vcl/source/app/settings.cxx|   68 +
 vcl/source/control/tabctrl.cxx |5 ---
 vcl/source/window/cursor.cxx   |6 ---
 5 files changed, 17 insertions(+), 64 deletions(-)

New commits:
commit 6ab83f201d80151a9a7ee22dec412e1c014c4063
Author: Noel Grandin 
AuthorDate: Mon Nov 12 08:51:27 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 12 12:49:43 2018 +0100

loplugin:singlevalfields in vcl

Change-Id: I71367548ae15ef78f9860bab9bb05c96b82eb54a
Reviewed-on: https://gerrit.libreoffice.org/63275
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index 0a0deb3e84bc..0051a0b7df29 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -47,7 +47,6 @@ class VCL_DLLPUBLIC Cursor
 private:
 std::unique_ptr mpData;
 VclPtr mpWindow;   // only for shadow cursor
-longmnSlant;
 SizemaSize;
 Point   maPos;
 short   mnOrientation;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 6fd7cd3841f5..39b45b1b423b 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -53,7 +53,6 @@ protected:
 std::unique_ptr mpTabCtrlData;
 longmnLastWidth;
 longmnLastHeight;
-longmnMaxPageWidth;
 sal_uInt16  mnActPageId;
 sal_uInt16  mnCurPageId;
 boolmbFormat;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 42f4f57a2a74..fc43e8bd244d 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -65,13 +65,7 @@ struct ImplMouseData
 longmnDoubleClkHeight   = 2;
 longmnStartDragWidth= 2 ;
 longmnStartDragHeight   = 2;
-sal_uInt16  mnStartDragCode = MOUSE_LEFT;
-sal_uInt16  mnContextMenuCode   = MOUSE_RIGHT;
-sal_uInt16  mnContextMenuClicks = 1;
-sal_uLong   mnScrollRepeat  = 100;
-sal_uLong   mnButtonStartRepeat = 370;
 sal_uLong   mnButtonRepeat  = 90;
-sal_uLong   mnActionDelay   = 250;
 sal_uLong   mnMenuDelay = 150;
 MouseFollowFlagsmnFollow= 
MouseFollowFlags::Menu | MouseFollowFlags::DDList;
 MouseMiddleButtonAction mnMiddleButtonAction= 
MouseMiddleButtonAction::AutoScroll;
@@ -151,11 +145,9 @@ struct ImplStyleData
 vcl::Font   maIconFont;
 vcl::Font   maTabFont;
 vcl::Font   maGroupFont;
-longmnBorderSize;
 longmnTitleHeight;
 longmnFloatTitleHeight;
 longmnScrollBarSize;
-longmnSplitSize;
 longmnSpinSize;
 longmnCursorSize;
 longmnAntialiasedMin;
@@ -199,10 +191,8 @@ struct ImplStyleData
 Color   maEdgeBlendingBottomRightColor;
 sal_uInt16  mnListBoxMaximumLineCount;
 sal_uInt16  mnColorValueSetColumnCount;
-sal_uInt16  mnColorValueSetMaximumRowCount;
 SizemaListBoxPreviewDefaultLogicSize;
 SizemaListBoxPreviewDefaultPixelSize;
-sal_uInt16  mnListBoxPreviewDefaultLineWidth;
 boolmbPreviewUsesCheckeredBackground;
 
 OUStringmaPersonaHeaderFooter; ///< Cache the 
settings to detect changes.
@@ -223,9 +213,7 @@ struct ImplMiscData
 
 struct ImplHelpData
 {
-sal_uLong   mnTipDelay = 500;
 sal_uLong   mnTipTimeout = 3000;
-sal_uLong   mnBalloonDelay = 1500;
 };
 
 struct ImplAllSettingsData
@@ -239,7 +227,6 @@ struct ImplAllSettingsData
 MiscSettingsmaMiscSettings;
 HelpSettingsmaHelpSettings;
 LanguageTag maLocale;
-AllSettingsFlagsmnWindowUpdate;
 LanguageTag maUILocale;
 std::unique_ptr  mpLocaleDataWrapper;
 std::unique_ptr  mpUILocaleDataWrapper;
@@ -329,31 +316,31 @@ MouseSettings::GetStartDragHeight() const
 sal_uInt16
 MouseSettings::GetStartDragCode() const
 {
-return mxData->mnStartDragCode;
+return MOUSE_LEFT;
 }
 
 sal_uInt16
 MouseSettings::GetContextMenuCode() const
 {

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

[Libreoffice Gerrit user]

 basctl/source/accessibility/accessibledialogwindow.cxx |   12 --
 basctl/source/inc/accessibledialogwindow.hxx   |1 
 cui/source/inc/border.hxx  |1 
 cui/source/inc/paragrph.hxx|1 
 cui/source/inc/tabstpge.hxx|1 
 cui/source/options/treeopt.cxx |   14 --
 cui/source/tabpages/border.cxx |   80 +
 cui/source/tabpages/paragrph.cxx   |7 -
 cui/source/tabpages/tabstpge.cxx   |3 
 dbaccess/source/ui/dlg/directsql.cxx   |7 -
 dbaccess/source/ui/inc/JoinTableView.hxx   |2 
 dbaccess/source/ui/inc/directsql.hxx   |1 
 dbaccess/source/ui/querydesign/JoinTableView.cxx   |4 
 extensions/source/bibliography/framectr.cxx|4 
 extensions/source/bibliography/framectr.hxx|1 
 15 files changed, 36 insertions(+), 103 deletions(-)

New commits:
commit bf8c1e277159b82362ed8f3a83d1abd0460a25c8
Author: Noel Grandin 
AuthorDate: Mon Nov 12 08:50:53 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 12 12:48:32 2018 +0100

loplugin:singlevalfields in accessibility..extensions

Change-Id: Id3a3241af83f769fc60f67e01c9129d6f4b5c2af
Reviewed-on: https://gerrit.libreoffice.org/63274
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index 3c5987a2cb28..07a7d0704e98 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -77,7 +77,6 @@ bool AccessibleDialogWindow::ChildDescriptor::operator<( 
const ChildDescriptor&
 
 AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* 
pDialogWindow)
 : m_pDialogWindow(pDialogWindow)
-, m_pDlgEditor(nullptr)
 , m_pDlgEdModel(nullptr)
 {
 if ( m_pDialogWindow )
@@ -110,9 +109,6 @@ AccessibleDialogWindow::~AccessibleDialogWindow()
 if ( m_pDialogWindow )
 m_pDialogWindow->RemoveEventListener( LINK( this, 
AccessibleDialogWindow, WindowEventListener ) );
 
-if ( m_pDlgEditor )
-EndListening( *m_pDlgEditor );
-
 if ( m_pDlgEdModel )
 EndListening( *m_pDlgEdModel );
 }
@@ -375,10 +371,6 @@ void AccessibleDialogWindow::ProcessWindowEvent( const 
VclWindowEvent& rVclWindo
 m_pDialogWindow->RemoveEventListener( LINK( this, 
AccessibleDialogWindow, WindowEventListener ) );
 m_pDialogWindow = nullptr;
 
-if ( m_pDlgEditor )
-EndListening( *m_pDlgEditor );
-m_pDlgEditor = nullptr;
-
 if ( m_pDlgEdModel )
 EndListening( *m_pDlgEdModel );
 m_pDlgEdModel = nullptr;
@@ -524,10 +516,6 @@ void AccessibleDialogWindow::disposing()
 m_pDialogWindow->RemoveEventListener( LINK( this, 
AccessibleDialogWindow, WindowEventListener ) );
 m_pDialogWindow = nullptr;
 
-if ( m_pDlgEditor )
-EndListening( *m_pDlgEditor );
-m_pDlgEditor = nullptr;
-
 if ( m_pDlgEdModel )
 EndListening( *m_pDlgEdModel );
 m_pDlgEdModel = nullptr;
diff --git a/basctl/source/inc/accessibledialogwindow.hxx 
b/basctl/source/inc/accessibledialogwindow.hxx
index 99e34ee06475..5b362fa6df96 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -73,7 +73,6 @@ private:
 
 AccessibleChildren m_aAccessibleChildren;
 VclPtr   m_pDialogWindow;
-DlgEditor* m_pDlgEditor;
 DlgEdModel*m_pDlgEdModel;
 
 voidUpdateFocused();
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index f2994a3fadb2..009048d738fb 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -115,7 +115,6 @@ private:
 boolmbTLBREnabled;  ///< true = Top-left to 
bottom-right border enabled.
 boolmbBLTREnabled;  ///< true = Bottom-left to 
top-right border enabled.
 boolmbUseMarginItem;
-boolmbAllowPaddingWithoutBorders;
 boolmbLeftModified;
 boolmbRightModified;
 boolmbTopModified;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 8acc4f4ea4bd..bbcb7b3d3f68 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -53,7 +53,6 @@ class SvxStdParagraphTabPage: public SfxTabPage
 private:
 SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
 
-longnAbst;
 longnWidth;
 longnMinFixDist;
 boolbRelativeMode;

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

[Libreoffice Gerrit user]

 include/svx/svdedtv.hxx|   94 +++
 sd/source/ui/inc/View.hxx  |   12 -
 svx/source/engine3d/view3d.cxx |   14 +-
 svx/source/svdraw/svddrgv.cxx  |2 
 svx/source/svdraw/svdedtv.cxx  |  256 -
 svx/source/svdraw/svdedtv1.cxx |   22 +--
 svx/source/svdraw/svdedtv2.cxx |   12 -
 sw/source/core/draw/dview.cxx  |   10 -
 8 files changed, 211 insertions(+), 211 deletions(-)

New commits:
commit 8cbe779fcbcfcd722a64f98f5cef3df63d02e037
Author: Miklos Vajna 
AuthorDate: Mon Nov 12 09:18:56 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Nov 12 12:45:53 2018 +0100

svx: prefix members of SdrEditView

Change-Id: I3e27d8444c5a152ee39b9e2cc12b9df707f092b8
Reviewed-on: https://gerrit.libreoffice.org/63281
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index ba6b1172df6b..6fc2e1aab75f 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -78,41 +78,41 @@ class SVX_DLLPUBLIC SdrEditView : public SdrMarkView
 protected:
 
 // cache the transformation queries, etc. a little
-boolbPossibilitiesDirty : 1;
-boolbReadOnly : 1;
-boolbGroupPossible : 1;
-boolbUnGroupPossible : 1;
-boolbGrpEnterPossible : 1;
-boolbToTopPossible : 1;
-boolbToBtmPossible : 1;
-boolbReverseOrderPossible : 1;
-boolbImportMtfPossible : 1;
-boolbCombinePossible : 1;
-boolbDismantlePossible : 1;
-boolbCombineNoPolyPolyPossible : 1;
-boolbDismantleMakeLinesPossible : 1;
-boolbOrthoDesiredOnMarked : 1;
-boolbOneOrMoreMovable : 1;// at least one 
object is moveable
-boolbMoreThanOneNoMovRot : 1; // more then one 
object is not movable nor turnable (Crook)
-boolbContortionPossible : 1;  // all polygones 
(grouped if necessary)
-boolbMoveAllowed : 1;
-boolbResizeFreeAllowed : 1;
-boolbResizePropAllowed : 1;
-boolbRotateFreeAllowed : 1;
-boolbRotate90Allowed : 1;
-boolbMirrorFreeAllowed : 1;
-boolbMirror45Allowed : 1;
-boolbMirror90Allowed : 1;
-boolbShearAllowed : 1;
-boolbEdgeRadiusAllowed : 1;
-boolbTransparenceAllowed : 1;
-boolbCropAllowed : 1;
-boolbGradientAllowed : 1;
-boolbCanConvToPath : 1;
-boolbCanConvToPoly : 1;
-boolbCanConvToContour : 1;
-boolbMoveProtect : 1;
-boolbResizeProtect : 1;
+boolm_bPossibilitiesDirty : 1;
+boolm_bReadOnly : 1;
+boolm_bGroupPossible : 1;
+boolm_bUnGroupPossible : 1;
+boolm_bGrpEnterPossible : 1;
+boolm_bToTopPossible : 1;
+boolm_bToBtmPossible : 1;
+boolm_bReverseOrderPossible : 1;
+boolm_bImportMtfPossible : 1;
+boolm_bCombinePossible : 1;
+boolm_bDismantlePossible : 1;
+boolm_bCombineNoPolyPolyPossible : 1;
+boolm_bDismantleMakeLinesPossible : 1;
+boolm_bOrthoDesiredOnMarked : 1;
+boolm_bOneOrMoreMovable : 1;// at least 
one object is moveable
+boolm_bMoreThanOneNoMovRot : 1; // more then 
one object is not movable nor turnable (Crook)
+boolm_bContortionPossible : 1;  // all 
polygones (grouped if necessary)
+boolm_bMoveAllowed : 1;
+boolm_bResizeFreeAllowed : 1;
+boolm_bResizePropAllowed : 1;
+boolm_bRotateFreeAllowed : 1;
+boolm_bRotate90Allowed : 1;
+boolm_bMirrorFreeAllowed : 1;
+boolm_bMirror45Allowed : 1;
+boolm_bMirror90Allowed : 1;
+boolm_bShearAllowed : 1;
+boolm_bEdgeRadiusAllowed : 1;
+bo

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extras/source

[Libreoffice Gerrit user]

 dev/null   |binary
 extras/source/templates/wizard/bitmap/FormWizard_1.bmp |binary
 extras/source/templates/wizard/bitmap/FormWizard_2.bmp |binary
 extras/source/templates/wizard/bitmap/webwizard.bmp|binary
 4 files changed

New commits:
commit c267268f2d1f8648af4897ada2753080520cbd7b
Author: Matthias Seidel 
AuthorDate: Mon Nov 12 10:20:25 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Nov 12 10:20:25 2018 +

Add missing graphics

diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
new file mode 100644
index ..aa7cb4940d1d
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp differ
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
new file mode 100644
index ..347c8c36e52b
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp differ
diff --git a/extras/source/templates/wizard/bitmap/euro_1.bmp 
b/extras/source/templates/wizard/bitmap/euro_1.bmp
deleted file mode 100644
index 139d6b270b87..
Binary files a/extras/source/templates/wizard/bitmap/euro_1.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/webwizard.bmp 
b/extras/source/templates/wizard/bitmap/webwizard.bmp
new file mode 100644
index ..f9e79411d945
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/webwizard.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/css loleaflet/html wsd/FileServer.cpp

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css  |1 +
 loleaflet/html/loleaflet.html.m4 |2 +-
 wsd/FileServer.cpp   |6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit a514abff884f95547ca5dbe97bdcab403d5b5d34
Author: Miklos Vajna 
AuthorDate: Mon Nov 12 11:53:12 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Nov 12 11:53:42 2018 +0100

document signing: fix disabled case for Calc/Impress

If the document-container has an explicit style attribute, then this
breaks Calc (only Writer was tested before). This restores the correct
Writer/Calc/Impress behavior when the setting is false and keeps correct
behavior with Writer when the setting is true.

Change-Id: I310660e88af4407e521529ec41b5dcb604108bd9

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 38a87695a..0920701cc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -2,6 +2,7 @@
border-top: 1px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
+   top: 70px;
bottom: 33px;
right: 0px;
left: 0px;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index f05ed2f27..3d8eb1a1d 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -110,7 +110,7 @@ ifelse(MOBILEAPP,[true],
 
 
 
-
+ifelse(MOBILEAPP,[true],[],[])
 
   
 
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index d56975470..0129070eb 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -640,15 +640,15 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
 
 // Customization related to document signing.
 std::string documentSigningDiv;
-std::string documentContainerTop("70px");
+std::string documentContainerTop("");
 const auto documentSigning = 
config.getBool("per_document.document_signing", false);
 if (documentSigning)
 {
 documentSigningDiv = "";
-documentContainerTop = "100px";
+documentContainerTop = "";
 }
 Poco::replaceInPlace(preprocess, 
std::string(""), documentSigningDiv);
-Poco::replaceInPlace(preprocess, 
std::string(""), documentContainerTop);
+Poco::replaceInPlace(preprocess, 
std::string(""), documentContainerTop);
 
 const auto loleafletLogging = config.getString("loleaflet_logging", 
"false");
 Poco::replaceInPlace(preprocess, std::string("%LOLEAFLET_LOGGING%"), 
loleafletLogging);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make check fails in [build JCS]

[Stephan Bergmann]

On 03/09/2018 17:23, Stephan Bergmann wrote:

On 29/08/18 11:43, Noel Grandin wrote:

On 2018/08/29 11:06 AM, Stephan Bergmann wrote:
investigating deeper into the issue.  (Apparently, Java no longer 
accepts file:... URLs there, at least on Windows, and won't accept 
full pathnames starting with a drive letter like C:/..., but does 
accept ("drive-absolute") pathnames like /...; so my hack should work 
as long as your files are on drive C.)




That probably needs whatever magic will convert a cygwin path into a 
DOS/NT path i.e. something starting with


    C:\

(note the backslash instead of a forwardslash)


No, things unfortunately appear to be more broken than that (at least 
with JDK 10.0.2):


* Using C:\foo\bar.jar pathnames in a jar's manifest class-path doesn't 
work (and 
 
does require those values to be "relative URLs").  At java run-time 
(e.g., when executing a JunitTest), resolving classes via that 
class-path entry apparently fails.


* Likewise when using C:/foo/bar.jar pathnames.

* Using file:/C:/foo/bar.jar URLs in a jar's manifest class-path would 
work at run-time.  However, when that jar is then mentioned in the 
-classpath argument of some javac invocation at build time, that 
invocation fails with "error: illegal argument for --class-path: Illegal 
char <:> at index 4: file:/C:/..."


* The only working hack I found for now is to use /foo/bar.jar 
drive-relative pathnames, which happen to also match the syntax of 
relative URLs.


(see also the recent discussion at 
 "Simplify and fix Java UNO 
API test makefiles")

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 svx/uiconfig/ui/sidebararea.ui |   16 
 svx/uiconfig/ui/sidebarline.ui |   16 
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 3a99ae072ac170ebed8d1f5bf65913d3412fab67
Author: Jim Raykowski 
AuthorDate: Sat Nov 10 23:48:58 2018 -0900
Commit: Katarina Behrens 
CommitDate: Mon Nov 12 10:34:02 2018 +0100

tdf#118764 Tab stop fixes for Area and Line panels

Change-Id: Ib29701a44ab42806951a5b2ad6b63aabda4abfba
Reviewed-on: https://gerrit.libreoffice.org/63262
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 8fd56b495f6c..ec9166c72388 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -56,7 +56,7 @@
 True
 
   
-False
+True
 
   
 105
@@ -81,7 +81,7 @@
 
 
   
-False
+True
 True
 Select the effect to 
apply.
 
@@ -101,7 +101,7 @@
 
 
   
-False
+True
 True
 Fill gradient from.
   
@@ -122,7 +122,7 @@
 
   
 True
-False
+True
 True
 Select the fill type to 
apply.
 0
@@ -145,7 +145,7 @@
 
 
   
-False
+True
 True
 Fill gradient to.
   
@@ -163,7 +163,7 @@
 
   
 True
-False
+True
 Select the gradient 
style.
 
   Linear
@@ -244,7 +244,7 @@
 
   
 True
-False
+True
 True
 Select the type of transparency to 
apply.
 
@@ -273,7 +273,7 @@
 
   
 True
-False
+True
 start
 
   
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 9e79cd64a408..a3e86db780ea 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -35,7 +35,7 @@
   
 65
 True
-False
+True
 True
 Select the style of the 
beginning arrowhead.
 True
@@ -55,7 +55,7 @@
   
 105
 True
-False
+True
 True
 Select the style of the 
line.
 True
@@ -75,7 +75,7 @@
   
 65
 True
-False
+True
 True
 Select the style of the ending 
arrowhead.
 6
@@ -102,7 +102,7 @@
 
   
 True
-False
+True
 True
 6
 6
@@ -125,7 +125,7 @@
   
 120
 True
-False
+True
 True
 Select the width of the 
line.
 
@@ -170,7 +170,7 @@
 
   
 True
-False
+True
 True
 Select the color of the 
line.
 
@@ -273,7 +273,7 @@
 
   
 True
-False
+True
 True
 Select the style of the edge 
connections.
 
@@ -314,7 +314,7 @@
 
   
 True
-False
+True
 True
 Select the style of the line 
caps.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 ucb/source/ucp/hierarchy/hierarchydatasource.cxx |   63 ---
 1 file changed, 33 insertions(+), 30 deletions(-)

New commits:
commit 77ab2833dce500bbe9fa78a96e38f73c33308066
Author: Noel Grandin 
AuthorDate: Mon Nov 12 09:33:25 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Nov 12 10:27:43 2018 +0100

convert ENSURE_ORIG_INTERFACE macro to template method

Change-Id: I50870b501d6195cf5b593e8a3b8b446f4461deca
Reviewed-on: https://gerrit.libreoffice.org/63277
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx 
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 2177653c7ad6..19438513dd4c 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -166,6 +166,9 @@ public:
 hasPendingChanges() override;
 virtual uno::Sequence< util::ElementChange > SAL_CALL
 getPendingChanges() override;
+private:
+template
+css::uno::Reference ensureOrigInterface(css::uno::Reference& x);
 };
 
 } // namespace hcp_impl
@@ -506,16 +509,16 @@ bool HierarchyDataSource::createConfigPath(
 
 // HierarchyDataAccess Implementation.
 
-
-#define ENSURE_ORIG_INTERFACE( interface_name, member_name )\
-m_xCfg##member_name;\
-if ( !m_xCfg##member_name.is() )\
-{   \
-osl::Guard< osl::Mutex > aGuard( m_aMutex );\
-if ( !m_xCfg##member_name.is() )\
-m_xCfg##member_name.set( m_xConfigAccess, uno::UNO_QUERY ); \
-xOrig = m_xCfg##member_name;\
-}
+template
+css::uno::Reference 
HierarchyDataAccess::ensureOrigInterface(css::uno::Reference& x)
+{
+if ( x.is() )
+return x;
+osl::Guard< osl::Mutex > aGuard( m_aMutex );
+if ( !x.is() )
+   x.set( m_xConfigAccess, uno::UNO_QUERY );
+return x;
+}
 
 
 HierarchyDataAccess::HierarchyDataAccess( const uno::Reference<
@@ -629,7 +632,7 @@ css::uno::Sequence< OUString > SAL_CALL 
HierarchyDataAccess::getSupportedService
 void SAL_CALL HierarchyDataAccess::dispose()
 {
 uno::Reference< lang::XComponent > xOrig
-= ENSURE_ORIG_INTERFACE( lang::XComponent, C );
+= ensureOrigInterface( m_xCfgC );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : Data source is not an XComponent!" );
@@ -642,7 +645,7 @@ void SAL_CALL HierarchyDataAccess::addEventListener(
 const uno::Reference< lang::XEventListener > & xListener )
 {
 uno::Reference< lang::XComponent > xOrig
-= ENSURE_ORIG_INTERFACE( lang::XComponent, C );
+= ensureOrigInterface( m_xCfgC );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : Data source is not an XComponent!" );
@@ -655,7 +658,7 @@ void SAL_CALL HierarchyDataAccess::removeEventListener(
 const uno::Reference< lang::XEventListener > & aListener )
 {
 uno::Reference< lang::XComponent > xOrig
-= ENSURE_ORIG_INTERFACE( lang::XComponent, C );
+= ensureOrigInterface( m_xCfgC );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : Data source is not an XComponent!" );
@@ -671,7 +674,7 @@ uno::Any SAL_CALL 
HierarchyDataAccess::getByHierarchicalName(
 const OUString & aName )
 {
 uno::Reference< container::XHierarchicalNameAccess > xOrig
-= ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA );
+= ensureOrigInterface( m_xCfgHNA );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : "
@@ -685,7 +688,7 @@ sal_Bool SAL_CALL 
HierarchyDataAccess::hasByHierarchicalName(
 const OUString & aName )
 {
 uno::Reference< container::XHierarchicalNameAccess > xOrig
-= ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA );
+= ensureOrigInterface( m_xCfgHNA );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : "
@@ -701,7 +704,7 @@ sal_Bool SAL_CALL 
HierarchyDataAccess::hasByHierarchicalName(
 uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName )
 {
 uno::Reference< container::XNameAccess > xOrig
-= ENSURE_ORIG_INTERFACE( container::XNameAccess, NA );
+= ensureOrigInterface( m_xCfgNA );
 
 OSL_ENSURE( xOrig.is(),
 "HierarchyDataAccess : Data source is not an XNameAccess!" );
@@ -713,7 +716,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const 
OUString & aName )
 uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames()
 {
 uno::Reference< container::XNameAccess > xOrig
-= ENSURE_ORIG_INTERFACE( container::XNameAccess, NA );
+= ensureOrigInterface( m_xCfgNA );
 
 OSL_ENSURE( xOrig.is(),

Re: master build problems with en_US.utf8 locale

[Stephan Bergmann]

On 12/11/2018 09:10, rene.engelh...@mailbox.org wrote:

And what about the tests which explicitly set en_US.utf8 too?


Whichever tests that are, them proclaiming success is apparently not 
affected by setting a locale not supported by the OS.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 include/svtools/ivctrl.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c747b60fac8b10681884f557ccabebd3bb0210c3
Author: Andrea Gelmini 
AuthorDate: Mon Nov 12 09:13:56 2018 +0100
Commit: Julien Nabet 
CommitDate: Mon Nov 12 09:53:01 2018 +0100

Fix typo

Change-Id: Ic471fbbfbcc00c0bb4ee42498ddcb1005e1e7103
Reviewed-on: https://gerrit.libreoffice.org/63280
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx
index ce1f8c9e7ff7..531cc86bc251 100644
--- a/include/svtools/ivctrl.hxx
+++ b/include/svtools/ivctrl.hxx
@@ -264,7 +264,7 @@ public:
 // Re-calculation of cached view-data and invalidation of those in the view
 voidInvalidateEntry( SvxIconChoiceCtrlEntry* pEntry );
 
-// Entry is selectd, if the BoundRect is selected
+// Entry is selected, if the BoundRect is selected
 SvxIconChoiceCtrlEntry* GetEntry( const Point& rPosPixel ) const;
 
 // sal_uLong is the position of the selected element in the list
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/ChildSession.hpp

[Libreoffice Gerrit user]

 kit/ChildSession.cpp |   14 +++---
 kit/ChildSession.hpp |   38 +++---
 2 files changed, 42 insertions(+), 10 deletions(-)

New commits:
commit c863e520013ef9908f4c8b0333ae69ef3f53ce7b
Author: Miklos Vajna 
AuthorDate: Mon Nov 12 09:03:54 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Nov 12 09:04:01 2018 +0100

RecordedEvent: make members private

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index be1cb831f..bef59c779 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -133,17 +133,17 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 for (const auto& eventPair : viewPair.second)
 {
 const RecordedEvent& event = eventPair.second;
-LOG_TRC("Replaying missed view event: " <<  viewPair.first << 
" " << LOKitHelper::kitCallbackTypeToString(event._type)
-<< ": " << 
event._payload);
-loKitCallback(event._type, event._payload);
+LOG_TRC("Replaying missed view event: " <<  viewPair.first << 
" " << LOKitHelper::kitCallbackTypeToString(event.getType())
+<< ": " << 
event.getPayload());
+loKitCallback(event.getType(), event.getPayload());
 }
 }
 
 for (const auto& eventPair : _stateRecorder.getRecordedEvents())
 {
 const RecordedEvent& event = eventPair.second;
-LOG_TRC("Replaying missed event: " << 
LOKitHelper::kitCallbackTypeToString(event._type) << ": " << event._payload);
-loKitCallback(event._type, event._payload);
+LOG_TRC("Replaying missed event: " << 
LOKitHelper::kitCallbackTypeToString(event.getType()) << ": " << 
event.getPayload());
+loKitCallback(event.getType(), event.getPayload());
 }
 
 for (const auto& pair : _stateRecorder.getRecordedStates())
@@ -154,8 +154,8 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 
 for (const auto& event : _stateRecorder.getRecordedEventsVector())
 {
-LOG_TRC("Replaying missed event (part of sequence): " << 
LOKitHelper::kitCallbackTypeToString(event._type) << ": " << event._payload);
-loKitCallback(event._type, event._payload);
+LOG_TRC("Replaying missed event (part of sequence): " << 
LOKitHelper::kitCallbackTypeToString(event.getType()) << ": " << 
event.getPayload());
+loKitCallback(event.getType(), event.getPayload());
 }
 
 _stateRecorder.clear();
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 292614ff1..898d09e22 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -78,8 +78,40 @@ public:
 
 struct RecordedEvent
 {
-int _type;
+private:
+int _type = 0;
 std::string _payload;
+
+public:
+RecordedEvent()
+{
+}
+
+RecordedEvent(int type, const std::string& payload)
+: _type(type),
+_payload(payload)
+{
+}
+
+void setType(int type)
+{
+_type = type;
+}
+
+int getType() const
+{
+return _type;
+}
+
+void setPayload(const std::string& payload)
+{
+_payload = payload;
+}
+
+const std::string& getPayload() const
+{
+return _payload;
+}
 };
 
 /// When the session is inactive, we need to record its state for a replay.
@@ -128,7 +160,7 @@ public:
 
 void recordEvent(const int type, const std::string& payload)
 {
-_recordedEvents[type] = {type, payload};
+_recordedEvents[type] = RecordedEvent(type, payload);
 }
 
 void recordViewEvent(const int viewId, const int type, const std::string& 
payload)
@@ -145,7 +177,7 @@ public:
 /// the final state.
 void recordEventSequence(const int type, const std::string& payload)
 {
-_recordedEventsVector.push_back({type, payload});
+_recordedEventsVector.emplace_back(type, payload);
 }
 
 void clear()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits