[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - connectivity/source

[Libreoffice Gerrit user]

 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d09362e5c4a0bdd943fc3df7a20163eb13697b8b
Author: Julien Nabet 
AuthorDate: Thu Jan 17 21:18:36 2019 +0100
Commit: Lionel Elie Mamane 
CommitDate: Tue Jan 29 08:43:40 2019 +0100

Base/Mysqlc: fix schemas retrieving

Change-Id: Ib0bd600aed3c3394890a199d105aff17cd547200
(cherry picked from commit dc8b79e378e28a87fdef8b10737a603443043e37)
Reviewed-on: https://gerrit.libreoffice.org/66563
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 0da41f5922ea..9acdbc952696 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -660,7 +660,7 @@ Reference SAL_CALL 
ODatabaseMetaData::getSchemas()
 OUString columnStringValue = xRow->getString(i);
 if (i == 1)
 { // TABLE_SCHEM
-informationSchema = 
!columnStringValue.equalsIgnoreAsciiCase("information_schema");
+informationSchema = 
columnStringValue.equalsIgnoreAsciiCase("information_schema");
 }
 aRow.push_back(makeAny(columnStringValue));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 connectivity/source/drivers/firebird/Connection.cxx |2 +-
 connectivity/source/drivers/firebird/Driver.cxx |3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e9e1813a6ebe6e3015e04347b15a18aebc4e0fa7
Author: Lionel Elie Mamane 
AuthorDate: Mon Jan 28 15:44:36 2019 +0100
Commit: Lionel Elie Mamane 
CommitDate: Tue Jan 29 08:42:19 2019 +0100

tdf#106463 set new firebird connections as autocommit by default

as per SDBC specifications

Change-Id: I132a8e565468bcacf0fa5ee0dfb62bf0dd717e24
Reviewed-on: https://gerrit.libreoffice.org/67015
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index b7f1276a8d4f..ba2fba974d78 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -87,7 +87,7 @@ Connection::Connection()
 , m_sFirebirdURL()
 , m_bIsEmbedded(false)
 , m_bIsFile(false)
-, m_bIsAutoCommit(false)
+, m_bIsAutoCommit(true)
 , m_bIsReadOnly(false)
 , m_aTransactionIsolation(TransactionIsolation::REPEATABLE_READ)
 #if SAL_TYPES_SIZEOFPOINTER == 8
diff --git a/connectivity/source/drivers/firebird/Driver.cxx 
b/connectivity/source/drivers/firebird/Driver.cxx
index 199529016995..8e81ae9ae9b8 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -181,9 +181,6 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
 Reference< XConnection > xCon = pCon;
 pCon->construct(url, info);
 
-if (url == "sdbc:embedded:firebird")
-pCon->setAutoCommit(true);
-
 m_xConnections.push_back(WeakReferenceHelper(*pCon));
 
 return xCon;
___
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/filter/dif/difimp.cxx   |8 +-
 sc/source/filter/excel/colrowst.cxx   |   10 --
 sc/source/filter/excel/excdoc.cxx |   17 ++--
 sc/source/filter/excel/excrecds.cxx   |   31 +++-
 sc/source/filter/excel/exctools.cxx   |   19 +
 sc/source/filter/excel/impop.cxx  |4 -
 sc/source/filter/excel/read.cxx   |   15 
 sc/source/filter/excel/xechart.cxx|   12 +--
 sc/source/filter/excel/xecontent.cxx  |   12 +--
 sc/source/filter/excel/xedbdata.cxx   |4 -
 sc/source/filter/excel/xeescher.cxx   |   10 +-
 sc/source/filter/excel/xeextlst.cxx   |   12 +--
 sc/source/filter/excel/xeformula.cxx  |   20 ++---
 sc/source/filter/excel/xehelper.cxx   |8 +-
 sc/source/filter/excel/xelink.cxx |   53 +++---
 sc/source/filter/excel/xename.cxx |   24 ++
 sc/source/filter/excel/xepage.cxx |   15 +---
 sc/source/filter/excel/xepivot.cxx|   37 +-
 sc/source/filter/excel/xepivotxml.cxx |   82 --
 sc/source/filter/excel/xestream.cxx   |   12 +--
 sc/source/filter/excel/xestring.cxx   |   34 +++--
 sc/source/filter/excel/xestyle.cxx|   90 
 sc/source/filter/excel/xetable.cxx|  125 --
 sc/source/filter/excel/xeview.cxx |   17 ++--
 sc/source/filter/excel/xichart.cxx|   37 +-
 sc/source/filter/excel/xicontent.cxx  |   26 +++
 sc/source/filter/excel/xiescher.cxx   |   48 ++---
 sc/source/filter/excel/xihelper.cxx   |4 -
 sc/source/filter/excel/xilink.cxx |   31 
 sc/source/filter/excel/xiname.cxx |   20 ++---
 sc/source/filter/excel/xipage.cxx |   10 +-
 sc/source/filter/excel/xipivot.cxx|   84 ++
 sc/source/filter/excel/xistream.cxx   |   18 ++--
 sc/source/filter/excel/xistyle.cxx|   51 ++---
 sc/source/filter/excel/xladdress.cxx  |4 -
 sc/source/filter/excel/xlpivot.cxx|4 -
 sc/source/filter/excel/xlstyle.cxx|4 -
 sc/source/filter/excel/xltoolbar.cxx  |   46 
 38 files changed, 496 insertions(+), 562 deletions(-)

New commits:
commit 474fa67c37b6c0b5e4ff12981c76a3b0bc860e95
Author: Arkadiy Illarionov 
AuthorDate: Sun Jan 27 16:56:41 2019 +0300
Commit: Noel Grandin 
CommitDate: Tue Jan 29 08:30:13 2019 +0100

Simplify containers iterations in sc/source/filter/[d-e]*

Use range-based loop or replace with STL functions

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

diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index ed71c759b184..4040f4adb67e 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -650,14 +650,14 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL 
nCol, const SCTAB nTab )
 ScPatternAttr aAttr( rDoc.GetPool() );
 SfxItemSet &rItemSet = aAttr.GetItemSet();
 
-for (std::vector::const_iterator it = maEntries.begin(); it != 
maEntries.end(); ++it)
+for (const auto& rEntry : maEntries)
 {
-OSL_ENSURE( it->nNumFormat > 0,
+OSL_ENSURE( rEntry.nNumFormat > 0,
 "+DifColumn::Apply(): Number format must not be 0!" );
 
-rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, it->nNumFormat ) );
+rItemSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, rEntry.nNumFormat ) );
 
-rDoc.ApplyPatternAreaTab( nCol, it->nStart, nCol, it->nEnd, nTab, 
aAttr );
+rDoc.ApplyPatternAreaTab( nCol, rEntry.nStart, nCol, rEntry.nEnd, 
nTab, aAttr );
 
 rItemSet.ClearItem();
 }
diff --git a/sc/source/filter/excel/colrowst.cxx 
b/sc/source/filter/excel/colrowst.cxx
index 32a67bc4f0be..5640335f08b8 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -217,13 +217,10 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
 if (!maRowHeights.is_tree_valid())
 return;
 
-ColRowFlagsType::const_iterator itrFlags = maRowFlags.begin(), itrFlagsEnd 
= maRowFlags.end();
 SCROW nPrevRow = -1;
 ExcColRowFlags nPrevFlags = ExcColRowFlags::NONE;
-for (; itrFlags != itrFlagsEnd; ++itrFlags)
+for (const auto& [nRow, nFlags] : maRowFlags)
 {
-SCROW nRow = itrFlags->first;
-ExcColRowFlags nFlags = itrFlags->second;
 if (nPrevRow >= 0)
 {
 sal_uInt16 nHeight = 0;
@@ -308,11 +305,8 @@ void XclImpColRowSettings::ConvertHiddenFlags( SCTAB 
nScTab )
 
 SCROW nPrevRow = -1;
 bool bPrevHidden = false;
-RowHiddenType::const_iterator itr = maHiddenRows.begin(), itrEnd = 
maHiddenRows.end();
-for (; itr != itrEnd; ++itr)
+for (const auto& [nRow, bHidden] : maHiddenRows)
 {
-SCROW nRow = itr->first;
-bool bHidden = itr->second;
 if (nPrevRow >= 0)
 {
 if (bPrevHidden)
diff --git a/sc/source/filter/excel/excdoc.cxx 
b/sc

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_svg

[Libreoffice Gerrit user]

 icon-themes/sifr/cmd/32/backcolor.png|binary
 icon-themes/sifr/cmd/32/bold.png |binary
 icon-themes/sifr/cmd/32/connector.png|binary
 icon-themes/sifr/cmd/32/copy.png |binary
 icon-themes/sifr/cmd/32/cut.png  |binary
 icon-themes/sifr/cmd/32/datadatapilotrun.png |binary
 icon-themes/sifr/cmd/32/dbviewfunctions.png  |binary
 icon-themes/sifr/cmd/32/defineprintarea.png  |binary
 icon-themes/sifr/cmd/32/deletetable.png  |binary
 icon-themes/sifr/cmd/32/editheaderandfooter.png  |binary
 icon-themes/sifr/cmd/32/entirecell.png   |binary
 icon-themes/sifr/cmd/32/entirecolumn.png |binary
 icon-themes/sifr/cmd/32/entirerow.png|binary
 icon-themes/sifr/cmd/32/exportdirecttoepub.png   |binary
 icon-themes/sifr/cmd/32/exportdirecttopdf.png|binary
 icon-themes/sifr/cmd/32/exportto.png |binary
 icon-themes/sifr/cmd/32/formatpaintbrush.png |binary
 icon-themes/sifr/cmd/32/freezepane.png   |binary
 icon-themes/sifr/cmd/32/insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/32/insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/32/insertindexentry.png |binary
 icon-themes/sifr/cmd/32/insertreferencefield.png |binary
 icon-themes/sifr/cmd/32/insertrowsafter.png  |binary
 icon-themes/sifr/cmd/32/insertrowsbefore.png |binary
 icon-themes/sifr/cmd/32/numberformatthousands.png|binary
 icon-themes/sifr/cmd/32/open.png |binary
 icon-themes/sifr/cmd/32/resetattributes.png  |binary
 icon-themes/sifr/cmd/32/romanliststyle.png   |binary
 icon-themes/sifr/cmd/32/selectall.png|binary
 icon-themes/sifr/cmd/32/selectobject.png |binary
 icon-themes/sifr_svg/cmd/32/backcolor.svg|   10 ++
 icon-themes/sifr_svg/cmd/32/bold.svg |6 ++
 icon-themes/sifr_svg/cmd/32/copy.svg |6 ++
 icon-themes/sifr_svg/cmd/32/cut.svg  |6 ++
 icon-themes/sifr_svg/cmd/32/defineprintarea.svg  |   14 ++
 icon-themes/sifr_svg/cmd/32/exportdirecttoepub.svg   |   10 ++
 icon-themes/sifr_svg/cmd/32/exportdirecttopdf.svg|   10 ++
 icon-themes/sifr_svg/cmd/32/exportto.svg |   10 ++
 icon-themes/sifr_svg/cmd/32/formatpaintbrush.svg |6 ++
 icon-themes/sifr_svg/cmd/32/freezepane.svg   |   14 ++
 icon-themes/sifr_svg/cmd/32/insertreferencefield.svg |   10 ++
 icon-themes/sifr_svg/cmd/32/open.svg |   12 ++--
 42 files changed, 108 insertions(+), 6 deletions(-)

New commits:
commit 46195e2a579a373287a99d03cc06c38f557880c0
Author: andreas kainz 
AuthorDate: Mon Jan 28 23:20:32 2019 +0100
Commit: andreas_kainz 
CommitDate: Tue Jan 29 08:20:18 2019 +0100

Sifr icon: add cmd/32px svg icons and update the png output

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

diff --git a/icon-themes/sifr/cmd/32/backcolor.png 
b/icon-themes/sifr/cmd/32/backcolor.png
index 1ab5a920775d..7a31822cc988 100644
Binary files a/icon-themes/sifr/cmd/32/backcolor.png and 
b/icon-themes/sifr/cmd/32/backcolor.png differ
diff --git a/icon-themes/sifr/cmd/32/bold.png b/icon-themes/sifr/cmd/32/bold.png
index a1d742570fff..624d93be4c0f 100644
Binary files a/icon-themes/sifr/cmd/32/bold.png and 
b/icon-themes/sifr/cmd/32/bold.png differ
diff --git a/icon-themes/sifr/cmd/32/connector.png 
b/icon-themes/sifr/cmd/32/connector.png
index 1f99c9edafe3..16a09240ceb8 100644
Binary files a/icon-themes/sifr/cmd/32/connector.png and 
b/icon-themes/sifr/cmd/32/connector.png differ
diff --git a/icon-themes/sifr/cmd/32/copy.png b/icon-themes/sifr/cmd/32/copy.png
index 19747908b128..0128513d665f 100644
Binary files a/icon-themes/sifr/cmd/32/copy.png and 
b/icon-themes/sifr/cmd/32/copy.png differ
diff --git a/icon-themes/sifr/cmd/32/cut.png b/icon-themes/sifr/cmd/32/cut.png
index 36dab3f99815..116e29521d24 100644
Binary files a/icon-themes/sifr/cmd/32/cut.png and 
b/icon-themes/sifr/cmd/32/cut.png differ
diff --git a/icon-themes/sifr/cmd/32/datadatapilotrun.png 
b/icon-themes/sifr/cmd/32/datadatapilotrun.png
index 3103cc50c0dc..6e6d5937751d 100644
Binary files a/icon-themes/sifr/cmd/32/datadatapilotrun.png and 
b/icon-themes/sifr/cmd/32/datadatapilotrun.png differ
diff --git a/icon-themes/sifr/cmd/32/dbviewfunctions.png 
b/icon-themes/sifr/cmd/32/dbviewfunctions.png
index 68346637e12b..d6fa147b5f8c 100644
Binary files a/icon-themes/sifr/cmd/32/dbviewfunctions.png and 
b/icon-themes/sifr/cmd/32/dbviewfunctions.png differ
diff --git a/icon-themes/sifr/cmd/32/defineprintarea.png 
b/icon-themes/sifr/cmd/32/defineprintarea.png
index 02bf1c18108c..d537cc8d9d3d 100644
B

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

[Libreoffice Gerrit user]

 sc/inc/pch/precompiled_sc.hxx|1 
 sc/inc/pch/precompiled_scfilt.hxx|1 
 sc/inc/pch/precompiled_scui.hxx  |1 
 sc/qa/unit/ucalc_condformat.cxx  |   13 -
 sc/qa/unit/ucalc_formula.cxx |3 
 sc/source/core/data/attarray.cxx |3 
 sc/source/core/data/bcaslot.cxx  |4 
 sc/source/core/data/cellvalues.cxx   |5 
 sc/source/core/data/colorscale.cxx   |5 
 sc/source/core/data/column2.cxx  |   12 -
 sc/source/core/data/column4.cxx  |3 
 sc/source/core/data/docpool.cxx  |3 
 sc/source/core/data/documen2.cxx |3 
 sc/source/core/data/documen8.cxx |3 
 sc/source/core/data/documen9.cxx |3 
 sc/source/core/data/documentimport.cxx   |7 
 sc/source/core/data/dpcache.cxx  |7 
 sc/source/core/data/dpobject.cxx |3 
 sc/source/core/data/dpresfilter.cxx  |3 
 sc/source/core/data/dpsave.cxx   |3 
 sc/source/core/data/drwlayer.cxx |   33 +--
 sc/source/core/data/fillinfo.cxx |3 
 sc/source/core/data/formulacell.cxx  |5 
 sc/source/core/data/mtvelements.cxx  |4 
 sc/source/core/data/patattr.cxx  |3 
 sc/source/core/data/pivot2.cxx   |3 
 sc/source/core/data/postit.cxx   |   13 -
 sc/source/core/data/table3.cxx   |3 
 sc/source/core/tool/autoform.cxx |1 
 sc/source/core/tool/callform.cxx |3 
 sc/source/core/tool/chartarr.cxx |1 
 sc/source/core/tool/chartpos.cxx |3 
 sc/source/core/tool/dbdata.cxx   |3 
 sc/source/core/tool/detfunc.cxx  |   17 -
 sc/source/core/tool/formulagroup.cxx |5 
 sc/source/core/tool/formulalogger.cxx|5 
 sc/source/core/tool/queryparam.cxx   |   13 -
 sc/source/core/tool/rangenam.cxx |3 
 sc/source/core/tool/userlist.cxx |   13 -
 sc/source/filter/excel/excimp8.cxx   |3 
 sc/source/filter/excel/fontbuff.cxx  |3 
 sc/source/filter/excel/frmbase.cxx   |5 
 sc/source/filter/excel/impop.cxx |3 
 sc/source/filter/excel/xechart.cxx   |6 
 sc/source/filter/excel/xeescher.cxx  |3 
 sc/source/filter/excel/xepivotxml.cxx|4 
 sc/source/filter/excel/xestyle.cxx   |3 
 sc/source/filter/excel/xichart.cxx   |3 
 sc/source/filter/excel/xicontent.cxx |3 
 sc/source/filter/excel/xihelper.cxx  |3 
 sc/source/filter/excel/xilink.cxx|   11 -
 sc/source/filter/excel/xiname.cxx|3 
 sc/source/filter/excel/xistyle.cxx   |3 
 sc/source/filter/ftools/fprogressbar.cxx |3 
 sc/source/filter/html/htmlimp.cxx|3 
 sc/source/filter/html/htmlpars.cxx   |   13 -
 sc/source/filter/oox/extlstcontext.cxx   |5 
 sc/source/filter/oox/formulabuffer.cxx   |5 
 sc/source/filter/oox/workbookfragment.cxx|3 
 sc/source/filter/orcus/interface.cxx |   11 -
 sc/source/filter/orcus/xmlcontext.cxx|3 
 sc/source/filter/rtf/rtfimp.cxx  |3 
 sc/source/filter/xcl97/xcl97esc.cxx  |3 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx   |   21 --
 sc/source/filter/xml/XMLStylesExportHelper.cxx   |3 
 sc/source/filter/xml/xmlcelli.cxx|   11 -
 sc/source/filter/xml/xmlimprt.cxx|4 
 sc/source/filter/xml/xmllabri.cxx|4 
 sc/source/ui/Accessibility/AccessibleCell.cxx|4 
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx  |4 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |4 
 sc/source/ui/

[Libreoffice-commits] core.git: 2 commits - stoc/source store/source svgio/source

[Libreoffice Gerrit user]

 stoc/source/corereflection/criface.cxx |   33 
 stoc/source/defaultregistry/defaultregistry.cxx|   18 
 stoc/source/implementationregistration/implreg.cxx |  492 
 stoc/source/invocation/invocation.cxx  |   28 
 stoc/source/javavm/javavm.cxx  |  196 +--
 stoc/source/proxy_factory/proxyfac.cxx |   26 
 stoc/source/security/access_controller.cxx |   94 -
 stoc/source/security/permissions.cxx   |  102 -
 stoc/source/servicemanager/servicemanager.cxx  |   54 
 store/source/storcach.cxx  |   58 -
 svgio/source/svgreader/svganode.cxx|   24 
 svgio/source/svgreader/svgcharacternode.cxx|   50 
 svgio/source/svgreader/svgcirclenode.cxx   |   36 
 svgio/source/svgreader/svgclippathnode.cxx |  230 ++--
 svgio/source/svgreader/svgdocumenthandler.cxx  |  760 ++---
 svgio/source/svgreader/svgellipsenode.cxx  |   38 
 svgio/source/svgreader/svgimagenode.cxx|  292 ++---
 svgio/source/svgreader/svglinenode.cxx |   38 
 svgio/source/svgreader/svgmasknode.cxx |  216 +--
 svgio/source/svgreader/svgnode.cxx |  278 ++--
 svgio/source/svgreader/svgpatternnode.cxx  |   90 -
 svgio/source/svgreader/svgrectnode.cxx |   82 -
 svgio/source/svgreader/svgstyleattributes.cxx  | 1194 ++---
 svgio/source/svgreader/svgstylenode.cxx|  204 +--
 svgio/source/svgreader/svgsvgnode.cxx  |  110 -
 svgio/source/svgreader/svgtextnode.cxx |   78 -
 svgio/source/svgreader/svgtextpathnode.cxx |  152 +-
 svgio/source/svgreader/svgusenode.cxx  |   80 -
 28 files changed, 2524 insertions(+), 2529 deletions(-)

New commits:
commit 7a576383308edec3d6538986310264bfc0f1c213
Author: Noel Grandin 
AuthorDate: Mon Jan 28 15:09:20 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jan 29 07:11:12 2019 +0100

loplugin:flatten in svgio

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

diff --git a/svgio/source/svgreader/svganode.cxx 
b/svgio/source/svgreader/svganode.cxx
index 8aac10dd1a3c..d2d64d04c359 100644
--- a/svgio/source/svgreader/svganode.cxx
+++ b/svgio/source/svgreader/svganode.cxx
@@ -81,21 +81,21 @@ namespace svgio
 // #i125258# for SVGTokenA decompose children
 const SvgStyleAttributes* pStyle = getSvgStyleAttributes();
 
-if(pStyle)
-{
-const double fOpacity(pStyle->getOpacity().getNumber());
+if(!pStyle)
+return;
 
-if(fOpacity > 0.0 && Display_none != getDisplay())
-{
-drawinglayer::primitive2d::Primitive2DContainer aContent;
+const double fOpacity(pStyle->getOpacity().getNumber());
 
-// decompose children
-SvgNode::decomposeSvgNode(aContent, bReferenced);
+if(fOpacity > 0.0 && Display_none != getDisplay())
+{
+drawinglayer::primitive2d::Primitive2DContainer aContent;
 
-if(!aContent.empty())
-{
-pStyle->add_postProcess(rTarget, aContent, 
getTransform());
-}
+// decompose children
+SvgNode::decomposeSvgNode(aContent, bReferenced);
+
+if(!aContent.empty())
+{
+pStyle->add_postProcess(rTarget, aContent, getTransform());
 }
 }
 }
diff --git a/svgio/source/svgreader/svgcharacternode.cxx 
b/svgio/source/svgreader/svgcharacternode.cxx
index 70e99384b440..edd77e2921eb 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -503,36 +503,36 @@ namespace svgio
 rSvgTextPosition,
 rSvgStyleAttributes));
 
-if(xRef.is() && (Visibility_visible == 
rSvgStyleAttributes.getVisibility()))
-{
-if(!rSvgTextPosition.isRotated())
-{
-rTarget.push_back(xRef);
-}
-else
-{
-// need to apply rotations to each character as given
-const 
drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pCandidate =
-dynamic_cast< const 
drawinglayer::primitive2d::TextSimplePortionPrimitive2D* >(xRef.get());
+if(!(xRef.is() && (Visibility_visible == 
rSvgStyleAttributes.getVisibility(
+return;
 
-if(pCandidate)
-{
-const localTextBreakupHelper 
alocalTextBreakupHelper(*pCandidate, rSvgTextPosition);
-const dr

[Libreoffice-commits] core.git: bin/find-german-comments

[Libreoffice Gerrit user]

 bin/find-german-comments |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4cff06065ebfe884d8661b790db76f15203f2549
Author: Andrea Gelmini 
AuthorDate: Mon Jan 28 10:43:46 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jan 29 07:09:44 2019 +0100

Fix typo

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

diff --git a/bin/find-german-comments b/bin/find-german-comments
index a944aaedf2b3..fc9f168f2340 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -126,9 +126,9 @@ class Parser:
 return sock
 
 def get_lang(self, s):
-""" the output is 'german' or 'english' or 'german or english'. when
+""" the output is 'german' or 'english' or 'german or english'. When
 unsure, just don't warn, there are strings where you just can't
-teremine the results reliably, like '#110680#' """
+determine the results reliably, like '#110680#' """
 
 self.text_cat.stdin.write(bytes(s, 'utf-8'))
 self.text_cat.stdin.write(bytes("\n", 'utf-8'))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 framework/qa/complex/api_internal/api.lst  |1 
 qadevOOo/Jar_OOoRunner.mk  |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv |7 
 qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java|  123 
--
 sc/qa/extras/scfilterdescriptorbase.cxx|   10 
 sc/qa/unoapi/sc_4.sce  |1 
 6 files changed, 10 insertions(+), 133 deletions(-)

New commits:
commit a71de08d75e15fd37408901d47a7aa3918f8087a
Author: Jens Carl 
AuthorDate: Tue Jan 29 01:17:54 2019 +
Commit: Jens Carl 
CommitDate: Tue Jan 29 07:08:44 2019 +0100

tdf#45904 Move XPropertySet Java tests to C++

Move XPropertySet Java tests to C++ for ScFilterDescriptorBase.

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

diff --git a/framework/qa/complex/api_internal/api.lst 
b/framework/qa/complex/api_internal/api.lst
index 434ae00edc0d..751bb7ccd89c 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -80,7 +80,6 @@ job85=sc.ScCellSearchObj
 job88=sc.ScDatabaseRangeObj
 job90=sc.ScDataPilotFieldObj
 job91=sc.ScDataPilotFieldsObj
-job96=sc.ScFilterDescriptorBase
 job98=sc.ScHeaderFieldObj
 job99=sc.ScHeaderFieldsObj
 job126=sc.ScSheetLinkObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 4e140f06b987..a80f13887733 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -973,7 +973,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj \
 qadevOOo/tests/java/mod/_sc/ScDocumentConfiguration \
 qadevOOo/tests/java/mod/_sc/ScDrawPageObj \
-qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase \
 qadevOOo/tests/java/mod/_sc/ScHeaderFieldObj \
 qadevOOo/tests/java/mod/_sc/ScHeaderFieldsObj \
 qadevOOo/tests/java/mod/_sc/ScHeaderFooterTextCursor \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv
deleted file mode 100644
index ed43efa9a2b5..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScFilterDescriptorBase.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"addPropertyChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"removePropertyChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"addVetoableChangeListener()"
-"ScFilterDescriptorBase";"com::sun::star::beans::XPropertySet";"removeVetoableChangeListener()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java 
b/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
deleted file mode 100644
index 993254bfabe0..
--- a/qadevOOo/tests/java/mod/_sc/ScFilterDescriptorBase.java
+++ /dev/null
@@ -1,123 +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.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XSheetFilterable;
-import com.sun.star.sheet.XSpreadsheet;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.uno.AnyConverter;
-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.SheetFilterDescriptor. 
-* Object implements the following interfaces :
-* 
-*   com::sun::star::sheet::XSheetFilterDescriptor
-*   com:

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

[Libreoffice Gerrit user]

 svx/qa/unit/customshapes.cxx  |   29 ++
 svx/qa/unit/data/tdf122964_MultipleMoveTo.odg |binary
 xmloff/source/draw/ximpcustomshape.cxx|   29 --
 3 files changed, 52 insertions(+), 6 deletions(-)

New commits:
commit 76c7a6c39d769cb9bdb9b951d9f95507c0139372
Author: Regina Henschel 
AuthorDate: Fri Jan 25 00:30:57 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Jan 29 01:16:51 2019 +0100

Improve ODF enhanced-path command moveTo to follow spec

ODF 1.2 section 19.145 says 'If a moveto is followed by multiple
pairs of coordinates, they are treated as lineto.' The patch does
this on import.

Change-Id: Ib493ca49288cdb2d34b7ee801bd052281617d2e8
Reviewed-on: https://gerrit.libreoffice.org/66888
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/svx/qa/unit/customshapes.cxx b/svx/qa/unit/customshapes.cxx
old mode 100644
new mode 100755
index d3f63dffe2a9..a0c256b5d6e0
--- a/svx/qa/unit/customshapes.cxx
+++ b/svx/qa/unit/customshapes.cxx
@@ -50,11 +50,13 @@ public:
 void testViewBoxLeftTop();
 void testAccuracyCommandX();
 void testToggleCommandXY();
+void testMultipleMoveTo();
 
 CPPUNIT_TEST_SUITE(CustomshapesTest);
 CPPUNIT_TEST(testViewBoxLeftTop);
 CPPUNIT_TEST(testAccuracyCommandX);
 CPPUNIT_TEST(testToggleCommandXY);
+CPPUNIT_TEST(testMultipleMoveTo);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -161,6 +163,33 @@ void CustomshapesTest::testToggleCommandXY()
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("segment height out of tolerance", 
5871.0, fHeight, 16.0);
 }
 
+void CustomshapesTest::testMultipleMoveTo()
+{
+// tdf122964 Multiple moveTo has to be treated as lineTo in 
draw:enhanced-path
+// Load a document with path "M 0 0 5 10 10 0 N"
+OUString aURL = m_directories.getURLFromSrc(sDataDirectory) + 
"tdf122964_MultipleMoveTo.odg";
+mxComponent = loadFromDesktop(aURL, 
"com.sun.star.comp.drawing.DrawingDocument");
+CPPUNIT_ASSERT_MESSAGE("Could not load document", mxComponent.is());
+
+uno::Reference xDrawPagesSupplier(mxComponent,
+   
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", 
xDrawPagesSupplier.is());
+uno::Reference 
xDrawPages(xDrawPagesSupplier->getDrawPages());
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY_THROW);
+
+// Error was, that the second and further parameter pairs were treated as 
moveTo,
+// and so the generated path was empty, resulting in zero width and height 
of the
+// bounding box. It has to be treated same as "M 0 0 L 5 10 10 0 N".
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape", xShape.is());
+uno::Reference xShapeProps(xShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape properties", 
xShapeProps.is());
+awt::Rectangle aBoundRect;
+xShapeProps->getPropertyValue(UNO_NAME_MISC_OBJ_BOUNDRECT) >>= aBoundRect;
+bool bIsZero(aBoundRect.Height == 0 && aBoundRect.Width == 0);
+CPPUNIT_ASSERT_MESSAGE("Path is empty", !bIsZero);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(CustomshapesTest);
 }
 
diff --git a/svx/qa/unit/data/tdf122964_MultipleMoveTo.odg 
b/svx/qa/unit/data/tdf122964_MultipleMoveTo.odg
new file mode 100644
index ..63d80fd06736
Binary files /dev/null and b/svx/qa/unit/data/tdf122964_MultipleMoveTo.odg 
differ
diff --git a/xmloff/source/draw/ximpcustomshape.cxx 
b/xmloff/source/draw/ximpcustomshape.cxx
index da15e3458cbb..35de24ba2562 100644
--- a/xmloff/source/draw/ximpcustomshape.cxx
+++ b/xmloff/source/draw/ximpcustomshape.cxx
@@ -792,16 +792,33 @@ static void GetEnhancedPath( std::vector< 
css::beans::PropertyValue >& rDest,
 }
 else if ( nParameterCount >= nParametersNeeded )
 {
-// check if the last command is identical,
-// if so, we just need to increment the count
-if ( !vSegments.empty() && ( vSegments[ vSegments.size() - 1 
].Command == nLatestSegmentCommand ) )
-vSegments[ vSegments.size() -1 ].Count++;
-else
+// Special rule for moveto in ODF 1.2 section 19.145
+// "If a moveto is followed by multiple pairs of coordinates, they 
are treated as lineto."
+if ( nLatestSegmentCommand == 
css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO )
 {
 css::drawing::EnhancedCustomShapeSegment aSegment;
-aSegment.Command = nLatestSegmentCommand;
+aSegment.Command = 
css::drawing::EnhancedCustomShapeSegmentCommand::MOVETO;
 aSegment.Count = 1;
 vSegments.push_back( aSegment );
+nIndex--;
+nLatestSegmentCommand = 
css::drawing::EnhancedCustomShapeSegmentCommand::LINET

[Libreoffice-commits] core.git: include/test qadevOOo/objdsc sc/qa test/Library_subsequenttest.mk test/source

[Libreoffice Gerrit user]

 include/test/text/xsimpletext.hxx |   36 ++
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv |4 
 sc/qa/extras/sccellobj.cxx|   54 +
 test/Library_subsequenttest.mk|1 
 test/source/text/xsimpletext.cxx  |   76 ++
 5 files changed, 145 insertions(+), 26 deletions(-)

New commits:
commit ecc855aa1c86d88a99c3be06c70ed382180be688
Author: Ajay Mahato 
AuthorDate: Mon Jan 21 23:14:15 2019 +0530
Commit: Jens Carl 
CommitDate: Tue Jan 29 01:02:34 2019 +0100

tdf#45904 Move XSimpleText Java tests to C++

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

diff --git a/include/test/text/xsimpletext.hxx 
b/include/test/text/xsimpletext.hxx
new file mode 100644
index ..fca6d24a0d6a
--- /dev/null
+++ b/include/test/text/xsimpletext.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_TEXT_XSIMPLETEXT_HXX
+#define INCLUDED_TEST_TEXT_XSIMPLETEXT_HXX
+
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XSimpleText
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testCreateTextCursor();
+void testCreateTextCursorByRange();
+void testInsertString();
+void testInsertControlCharacter();
+
+protected:
+~XSimpleText() {}
+};
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
index 3be24423a38d..e31e938fe88b 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
@@ -109,10 +109,6 @@
 "ScCellObj";"com::sun::star::text::XTextRangeMover#optional";"moveTextRange()"
 
"ScCellObj";"com::sun::star::text::XTextRangeCompare#optional";"compareRegionStarts()"
 
"ScCellObj";"com::sun::star::text::XTextRangeCompare#optional";"compareRegionEnds()"
-"ScCellObj";"com::sun::star::text::XSimpleText";"createTextCursor()"
-"ScCellObj";"com::sun::star::text::XSimpleText";"createTextCursorByRange()"
-"ScCellObj";"com::sun::star::text::XSimpleText";"insertString()"
-"ScCellObj";"com::sun::star::text::XSimpleText";"insertControlCharacter()"
 "ScCellObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScCellObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
 "ScCellObj";"com::sun::star::sheet::XCellRangesQuery";"queryContentCells()"
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index cb1c5a1421fd..51d7b0ce22b1 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -10,11 +10,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 
 #include 
@@ -25,27 +26,30 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace css;
 using namespace css::uno;
 
-namespace sc_apitest {
-
-class ScCellObj : public CalcUnoApiTest, public apitest::SheetCell,
- public apitest::XCell,
- public apitest::XCellAddressable,
- public apitest::XColumnRowRange,
- public apitest::XEnumerationAccess,
- public apitest::XFormulaQuery,
- public apitest::XIndent,
- public apitest::XSheetAnnotationAnchor
+namespace sc_apitest
+{
+class ScCellObj : public CalcUnoApiTest,
+  public apitest::SheetCell,
+  public apitest::XCell,
+  public apitest::XCellAddressable,
+  public apitest::XColumnRowRange,
+  public apitest::XEnumerationAccess,
+  public apitest::XFormulaQuery,
+  public apitest::XIndent,
+  public apitest::XSheetAnnotationAnchor,
+  public apitest::XSimpleText
 {
 public:
 ScCellObj();
 
-virtual uno::Reference< uno::XInterface > init() override;
-virtual uno::Reference< uno::XInterface > getXSpreadsheet() override;
+virtual uno::Reference init() override;
+virtual uno::Reference getXSpreadsheet() override;
 virtual void setUp() override;
 virtual void tearDown() override;
 
@@ -81,23 +85,30 @@ public:
 // XSheetAnnotationAnchor
 CPPUNIT_TEST(testGetAnnotatio

[Libreoffice-commits] core.git: sc/CppunitTest_sc_filterdescriptorbase.mk sc/CppunitTest_sc_filterdescriptorbaseobj.mk sc/Module_sc.mk sc/qa solenv/clang-format

[Libreoffice Gerrit user]

 sc/CppunitTest_sc_filterdescriptorbase.mk |   22 
 sc/Module_sc.mk   |2 -
 sc/qa/extras/scfilterdescriptorbase.cxx   |   40 +++---
 solenv/clang-format/blacklist |1 
 4 files changed, 32 insertions(+), 33 deletions(-)

New commits:
commit 7cf66213a975d9c846990ed8b0c2eb0daae89aa2
Author: Jens Carl 
AuthorDate: Mon Jan 28 20:44:20 2019 +
Commit: Jens Carl 
CommitDate: Tue Jan 29 01:01:25 2019 +0100

Rename ScFilterDescriptorBaseObj to ScFilterDescriptorBase

Rename ScFilterDescriptorBaseObj to ScFilterDescriptorBase so it
matches the object name we test against.

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

diff --git a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk 
b/sc/CppunitTest_sc_filterdescriptorbase.mk
similarity index 81%
rename from sc/CppunitTest_sc_filterdescriptorbaseobj.mk
rename to sc/CppunitTest_sc_filterdescriptorbase.mk
index 2f67b429859c..4f0f206473cc 100644
--- a/sc/CppunitTest_sc_filterdescriptorbaseobj.mk
+++ b/sc/CppunitTest_sc_filterdescriptorbase.mk
@@ -9,15 +9,15 @@
 #
 #*
 
-$(eval $(call gb_CppunitTest_CppunitTest,sc_filterdescriptorbaseobj))
+$(eval $(call gb_CppunitTest_CppunitTest,sc_filterdescriptorbase))
 
-$(eval $(call 
gb_CppunitTest_use_external,sc_filterdescriptorbaseobj,boost_headers))
+$(eval $(call 
gb_CppunitTest_use_external,sc_filterdescriptorbase,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_filterdescriptorbaseobj, 
\
-   sc/qa/extras/scfilterdescriptorbaseobj\
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_filterdescriptorbase, \
+   sc/qa/extras/scfilterdescriptorbase\
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbaseobj, \
+$(eval $(call gb_CppunitTest_use_libraries,sc_filterdescriptorbase, \
cppu \
sal \
subsequenttest \
@@ -25,19 +25,19 @@ $(eval $(call 
gb_CppunitTest_use_libraries,sc_filterdescriptorbaseobj, \
unotest \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,sc_filterdescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_set_include,sc_filterdescriptorbase,\
$$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_filterdescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_filterdescriptorbase))
 
-$(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbaseobj))
-$(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_ure,sc_filterdescriptorbase))
+$(eval $(call gb_CppunitTest_use_vcl,sc_filterdescriptorbase))
 
-$(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbaseobj,\
+$(eval $(call gb_CppunitTest_use_components,sc_filterdescriptorbase,\
$(sc_unoapi_common_components) \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbaseobj))
+$(eval $(call gb_CppunitTest_use_configuration,sc_filterdescriptorbase))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 75b10a4de667..dd41344970f5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -135,7 +135,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_drawpagesobj \
CppunitTest_sc_editfieldobj_cell \
CppunitTest_sc_editfieldobj_header \
-   CppunitTest_sc_filterdescriptorbaseobj \
+   CppunitTest_sc_filterdescriptorbase \
CppunitTest_sc_functiondescriptionobj \
CppunitTest_sc_functionlistobj \
CppunitTest_sc_headerfieldsobj \
diff --git a/sc/qa/extras/scfilterdescriptorbaseobj.cxx 
b/sc/qa/extras/scfilterdescriptorbase.cxx
similarity index 58%
rename from sc/qa/extras/scfilterdescriptorbaseobj.cxx
rename to sc/qa/extras/scfilterdescriptorbase.cxx
index 5a0fd35ec5b3..be19bfc679f8 100644
--- a/sc/qa/extras/scfilterdescriptorbaseobj.cxx
+++ b/sc/qa/extras/scfilterdescriptorbase.cxx
@@ -21,21 +21,21 @@
 using namespace css;
 using namespace css::uno;
 
-namespace sc_apitest {
-
-class ScFilterDescriptorBaseObj : public CalcUnoApiTest,
-  public apitest::SheetFilterDescriptor,
-  public apitest::XSheetFilterDescriptor
+namespace sc_apitest
+{
+class ScFilterDescriptorBase : public CalcUnoApiTest,
+   public apitest::SheetFilterDescriptor,
+   public apitest::XSheetFilterDescriptor
 {
 public:
-ScFilterDescriptorBaseObj();
+ScFilterDescriptorBase();
 
 virtual void setUp() override;
 virtual void tearDown() override;
 
-virtual uno::Reference< uno::XInterface > init() override;
+virtual uno::Reference init() override;
 
-CPPUNIT_TEST_SUITE(ScFilterDescriptorBaseObj);
+CPPUNIT_TEST_SUITE(ScFilterDescriptorBase);
 
 // SheetFilterDescriptor

[Libreoffice-commits] core.git: external/libgpg-error

[Libreoffice Gerrit user]

 external/libgpg-error/ExternalPackage_libgpg-error.mk|2 -
 external/libgpg-error/UnpackedTarball_libgpg-error.mk|1 
 external/libgpg-error/libgpgerror-bundled-soname.patch.1 |   22 +++
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 87873a682f0d0c3173ac815385484fa9ea92b883
Author: Michael Stahl 
AuthorDate: Mon Jan 28 14:31:12 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jan 28 23:54:56 2019 +0100

libgpg-error: use custom soname and symbol version

The hope is that this should allow both system's libgpg-error.so.0 and
LO's bundled libgpg-error-lo.so.0 to be loaded by soffice.bin without
unintended hilarity.

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

diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk 
b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index a7c04ff9c900..3afd218eef9e 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
+$(eval $(call 
gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error-lo.so.0,src/.libs/libgpg-error-lo.so.0.22.0))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk 
b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
index ad2145a96aa7..753f29716e2f 100644
--- a/external/libgpg-error/UnpackedTarball_libgpg-error.mk
+++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgpg-error, \
$(if $(filter 
MSC,$(COM)),external/libgpg-error/w32-disable-dllinit.patch.1) \
external/libgpg-error/w32-build-fixes-4.patch \
external/libgpg-error/clang-cl.patch \
+   $(if $(filter 
LINUX,$(OS)),external/libgpg-error/libgpgerror-bundled-soname.patch.1) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgpg-error/libgpgerror-bundled-soname.patch.1 
b/external/libgpg-error/libgpgerror-bundled-soname.patch.1
new file mode 100644
index ..4f927def368a
--- /dev/null
+++ b/external/libgpg-error/libgpgerror-bundled-soname.patch.1
@@ -0,0 +1,22 @@
+--- libgpg-error/src/Makefile.in.orig  2019-01-28 14:11:10.518425440 +0100
 libgpg-error/src/Makefile.in   2019-01-28 14:11:16.901414229 +0100
+@@ -540,7 +540,7 @@
+ @HAVE_LD_VERSION_SCRIPT_TRUE@libgpg_error_vers_opt = 
-Wl,--version-script=$(srcdir)/gpg-error.vers
+ libgpg_error_la_LDFLAGS = \
+   $(no_undefined) $(export_symbols) $(libgpg_error_vers_opt) \
+-  $(extra_ltoptions) -version-info \
++  $(extra_ltoptions) -release lo -version-info \
+   @LIBGPG_ERROR_LT_CURRENT@:@LIBGPG_ERROR_LT_REVISION@:@LIBGPG_ERROR_LT_AGE@
+ 
+ libgpg_error_la_SOURCES = gettext.h $(arch_sources) \
+--- libgpg-error/src/gpg-error.vers.orig   2019-01-28 14:08:11.413740011 
+0100
 libgpg-error/src/gpg-error.vers2019-01-28 14:08:34.172700037 +0100
+@@ -20,7 +20,7 @@
+ #   visibility.h and gpg-error.def.in as well.
+ 
+ 
+-GPG_ERROR_1.0 {
++GPG_ERROR_LIBREOFFICE {
+   global:
+ gpg_strerror;
+ gpg_strerror_r;
___
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 ade7cbbb01c72828e1555c826359beaeda64e69a
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 16:25:10 2019 -0600
Commit: Gerrit Code Review 
CommitDate: Mon Jan 28 23:27:50 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#121571 Solve cognitive dissonance with note icons and colors

More often than not, the alarmist colors given to note boxes didn’t
match their content.

Change-Id: I88d7a8e2d07ffba661c218887fd54638506d21c8

diff --git a/helpcontent2 b/helpcontent2
index a8ab16150bf0..622324ec76e5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a8ab16150bf04fd812dde07bdd7d0bbd9b52f48e
+Subproject commit 622324ec76e54ea1de99d6cea3debc2389049f58
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/default.css  |   18 +-
 help3xsl/online_transform.xsl |6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 622324ec76e54ea1de99d6cea3debc2389049f58
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 16:25:10 2019 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 28 16:25:10 2019 -0600

tdf#121571 Solve cognitive dissonance with note icons and colors

More often than not, the alarmist colors given to note boxes didn’t
match their content.

Change-Id: I88d7a8e2d07ffba661c218887fd54638506d21c8

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 9b7028af4..2594c5de6 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -86,7 +86,7 @@ h6,
 pointer-events: auto;
 }
 body {
-background-color: #F4F7F7;
+background-color: #F7F8F7;
 margin: 0;
 line-height: normal;
 }
@@ -159,16 +159,16 @@ pre,
 margin-top: 15px;
 }
 .note {
-border-left: 4px solid #FFDE09;
-background-color: #FFF4D0;
+border-left: 4px solid #61897C;
+background-color: #D9E7E2;
 }
 .tip {
-border-left: 4px solid #38618C;
-background-color: #DAE2EA;
+border-left: 4px solid #4866AD;
+background-color: #CDD5E8;
 }
 .warning {
-border-left: 4px solid #FF5964;
-background-color: #FFE0E2;
+border-left: 4px solid #D5B177;
+background-color: #F9EEDC;
 }
 .noteicon, .notetext {
 padding:0.3em;
@@ -260,8 +260,8 @@ h6 {
 margin-left: 5px;
 }
 .howtoget {
-background: #CCF4C6;
-border-left: 4px solid #148603;
+background: #EBE7E9;
+border-left: 4px solid #4E4B55;
 border-radius: 0 4px 4px 0;
 box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
 padding: 0.3em;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index f52edfa01..02a166c63 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -94,9 +94,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basegfx/CppunitTest_basegfx.mk basegfx/test

[Libreoffice Gerrit user]

 basegfx/CppunitTest_basegfx.mk   |   13 
 basegfx/test/B1DRangeTest.cxx|   97 +++
 basegfx/test/B2DHomMatrixTest.cxx|  468 +++
 basegfx/test/B2DPointTest.cxx|   50 +
 basegfx/test/B2DPolyPolygonTest.cxx  |   82 ++
 basegfx/test/B2DPolyRangeTest.cxx|   66 ++
 basegfx/test/B2DPolygonTest.cxx  |   94 +++
 basegfx/test/B2DPolygonToolsTest.cxx |   85 ++
 basegfx/test/B2DRangeTest.cxx|   54 +
 basegfx/test/B2DTupleTest.cxx|   50 +
 basegfx/test/B2IBoxTest.cxx  |   63 ++
 basegfx/test/B2XRangeTest.cxx|   70 ++
 basegfx/test/BColorTest.cxx  |  151 +
 basegfx/test/basegfx2d.cxx   | 1024 ---
 14 files changed, 1342 insertions(+), 1025 deletions(-)

New commits:
commit dfc4d2b009b9f9c7307c79e7ef2c1663005a5646
Author: Tomaž Vajngerl 
AuthorDate: Mon Jan 28 19:54:51 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Jan 28 23:14:23 2019 +0100

split basegfx 2d tests to separate files (one per tested class)

Change-Id: Icb2f745851ba3de31f6a672d1bc20659de687d2e
Reviewed-on: https://gerrit.libreoffice.org/67031
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 472c6ff11049..91cfc2226774 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -22,7 +22,18 @@ $(eval $(call gb_CppunitTest_use_libraries,basegfx,\
 ))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,basegfx,\
-basegfx/test/basegfx2d \
+basegfx/test/B2DRangeTest \
+basegfx/test/B2DPolyRangeTest \
+basegfx/test/B2DHomMatrixTest \
+basegfx/test/B2DPointTest \
+basegfx/test/B2DPolygonTest \
+basegfx/test/B2DPolygonToolsTest \
+basegfx/test/B2DPolyPolygonTest \
+basegfx/test/B1DRangeTest \
+basegfx/test/B2XRangeTest \
+basegfx/test/B2IBoxTest \
+basegfx/test/B2DTupleTest \
+basegfx/test/BColorTest \
 basegfx/test/SvgPathImportExport \
 basegfx/test/basegfx3d \
 basegfx/test/boxclipper \
diff --git a/basegfx/test/B1DRangeTest.cxx b/basegfx/test/B1DRangeTest.cxx
new file mode 100644
index ..3eefc9026484
--- /dev/null
+++ b/basegfx/test/B1DRangeTest.cxx
@@ -0,0 +1,97 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file 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 .
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+namespace basegfx
+{
+class b1Xrange : public CppUnit::TestFixture
+{
+public:
+template  void implCheck()
+{
+// test interval axioms
+// (http://en.wikipedia.org/wiki/Interval_%28mathematics%29)
+Type aRange;
+CPPUNIT_ASSERT_MESSAGE("default ctor - empty range", aRange.isEmpty());
+CPPUNIT_ASSERT_MESSAGE("center - get cop-out value since range is 
empty",
+   aRange.getCenter() == 0);
+
+// degenerate interval
+aRange.expand(1);
+CPPUNIT_ASSERT_MESSAGE("degenerate range - still, not empty!", 
!aRange.isEmpty());
+CPPUNIT_ASSERT_MESSAGE("degenerate range - size of 0", 
aRange.getRange() == 0);
+CPPUNIT_ASSERT_MESSAGE("same value as degenerate range - is inside 
range",
+   aRange.isInside(1));
+CPPUNIT_ASSERT_MESSAGE("center - must be the single range value", 
aRange.getCenter() == 1);
+
+// proper interval
+aRange.expand(2);
+CPPUNIT_ASSERT_MESSAGE("proper range - size of 1", aRange.getRange() 
== 1);
+CPPUNIT_ASSERT_MESSAGE("smaller value of range - is inside *closed* 
range",
+   aRange.isInside(1));
+CPPUNIT_ASSERT_MESSAGE("larger value of range - is inside *closed* 
range",
+   aRange.isInside(2));
+
+// center for proper interval that works for ints, too
+aRange.expand(3);
+CPPUNIT_ASSERT_MESSAGE("center - must be half of the range", 
aRange.getCenter() == 2);
+
+// check overlap
+Type aRange2(0, 1);
+CPPUNIT_ASSERT_MESSAGE("range overlapping *includes* upper bound",
+   aRa

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

[Libreoffice Gerrit user]

 basegfx/source/polygon/b2dpolygontools.cxx |   20 ++--
 1 file changed, 2 insertions(+), 18 deletions(-)

New commits:
commit a2f5a7d69d1bec0b5761e48d3feb5346193a969b
Author: Tomaž Vajngerl 
AuthorDate: Mon Jan 28 20:01:53 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Jan 28 23:14:06 2019 +0100

basegfx: just use the std::clamp for clamping the input

Change-Id: Ia7d6c103956c8e3cebd6ebe656fd88586d33a9c8
Reviewed-on: https://gerrit.libreoffice.org/67032
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index 5b00b312587d..38d9bb192696 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1509,24 +1509,8 @@ namespace basegfx
 const double fZero(0.0);
 const double fOne(1.0);
 
-// crop to useful values
-if(fTools::less(fRadiusX, fZero))
-{
-fRadiusX = fZero;
-}
-else if(fTools::more(fRadiusX, fOne))
-{
-fRadiusX = fOne;
-}
-
-if(fTools::less(fRadiusY, fZero))
-{
-fRadiusY = fZero;
-}
-else if(fTools::more(fRadiusY, fOne))
-{
-fRadiusY = fOne;
-}
+fRadiusX = std::clamp(fRadiusX, 0.0, 1.0);
+fRadiusY = std::clamp(fRadiusY, 0.0, 1.0);
 
 if(rtl::math::approxEqual(fZero, fRadiusX) || 
rtl::math::approxEqual(fZero, fRadiusY))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/default.css help3xsl/online_transform.xsl

[Libreoffice Gerrit user]

 help3xsl/default.css  |   15 +--
 help3xsl/online_transform.xsl |6 ++
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit a8ab16150bf04fd812dde07bdd7d0bbd9b52f48e
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 15:31:15 2019 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 28 15:31:15 2019 -0600

Drop this pitiful, bothersome, gimmicky animation

Change-Id: If533f8565e38e02d503cc1ab59f65e2445f1369b

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 0870b7a1b..9b7028af4 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -170,14 +170,7 @@ pre,
 border-left: 4px solid #FF5964;
 background-color: #FFE0E2;
 }
-.noteicon {
-padding:0.3em;
-transition: transform .2s; /* Animation */
-}
-.noteicon:hover {
-transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it 
will go outside of the viewport) */
-}
-.notetext {
+.noteicon, .notetext {
 padding:0.3em;
 }
 
@@ -196,12 +189,6 @@ pre,
 .iconcell {
 padding:0.3em;
 }
-.imageicon {
-transition: transform .2s; /* Animation */
-}
-.imageicon:hover{
-transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it 
will go outside of the viewport) */
-}
 
 table {
 box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 2bd356a8c..f52edfa01 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -1197,10 +1197,8 @@
 
 
 
-
-
-
-
+
+
 
 
 
___
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 67afa83d27ac8ce84810169741846499f452dfd1
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 15:31:15 2019 -0600
Commit: Gerrit Code Review 
CommitDate: Mon Jan 28 22:33:59 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Drop this pitiful, bothersome, gimmicky animation

Change-Id: If533f8565e38e02d503cc1ab59f65e2445f1369b

diff --git a/helpcontent2 b/helpcontent2
index 9438da88cd6f..a8ab16150bf0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9438da88cd6f21fce3778601164b817e9a1d72de
+Subproject commit a8ab16150bf04fd812dde07bdd7d0bbd9b52f48e
___
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 553f34b8da22f087dfae8bc647f0c220aa31d3d8
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 15:19:28 2019 -0600
Commit: Gerrit Code Review 
CommitDate: Mon Jan 28 22:29:41 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - A couple of articles and tag vomit cleanup

Change-Id: I5e3d9c7f9ce78807d1acfa190a740f41ddd8a378

diff --git a/helpcontent2 b/helpcontent2
index e0909dbaa69b..9438da88cd6f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e0909dbaa69b546d27b5aa52befd1df99085d950
+Subproject commit 9438da88cd6f21fce3778601164b817e9a1d72de
___
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/sbasic/shared/GetPathSeparator.xhp |2 +-
 source/text/sbasic/shared/compatible.xhp   |2 +-
 source/text/scalc/01/12010100.xhp  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9438da88cd6f21fce3778601164b817e9a1d72de
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Jan 28 15:19:28 2019 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 28 15:27:22 2019 -0600

A couple of articles and tag vomit cleanup

Change-Id: I5e3d9c7f9ce78807d1acfa190a740f41ddd8a378

diff --git a/source/text/sbasic/shared/GetPathSeparator.xhp 
b/source/text/sbasic/shared/GetPathSeparator.xhp
index 6efe46456..97b22e576 100644
--- a/source/text/sbasic/shared/GetPathSeparator.xhp
+++ b/source/text/sbasic/shared/GetPathSeparator.xhp
@@ -51,7 +51,7 @@
 It is recommended to use:
 
 
-ConvertFromURL function to convert a file URL to system file 
name.
+ConvertFromURL function to convert a file URL to a system 
file name.
 
 
 ConvertToURL function to convert a system file name to a 
file URL.
diff --git a/source/text/sbasic/shared/compatible.xhp 
b/source/text/sbasic/shared/compatible.xhp
index d533ceaf7..a2655de54 100644
--- a/source/text/sbasic/shared/compatible.xhp
+++ b/source/text/sbasic/shared/compatible.xhp
@@ -23,7 +23,7 @@
 
 
 Option Compatible 
Statement
-Option 
Compatible turns on VBA compatible Basic compiler mode at module 
level. Function CompatibilityMode() controls runtime mode 
and affects all code executed after setting or resetting the mode.
+Option 
Compatible turns on the VBA-compatible Basic compiler mode at the 
module level. The function CompatibilityMode() controls 
runtime mode and affects all code executed after setting or resetting the 
mode.
 
 
 This option may affect or assist in 
the following situations:
diff --git a/source/text/scalc/01/12010100.xhp 
b/source/text/scalc/01/12010100.xhp
index c41bd360f..57b2a0573 100644
--- a/source/text/scalc/01/12010100.xhp
+++ b/source/text/scalc/01/12010100.xhp
@@ -36,7 +36,7 @@
   Contains column labels
   Selected cell ranges contains labels.
   Insert or delete cells
-  Automatically inserts new rows and columns into the 
database range in your document when new records are added to the 
database. To manually update the database range, choose Data - 
Refresh Range.
+  Automatically inserts new rows and columns into the 
database range in your document when new records are added to the 
database. To manually update the database range, choose Data - 
Refresh Range.
   Keep formatting
   Applies the existing cell format of headers and first data 
row to the whole database range.
   Don't save imported 
data
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ad322cd74e9540dc37dff8f599ade60c4d2bf9a2
Author: Michael Meeks 
AuthorDate: Fri Jan 25 17:47:15 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 22:14:25 2019 +0100

lok: don't crash in simple LOK use-case with no callback.

Change-Id: I7bceba10f002ad5751e3d810f9a9767ad2e875bc
Reviewed-on: https://gerrit.libreoffice.org/66924
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
(cherry picked from commit 175274a6bca20451ccd6b5574e118265449f7642)
Reviewed-on: https://gerrit.libreoffice.org/66929
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a7ce8182ebd1..4964859eb664 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1522,8 +1522,11 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 }
 
 LibLODocument_Impl* pDocument = new LibLODocument_Impl(xComponent);
-int nState = doc_getSignatureState(pDocument);
-pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS, 
OString::number(nState).getStr(), pLib->mpCallbackData);
+if (pLib->mpCallback)
+{
+int nState = doc_getSignatureState(pDocument);
+pLib->mpCallback(LOK_CALLBACK_SIGNATURE_STATUS, 
OString::number(nState).getStr(), pLib->mpCallbackData);
+}
 return pDocument;
 }
 catch (const uno::Exception& exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 distro-configs/LibreOfficeFlatpak.conf |1 +
 solenv/flatpak-manifest.in |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit 743f57b3f83e324cdbb2cf60433bbd8a12b3c3b8
Author: Stephan Bergmann 
AuthorDate: Mon Jan 28 09:13:33 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 22:13:06 2019 +0100

aarch64 and arm need libatomic_ops

(cf. LO's configure.ac, needed for external/firebird on non-x86[-64]), but
org.freedesktop.Sdk//18.08 apparently doesn't provide it (while
org.freedesktop.Sdk//1.6 apparently did)

(cf. 
 "aarch64 and arm need 
libatomic_ops")

Change-Id: I6eb060251ce85bfd399b72d9c90a93497a3a9029
Reviewed-on: https://gerrit.libreoffice.org/66987
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 273e9694ee3920fed5cdf0da59d88f32a6294a2a)
Reviewed-on: https://gerrit.libreoffice.org/67004
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 65f473c48b51..9d638fa0a449 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -23,6 +23,7 @@
 --without-system-gpgmepp
 --without-system-jfreereport
 --without-system-libabw
+--without-system-libatomic_ops
 --without-system-libcdr
 --without-system-libcmis
 --without-system-libebook
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 36ec66991ebc..abb3f79b284b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -542,6 +542,12 @@
 "dest-filename": 
"external/tarballs/libnumbertext-1.0.5.tar.xz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";,
+"sha256": 
"cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7ef59c68d9ad",
+"type": "file",
+"dest-filename": "external/tarballs/libatomic_ops-7_2d.zip"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf";,
 "sha256": 
"49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   94 --
 1 file changed, 40 insertions(+), 54 deletions(-)

New commits:
commit c83f25bfe7f4021f419244f02678e423968cb4b3
Author: Caolán McNamara 
AuthorDate: Mon Jan 28 16:28:08 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 22:09:42 2019 +0100

Resolves: tdf#122949 gtk_style_context_save doesn't work the way I want

so write something that does

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

diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index c1fb89329e63..40d5abd573f9 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -387,47 +387,37 @@ static GtkWidget* gTreeViewWidget;
 
 namespace
 {
-void parent_styles_context_set_state(GtkStyleContext* context, 
GtkStateFlags flags)
+void style_context_set_state(GtkStyleContext* context, GtkStateFlags flags)
 {
-while ((context = gtk_style_context_get_parent(context)))
+do
 {
 gtk_style_context_set_state(context, flags);
 }
+while ((context = gtk_style_context_get_parent(context)));
 }
 
-void parent_styles_context_save(GtkStyleContext* context)
+class StyleContextSave
 {
-while ((context = gtk_style_context_get_parent(context)))
+private:
+std::vector> m_aStates;
+public:
+void save(GtkStyleContext* context)
 {
-gtk_style_context_save(context);
+do
+{
+m_aStates.emplace_back(context, 
gtk_style_context_get_state(context));
+}
+while ((context = gtk_style_context_get_parent(context)));
 }
-}
-
-void parent_styles_context_restore(GtkStyleContext* context)
-{
-while ((context = gtk_style_context_get_parent(context)))
+void restore()
 {
-gtk_style_context_restore(context);
+for (auto a = m_aStates.rbegin(); a != m_aStates.rend(); ++a)
+{
+gtk_style_context_set_state(a->first, a->second);
+}
+m_aStates.clear();
 }
-}
-
-void style_context_set_state(GtkStyleContext* context, GtkStateFlags flags)
-{
-gtk_style_context_set_state(context, flags);
-parent_styles_context_set_state(context, flags);
-}
-
-void style_context_save(GtkStyleContext* context)
-{
-gtk_style_context_save(context);
-parent_styles_context_save(context);
-}
-
-void style_context_restore(GtkStyleContext* context)
-{
-gtk_style_context_restore(context);
-parent_styles_context_restore(context);
-}
+};
 
 tools::Rectangle render_common(GtkStyleContext *pContext, cairo_t *cr, 
const tools::Rectangle &rIn, GtkStateFlags flags)
 {
@@ -2519,7 +2509,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 long nWidth = rControlRegion.GetWidth();
 long nHeight = rControlRegion.GetHeight();
 
-style_context_save(context);
+StyleContextSave aContextState;
+aContextState.save(context);
 style_context_set_state(context, flags);
 
 if (styleClass)
@@ -2654,7 +2645,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 {
 gtk_style_context_remove_class(context, styleClass);
 }
-style_context_restore(context);
+aContextState.restore();
 
 cairo_destroy(cr); // unref
 
@@ -2959,7 +2950,8 @@ void GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
 }
 
 GtkStyleContext* pStyle = gtk_widget_get_style_context( mpWindow );
-style_context_save(pStyle);
+StyleContextSave aContextState;
+aContextState.save(pStyle);
 GtkSettings* pSettings = gtk_widget_get_settings( mpWindow );
 StyleSettings aStyleSet = rSettings.GetStyleSettings();
 GdkRGBA color;
@@ -2999,12 +2991,12 @@ void GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
 aTextColor = getColor( text_color );
 aStyleSet.SetFieldRolloverTextColor( aTextColor );
 
-style_context_restore(pStyle);
+aContextState.restore();
 
 // button mouse over colors
 {
 GdkRGBA normal_button_rollover_text_color, 
pressed_button_rollover_text_color;
-style_context_save(mpButtonStyle);
+aContextState.save(mpButtonStyle);
 style_context_set_state(mpButtonStyle, GTK_STATE_FLAG_PRELIGHT);
 gtk_style_context_get_color(mpButtonStyle, 
gtk_style_context_get_state(mpButtonStyle), &normal_button_rollover_text_color);
 aTextColor = getColor(normal_button_rollover_text_color);
@@ -3014,7 +3006,7 @@ void GtkSalGraphics::updateSettings(AllSettings& 
rSettings)
   

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

[Libreoffice Gerrit user]

 cui/source/tabpages/chardlg.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 61da05ebd0cd73507484ce11c8ba6401d5c562fe
Author: Caolán McNamara 
AuthorDate: Mon Jan 28 17:21:32 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 22:09:06 2019 +0100

Resolves: tdf#122992 allow pre-selected fonts not in the font list

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

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ffcfd040493b..6a9c23bb3ef2 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -673,7 +673,12 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, 
LanguageGroup eLangGrp
 if ( eState >= SfxItemState::DEFAULT )
 {
 pFontItem = static_cast(&( rSet.Get( nWhich ) ));
-pNameBox->set_active_text( pFontItem->GetFamilyName() );
+const OUString &rName = pFontItem->GetFamilyName();
+int nIndex = pNameBox->find_text(rName);
+pNameBox->set_active(nIndex);
+// tdf#122992 if it didn't exist in the list, set the entry text to it 
anyway
+if (nIndex == -1)
+pNameBox->set_entry_text(rName);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/form/fmshell.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 807f2202d7a974048d417279cd83effa24213759
Author: Caolán McNamara 
AuthorDate: Mon Jan 28 17:09:33 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 22:09:22 2019 +0100

Resolves: tdf#123019 give modal dialog a parent

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

diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index e24ca7ca09ea..67191161c8af 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -245,7 +245,10 @@ bool FmFormShell::PrepareClose(bool bUI)
 
 if ( bModified && bUI )
 {
-std::unique_ptr 
xBuilder(Application::CreateBuilder(nullptr, "svx/ui/savemodifieddialog.ui"));
+SfxViewShell* pShell = GetViewShell();
+vcl::Window* pShellWnd = pShell ? pShell->GetWindow() 
: nullptr;
+weld::Widget* pFrameWeld = pShellWnd ? 
pShellWnd->GetFrameWeld() : nullptr;
+std::unique_ptr 
xBuilder(Application::CreateBuilder(pFrameWeld, 
"svx/ui/savemodifieddialog.ui"));
 std::unique_ptr 
xQry(xBuilder->weld_message_dialog("SaveModifiedDialog"));
 switch (xQry->run())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Bug 115747] Can't edit file on samba shares

[Wols Lists]

On 28/01/19 07:55, Kaganski Mike wrote:
> Hi Thorsten!
> 
> On 28.01.2019 5:32, Thorsten Behrens wrote:
>> Kaganski Mike wrote:
>>> My vision of this would me that if inability to create lockfiles
>>> needs to be handled specially at all, then at maximum a warning
>>> infobar telling that "no lockfile was created, so clashes are
>>> possible" could be shown, but not limiting user's ability to work
>>> (because technically nothing prevents users).
>>>
>> That appears backwards to me. My take is, software should always go
>> the safe path by default, and offer the dangerous one only after
>> explicit consent. So with the infobar idea, that would mean open
>> read-only, but perhaps provide the option to switch to edit mode while
>> keeping the filename?
> 
> Well - that'd be OK IMO :-)
> 
Maybe with a follow-up warning on saving "you are about to save a file
someone else may have open. Either you or they could lose their changes".

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

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

[Libreoffice Gerrit user]

 svl/source/numbers/zformat.cxx |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 31d3369803ce4eceab5ef708f2cd33748b6d10ea
Author: Eike Rathke 
AuthorDate: Mon Jan 28 13:31:40 2019 +0100
Commit: Eike Rathke 
CommitDate: Mon Jan 28 20:02:23 2019 +0100

Resolves: tdf#122991 do not truncate time duration [] format values

Regression from

commit e2e47898180e547cad7ccde1e5890385d573e551
CommitDate: Fri Aug 31 12:50:52 2018 +0200

Use tools::Time::GetClock() in number formatter for wall clock time

This partly reverts the change for the affected time duration []
formats, which truncated the value within the magnitude that due
to the imprecision of floating point values lead to "false"
precision of h:m:s.99...

This might again yield imprecise display values (old behaviour)
for a difference of two wall clock times that now are not rounded
up into the next magnitude for display. If so, a
tools::Time::GetDuration() might be appropriate.

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

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 94a6ed27bb16..47f194285aa9 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3058,14 +3058,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
 }
 else
 {
-double fTime = fNumber * 86400.0;
-const double fOrigTime = fTime;
-const double fFullSeconds = std::trunc(fTime);
-fTime = rtl::math::round( fTime, int(nCntPost));
-// Do not round up into the next magnitude, truncate instead.
-if (fTime >= fFullSeconds + 1.0 || (fTime == 0.0 && fOrigTime != 0.0))
-fTime = rtl::math::pow10Exp( std::trunc( rtl::math::pow10Exp( 
fOrigTime, nCntPost)), -nCntPost);
-
+const double fTime = rtl::math::round( fNumber * 86400.0, 
int(nCntPost));
 if (bSign && fTime == 0.0)
 {
 bSign = false; // Not -00:00:00
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/uiwriter/data2/tdf122942.odt |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   34 ++
 sw/source/core/frmedt/feshview.cxx|   23 
 3 files changed, 48 insertions(+), 9 deletions(-)

New commits:
commit 4218caf142a7ecac34548c6d38c6f6fbebb898b9
Author: Miklos Vajna 
AuthorDate: Mon Jan 28 17:18:34 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 19:15:36 2019 +0100

tdf#122942 sw: update shape insert UI for the AddVerticalFrameOffsets option

Regression from commit 50223ea6e212b60b7d33839c2753c5601fb50f95
(tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31),
SwFEShell::ImpEndCreate() was not adapted to call
SwTextFrame::GetBaseVertOffsetForFly() when determining the vertical
position of the inserted shape.

The call can be unconditional, the returned value is already 0 when the
DocumentSettingId::ADD_VERTICAL_FLY_OFFSETS compat setting is false.

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

diff --git a/sw/qa/extras/uiwriter/data2/tdf122942.odt 
b/sw/qa/extras/uiwriter/data2/tdf122942.odt
new file mode 100644
index ..c56583d305f2
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf122942.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 147936818d68..8a54f0a97910 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -57,6 +58,7 @@ public:
 void testUnfloating();
 void testTdf122893();
 void testTdf122901();
+void testTdf122942();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testRedlineMoveInsertInDelete);
@@ -76,6 +78,7 @@ public:
 CPPUNIT_TEST(testUnfloating);
 CPPUNIT_TEST(testTdf122893);
 CPPUNIT_TEST(testTdf122901);
+CPPUNIT_TEST(testTdf122942);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -789,6 +792,37 @@ void SwUiWriterTest2::testTdf122901()
  getProperty(getParagraph(1), 
"ParaBottomMargin"));
 }
 
+void SwUiWriterTest2::testTdf122942()
+{
+load(DATA_DIRECTORY, "tdf122942.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+
+// Do the moral equivalent of mouse button down, move and up.
+// Start creating a custom shape that overlaps with the rounded rectangle
+// already present in the document.
+Point aStartPos(8000, 3000);
+pWrtShell->BeginCreate(static_cast(OBJ_CUSTOMSHAPE), 
aStartPos);
+
+// Set its size.
+Point aMovePos(1, 5000);
+pWrtShell->MoveCreate(aMovePos);
+
+// Finish creation.
+pWrtShell->EndCreate(SdrCreateCmd::ForceEnd);
+
+// Make sure that the shape is inserted.
+SwDoc* pDoc = pWrtShell->GetDoc();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats.size());
+
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected less than: 0; Actual  : 1030', i.e. the shape was below the
+// paragraph mark, not above it.
+const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
+CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index c841bb322d0e..e7486384e692 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1961,17 +1961,22 @@ bool SwFEShell::ImpEndCreate()
 nXOffset = 
pAnch->getFrameArea().Left()+pAnch->getFrameArea().Width()-rBound.Right();
 else
 nXOffset = rBound.Left() - pAnch->getFrameArea().Left();
-if( pAnch->IsTextFrame() && static_cast(pAnch)->IsFollow() )
+if (pAnch->IsTextFrame())
 {
 const SwTextFrame* pTmp = static_cast(pAnch);
-do {
-pTmp = pTmp->FindMaster();
-OSL_ENSURE( pTmp, "Where's my Master?" );
-// OD 2004-03-30 #i26791# - correction: add frame area height
-// of master frames.
-nYOffset += pTmp->IsVertical() ?
-pTmp->getFrameArea().Width() : 
pTmp->getFrameArea().Height();
-} while ( pTmp->IsFollow() );
+if (pTmp->IsFollow())
+{
+do {
+pTmp = pTmp->FindMaster();
+OSL_ENSURE(pTmp, "Where's my Master?");
+// OD 2004-03-30 #i26791# - correction: add frame area 
height
+// of master frames.
+nYOffset += pTmp

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fefaf392343f65c65f40ab785fe11c8cd50623e3
Author: Stephan Bergmann 
AuthorDate: Mon Jan 28 09:05:22 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Jan 28 17:16:49 2019 +0100

org.freedesktop.Sdk//18.08 `uname -i` always returns "unknown"

(cf. 
 "org.freedesktop.Sdk//18.08 
`uname -i`
always returns 'unknown'")

Change-Id: Id158d769edb07aa09189907d120cb1e9cd8d9b17
Reviewed-on: https://gerrit.libreoffice.org/66985
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fcc5fc76c33de566cb2d02be541dcbde29d1eb8a)
Reviewed-on: https://gerrit.libreoffice.org/67003
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d3b2fea02d0a..36ec66991ebc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -551,7 +551,7 @@
 "buildsystem": "simple",
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
-"make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
+"make $(if test \"$FLATPAK_ARCH\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
 "desktop-file-edit --set-key=X-Endless-Alias 
--set-value=libreoffice-startcenter 
/app/share/applications/org.libreoffice.LibreOffice.desktop",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/inc/page.hxx  |2 -
 cui/source/tabpages/page.cxx |4 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx |   61 +--
 3 files changed, 56 insertions(+), 11 deletions(-)

New commits:
commit 608c82472da65d9ac0b81f5a985dfa329e6c5136
Author: Caolán McNamara 
AuthorDate: Mon Jan 28 13:12:00 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 17:04:32 2019 +0100

Resolves: tdf#122930 paper tray is to update on focus-in

which adds the problem that GtkComboBox doesn't send a focus-in,
but its toggle does, to find and use that instead

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

diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index f57d23f0daa4..a5011ae00db1 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -132,7 +132,7 @@ private:
 
 voidInit_Impl();
 DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void);
-DECL_LINK(PaperBinHdl_Impl, weld::ComboBox&, void);
+DECL_LINK(PaperBinHdl_Impl, weld::Widget&, void);
 DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
 void SwapFirstValues_Impl( bool bSet );
 DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index c9cc5f5dfd64..81ad11e810f6 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -308,7 +308,7 @@ void SvxPageDescPage::Init_Impl()
 // adjust the handler
 m_xLayoutBox->connect_changed(LINK(this, SvxPageDescPage, LayoutHdl_Impl));
 
-m_xPaperTrayBox->connect_changed(LINK(this, SvxPageDescPage, 
PaperBinHdl_Impl));
+m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, 
PaperBinHdl_Impl));
 m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, 
PaperSizeSelect_Impl));
 m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
 m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, 
PaperSizeModify_Impl));
@@ -802,7 +802,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, 
weld::ComboBox&, void)
 UpdateExample_Impl( true );
 }
 
-IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::ComboBox&, void)
+IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::Widget&, void)
 {
 if (m_xPaperTrayBox->get_count() > 1)
 // already filled
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f5cc12335744..c5b99ca92985 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1201,14 +1201,6 @@ class GtkInstanceWidget : public virtual weld::Widget
 {
 protected:
 GtkWidget* m_pWidget;
-private:
-bool m_bTakeOwnership;
-bool m_bFrozen;
-gulong m_nFocusInSignalId;
-gulong m_nFocusOutSignalId;
-gulong m_nKeyPressSignalId;
-gulong m_nKeyReleaseSignalId;
-gulong m_nSizeAllocateSignalId;
 
 static void signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
 {
@@ -1234,6 +1226,15 @@ private:
 m_aFocusOutHdl.Call(*this);
 }
 
+private:
+bool m_bTakeOwnership;
+bool m_bFrozen;
+gulong m_nFocusInSignalId;
+gulong m_nFocusOutSignalId;
+gulong m_nKeyPressSignalId;
+gulong m_nKeyReleaseSignalId;
+gulong m_nSizeAllocateSignalId;
+
 static void signalSizeAllocate(GtkWidget*, GdkRectangle* allocation, 
gpointer widget)
 {
 GtkInstanceWidget* pThis = static_cast(widget);
@@ -6586,11 +6587,14 @@ private:
 GtkTreeModel* m_pTreeModel;
 GtkCellRenderer* m_pTextRenderer;
 GtkMenu* m_pMenu;
+GtkWidget* m_pToggleButton;
 std::unique_ptr m_xSorter;
 vcl::QuickSelectionEngine m_aQuickSelectionEngine;
 std::vector m_aSeparatorRows;
 gboolean m_bPopupActive;
 bool m_bAutoComplete;
+gulong m_nToggleFocusInSignalId;
+gulong m_nToggleFocusOutSignalId;
 gulong m_nChangedSignalId;
 gulong m_nPopupShownSignalId;
 gulong m_nKeyPressEventSignalId;
@@ -6941,15 +6945,29 @@ private:
 g_signal_connect(m_pMenu, "key-press-event", 
G_CALLBACK(signalKeyPress), this);
 }
 
+static void find_toggle_button(GtkWidget *pWidget, gpointer user_data)
+{
+if (g_strcmp0(gtk_widget_get_name(pWidget), "GtkToggleButton") == 0)
+{
+GtkWidget **ppToggleButton = static_cast(user_data);
+*ppToggleButton = pWidget;
+}
+else if (GTK_IS_CONTAINER(pWidget))
+gtk_container_forall(GTK_CONTAINER(pWidget), find_toggle_button, 
user_data);
+}
+
 public:
 GtkInstanceComboBox(GtkComboBox* pComboBox, bool bTakeOwnership)
 : GtkInstanceContainer(GTK_CONTAINER(pComboBox), bTakeOwnership)
 , m_pComboBox(pComboBox)
 , m_pTreeModel(gtk_combo_box_get_model(m_pComboBox))
 , m_pMenu(nullptr)
+

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

[Libreoffice Gerrit user]

 vcl/unx/kde5/KDE5FilePicker2.cxx |   32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

New commits:
commit 360844f902cdbcbe787659628892a5a28702c66d
Author: Katarina Behrens 
AuthorDate: Tue Jan 22 13:43:06 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 16:05:24 2019 +0100

tdf#121129: more custom listboxes in kde5 fpicker

the following additional fpicker templates are now fully supported:
FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE
FILESAVE_AUTOEXTENSION_TEMPLATE
FILEOPEN_LINK_PREVIEW_IMAGE_ANCHOR
FILEOPEN_READONLY_VERSION

Listboxes now also have valid mnemonic labels

Change-Id: Ib7f9dd234bf2cbd0eadc1a7675ef51abcea3c532
Reviewed-on: https://gerrit.libreoffice.org/66736
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/66759
Reviewed-by: Samuel Mehrbrodt 

diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 81ed9d0a8e0b..9968d1b4316d 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -47,6 +47,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -434,7 +435,7 @@ void SAL_CALL KDE5FilePicker::enableControl(sal_Int16 
controlId, sal_Bool enable
 if (_customWidgets.contains(controlId))
 _customWidgets.value(controlId)->setEnabled(enable);
 else
-SAL_WARN("vcl.kde5", "enable on unknown control" << controlId);
+SAL_WARN("vcl.kde5", "enable on unknown control " << controlId);
 }
 
 void SAL_CALL KDE5FilePicker::setLabel(sal_Int16 controlId, const OUString& 
label)
@@ -452,7 +453,7 @@ void SAL_CALL KDE5FilePicker::setLabel(sal_Int16 controlId, 
const OUString& labe
 cb->setText(toQString(label));
 }
 else
-SAL_WARN("vcl.kde5", "set label on unknown control" << controlId);
+SAL_WARN("vcl.kde5", "set label on unknown control " << controlId);
 }
 
 OUString SAL_CALL KDE5FilePicker::getLabel(sal_Int16 controlId)
@@ -471,7 +472,7 @@ OUString SAL_CALL KDE5FilePicker::getLabel(sal_Int16 
controlId)
 label = toOUString(cb->text());
 }
 else
-SAL_WARN("vcl.kde5", "get label on unknown control" << controlId);
+SAL_WARN("vcl.kde5", "get label on unknown control " << controlId);
 
 return label;
 }
@@ -543,6 +544,9 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 break;
 }
 
+auto resString = toQString(VclResId(resId));
+resString.replace('~', '&');
+
 switch (controlId)
 {
 case CHECKBOX_AUTOEXTENSION:
@@ -557,8 +561,6 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 // the checkbox is created even for CHECKBOX_AUTOEXTENSION to 
simplify
 // code, but the checkbox is hidden and ignored
 bool hidden = controlId == CHECKBOX_AUTOEXTENSION;
-auto resString = toQString(VclResId(resId));
-resString.replace('~', '&');
 
 auto widget = new QCheckBox(resString, _extraControls);
 widget->setHidden(hidden);
@@ -571,9 +573,6 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 break;
 }
 case PUSHBUTTON_PLAY:
-case LISTBOX_VERSION:
-case LISTBOX_TEMPLATE:
-case LISTBOX_IMAGE_ANCHOR:
 case LISTBOX_VERSION_LABEL:
 case LISTBOX_TEMPLATE_LABEL:
 case LISTBOX_IMAGE_TEMPLATE_LABEL:
@@ -581,11 +580,22 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 case LISTBOX_FILTER_SELECTOR:
 break;
 
+case LISTBOX_IMAGE_ANCHOR:
 case LISTBOX_IMAGE_TEMPLATE:
+case LISTBOX_TEMPLATE:
+case LISTBOX_VERSION:
+{
 auto widget = new QComboBox(_extraControls);
-_layout->addWidget(widget);
+QLabel* label = new QLabel(resString);
+label->setBuddy(widget);
+
+QHBoxLayout* hBox = new QHBoxLayout;
+hBox->addWidget(label);
+hBox->addWidget(widget);
+_layout->addLayout(hBox, _layout->rowCount(), 0, Qt::AlignLeft);
 _customListboxes.insert(controlId, widget);
 break;
+}
 }
 }
 
@@ -620,7 +630,7 @@ void KDE5FilePicker::handleSetListValue(QComboBox* 
pQComboBox, sal_Int16 nAction
 }
 break;
 default:
-//FIXME: insert warning here
+SAL_WARN("vcl.kde5", "unknown action on list control " << nAction);
 break;
 }
 }
@@ -654,7 +664,7 @@ uno::Any KDE5FilePicker::handleGetListValue(QComboBox* 
pQComboBox, sal_Int16 nAc
 }
 break;
 default:
-//FIXME: insert warning here
+SAL_WARN("vcl.kde5", "unknown action on list control " << nAction);
 break;
 }
 return aAny;
___
Libreoffice-commits mailing list
libreof

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

[Libreoffice Gerrit user]

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

New commits:
commit c41adbca85969efd8442abf3b593118e1256efb6
Author: Katarina Behrens 
AuthorDate: Mon Jan 21 22:12:15 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 16:05:09 2019 +0100

tdf#121129: custom listboxes in kde5 fpicker, first stab

for FILESAVE_AUTOEXTENSION_TEMPLATE only so far (e.g. menu Insert >
Image)

Change-Id: I5674025788ce9bab4094f717e2b940e7cd6891e3
Reviewed-on: https://gerrit.libreoffice.org/66705
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 2d33c7cb4b4835de77194650124a1cf046920f66)
Reviewed-on: https://gerrit.libreoffice.org/66758
Reviewed-by: Samuel Mehrbrodt 

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 8179170e831d..b3293b32a1b7 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -43,6 +43,7 @@
 class QFileDialog;
 class QGridLayout;
 class QWidget;
+class QComboBox;
 
 typedef ::cppu::WeakComponentImplHelper _customWidgets;
+QHash _customListboxes;
 
 //widget to contain extra custom controls
 QWidget* _extraControls;
@@ -157,6 +159,8 @@ public:
 private:
 //add a custom control widget to the file dialog
 void addCustomControl(sal_Int16 controlId);
+void handleSetListValue(QComboBox* pQComboBox, sal_Int16 nAction, const 
css::uno::Any& rValue);
+css::uno::Any handleGetListValue(QComboBox* pQComboBox, sal_Int16 nAction);
 OUString implGetDirectory();
 
 // emit XFilePickerListener controlStateChanged event
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 553ed8500c84..81ed9d0a8e0b 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -377,6 +378,12 @@ void SAL_CALL KDE5FilePicker::setValue(sal_Int16 
controlId, sal_Int16 nControlAc
 if (cb)
 cb->setChecked(bChecked);
 }
+else if (_customListboxes.contains(controlId))
+{
+QComboBox* cb = 
dynamic_cast(_customListboxes.value(controlId));
+if (cb)
+handleSetListValue(cb, nControlAction, value);
+}
 else
 SAL_WARN("vcl.kde5", "set value on unknown control " << controlId);
 }
@@ -404,6 +411,12 @@ uno::Any SAL_CALL KDE5FilePicker::getValue(sal_Int16 
controlId, sal_Int16 nContr
 if (cb)
 value = cb->isChecked();
 }
+else if (_customListboxes.contains(controlId))
+{
+QComboBox* cb = 
dynamic_cast(_customListboxes.value(controlId));
+if (cb)
+return handleGetListValue(cb, nControlAction);
+}
 else
 SAL_WARN("vcl.kde5", "get value on unknown control" << controlId);
 
@@ -560,7 +573,6 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 case PUSHBUTTON_PLAY:
 case LISTBOX_VERSION:
 case LISTBOX_TEMPLATE:
-case LISTBOX_IMAGE_TEMPLATE:
 case LISTBOX_IMAGE_ANCHOR:
 case LISTBOX_VERSION_LABEL:
 case LISTBOX_TEMPLATE_LABEL:
@@ -568,7 +580,84 @@ void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 case LISTBOX_IMAGE_ANCHOR_LABEL:
 case LISTBOX_FILTER_SELECTOR:
 break;
+
+case LISTBOX_IMAGE_TEMPLATE:
+auto widget = new QComboBox(_extraControls);
+_layout->addWidget(widget);
+_customListboxes.insert(controlId, widget);
+break;
+}
+}
+
+void KDE5FilePicker::handleSetListValue(QComboBox* pQComboBox, sal_Int16 
nAction,
+const css::uno::Any& rValue)
+{
+switch (nAction)
+{
+case ControlActions::ADD_ITEM:
+{
+OUString sItem;
+rValue >>= sItem;
+pQComboBox->addItem(toQString(sItem));
+}
+break;
+case ControlActions::ADD_ITEMS:
+{
+Sequence aStringList;
+rValue >>= aStringList;
+sal_Int32 nItemCount = aStringList.getLength();
+for (sal_Int32 i = 0; i < nItemCount; ++i)
+{
+pQComboBox->addItem(toQString(aStringList[i]));
+}
+}
+break;
+case ControlActions::SET_SELECT_ITEM:
+{
+sal_Int32 nPos = 0;
+rValue >>= nPos;
+pQComboBox->setCurrentIndex(nPos);
+}
+break;
+default:
+//FIXME: insert warning here
+break;
+}
+}
+
+uno::Any KDE5FilePicker::handleGetListValue(QComboBox* pQComboBox, sal_Int16 
nAction)
+{
+uno::Any aAny;
+switch (nAction)
+{
+case ControlActions::GET_ITEMS:
+{
+uno::Sequence aItemList;
+
+for (int i = 0;

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |5 +
 vcl/qt5/Qt5Menu.cxx |  163 
 2 files changed, 154 insertions(+), 14 deletions(-)

New commits:
commit 617998e9272c62bca2260a1c10c5c0f5d5559653
Author: Aleksei Nikiforov 
AuthorDate: Fri Jan 11 16:39:55 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jan 28 16:02:52 2019 +0100

KDE5: Fix radiocheck menu items

This change fixes displaying of elements of 'Styles' menu of Writer

Change-Id: I455a4f1c37aa7bc6641ebdd15eec23f18a8430d9
Reviewed-on: https://gerrit.libreoffice.org/66387
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit aa3ef0a5efa3da3fe1d06509af52fe46fe8c6c81)
Reviewed-on: https://gerrit.libreoffice.org/66994
Tested-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index e41fb041ab81..ea4369263f62 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -31,13 +31,15 @@ private:
 bool mbMenuBar;
 QMenuBar* mpQMenuBar;
 QMenu* mpQMenu;
-QActionGroup* mpQActionGroup;
 
 void DoFullMenuUpdate(Menu* pMenuBar);
 static void NativeItemText(OUString& rItemText);
 
 QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos);
 
+void ReinitializeActionGroup(unsigned nPos);
+void ResetAllActionGroups();
+
 public:
 Qt5Menu(bool bMenuBar);
 
@@ -85,6 +87,7 @@ public:
 Qt5Menu* mpSubMenu; // Submenu of this item (if defined)
 std::unique_ptr mpAction; // action corresponding to this item
 std::unique_ptr mpMenu; // menu corresponding to this item
+std::shared_ptr mpActionGroup; // empty if it's a separator 
element
 sal_uInt16 mnId; // Item ID
 MenuItemType mnType; // Item type
 bool mbVisible; // Item visibility.
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index ceaf0d9138f9..8fee56a9cf70 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -27,7 +27,6 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 , mbMenuBar(bMenuBar)
 , mpQMenuBar(nullptr)
 , mpQMenu(nullptr)
-, mpQActionGroup(nullptr)
 {
 connect(this, &Qt5Menu::setFrameSignal, this, &Qt5Menu::SetFrame, 
Qt::BlockingQueuedConnection);
 }
@@ -90,7 +89,11 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 }
 
 pQMenu = pTempQMenu;
-mpQActionGroup = new QActionGroup(pQMenu);
+
+ReinitializeActionGroup(nPos);
+
+// clear all action groups since menu is recreated
+pSalMenuItem->mpSubMenu->ResetAllActionGroups();
 
 connect(pQMenu, &QMenu::aboutToShow, this,
 [pSalMenuItem] { slotMenuAboutToShow(pSalMenuItem); });
@@ -114,6 +117,8 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 {
 pQMenu->addAction(pAction);
 }
+
+ReinitializeActionGroup(nPos);
 }
 else
 {
@@ -131,6 +136,8 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 pQMenu->addAction(pAction);
 }
 
+ReinitializeActionGroup(nPos);
+
 
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
 
 if (itemBits & MenuItemBits::CHECKABLE)
@@ -141,15 +148,12 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 else if (itemBits & MenuItemBits::RADIOCHECK)
 {
 pAction->setCheckable(true);
-if (!mpQActionGroup)
+
+if (pSalMenuItem->mpActionGroup)
 {
-mpQActionGroup = new QActionGroup(pQMenu);
-mpQActionGroup->setExclusive(true);
+pSalMenuItem->mpActionGroup->addAction(pAction);
 }
-// NOTE: QActionGroup support may need improvement
-// if menu item is added not to the end of menu,
-// it may be needed to add new item to QActionGroup 
different from last created one for this menu
-mpQActionGroup->addAction(pAction);
+
 pAction->setChecked(bChecked);
 }
 
@@ -165,6 +169,130 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, 
unsigned nPos)
 return pQMenu;
 }
 
+void Qt5Menu::ReinitializeActionGroup(unsigned nPos)
+{
+const unsigned nCount = GetItemCount();
+
+if (nCount == 0)
+{
+return;
+}
+
+if (nPos == MENU_APPEND)
+{
+nPos = nCount - 1;
+}
+else if (nPos >= nCount)
+{
+return;
+}
+
+Qt5MenuItem* pPrevItem = (nPos > 0) ? GetItemAtPos(nPos - 1) : nullptr;
+Qt5MenuItem* pCurrentItem = GetItemAtPos(nPos);
+Qt5MenuItem* pNextItem = (nPos < nCount - 1) ? GetItemAtPos(nPos + 1) : 
nullptr

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |1 -
 vcl/qt5/Qt5Menu.cxx |8 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 911a55230676a0a996cc967b7143fb6ceb41c102
Author: Aleksei Nikiforov 
AuthorDate: Fri Jan 11 16:41:19 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jan 28 16:02:30 2019 +0100

KDE5: minor Qt5Menu cleanup

Remove unnecessary destructor

Move MenuBar clearing out of DoFullMenuUpdate function

Change-Id: I0fb916c6935b2f8a675e75adf696d99203a2c016
Reviewed-on: https://gerrit.libreoffice.org/66386
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit f9231f054e5b6597ae8a92da165a1841e4199378)
Reviewed-on: https://gerrit.libreoffice.org/66992
Tested-by: Thorsten Behrens 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index b3b06bfeabac..e41fb041ab81 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -40,7 +40,6 @@ private:
 
 public:
 Qt5Menu(bool bMenuBar);
-virtual ~Qt5Menu() override;
 
 virtual bool VisibleMenuBar() override; // must return TRUE to actually 
DISPLAY native menu bars
 
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 9aaea199eeae..ceaf0d9138f9 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -32,8 +32,6 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 connect(this, &Qt5Menu::setFrameSignal, this, &Qt5Menu::SetFrame, 
Qt::BlockingQueuedConnection);
 }
 
-Qt5Menu::~Qt5Menu() { maItems.clear(); }
-
 bool Qt5Menu::VisibleMenuBar() { return true; }
 
 QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
@@ -227,6 +225,9 @@ void Qt5Menu::SetFrame(const SalFrame* pFrame)
 if (pMainWindow)
 {
 mpQMenuBar = pMainWindow->menuBar();
+if (mpQMenuBar)
+mpQMenuBar->clear();
+
 mpQMenu = nullptr;
 mpQActionGroup = nullptr;
 
@@ -236,9 +237,6 @@ void Qt5Menu::SetFrame(const SalFrame* pFrame)
 
 void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar)
 {
-if (mbMenuBar && mpQMenuBar)
-mpQMenuBar->clear();
-
 for (sal_Int32 nItem = 0; nItem < static_cast(GetItemCount()); 
nItem++)
 {
 Qt5MenuItem* pSalMenuItem = GetItemAtPos(nItem);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Widget.hxx |1 -
 vcl/qt5/Qt5Widget.cxx |   16 +++-
 2 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 96af619c9650e806dfb19da5b9344c46412d573d
Author: Aleksei Nikiforov 
AuthorDate: Mon Jan 21 12:16:13 2019 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 15:52:53 2019 +0100

tdf#122814 KDE5: conditional disable of Qt shortcuts

Change-Id: I5375f0b555e483b2c108550d319e64d781b96f75
Reviewed-on: https://gerrit.libreoffice.org/66673
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1a5340788639ba71725338ddc5d340b2b304f4c2)
Reviewed-on: https://gerrit.libreoffice.org/66991
Reviewed-by: Samuel Mehrbrodt 

diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 4337792dfc43..731498f11d13 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -49,7 +49,6 @@ class Qt5Widget : public QWidget
 
 virtual void focusInEvent(QFocusEvent*) override;
 virtual void focusOutEvent(QFocusEvent*) override;
-virtual void keyPressEvent(QKeyEvent*) override;
 virtual void keyReleaseEvent(QKeyEvent*) override;
 virtual void mouseMoveEvent(QMouseEvent*) override;
 virtual void mousePressEvent(QMouseEvent*) override;
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 26e89a7ef6fb..69ca329ab97f 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -402,20 +402,18 @@ bool Qt5Widget::event(QEvent* pEvent)
 // but enables keypress event.
 // If event is not accepted and shortcut is successfully activated,
 // KeyPress event is omitted.
-// It looks like handleKeyEvent function still activates the shortcut 
on KeyPress event,
-// so there's no harm in disabling shortcut activation via Qt 
mechanisms.
-pEvent->accept();
+//
+// Instead of processing keyPressEvent, handle ShortcutOverride event,
+// and if it's handled - disable the shortcut, it should have been 
activated.
+// Don't process keyPressEvent generated after disabling shortcut 
since it was handled here.
+// If event is not handled, don't accept it and let Qt activate 
related shortcut.
+if (handleKeyEvent(static_cast(pEvent), true))
+pEvent->accept();
 }
 
 return QWidget::event(pEvent);
 }
 
-void Qt5Widget::keyPressEvent(QKeyEvent* pEvent)
-{
-if (handleKeyEvent(pEvent, true))
-pEvent->accept();
-}
-
 void Qt5Widget::keyReleaseEvent(QKeyEvent* pEvent)
 {
 if (handleKeyEvent(pEvent, 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-2' - vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Widget.hxx |2 ++
 vcl/qt5/Qt5Widget.cxx |   16 
 2 files changed, 18 insertions(+)

New commits:
commit 04dff1b796c1ee84da0b2861fc42e35891f76101
Author: Aleksei Nikiforov 
AuthorDate: Wed Jan 16 14:57:42 2019 +0300
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 15:52:37 2019 +0100

tdf#122238 KDE5: disable mechanism of Qt for shortcut activation

When QEvent::KeyPress event is processed, QEvent::ShortcutOverride event is 
created
and processed before finishing processing original event.

If it's an active shortcut, and QEvent::ShortcutOverride event is not 
accepted,
the shortcut is activated, but QEvent::KeyPress event is omitted.
If it's an active shortcut, and QEvent::ShortcutOverride event is accepted,
the shortcut is not activated, and QEvent::KeyPress event is sent as usual.

But it looks like even if shortcut activation is suppressed,
shortcut is still called somewhere from insides SalEvent::KeyInput
event processing callback from Qt5Widget::handleKeyEvent function.

Shortcuts are still assigned to menu actions
since it shows the key combinations used to activate them.

Change-Id: I1ffc63c2530dd61ae67ab66a96ea3efe767218c0
Reviewed-on: https://gerrit.libreoffice.org/66444
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 5843e14a4ddc6d2b1e375ca26eec33033bfad455)
Reviewed-on: https://gerrit.libreoffice.org/66990
Reviewed-by: Samuel Mehrbrodt 

diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 26f26c8bf0a3..4337792dfc43 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -45,6 +45,8 @@ class Qt5Widget : public QWidget
 bool handleKeyEvent(QKeyEvent*, bool);
 void handleMouseButtonEvent(QMouseEvent*, bool);
 
+virtual bool event(QEvent*) override;
+
 virtual void focusInEvent(QFocusEvent*) override;
 virtual void focusOutEvent(QFocusEvent*) override;
 virtual void keyPressEvent(QKeyEvent*) override;
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 4eaac1629b53..26e89a7ef6fb 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -394,6 +394,22 @@ bool Qt5Widget::handleKeyEvent(QKeyEvent* pEvent, bool 
bDown)
 return bStopProcessingKey;
 }
 
+bool Qt5Widget::event(QEvent* pEvent)
+{
+if (pEvent->type() == QEvent::ShortcutOverride)
+{
+// Accepted event disables shortcut activation,
+// but enables keypress event.
+// If event is not accepted and shortcut is successfully activated,
+// KeyPress event is omitted.
+// It looks like handleKeyEvent function still activates the shortcut 
on KeyPress event,
+// so there's no harm in disabling shortcut activation via Qt 
mechanisms.
+pEvent->accept();
+}
+
+return QWidget::event(pEvent);
+}
+
 void Qt5Widget::keyPressEvent(QKeyEvent* pEvent)
 {
 if (handleKeyEvent(pEvent, true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding the Present Android Application -"LibreOffice Viewer

[Michael Meeks]

Hi Rohit,

On 27/01/2019 23:00, Rohit Raj wrote:
> I am writing this letter out of great curiosity and eagerness to
> present you with an idea. I am willing to apply for GSOC -2019 and I
> have been using your Ubuntu -Libre Office and I have checked your
> recent Projects, but  I personally feel that your android app of
> LibreOffice Viewer needs major changes in terms of UI and UX and I
> want to volunteer for the task.

You're entirely right of course =)

However - I'm also rather convinced that rather than re-using the
Mozilla/Fennec/Java approach - we should do this work on top of Online -
as we're doing for iOS[1]. This will then allow us to do several things
- particularly writing in Javascript - debugging on a normal Linux
machine and in a normal browser, as well as sharing all of the great new
Mobile UI work with the responsive design of Online.

If that's interesting to you - I imagine Gülşah would be available to
mentor you - although the code-base is moving reasonably rapidly, so I
think we'd want to have a series of smaller features here. One idea is
to target the mobile-phone UI here are a couple of ideas:

* make entry drop-downs into full-screen dialogs on Mobile

* re-purpose side-bars as tools panels for mobile.

* providing a JS / widget toolkit front-end using the native UI
  welding framework from Caolan.

Anyhow - just some ideas, would be good to sync. with Gülşah.

ATB,

Michael.

[1] - https://adfinis-sygroup.ch/en/blog/libreoffice-on-ios-some-insights/
-- 
michael.me...@collabora.com <><, GM Collabora Productivity
Hangout: mejme...@gmail.com, Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/inc/fmtfollowtextflow.hxx   |   22 +++
 sw/inc/unomid.h|4 
 sw/inc/unoprnms.hxx|1 
 sw/qa/extras/layout/data/tdf115094.docx|binary
 sw/qa/extras/layout/layout.cxx |   29 +
 sw/qa/extras/ooxmlimport/data/tdf115094v2.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |8 +
 sw/source/core/attr/fmtfollowtextflow.cxx  |   58 
++
 sw/source/core/inc/anchoredobjectposition.hxx  |5 
 sw/source/core/inc/environmentofanchoredobject.hxx |7 +
 sw/source/core/objectpositioning/anchoredobjectposition.cxx|1 
 sw/source/core/objectpositioning/environmentofanchoredobject.cxx   |6 -
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |2 
 sw/source/core/unocore/unoframe.cxx|   17 ++
 sw/source/core/unocore/unomap.cxx  |3 
 sw/source/core/unocore/unomap1.cxx |3 
 sw/source/core/unocore/unomapproperties.hxx|3 
 sw/source/uibase/utlui/attrdesc.cxx|1 
 writerfilter/source/dmapper/GraphicImport.cxx  |5 
 writerfilter/source/dmapper/PropertyIds.cxx|1 
 writerfilter/source/dmapper/PropertyIds.hxx|1 
 21 files changed, 166 insertions(+), 11 deletions(-)

New commits:
commit a454fe6ca36924bfcb0db984aab54ad5242949f0
Author: Patrick Jaap 
AuthorDate: Wed Nov 14 16:25:45 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 15:21:21 2019 +0100

tdf#115094 Part II: OOXML Feature: Add layoutInCell to Doc model

Change-Id: I50dcc2363982f8e6b68f10b0b724b59e9430d6c5
Reviewed-on: https://gerrit.libreoffice.org/63380
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/66999

diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 6cbc6dfe39e9..ff3aa9f9b32b 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 #define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 
+#include 
 #include 
 #include "hintids.hxx"
 #include "format.hxx"
@@ -28,9 +29,19 @@ class IntlWrapper;
 
 class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
 {
+private:
+bool mbLayoutInCell = false;
+
 public:
+
 SwFormatFollowTextFlow( bool bFlag = false )
-: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
+: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
+{}
+
+SwFormatFollowTextFlow( bool bFlag, bool _bLayoutInCell  )
+: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
+, mbLayoutInCell( _bLayoutInCell )
+{}
 
 
 /// "pure virtual methods" of SfxPoolItem
@@ -41,7 +52,16 @@ public:
   OUString &rText,
   const IntlWrapper& rIntl ) const override;
 
+bool GetLayoutInCell() const { return mbLayoutInCell; }
+
+
+bool PutValue(const css::uno::Any& rVal, sal_uInt8 aInt) override;
+
+bool QueryValue(css::uno::Any& rVal, sal_uInt8 aInt = 0) const override;
+
 void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+
+bool operator==(const SfxPoolItem& rItem) const override;
 };
 
 inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) 
const
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 020da9d7e08e..06e84c99acb1 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -147,6 +147,10 @@
 // SwFormatWrapInfluenceOnObjPos
 #define MID_WRAP_INFLUENCE  0
 
+// SwFormatFollowTextFlow
+#define MID_FOLLOW_TEXT_FLOW0
+#define MID_FTF_LAYOUT_IN_CELL  1
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 30731e1033e6..b2de700dd23f 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -743,6 +743,7 @@
 #define UNO_NAME_IS_SPLIT_ALLOWED "IsSplitAllowed"
 #define UNO_NAME_CHAR_HIDDEN "CharHidden"
 #define UNO_NAME_IS_FOLLOWING_TEXT_FLOW "IsFollowingTextFlow"
+#define UNO_NAME_IS_LAYOUT_IN_CELL "IsLayoutInCell"
 #define UNO_NAME_WIDTH_TYPE "WidthType"
 #define UNO_NAME_SCRIPT_URL "ScriptURL"
 #define UNO_NAME_RUNTIME_UID "RuntimeUID"
diff --git a/sw/qa/extras/layout/data/tdf115094.docx 
b/sw/qa/extras/layout/data/tdf115094.docx
new file mode 100644
index ..49a7c9194f1a
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf115094.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4d65fc18f84c..cd4b87def41d 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layo

[Libreoffice-commits] core.git: configure.ac readlicense_oo/license

[Libreoffice Gerrit user]

 configure.ac|6 +++---
 readlicense_oo/license/LICENSE  |4 ++--
 readlicense_oo/license/LICENSE.fodt |4 ++--
 readlicense_oo/license/LICENSE.html |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ef28740d0ae036f6fa2e9866cadf335e9f0ad8b9
Author: Stephan Bergmann 
AuthorDate: Fri Jan 25 15:46:22 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 28 15:19:52 2019 +0100

It's called libatomic_ops not libatomic-ops

cf.  (as mentioned in
external/libatomic_ops/README)

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

diff --git a/configure.ac b/configure.ac
index 1c887612..f80716445395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8879,16 +8879,16 @@ int fb_api_is_30(void) { return 0; }
 else
 dnl Embedded Firebird has version 3.0
 AC_DEFINE(HAVE_FIREBIRD_30, 1)
-dnl We need libatomic-ops for any non X86/X64 system
+dnl We need libatomic_ops for any non X86/X64 system
 if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then
 dnl 
===
-dnl Check for system libatomic-ops
+dnl Check for system libatomic_ops
 dnl 
===
 libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops 
>= 0.7.2])
 if test "$with_system_libatomic_ops" = "yes"; then
 SYSTEM_LIBATOMIC_OPS=TRUE
 AC_CHECK_HEADERS(atomic_ops.h, [],
-[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], 
[])
+[AC_MSG_ERROR(atomic_ops.h not found. install libatomic_ops)], 
[])
 else
 SYSTEM_LIBATOMIC_OPS=
 
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 42f7df4e8f1b..cae07236b293 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -930,9 +930,9 @@ libassuan
See GNU Lesser General Public License Version 2.1 below
See GNU General Public License Version 3 below
 
-libatomic-ops
+libatomic_ops
 
-   The following software may be included in this product: libatomic-ops.
+   The following software may be included in this product: libatomic_ops.
Use of any of this software is governed by the terms of the license
below:
 
diff --git a/readlicense_oo/license/LICENSE.fodt 
b/readlicense_oo/license/LICENSE.fodt
index a04019e4d88d..f243fb9d8b04 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -3546,8 +3546,8 @@
Alternatively, the acknowledgment may be 
graphical using the logos available at http://www.jdom.org/images/logos"; 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/images/logos.
THIS SOFTWARE IS PROVIDED ``AS 
IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE 
PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
OF SUCH DAMAGE.
This software consists of voluntary 
contributions made by many individuals on behalf of the JDOM Project and was 
originally created by Jason Hunter  and Brett 
McLaughlin . For more information on the JDOM 
Project, please see http://www.jdom.org/"; text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/.
-   libatomic-ops
-   The following software may be included in 
this product: libatomic-ops. Use 
of any of this software is governed by the terms of the license below:
+   libatomic_ops
+   The following software may be included in 
this product: libatomic_ops. Use 
of any of this software is governed by the terms of the license below:
Jump to GPL Version 
2
libcdr
The following software may be included 
in this product: libcdr. Use of any of this software is governed by the terms 
of the license below:
diff --git a/readlicense_oo/license/LICENSE.html 
b/readlicense_oo/license/LICENSE.html
index 52e24b8a2284..4af04dbc45bb 100644
--- a/readlicense_

Re: Linker problems with system vs bundled libraries (RPATH vs RUNPATH)

[Michael Stahl]

On 25.01.19 15:06, Luboš Luňák wrote:

On Friday 25 of January 2019, Miklos Vajna wrote:

On Fri, Jan 25, 2019 at 01:08:51PM +0100, Luboš Luňák

 wrote:

  No, those messages are not the errors that cause the failures, I listed
it to show that the system lib is used even though there's the bundled
one.


The DLP libs had this problem as well, and these days we just patch the
externals to have a different .so name, see e.g.:

external/libodfgen/libodfgen-bundled-soname.patch.0

(Other DLP libs are built statically.)

Would it be an option to do the same for the GPG stuff?


  I'm not sure. That'd make soffice.bin load both instances of the lib, which
would solve the problem of some symbols missing. But having two different
versions of the same lib could possibly also cause clashes between them,
since ELF interposition could make e.g. libgpgme bind some symbols to the
system lib and other to the bundled lib (I've actually tried that, see the
attachment). Which we could either ignore (I don't know likely is that to
cause a real problem) or we'd need to namespace/version the whole library
(which I don't know how much work that'd be).


hope this will help:

https://gerrit.libreoffice.org/#/c/67012/

the idea is we use different symbol version for everything so LO libs 
call into bundled library, system libs call into system library.


haven't tested it though, just make check runs fine here...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf120511_eatenSection.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   11 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |1 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +++
 4 files changed, 15 insertions(+)

New commits:
commit b761504aa81ac8e2f61ba87899a965de19dc35cc
Author: Justin Luth 
AuthorDate: Sat Dec 29 18:50:18 2018 +0300
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 15:03:06 2019 +0100

tdf#120511 writerfilter: track inserted frame per section

The logic using IsTextFrameInserted is worried about whether
a frame has been inserted before a table *in this section*,
so track frame's existence per section, not per document.

Change-Id: I8aa8a695b89727832e65535adae3fc3c94f95be5
Reviewed-on: https://gerrit.libreoffice.org/65720
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 6aeba04b31cc33135f84bd7ea38a04ee9faa14ec)
Reviewed-on: https://gerrit.libreoffice.org/65722

diff --git a/sw/qa/extras/ooxmlexport/data/tdf120511_eatenSection.docx 
b/sw/qa/extras/ooxmlexport/data/tdf120511_eatenSection.docx
new file mode 100644
index ..6a6d6f17bae7
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf120511_eatenSection.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index c9e569cece74..d9dd00a69fbd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -488,6 +488,17 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf113258_noBeforeAutospacing, "tdf113258_noBeforeA
  getProperty(xShape->getStart(), 
"ParaTopMargin"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf120511_eatenSection, 
"tdf120511_eatenSection.docx")
+{
+xmlDocPtr pXmlDoc = parseLayoutDump();
+sal_Int32 nHeight = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds", 
"height").toInt32();
+sal_Int32 nWidth  = getXPath(pXmlDoc, "/root/page[1]/infos/prtBounds", 
"width").toInt32();
+CPPUNIT_ASSERT_MESSAGE( "Page1 is portrait", nWidth < nHeight );
+nHeight = getXPath(pXmlDoc, "/root/page[2]/infos/prtBounds", 
"height").toInt32();
+nWidth  = getXPath(pXmlDoc, "/root/page[2]/infos/prtBounds", 
"width").toInt32();
+CPPUNIT_ASSERT_MESSAGE( "Page2 is landscape", nWidth > nHeight );
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf104354, "tdf104354.docx")
 {
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5e9bed49044a..a44771dbd8ab 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2883,6 +2883,7 @@ void DomainMapper::lcl_endSectionGroup()
 if (m_pImpl->GetIsDummyParaAddedForTableInSection())
 m_pImpl->RemoveDummyParaForTableInSection();
 }
+m_pImpl->SetIsTextFrameInserted( false );
 m_pImpl->PopProperties(CONTEXT_SECTION);
 }
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 02f029a4732c..6006d2465f13 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -605,8 +605,11 @@ public:
 bool GetIsFirstParagraphInShape() { return m_bIsFirstParaInShape; }
 void SetIsDummyParaAddedForTableInSection( bool bIsAdded );
 bool GetIsDummyParaAddedForTableInSection() { return 
m_bDummyParaAddedForTableInSection;}
+
+/// Track if a textframe has been inserted into this section
 void SetIsTextFrameInserted( bool bIsInserted );
 bool GetIsTextFrameInserted() { return m_bTextFrameInserted;}
+
 void SetIsPreviousParagraphFramed( bool bIsFramed ) { 
m_bIsPreviousParagraphFramed = bIsFramed; }
 bool GetIsPreviousParagraphFramed() { return m_bIsPreviousParagraphFramed; 
}
 void SetParaSectpr(bool bParaSectpr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf113849_evenAndOddHeaders.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   17 ++
 sw/source/filter/ww8/docxexport.cxx   |   25 +++---
 3 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 303e03115e59c8e8c7e7727569012453e643c2a9
Author: Justin Luth 
AuthorDate: Sat Dec 29 08:31:20 2018 +0300
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 15:02:18 2019 +0100

tdf#113849 ooxmlexport: even headers/footers for both or none.

For DOCX, there is a single setting to indicate the use of even
headers/footers. So, if either one of these has a separate
even, then create an even for both.

In 2017, nBreakCode was used to write an empty footer to
prevent inheriting any previously defined footer.
So I also removed the obsolete debug.

Change-Id: I3ec4a399103679092e6a6ec3a7ae9b1ae303cc3e
Reviewed-on: https://gerrit.libreoffice.org/65699
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 7815b4d2a2c89261ad6424c7fe3ce0c453e4d02c)
Reviewed-on: https://gerrit.libreoffice.org/65705

diff --git a/sw/qa/extras/ooxmlexport/data/tdf113849_evenAndOddHeaders.odt 
b/sw/qa/extras/ooxmlexport/data/tdf113849_evenAndOddHeaders.odt
new file mode 100644
index ..d9aa0ae23541
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf113849_evenAndOddHeaders.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 899199224705..c9e569cece74 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -229,6 +229,23 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112694, "tdf112694.docx")
 CPPUNIT_ASSERT(!getProperty(aPageStyle, "HeaderIsOn"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf113849_evenAndOddHeaders, 
"tdf113849_evenAndOddHeaders.odt")
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Header2 text", OUString("L. J. Kendall"), 
parseDump("/root/page[2]/header/txt"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer2 text", OUString("*"), 
parseDump("/root/page[2]/footer/txt"));
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Header3 text", OUString("Shadow Hunt"), 
parseDump("/root/page[3]/header/txt"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer3 text", OUString("*"), 
parseDump("/root/page[3]/footer/txt"));
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Header4 text", OUString("L. J. Kendall"), 
parseDump("/root/page[4]/header/txt"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer4 text", OUString("*"), 
parseDump("/root/page[4]/footer/txt"));
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer5 text", OUString(""), 
parseDump("/root/page[5]/footer/txt"));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer6 text", OUString(""), 
parseDump("/root/page[6]/footer/txt"));
+
+//CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of pages", 6, getPages() );
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf118361_RTLfootnoteSeparator, 
"tdf118361_RTLfootnoteSeparator.docx")
 {
 uno::Any aPageStyle = getStyles("PageStyles")->getByName("Standard");
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 9e4cd6c9fc6b..f7048a2ae909 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -251,12 +251,24 @@ void DocxExport::WriteHeadersFooters( sal_uInt8 
nHeadFootFlags,
 const SwFrameFormat& rFormat, const SwFrameFormat& rLeftFormat, const 
SwFrameFormat& rFirstPageFormat, sal_uInt8 nBreakCode )
 {
 m_nHeadersFootersInSection = 1;
+
+// document setting indicating the requirement of EVEN and ODD for both 
headers and footers
+if ( nHeadFootFlags & ( nsHdFtFlags::WW8_FOOTER_EVEN | 
nsHdFtFlags::WW8_HEADER_EVEN ))
+m_aSettings.evenAndOddHeaders = true;
+
 // Turn ON flag for 'Writing Headers \ Footers'
 m_pAttrOutput->SetWritingHeaderFooter( true );
 
 // headers
 if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
 WriteHeaderFooter( &rLeftFormat, true, "even" );
+else if ( m_aSettings.evenAndOddHeaders )
+{
+if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD )
+WriteHeaderFooter( &rFormat, true, "even" );
+else if ( m_bHasHdr && nBreakCode == 2 )
+WriteHeaderFooter( nullptr, true, "even" );
+}
 
 if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD )
 WriteHeaderFooter( &rFormat, true, "default" );
@@ -274,6 +286,13 @@ void DocxExport::WriteHeadersFooters( sal_uInt8 
nHeadFootFlags,
 // footers
 if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_EVEN )
 WriteHeaderFooter( &rLeftFormat, false, "even" );
+else if ( m_aSettings.evenAndOddHeaders )
+{
+if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_ODD )
+   WriteHeaderFooter( &rFormat, false, "even" );
+else if ( m_bHasFtr && nBreakCode == 2 )
+WriteHeaderFooter( nullptr, false, "even");
+}
 
 if ( nHeadFootFlags & ns

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

[Libreoffice Gerrit user]

 oox/source/vml/vmlshapecontext.cxx   |4 +++-
 sw/qa/extras/ooxmlexport/data/tdf122563.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |   11 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d55cc244aba92f4e9fbdd7d51c65112075c6e8a8
Author: László Németh 
AuthorDate: Wed Jan 9 22:15:26 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 15:00:41 2019 +0100

tdf#122563 DOCX import: fix OLE size after roundtrip

Embedded XLSX spreadsheets and other OLE objects
became small in Writer after a roundtrip between
LibO and MSO, caused by the empty drawing path of
OLE shapes.

Change-Id: I4cd39d4bcd6707cc5a3b8e40dde8c6148a20cabc
Reviewed-on: https://gerrit.libreoffice.org/66053
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit bdb0177b550d27a541cdfc0668714b2e9ac28540)
Reviewed-on: https://gerrit.libreoffice.org/66689
Reviewed-by: Miklos Vajna 

diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index f5f4bf884e31..621f20d29895 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -240,7 +240,9 @@ ContextHandlerRef ShapeContextBase::createShapeContext( 
ContextHandler2Helper co
 case VML_TOKEN( group ):
 return new GroupShapeContext( rParent, rShapes.createShape< 
GroupShape >(), rAttribs );
 case VML_TOKEN( shape ):
-if (rAttribs.hasAttribute(XML_path))
+if (rAttribs.hasAttribute(XML_path) &&
+// tdf#122563 skip in the case of empty path
+!rAttribs.getString(XML_path, "").isEmpty())
 return new ShapeContext( rParent, rShapes.createShape< 
BezierShape >(), rAttribs );
 else
 return new ShapeContext( rParent, rShapes.createShape< 
ComplexShape >(), rAttribs );
diff --git a/sw/qa/extras/ooxmlexport/data/tdf122563.docx 
b/sw/qa/extras/ooxmlexport/data/tdf122563.docx
new file mode 100644
index ..69168a382623
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf122563.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 3e90ed1b4d9d..a91fe0c3b67b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -936,6 +936,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf99631, "tdf99631.docx")
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:object[1]", 
"dyaOrig", "768");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf122563, "tdf122563.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object", 1);
+// Size of the embedded OLE spreadsheet was the bad 
"width:28.35pt;height:28.35pt"
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:object/v:shape", 
"style",
+"width:255.75pt;height:63.75pt");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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-5' - odk/CustomTarget_javadoc.mk

[Libreoffice Gerrit user]

 odk/CustomTarget_javadoc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98daad73b52bdeebef137dd4791a8e072d7394f2
Author: Fridrich Štrba 
AuthorDate: Thu Jan 24 15:58:57 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 28 14:37:20 2019 +0100

Fix build with recent jdk 11.0.2

Change-Id: I0ee68e087e3973b6a148f9bfefc16581606d6568
Reviewed-on: https://gerrit.libreoffice.org/66962
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Michael Stahl 

diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index a8f83dcd83c6..9bc62e0887d2 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -32,7 +32,7 @@ $(call 
gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
$(call gb_Jar_get_target,ridl)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
$(call gb_Helper_abbreviate_dirs,\
-   $(JAVADOC) -J-Xmx120m -use -splitindex \
+   $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use 
-splitindex \
-windowtitle "Java UNO Runtime Reference" \
-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API 
Reference"\
-tag attention:a:"Attention:" \
___
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' - odk/CustomTarget_javadoc.mk

[Libreoffice Gerrit user]

 odk/CustomTarget_javadoc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62fbee2119ba69704b65aaf03ab90caf611ef6aa
Author: Fridrich Štrba 
AuthorDate: Thu Jan 24 15:58:57 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 28 14:36:37 2019 +0100

Fix build with recent jdk 11.0.2

Change-Id: I0ee68e087e3973b6a148f9bfefc16581606d6568
Reviewed-on: https://gerrit.libreoffice.org/66961
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index a8f83dcd83c6..9bc62e0887d2 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -32,7 +32,7 @@ $(call 
gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
$(call gb_Jar_get_target,ridl)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
$(call gb_Helper_abbreviate_dirs,\
-   $(JAVADOC) -J-Xmx120m -use -splitindex \
+   $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use 
-splitindex \
-windowtitle "Java UNO Runtime Reference" \
-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API 
Reference"\
-tag attention:a:"Attention:" \
___
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' - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numpages.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit a9642a2549bf429eb70aed724fbd98a147c22a42
Author: Xisco Fauli 
AuthorDate: Fri Jan 25 12:11:04 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Jan 28 14:10:20 2019 +0100

tdf#122951: Fix insertion of graphics as bullets

Regression from 81260c448911069ce8cb051d3a973ec52b9b43a3

Change-Id: Iecf00ea8310a767ff7945e7c1a0efe9dca5edd20
Reviewed-on: https://gerrit.libreoffice.org/66906
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3c31e11d4a4b..8ff1e9384512 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1998,12 +1998,14 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, 
PopupActivateHdl_Impl, MenuButton *, void)
 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
 
 Graphic aGraphic;
+OUString sGrfName;
 size_t i = 0;
 for (auto & grfName : aGrfNames)
 {
-INetURLObject aObj(grfName);
+sGrfName = grfName;
+INetURLObject aObj(sGrfName);
 if(aObj.GetProtocol() == INetProtocol::File)
-grfName = aObj.PathToFileName();
+sGrfName = aObj.PathToFileName();
 
 if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, 
&aGraphic))
 {
@@ -2020,13 +2022,13 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, 
PopupActivateHdl_Impl, MenuButton *, void)
 }
 Image aImage(aBitmap);
 
-pPopup->InsertItem(MN_GALLERY_ENTRY + i, grfName, aImage );
+pPopup->InsertItem(MN_GALLERY_ENTRY + i, sGrfName, aImage 
);
 }
 else
 {
 Image aImage;
 pPopup->InsertItem(
-MN_GALLERY_ENTRY + i, grfName, aImage );
+MN_GALLERY_ENTRY + i, sGrfName, aImage );
 }
 ++i;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 download.lst   |4 ++--
 solenv/flatpak-manifest.in |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6584a5d9d1bb3e9b00e529358c989e8485071e36
Author: Stephan Bergmann 
AuthorDate: Fri Jan 25 18:02:54 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 28 13:42:45 2019 +0100

Upgrade libatomic_ops to latest libatomic_ops-7.6.8.tar.gz

...from .  (The md5sum
given there is 99128f05e3e3f4e0cd39aa23f23bbe0c.)

The old version of external/libatomic_ops failed to build at least when 
building
a Flatpak for aarch64, see
:

[...]
> Making all in src
> Making all in atomic_ops
> Making all in sysdeps
> In file included from atomic_ops_stack.h:32,
>  from atomic_ops_malloc.c:20:
> atomic_ops.h:343:4: error: #error Cannot implement 
AO_compare_and_swap_full on this architecture.
>  #  error Cannot implement AO_compare_and_swap_full on this architecture.
> ^
> atomic_ops.c:97:1: error: unknown type name ‘AO_TS_t’; did you mean 
‘AO_TS_T’?
>  AO_TS_t AO_locks[AO_HASH_SIZE] = {
>  ^~~
>  AO_TS_T
[...]

(cf. 
 "Upgrade libatomic_ops to latest
libatomic_ops-7.6.8.tar.gz")

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

diff --git a/download.lst b/download.lst
index 5d4b8f06c4f3..009baa8ff72c 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,8 @@ export LCMS2_SHA256SUM := 
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f80
 export LCMS2_TARBALL := lcms2-2.9.tar.gz
 export LIBASSUAN_SHA256SUM := 
47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
 export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
-export LIBATOMIC_OPS_SHA256SUM := 
cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7ef59c68d9ad
-export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
+export LIBATOMIC_OPS_SHA256SUM := 
1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
+export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz
 export LIBEOT_SHA256SUM := 
cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_SHA256SUM := 
13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index bd534ad5999f..4582a79243fe 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -553,10 +553,10 @@
 "dest-filename": 
"external/tarballs/libnumbertext-1.0.5.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";,
-"sha256": 
"cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7ef59c68d9ad",
+"url": 
"https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz";,
+"sha256": 
"1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665",
 "type": "file",
-"dest-filename": "external/tarballs/libatomic_ops-7_2d.zip"
+"dest-filename": "libatomic_ops-7.6.8.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf";,
___
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/unocore/unodraw.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 348482e41c9391e8fc0bab9b8eee8f52ffabfac2
Author: Caolán McNamara 
AuthorDate: Mon Jan 28 09:11:45 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 13:42:02 2019 +0100

ofz#12729 integer-overflow

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

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 1e34acbff52b..2b59d3ef2008 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2308,8 +2309,8 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& 
aPosition )
 awt::Point aAttrPosInHoriL2R(
 ConvertPositionToHoriL2R( xGroupShape->getPosition(),
xGroupShape->getSize() ) );
-aNewPos.X -= aAttrPosInHoriL2R.X;
-aNewPos.Y -= aAttrPosInHoriL2R.Y;
+aNewPos.X = o3tl::saturating_sub(aNewPos.X, aAttrPosInHoriL2R.X);
+aNewPos.Y = o3tl::saturating_sub(aNewPos.Y, aAttrPosInHoriL2R.Y);
 }
 // convert relative position in horizontal left-to-right layout into
 // absolute position in horizontal left-to-right layout
@@ -2323,8 +2324,8 @@ void SAL_CALL SwXShape::setPosition( const awt::Point& 
aPosition )
 SvxShape* pSvxGroupShape = reinterpret_cast< SvxShape * >(
 sal::static_int_cast< sal_IntPtr >( 
xGrpShapeTunnel->getSomething(SvxShape::getUnoTunnelId()) ));
 const awt::Point aGroupPos = pSvxGroupShape->getPosition();
-aNewPos.X += aGroupPos.X;
-aNewPos.Y += aGroupPos.Y;
+aNewPos.X = o3tl::saturating_add(aNewPos.X, aGroupPos.X);
+aNewPos.Y = o3tl::saturating_add(aNewPos.Y, aGroupPos.Y);
 }
 // set position
 mxShape->setPosition( aNewPos );
___
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' - translations

[Libreoffice Gerrit user]

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

New commits:
commit 5e87c9f6d6ca5ea46755516c477170d60930f597
Author: Andras Timar 
AuthorDate: Mon Jan 28 13:36:54 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jan 28 13:37:02 2019 +0100

Update git submodules

* Update translations from branch 'distro/collabora/cp-6.0'
  - [cp] Revert rename of Master Slide Design

Change-Id: Ia8a6f8f16a7bc725a6184a627d65ba8a914d8c29

diff --git a/translations b/translations
index 4aa7a68c325f..fb7b8ceeb80d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 4aa7a68c325fa9d151a022acecf96325e270afb3
+Subproject commit fb7b8ceeb80d38d579fa11d220a056394d511170
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-6.0' - source/en-GB

[Libreoffice Gerrit user]

 source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb7b8ceeb80d38d579fa11d220a056394d511170
Author: Andras Timar 
AuthorDate: Mon Jan 28 13:36:54 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 28 13:36:54 2019 +0100

[cp] Revert rename of Master Slide Design

Change-Id: Ia8a6f8f16a7bc725a6184a627d65ba8a914d8c29

diff --git a/source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po 
b/source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po
index fb352e1740b..c0d63cb0122 100644
--- a/source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/en-GB/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -8077,8 +8077,8 @@ msgctxt ""
 "..DrawImpressCommands.UserInterface.Commands..uno:PresentationLayout\n"
 "Label\n"
 "value.text"
-msgid "Master Slide..."
-msgstr "Master Slide..."
+msgid "Master Slide D~esign..."
+msgstr "Master Slide D~esign..."
 
 #: DrawImpressCommands.xcu
 msgctxt ""
___
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-5' - sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |5 +
 sw/source/filter/ww8/docxattributeoutput.cxx |   15 +++
 2 files changed, 20 insertions(+)

New commits:
commit a3ee3432dc7f9db2cec62daccc76f5e89dfe9459
Author: Serge Krot 
AuthorDate: Fri Jan 18 12:51:33 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 28 13:26:43 2019 +0100

tdf#121561 sw DOCX: output toc-end inside last toc paragraph

During export of the TOC into DOCX all TOC field parts
should be placed inside one STD frame: field start-begin,
field-separate and field-end mark.

Updated unit test.

Change-Id: I10e37a48160e1dc4f0074c4e2e7621a59f79c2ee
Reviewed-on: https://gerrit.libreoffice.org/66587
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit fd5599b9d23a2d9b13af6dd88bd2d38f438f7e00)
Reviewed-on: https://gerrit.libreoffice.org/66810
(cherry picked from commit 05a5037f489971676737808c37ad1cfb9dcd53d9)
Reviewed-on: https://gerrit.libreoffice.org/66868
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 41194b02db98..bcc136d31ef2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -99,11 +99,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121561_tocTitleDocx, 
"tdf121456_tabsOffset.odt")
 if (!pXmlDoc)
 return;
 
+// get TOC node
 uno::Reference xIndexSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xIndexes(xIndexSupplier->getDocumentIndexes( ), uno::UNO_QUERY);
 uno::Reference xTOCIndex(xIndexes->getByIndex(0), 
uno::UNO_QUERY);
 
+// ensure TOC title was set in TOC properties
 CPPUNIT_ASSERT_EQUAL(OUString("Inhaltsverzeichnis"), 
getProperty(xTOCIndex, "Title"));
+
+// ensure TOC end-field mark is placed inside TOC section
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[16]/w:r/w:fldChar", "fldCharType", 
"end");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict, 
"tdf82065_Ind_start_strict.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a73f90de5153..e332bee8d747 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1411,6 +1411,21 @@ void DocxAttributeOutput::EndRun(const SwTextNode* 
pNode, sal_Int32 nPos, bool /
 m_nFieldsInHyperlink = 0;
 }
 
+// end ToX fields
+for (auto it = m_Fields.rbegin(); it != m_Fields.rend(); )
+{
+if (it->bClose && !it->pField)
+{
+EndField_Impl( pNode, nPos, *it );
+it = decltype(m_Fields)::reverse_iterator(m_Fields.erase(it.base() 
- 1));
+}
+else
+{
+++it;
+}
+}
+
+
 DoWriteBookmarksStart(m_rFinalBookmarksStart);
 DoWriteBookmarksEnd(m_rFinalBookmarksEnd);
 DoWriteBookmarkEndIfExist(nPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - fpicker/source

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePickerEventHandler.cxx |1 +
 fpicker/source/win32/asyncrequests.cxx   |9 -
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1ed8416703d1f1a33690cc47fd6cb6b2b3520cf1
Author: Jan-Marek Glogowski 
AuthorDate: Fri Jan 25 10:05:36 2019 +
Commit: Xisco Faulí 
CommitDate: Mon Jan 28 13:12:14 2019 +0100

tdf#122927 prevent SolarMutex deadlock on join()

The AsyncRequests thread can be blocked in a SolarMutexGuard, so
we have to release the mutex before calling join().

But there is also a static AsyncRequests object inside the
VistaFilePickerEventHandler::impl_sendEvent function, which will
just be cleaned up at DLL atexit.

"Luckily" it won't ever run, so it doesn't need to be joined and
we can use isRunning to detect it, prevent releasing a non-
existing SolarMutex at this point and so won't crash LO on exit.

Change-Id: I0c56b89a11f96be54e82b756c5e18a058b04a41d
Reviewed-on: https://gerrit.libreoffice.org/66901
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 5b2f1243bd44b450da26c8344b3ee459f8e88f6c)
Reviewed-on: https://gerrit.libreoffice.org/66913
Reviewed-by: Xisco Faulí 

diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx 
b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index 0bf9165f9e48..e770bef25406 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
@@ -289,6 +289,7 @@ public:
 void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
  ::sal_Int16  nControlID)
 {
+// See special handling in ~AsyncRequests for this static
 static AsyncRequests aNotify(RequestHandlerRef(new AsyncPickerEvents()));
 
 ::cppu::OInterfaceContainerHelper* pContainer = m_lListener.getContainer( 
cppu::UnoType::get());
diff --git a/fpicker/source/win32/asyncrequests.cxx 
b/fpicker/source/win32/asyncrequests.cxx
index 766a2309d991..c7fb3f73878e 100644
--- a/fpicker/source/win32/asyncrequests.cxx
+++ b/fpicker/source/win32/asyncrequests.cxx
@@ -75,7 +75,14 @@ AsyncRequests::~AsyncRequests()
 aLock.clear();
 // <- SYNCHRONIZED
 
-join();
+// The static AsyncRequests aNotify in 
VistaFilePickerEventHandler::impl_sendEvent
+// is destructed at DLL atexit. But it won't run, so needs no join and 
release of
+// the already destructed SolarMutex, which would crash LO on exit.
+if (isRunning())
+{
+SolarMutexReleaser aReleaser;
+join();
+}
 }
 
 void AsyncRequests::triggerJobExecution()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: First-time development/C++ Contributor

[Kaganski Mike]

On 28.01.2019 14:40, Michael Weghorn wrote:
> The use of "lode" is not mandatory, you can also manually do the
> required setup, but be aware that lode will simplify the setup

True, but

> and
> you're more on your own if you encounter any issues while doing things
> by yourself.

Personally I feel more comfortable helping those on IRC who do it by 
themselves, because that's how I did, and so because I'm more familiar 
with that setup.

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

Re: First-time development/C++ Contributor

[Michael Weghorn]

[Taking the conversation back to the development mailing list]

On 28/01/2019 12.31, Ares Dragoj wrote:
> Firstly, thank you for the warm welcome!
> Next I would like to know do I need to build LibreOffice even if I have
> the app installed in my computer (I'm on Windows OS)? If I need to, is
> the usage of "lode" mandatory?
> Thank you in advance!

If you actually want to work on the code, you'll have to build
LibreOffice by yourself in order to test your modifications.

The use of "lode" is not mandatory, you can also manually do the
required setup, but be aware that lode will simplify the setup and
you're more on your own if you encounter any issues while doing things
by yourself.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 distro-configs/LibreOfficeFlatpak.conf |1 +
 solenv/flatpak-manifest.in |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit 273e9694ee3920fed5cdf0da59d88f32a6294a2a
Author: Stephan Bergmann 
AuthorDate: Mon Jan 28 09:13:33 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 28 12:38:41 2019 +0100

aarch64 and arm need libatomic_ops

(cf. LO's configure.ac, needed for external/firebird on non-x86[-64]), but
org.freedesktop.Sdk//18.08 apparently doesn't provide it (while
org.freedesktop.Sdk//1.6 apparently did)

(cf. 
 "aarch64 and arm need 
libatomic_ops")

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

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 65f473c48b51..9d638fa0a449 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -23,6 +23,7 @@
 --without-system-gpgmepp
 --without-system-jfreereport
 --without-system-libabw
+--without-system-libatomic_ops
 --without-system-libcdr
 --without-system-libcmis
 --without-system-libebook
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 1d3f85593b2e..bd534ad5999f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -553,6 +553,12 @@
 "dest-filename": 
"external/tarballs/libnumbertext-1.0.5.tar.xz"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip";,
+"sha256": 
"cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7ef59c68d9ad",
+"type": "file",
+"dest-filename": "external/tarballs/libatomic_ops-7_2d.zip"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf";,
 "sha256": 
"49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcc5fc76c33de566cb2d02be541dcbde29d1eb8a
Author: Stephan Bergmann 
AuthorDate: Mon Jan 28 09:05:22 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 28 12:36:43 2019 +0100

org.freedesktop.Sdk//18.08 `uname -i` always returns "unknown"

(cf. 
 "org.freedesktop.Sdk//18.08 
`uname -i`
always returns 'unknown'")

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index db4bfc94409d..1d3f85593b2e 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -562,7 +562,7 @@
 "buildsystem": "simple",
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak",
-"make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
+"make $(if test \"$FLATPAK_ARCH\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
 "desktop-file-edit --set-key=X-Endless-Alias 
--set-value=libreoffice-startcenter 
/app/share/applications/org.libreoffice.LibreOffice.desktop",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - odk/CustomTarget_javadoc.mk

[Libreoffice Gerrit user]

 odk/CustomTarget_javadoc.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0de21adc9071c5420d3144cb44c0b7857a5c3efd
Author: Fridrich Štrba 
AuthorDate: Thu Jan 24 15:58:57 2019 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 28 12:17:03 2019 +0100

Fix build with recent jdk 11.0.2

Change-Id: I0ee68e087e3973b6a148f9bfefc16581606d6568
Reviewed-on: https://gerrit.libreoffice.org/66898
Tested-by: Jenkins
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Reviewed-by: Michael Stahl 

diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index a8f83dcd83c6..9bc62e0887d2 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -32,7 +32,7 @@ $(call 
gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
$(call gb_Jar_get_target,ridl)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
$(call gb_Helper_abbreviate_dirs,\
-   $(JAVADOC) -J-Xmx120m -use -splitindex \
+   $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use 
-splitindex \
-windowtitle "Java UNO Runtime Reference" \
-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API 
Reference"\
-tag attention:a:"Attention:" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

[Libreoffice Gerrit user]

 docker/l10n-docker-nightly.sh |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit adff9d1e2c9954ebdc7362dec8618e1bca297080
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 28 12:14:36 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 12:14:36 2019 +0100

Docker: add env var to change core build target

Change-Id: Ida0410d6ff6515b479d4d431b4a1060e3430dd9d

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 2f05863d6..3fa5bfce3 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -9,6 +9,7 @@
 # * DOCKER_HUB_REPO - which Docker Hub repo to use
 # * DOCKER_HUB_TAG  - which Docker Hub tag to create
 # * LIBREOFFICE_BRANCH  - which branch to build (needs to exist in both core 
and online)
+# * LIBREOFFICE_BUILD_TARGET - which make target to run (in core repo)
 
 # check we can sudo without asking a pwd
 echo "Trying if sudo works without a password"
@@ -32,6 +33,11 @@ if [ -z "$LIBREOFFICE_BRANCH" ]; then
 fi;
 echo "Building branch '$LIBREOFFICE_BRANCH'"
 
+if [ -z "$LIBREOFFICE_BUILD_TARGET" ]; then
+  LIBREOFFICE_BUILD_TARGET=""
+fi;
+echo "LibreOffice build target: '$LIBREOFFICE_BUILD_TARGET'"
+
 # check if we have jake
 which jake || { cat << EOF
 
@@ -128,7 +134,7 @@ cat > libreoffice/autogen.input << EOF
 EOF
 
 ( cd libreoffice && ./autogen.sh ) || exit 1
-( cd libreoffice && make ) || exit 1
+( cd libreoffice && make $LIBREOFFICE_BUILD_TARGET ) || exit 1
 
 # copy stuff
 mkdir -p "$INSTDIR"/opt/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: HowTo load a file in unit test in xmloff?

[Regina Henschel]

Hi Tomaž,

Tomaž Vajngerl schrieb am 27-Jan-19 um 20:57:

Hi Regina,

On Sat, Jan 26, 2019 at 8:43 PM Regina Henschel  wrote:


Hi all,

HowTo load a file in unit test in xmloff?


Actually I wonder why not just add the test as a import/export test
into sd/qa or svx/qa (which already has customshapes.cxx). We test
most of the behaviour of our filters that way so I don't know why this
should be different. I would only put unit tests (testing a specific
algorithm without the need to load from a file) into xmloff/qa.


Oh, I thought the unit test has to be in the same module where the fix 
was made. Putting the test into sd makes things much easier. Thank you 
for the information.


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

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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/bitmaptabpage.ui |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 68bdea37d79793bc8dff4672c2d360be3554b041
Author: Katarina Behrens 
AuthorDate: Mon Jan 28 09:09:43 2019 +0100
Commit: Katarina Behrens 
CommitDate: Mon Jan 28 12:05:47 2019 +0100

Fix misplaced Scale checkbox

regression from weld-ing this tabpage

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

diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index 6be64b47549d..dae24f1ea007 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -222,22 +222,6 @@
   
 
 
-  
-Scale
-True
-True
-False
-True
-0
-True
-  
-  
-False
-True
-2
-  
-
-
   
 True
 False
@@ -272,6 +256,22 @@
   
 False
 True
+2
+  
+
+
+  
+Scale
+True
+True
+False
+True
+0
+True
+  
+  
+False
+True
 3
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6ba08959ab0e70a3dd50a4a88134ccf7a18710ca
Author: Xisco Fauli 
AuthorDate: Thu Jan 24 10:13:18 2019 +0100
Commit: Katarina Behrens 
CommitDate: Mon Jan 28 12:05:05 2019 +0100

tdf#122912: Close option dialog if restart is confirmed ( part 2 )

forgot it in e961e08a3277158d4e3074bfacb8599296d2fa75

Change-Id: Id896bf407ca33faf0dbff74f3cbe98d23de0e0c7
Reviewed-on: https://gerrit.libreoffice.org/66846
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit c81340bcc73144e082efb9fc575ef62b9b046ca4)
Reviewed-on: https://gerrit.libreoffice.org/66870
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bd9702902e6d..535262f022a8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1393,9 +1393,10 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
 Reference< XChangesBatch >(xProp, 
UNO_QUERY_THROW)->commitChanges();
 // display info
 SolarMutexGuard aGuard;
-svtools::executeRestartDialog(
-comphelper::getProcessComponentContext(), GetFrameWeld(),
-svtools::RESTART_REASON_LANGUAGE_CHANGE);
+if (svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), GetFrameWeld(),
+svtools::RESTART_REASON_LANGUAGE_CHANGE))
+GetParentDialog()->EndDialog(RET_OK);
 
 // tell quickstarter to stop being a veto listener
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 026b3d9b339992eb14698cc26334e2f500b018ce
Author: Noel Grandin 
AuthorDate: Mon Jan 28 10:36:15 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 28 11:53:58 2019 +0100

tdf#122997 Canceling Paragraph dialog causes crash

regression from
commit bf359d01ac8b1e0292e8a92c38e58c03e6c17d8b
add a Dialog::runAsync for the non-controller case

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8392ab4e97a5..f5cc12335744 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2415,8 +2415,10 @@ private:
 hide();
 m_aFunc(GtkToVcl(ret));
 m_aFunc = nullptr;
+// move the self pointer, otherwise it might be de-allocated by time 
we try to reset it
+std::shared_ptr me = std::move(m_xRunAsyncSelf);
 m_xDialogController.reset();
-m_xRunAsyncSelf.reset();
+me.reset();
 }
 
 public:
___
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/draw/dview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 525a5ea36310168c810dad6a8e764bf2ad2afce0
Author: Miklos Vajna 
AuthorDate: Mon Jan 28 09:08:18 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 11:47:31 2019 +0100

sw: avoid wrong and unnecessary downcast in SwDrawView::DeleteMarked()

/sw/source/core/draw/dview.cxx:967:39: runtime error: downcast of address 
0x6060006d1cc0 which does not point to an object of type 'SwDrawContact'
0x6060006d1cc0: note: object is of type 'SwFlyDrawContact'
 1d 02 00 2e  b0 3e 06 87 15 7f 00 00  18 3f 06 87 15 7f 00 00  50 1c 28 00 
50 61 00 00  00 00 00 00
  ^~~
  vptr for 'SwFlyDrawContact'
#0 0x7f157de946d8 in SwDrawView::DeleteMarked() 
/sw/source/core/draw/dview.cxx:967:39
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
/sw/source/core/draw/dview.cxx:967:39 in

When executing testPasteListener in CppunitTest_sw_unowriter since
commit 2a054445f09e8ba66e7cfb9f1d598554b555772d (sw paste listener:
expose pasted images as well, 2019-01-24), though that code was added
much earlier in commit 33141f999b22ce10cdbfbd76081fff211c4b5067
(SwDrawView::DeleteMarked: delete textbox of shape as well, 2014-06-23),
just no testcase invoked it.

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

diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 70436dd66f2e..91a3febb660a 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -964,8 +964,8 @@ void SwDrawView::DeleteMarked()
 for (size_t i = 0; i < rMarkList.GetMarkCount(); ++i)
 {
 SdrObject *pObject = rMarkList.GetMark(i)->GetMarkedSdrObj();
-SwDrawContact* pDrawContact = 
static_cast(GetUserCall(pObject));
-SwFrameFormat* pFormat = pDrawContact->GetFormat();
+SwContact* pContact = GetUserCall(pObject);
+SwFrameFormat* pFormat = pContact->GetFormat();
 if (SwFrameFormat* pTextBox = 
SwTextBoxHelper::getOtherTextBoxFormat(pFormat, RES_DRAWFRMFMT))
 aTextBoxesToDelete.push_back(pTextBox);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numpages.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit c985db8b603d809d5896e42259e0768d607177f7
Author: Xisco Fauli 
AuthorDate: Fri Jan 25 12:11:04 2019 +0100
Commit: Xisco Faulí 
CommitDate: Mon Jan 28 11:34:21 2019 +0100

tdf#122951: Fix insertion of graphics as bullets

Regression from 81260c448911069ce8cb051d3a973ec52b9b43a3

Change-Id: Iecf00ea8310a767ff7945e7c1a0efe9dca5edd20
Reviewed-on: https://gerrit.libreoffice.org/66903
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 265a4fd43d207cd6a99fdd9c23d54259428ed709)
Reviewed-on: https://gerrit.libreoffice.org/66905
Reviewed-by: Julien Nabet 
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index a6ea4899f3dd..7f4fa43b0494 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1910,14 +1910,16 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, 
PopupActivateHdl_Impl, weld::ToggleButton&
 GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
 
 Graphic aGraphic;
+OUString sGrfName;
 ScopedVclPtrInstance< VirtualDevice > pVD;
 size_t i = 0;
 for (auto & grfName : aGrfNames)
 {
+sGrfName = grfName;
 OUString sItemId = "gallery" + OUString::number(i);
-INetURLObject aObj(grfName);
+INetURLObject aObj(sGrfName);
 if(aObj.GetProtocol() == INetProtocol::File)
-grfName = aObj.PathToFileName();
+sGrfName = aObj.PathToFileName();
 if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, 
&aGraphic))
 {
 BitmapEx aBitmap(aGraphic.GetBitmapEx());
@@ -1933,11 +1935,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, 
PopupActivateHdl_Impl, weld::ToggleButton&
 }
 pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
 pVD->DrawBitmapEx(Point(), aBitmap);
-m_xGalleryMenu->append(sItemId, grfName, *pVD);
+m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
 }
 else
 {
-m_xGalleryMenu->append(sItemId, grfName);
+m_xGalleryMenu->append(sItemId, sGrfName);
 }
 ++i;
 }
___
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/data/formulacell.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 906b505940f6330d2336164f341e338ff4b9b9ee
Author: Luboš Luňák 
AuthorDate: Fri Jan 25 15:08:16 2019 +0100
Commit: Luboš Luňák 
CommitDate: Mon Jan 28 11:01:06 2019 +0100

avoid a calc threads assert because of an undetected cyclic dependency

ooo#103156-1 has a quite complex cycle of cells, some of them (and only 
some)
in formula groups. And the complex Interpret() nesting confuses its cycle
detection into believing that Interpret() can simply return without 
providing
a value, which is ok if it's called from dependency checking of threaded
calculation, but is not ok when it's called for a single cell evalution.
So make the code set cyclic-dependency error even when it's possibly
inside dependency checking, since if it's really that case, the error
will be later overwritten by the actual value.

This is still not a completely correct fix, as the document on repeated hard
recals alternates some cells between correctly reporting an error and 
providing
some bogus values (e.g. column S in the second sheet). But the document uses
iteration, which complicates all this stuff even more, and after spending
quite some time on this I'm still not sure on how to fix that. So at least
for now, at least avoid the assert.

Change-Id: I395f97d104d98b5c043d1f17878338d3f1b31146
Reviewed-on: https://gerrit.libreoffice.org/66911
Tested-by: Jenkins
Reviewed-by: Dennis Francis 
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 900bd2e71990..3137cfd53a42 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1519,9 +1519,10 @@ void ScFormulaCell::Interpret()
 
 ScFormulaCell* pTopCell = mxGroup ? mxGroup->mpTopCell : this;
 
-if (pTopCell->mbSeenInPath && rRecursionHelper.GetDepComputeLevel() && 
!bRunning)
+if (pTopCell->mbSeenInPath && rRecursionHelper.GetDepComputeLevel())
 {
 // This call arose from a dependency calculation and we just found a 
cycle.
+aResult.SetResultError( FormulaError::CircularReference );
 // This will mark all elements in the cycle as parts-of-cycle.
 ScFormulaGroupCycleCheckGuard aCycleCheckGuard(rRecursionHelper, 
pTopCell);
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/tblafmt.hxx |   40 
 sw/qa/core/uwriter.cxx |   20 
 sw/source/core/doc/tblafmt.cxx |   98 -
 3 files changed, 79 insertions(+), 79 deletions(-)

New commits:
commit 6f5991261a152812d5023fd146398c1528683676
Author: Miklos Vajna 
AuthorDate: Mon Jan 28 09:05:42 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 10:14:00 2019 +0100

sw: prefix members of SwTableAutoFormat

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

diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index b2e6bded8be3..2170091abe5d 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -247,19 +247,19 @@ class SW_DLLPUBLIC SwTableAutoFormat
 css::uno::WeakReference m_wXObject;
 
 OUString m_aName;
-sal_uInt16 nStrResId;
+sal_uInt16 m_nStrResId;
 
 // Common flags of Calc and Writer.
-bool bInclFont : 1;
-bool bInclJustify : 1;
-bool bInclFrame : 1;
-bool bInclBackground : 1;
-bool bInclValueFormat : 1;
+bool m_bInclFont : 1;
+bool m_bInclJustify : 1;
+bool m_bInclFrame : 1;
+bool m_bInclBackground : 1;
+bool m_bInclValueFormat : 1;
 
 // Calc specific flags.
-bool bInclWidthHeight : 1;
+bool m_bInclWidthHeight : 1;
 
-SwBoxAutoFormat* aBoxAutoFormat[ 16 ];
+SwBoxAutoFormat* m_aBoxAutoFormat[ 16 ];
 
 // Writer-specific options
 SvxFormatBreakItem m_aBreak;
@@ -285,7 +285,7 @@ public:
 SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos );
 static const SwBoxAutoFormat& GetDefaultBoxFormat();
 
-void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = 
USHRT_MAX; }
+void SetName( const OUString& rNew ) { m_aName = rNew; m_nStrResId = 
USHRT_MAX; }
 const OUString& GetName() const { return m_aName; }
 
 void UpdateFromSet( sal_uInt8 nPos, const SfxItemSet& rSet,
@@ -296,23 +296,23 @@ public:
 void RestoreTableProperties(SwTable &table) const;
 void StoreTableProperties(const SwTable &table);
 
-bool IsFont() const { return bInclFont; }
-bool IsJustify() const  { return bInclJustify; }
-bool IsFrame() const{ return bInclFrame; }
-bool IsBackground() const   { return bInclBackground; }
-bool IsValueFormat() const  { return bInclValueFormat; }
+bool IsFont() const { return m_bInclFont; }
+bool IsJustify() const  { return m_bInclJustify; }
+bool IsFrame() const{ return m_bInclFrame; }
+bool IsBackground() const   { return m_bInclBackground; }
+bool IsValueFormat() const  { return m_bInclValueFormat; }
 
 /// Check if style is hidden.
 bool IsHidden() const   { return m_bHidden; }
 /// Check if style is defined by user.
 bool IsUserDefined() const  { return m_bUserDefined; }
 
-void SetFont( const bool bNew ) { bInclFont = bNew; }
-void SetJustify( const  bool bNew ) { bInclJustify = bNew; }
-void SetFrame( const bool bNew ){ bInclFrame = bNew; }
-void SetBackground( const bool bNew )   { bInclBackground = bNew; }
-void SetValueFormat( const bool bNew )  { bInclValueFormat = bNew; }
-void SetWidthHeight( const bool bNew )  { bInclWidthHeight = bNew; }
+void SetFont( const bool bNew ) { m_bInclFont = bNew; }
+void SetJustify( const  bool bNew ) { m_bInclJustify = bNew; }
+void SetFrame( const bool bNew ){ m_bInclFrame = bNew; }
+void SetBackground( const bool bNew )   { m_bInclBackground = bNew; }
+void SetValueFormat( const bool bNew )  { m_bInclValueFormat = bNew; }
+void SetWidthHeight( const bool bNew )  { m_bInclWidthHeight = bNew; }
 
 /// Set if style is hidden.
 void SetHidden(bool bHidden){ m_bHidden = bHidden; }
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index bd7cfff7ff61..9589035e3d30 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1354,19 +1354,19 @@ void SwDocTest::testTableAutoFormats()
 aTableAF.m_aShadow = aShadow;
 //Set bInclFont
 bool aIFont = false;
-aTableAF.bInclFont = aIFont;
+aTableAF.m_bInclFont = aIFont;
 //Set bInclJustify
 bool aIJustify = false;
-aTableAF.bInclJustify = aIJustify;
+aTableAF.m_bInclJustify = aIJustify;
 //Set bInclFrame
 bool aIFrame = false;
-aTableAF.bInclFrame = aIFrame;
+aTableAF.m_bInclFrame = aIFrame;
 //Set bInclBackground
 bool aIBackground = false;
-aTableAF.bInclBackground = aIBackground;
+aTableAF.m_bInclBackground = aIBackground;
 //Set bInclValueFormat
 bool aIVFormat = false;
-aTableAF.bInclValueFormat = aIVFormat;
+aTableAF.m_bInclValueFormat = aIVFormat;
 
 //set the box format to AutoFormat
 aTableAF.SetBoxFormat( aBoxAF, sal_uInt8(0) );
@@ -1492,15 +1492,15 @@ void SwDocTest::testTableAutoFormat

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

[Libreoffice Gerrit user]

 filter/source/graphicfilter/icgm/bitmap.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7545d180fbc133fe19917a484aaad1e4df250c0a
Author: Caolán McNamara 
AuthorDate: Fri Jan 25 09:44:21 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 10:12:29 2019 +0100

both branches have a common piece

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

diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx 
b/filter/source/graphicfilter/icgm/bitmap.cxx
index f74ba6fb5d5b..bca6ec869ff1 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -308,13 +308,14 @@ bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& 
rDesc )
 
 void CGMBitmap::ImplInsert( CGMBitmapDescriptor const & rSource, 
CGMBitmapDescriptor& rDest )
 {
+rDest.mxBitmap.Expand( 0, rSource.mnY );
+rDest.mxBitmap.CopyPixel( tools::Rectangle( Point( 0, rDest.mnY ), Size( 
rSource.mnX, rSource.mnY ) ),
+tools::Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) ), 
&rSource.mxBitmap );
+
 if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) )
 {   // Insert on Bottom
 if ( mpCGM->mnVDCYmul == -1 )
 rDest.mnOrigin = rSource.mnOrigin;  // new origin
-rDest.mxBitmap.Expand( 0, rSource.mnY );
-rDest.mxBitmap.CopyPixel( tools::Rectangle( Point( 0, rDest.mnY ), 
Size( rSource.mnX, rSource.mnY ) ),
-tools::Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) 
), &rSource.mxBitmap );
 FloatPoint aFloatPoint;
 aFloatPoint.X = rSource.mnQ.X - rSource.mnR.X;
 aFloatPoint.Y = rSource.mnQ.Y - rSource.mnR.Y;
@@ -327,9 +328,6 @@ void CGMBitmap::ImplInsert( CGMBitmapDescriptor const & 
rSource, CGMBitmapDescri
 {   // Insert on Top
 if ( mpCGM->mnVDCYmul == 1 )
 rDest.mnOrigin = rSource.mnOrigin;  // new origin
-rDest.mxBitmap.Expand( 0, rSource.mnY );
-rDest.mxBitmap.CopyPixel( tools::Rectangle( Point( 0, rDest.mnY ), 
Size( rSource.mnX, rSource.mnY ) ),
-tools::Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) 
), &rSource.mxBitmap );
 rDest.mnP = rSource.mnP;
 rDest.mnR = rSource.mnR;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

[Libreoffice Gerrit user]

 docker/l10n-docker-nightly.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4bfdda1068042b849b640dde882e9af395ba5fe1
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jan 28 10:10:34 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jan 28 10:10:34 2019 +0100

docker: Ignore errors when deleting instdir

Building in docker, this is a volume which is undeletable

Change-Id: I08c4fd87b1d7ca146f5d91c2cd26675191bd6047

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 5f8069a1e..2f05863d6 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -49,7 +49,7 @@ BUILDDIR="$SRCDIR/builddir"
 mkdir -p "$BUILDDIR"
 cd "$BUILDDIR"
 
-rm -rf "$INSTDIR"
+rm -rf "$INSTDIR" || true
 mkdir -p "$INSTDIR"
 
 # cloning & updating #
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sax/source scripting/source sdext/source sd/inc sd/source sfx2/inc sfx2/source shell/source starmath/inc starmath/source svl/source svtools/inc svtools/source

[Libreoffice Gerrit user]

 sax/source/expatwrap/xml2utf.cxx   |5 -
 sax/source/fastparser/legacyfastparser.cxx |3 -
 scripting/source/stringresource/stringresource.cxx |5 -
 sd/inc/pch/precompiled_sd.hxx  |1 
 sd/source/core/annotations/Annotation.cxx  |5 -
 sd/source/core/drawdoc3.cxx|   19 +++
 sd/source/core/sdpage.cxx  |   11 +---
 sd/source/core/sdpage2.cxx |3 -
 sd/source/core/text/textapi.cxx|5 -
 sd/source/core/undo/undofactory.cxx|   13 ++---
 sd/source/filter/eppt/pptx-animations.cxx  |5 -
 sd/source/filter/eppt/pptx-text.cxx|3 -
 sd/source/filter/ppt/propread.cxx  |   13 ++---
 sd/source/ui/animations/CustomAnimationList.cxx|9 +--
 sd/source/ui/animations/CustomAnimationPane.cxx|5 -
 sd/source/ui/animations/motionpathtag.cxx  |   23 -
 sd/source/ui/app/sddll.cxx |3 -
 sd/source/ui/app/sdmod2.cxx|3 -
 sd/source/ui/dlg/TemplateScanner.cxx   |3 -
 sd/source/ui/dlg/sddlgfact.cxx |   37 +++---
 sd/source/ui/dlg/sdtreelb.cxx  |3 -
 sd/source/ui/dlg/unchss.cxx|6 --
 sd/source/ui/docshell/docshel4.cxx |   15 ++---
 sd/source/ui/docshell/docshell.cxx |1 
 sd/source/ui/func/fulinend.cxx |3 -
 sd/source/ui/func/fupage.cxx   |3 -
 sd/source/ui/func/fuprobjs.cxx |3 -
 sd/source/ui/func/undoback.cxx |8 +--
 sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +--
 sd/source/ui/sidebar/DocumentHelper.cxx|5 -
 sd/source/ui/sidebar/MasterPagesSelector.cxx   |3 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |5 -
 sd/source/ui/unoidl/UnoDocumentSettings.cxx|3 -
 sd/source/ui/unoidl/unopback.cxx   |5 -
 sd/source/ui/view/OutlinerIterator.cxx |5 -
 sd/source/ui/view/ViewShellImplementation.cxx  |4 -
 sd/source/ui/view/drawview.cxx |9 +--
 sd/source/ui/view/drviews2.cxx |5 -
 sd/source/ui/view/drviews9.cxx |   11 +---
 sd/source/ui/view/drviewsb.cxx |3 -
 sd/source/ui/view/drviewse.cxx |3 -
 sd/source/ui/view/sdview3.cxx  |2 
 sd/source/ui/view/viewoverlaymanager.cxx   |5 -
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |3 -
 sdext/source/pdfimport/pdfparse/pdfparse.cxx   |   13 ++---
 sfx2/inc/pch/precompiled_sfx.hxx   |1 
 sfx2/source/appl/workwin.cxx   |4 -
 sfx2/source/bastyp/fltfnc.cxx  |3 -
 sfx2/source/control/bindings.cxx   |2 
 sfx2/source/control/dispatch.cxx   |2 
 sfx2/source/control/recentdocsview.cxx |3 -
 sfx2/source/control/unoctitm.cxx   |4 -
 sfx2/source/dialog/dockwin.cxx |4 -
 sfx2/source/dialog/templdlg.cxx|7 +-
 sfx2/source/doc/docfile.cxx|3 -
 sfx2/source/doc/doctempl.cxx   |7 +-
 sfx2/source/sidebar/SidebarController.cxx  |3 -
 sfx2/source/view/classificationhelper.cxx  |3 -
 shell/source/win32/simplemail/smplmailclient.cxx   |3 -
 starmath/inc/pch/precompiled_sm.hxx|1 
 starmath/source/ElementsDockingWindow.cxx  |7 +-
 starmath/source/accessibility.cxx  |3 -
 starmath/source/caret.cxx  |4 -
 starmath/source/document.cxx   |   13 ++---
 starmath/source/edit.cxx   |3 -
 starmath/source/mathmlimport.cxx   |9 +--
 starmath/source/parse.cxx  |   43 -
 starmath/source/smdll.cxx  |3 -
 starmath/source/smmod.cxx  |3 -
 starmath/source/unomodel.cxx   |3 -
 svl/source/items/style.cxx |5 -
 svl/source/items/stylepool.cxx |3 -
 svl/source/numbers/zforlist.cxx|5 -
 svl/source/svdde/ddecli.cxx|3 -
 svtools/inc/pch/precompiled_svt.hxx|1 
 svtools/source/control/toolbarmenu.cxx  

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

[Libreoffice Gerrit user]

 vcl/unx/gtk/gtksalmenu.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1d64946c073f5a244fd115ec1dfb3dcb09c9313d
Author: Julien Nabet 
AuthorDate: Sun Jan 27 15:37:43 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jan 28 09:53:04 2019 +0100

tdf#122990: return if no mpMenuBarContainerWidget in ApplyPersona

Related to patches for tdf#122241

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

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 538cb0aa680d..27ba8096bce8 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -859,6 +859,8 @@ void GtkSalMenu::CreateMenuBarWidget()
 void GtkSalMenu::ApplyPersona()
 {
 #if GTK_CHECK_VERSION(3,0,0)
+if (!mpMenuBarContainerWidget)
+return;
 assert(mbMenuBar);
 // I'm dubious about the persona theming feature, but as it exists, lets 
try and support
 // it, apply the image to the mpMenuBarContainerWidget
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Firebird on dev-www.libreoffice.org/src/

[Stephan Bergmann]

On 27/01/2019 14:25, julien2412 wrote:

Could someone upload
https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/Firebird-3.0.4.33054-0.tar.bz2
?
sha256sum Firebird-3.0.4.33054-0.tar.bz2 gave me:
b208931d309029d05dbcd8f6c1b4fd9d21be1d60cee2ff29c08b5002db83756b


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

[Libreoffice-commits] core.git: bin/distro-install-desktop-integration

[Libreoffice Gerrit user]

 bin/distro-install-desktop-integration |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5238ff887849b0d94c6da00a07b57984a86b6ee6
Author: Andrea Gelmini 
AuthorDate: Sat Jan 26 16:11:57 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jan 28 09:17:03 2019 +0100

Fix typo

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

diff --git a/bin/distro-install-desktop-integration 
b/bin/distro-install-desktop-integration
index c8988b922f3e..1da104e47621 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -103,7 +103,7 @@ sed -i \
 -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
 -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
 *
-# call in subshell to do not malfrom PRODUCTVERSION, ...
+# call in subshell to do not malform PRODUCTVERSION, ...
 (
 export OFFICE_PREFIX=$LIBDIR
 export PREFIX=$INSTALLDIRNAME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com

[Libreoffice Gerrit user]

 bean/com/sun/star/comp/beans/OOoBean.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eeeae885b726d10e97327198792775b54b456274
Author: Andrea Gelmini 
AuthorDate: Sat Jan 26 16:11:58 2019 +
Commit: Julien Nabet 
CommitDate: Mon Jan 28 09:16:24 2019 +0100

Fix typo

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

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 84e6a4f177f2..0e427e325622 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -128,7 +128,7 @@ public class OOoBean
 { /* impossible here */ }
 }
 
-/** Sets the timeout for methods which launch OOo in milli seconds.
+/** Sets the timeout for methods which launch OOo in milliseconds.
 
 This method does not need a connection to an OOo instance.
  */
@@ -137,7 +137,7 @@ public class OOoBean
 nOOoStartTimeOut = nMilliSecs;
 }
 
-/** Sets the timeout for normal OOO methods calls in milli seconds.
+/** Sets the timeout for normal OOO methods calls in milliseconds.
 
 This method does not need a connection to an OOo instance.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Regarding the Present Android Application -"LibreOffice Viewer

[Heiko Tietze]

Hi Rohit,

Welcome to LibreOffice! It's great to have you on board. We collected some 
information to get started on our wiki [1] and in particular about GSoC here 
[2]. We request all students to solve a few non-trivial "easyhacks" to show 
their skills to the potential mentors and to figure out if LibreOffice is the 
right project for you. Don't hesitate to contact the developers via IRC at 
#libreoffice-dev (see also [1]).

Happy hacking,
Heiko (GSoC Admin, UX Mentor)

[1] https://wiki.documentfoundation.org/Development
[2] https://wiki.documentfoundation.org/Development/GSoC


On 28.01.19 00:00, Rohit Raj wrote:
> Dear Sir,
> 
> I am writing this letter out of great curiosity and eagerness to present you 
> with an idea. I am willing to apply for GSOC -2019 and I have been using your 
> Ubuntu -Libre Office and I have checked your recent Projects, but  I 
> personally feel that your android app of LibreOffice Viewer needs major 
> changes in terms of UI and UX and I want to volunteer for the task.
> I am a 2nd Year Computer Science student from India and I have experience in 
> Java , Kotlin and Android Development.
> I am currently working on an app and I am quite confident about the fact that 
> I can Design a new LibreOffice Viewer App with a better user interface and 
> with better performance.
> This is the first time I am writing to an open source organisation so I am 
> very less aware of the common courtesy , but I want to work with your 
> community as I share the same opinion as you about the open source community.
> I look forward to hearing from you.
> 
> Thanking you
> Rohit Rajsurya Prasad
> Mob- +91-9471170057
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] libcdr.git: src/lib

[Libreoffice Gerrit user]

 src/lib/CMXParser.cpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 00c4b331df8157dff7c251323d00ec2d63691dfb
Author: Miklos Vajna 
AuthorDate: Mon Jan 28 09:04:56 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 28 09:04:56 2019 +0100

Add missing include

CMXParser.cpp:42:43: error: expected ')'
CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
  ^
CMXParser.cpp:42:19: note: to match this '('
CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
  ^
1 error generated.

Change-Id: I9575a96327a62dc6c44950d35a8740242e1a4433

diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index 78cc417..02852c9 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "libcdr_utils.h"
 #include "CDRPath.h"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSOC Project

[Heiko Tietze]

Hi Sumit,

Welcome to LibreOffice! It's great to have you on board. We collected some 
information to get started on our wiki [1] and in particular about GSoC here 
[2]. We request all students to solve a few non-trivial "easyhacks" to show 
their skills to the potential mentors and to figure out if LibreOffice is the 
right project for you. Don't hesitate to contact the developers via IRC at 
#libreoffice-dev (see also [1]).

Happy hacking,
Heiko (GSoC Admin, UX Mentor)

[1] https://wiki.documentfoundation.org/Development
[2] https://wiki.documentfoundation.org/Development/GSoC

On 27.01.19 10:49, SUMIT wrote:
> Hello,
> My name is Sumit, 2^nd  year CSE undergraduate MNIT Jaipur. I am using 
> LibreOffice for many years and looking forward to contribute somewhere in the 
> organization applications. I am excited to apply for GSOC this year. I am 
> primarily interested in Windows and Android apps. I have knowledge of C, C++, 
> Python and Java. I hope to find a mentor who could guide me and help me to 
> start contributing to LibreOffice Projects.
> 
> Thank You
> Sumit  
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice