date:20180727

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1-0' - help3xsl/link.txt.xsl help3xsl/online_transform.xsl

2018-07-27 Thread Libreoffice Gerrit user

 help3xsl/link.txt.xsl | 1724 ++
 help3xsl/online_transform.xsl |8 
 2 files changed, 1731 insertions(+), 1 deletion(-)

New commits:
commit bdf9b0bcee1afadc80a41d548803c33cd3b755ed
Author: Olivier Hallot 
AuthorDate: Sat Jul 21 11:08:23 2018 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jul 27 14:24:57 2018 +0200

tdf#118844 Add missing icons in Help pages

Apply strategy #1 described in tdf#118844 comment #3

Change-Id: I072bf837217acc8dc84ff1104324df69e33a22bd
Reviewed-on: https://gerrit.libreoffice.org/57802
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/link.txt.xsl b/help3xsl/link.txt.xsl
new file mode 100644
index 0..0d3c219f5
--- /dev/null
+++ b/help3xsl/link.txt.xsl
@@ -0,0 +1,1724 @@
+
+
+
+
+http://www.w3.org/1999/XSL/Transform";>
+
+
+
+
+
+cmd/sc_open.png
+cmd/sc_runbasic.png
+cmd/sc_mediapause.png
+cmd/sc_basicstop.png
+cmd/sc_mediarepeat.png
+cmd/sc_ok.png
+cmd/sc_mediamute.png
+cmd/lc_open.png
+cmd/lc_runbasic.png
+cmd/lc_mediapause.png
+cmd/lc_basicstop.png
+cmd/lc_mediarepeat.png
+cmd/lc_ok.png
+cmd/lc_mediamute.png
+
+cmd/sc_insertrowsafter.png
+cmd/sc_insertcolumnsafter.png
+cmd/sc_deleterows.png
+cmd/sc_deletecolumns.png
+cmd/sc_insertcellsright.png
+cmd/sc_insertcellsdown.png
+cmd/sc_insertcolumnsafter.png
+cmd/sc_insertcolumns.png
+cmd/sc_insertrowsbefore.png
+formula/res/refinp1.png
+
+cmd/lc_datefield.png
+cmd/lc_insertplugin.png
+cmd/lc_inserttable.png
+cmd/lc_inserttable.png
+cmd/sc_datefield.png
+cmd/sc_insertplugin.png
+cmd/sc_inserttable.png
+cmd/sc_inserttable.png
+
+
+cmd/lc_editannotation.png
+cmd/sc_editannotation.png
+
+
+cmd/lc_newdoc.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_avmediaplayer.png
+cmd/lc_formattedfield.png
+cmd/lc_datefield.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_dbviewaliases.png
+cmd/lc_edit.png
+cmd/lc_addfield.png
+cmd/lc_inserttable.png
+cmd/lc_open.png
+cmd/lc_formattedfield.png
+cmd/lc_checkbox.png
+cmd/lc_combobox.png
+cmd/lc_listbox.png
+cmd/lc_radiobutton.png
+cmd/lc_spinbutton.png
+cmd/lc_dbviewfunctions.png
+cmd/lc_scrollbar.png
+cmd/lc_insertframe.png
+cmd/lc_insertframe.png
+cmd/lc_drawchart.png
+cmd/lc_numberformatstandard.png
+cmd/lc_numberformatstandard.png
+cmd/lc_listbox.png
+cmd/lc_insertframe.png
+cmd/lc_insertmath.png
+cmd/lc_patternfield.png
+cmd/lc_pushbutton.png
+cmd/lc_insertpagebreak.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_timefield.png
+
+cmd/sc_newdoc.png
+cmd/sc_togglesheetgrid.png
+cmd/sc_avmediaplayer.png
+cmd/sc_formattedfield.png
+cmd/sc_datefield.png
+cmd/sc_dbviewaliases.png
+cmd/sc_text.png
+cmd/sc_addfield.png
+cmd/sc_inserttable.png
+cmd/sc_open.png
+cmd/sc_formattedfield.png
+cmd/sc_checkbox.png
+cmd/sc_combobox.png
+cmd/sc_listbox.png
+cmd/sc_radiobutton.png
+cmd/sc_spinbutton.png
+cmd/sc_dbviewfunctions.png
+cmd/sc_scrollbar.png
+cmd/sc_scrollbar.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_drawchart.png
+cmd/sc_drawchart.png
+cmd/sc_numberformatstandard.png
+cmd/sc_numberformatstandard.png
+cmd/sc_listbox.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_insertmath.png
+cmd/sc_patternfield.png
+cmd/sc_pushbutton.png
+cmd/sc_insertpagebreak.png
+cmd/sc_togglesheetgrid.png
+cmd/sc_timefield.png
+cmd/sc_addwatch.png
+cmd/lc_addwatch.png
+cmd/sc_trackchanges.png
+cmd/lc_trackchanges.png
+cmd/sc_basicshapes.round-quadrat.png
+
+
+cmd/lc_zoomprevious.png
+cmd/lc_zoomout.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomin.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomoptimal.png
+cmd/lc_view100.png
+cmd/sc_zoomprevious.png
+cmd/sc_zoomout.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomin.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomoptimal.png
+cmd/sc_view100.png
+
+
+cmd/lc_saveas.png
+cmd/lc_save.png
+cmd/lc_save.png
+cmd/sc_saveas.png
+cmd/sc_save.png
+cmd/sc_save.png
+
+
+cmd/lc_text_marquee.png
+cmd/lc_text.png
+cmd/lc_text.png
+cmd/lc_pickthrough.png
+cmd/lc_spacing.png
+cmd/lc_scaletext.png
+cmd/sc_text_marquee.png
+cmd/sc_text.png
+cmd/sc_text.png
+cmd/sc_text.png
+cmd/sc_pickthrough.png
+cmd/sc_spacing.png
+cmd/sc_scaletext.png
+
+
+cmd/lc_dbnewform.png
+cmd/sc_dbnewform.png
+
+
+cmd/lc_cube.png
+cmd/lc_cube.png
+cmd/lc_convertinto3dlathe.png
+cmd/sc_cube.png
+cmd/sc_cube.png
+cmd/sc_convertinto3dlathe.png
+
+
+cmd/lc_controlproperties.png
+cmd/sc_controlproperties.png
+cmd/lc_controlproperties.png
+cmd/sc_controlproperties.png
+
+
+cmd/lc_toggleanchortype.png
+cmd/lc_colorscaleformatdialog.png
+cmd/sc_colorscaleformatdialog.png
+cmd/sc_color.png
+cmd/sc_spacepara15.png
+cmd/sc_alignblock.png
+cmd/sc_defaultbullet.png
+cmd/sc_gallery.png
+cmd/sc_framedialog.png
+
+
+cmd/lc_browseview.png
+cmd/lc_browseview.png
+cmd/sc_browseview.png
+cmd/sc_browseview.png
+
+
+cmd/lc_scrollbar.png
+cmd/sc_scrol

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - helpcontent2

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit fa580700574858e3a347da6c6bb5cfd11eb25cb6
Author: Olivier Hallot 
AuthorDate: Sat Jul 21 11:08:23 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Jul 27 14:24:57 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-1-0'
  - tdf#118844 Add missing icons in Help pages

Apply strategy #1 described in tdf#118844 comment #3

Change-Id: I072bf837217acc8dc84ff1104324df69e33a22bd
Reviewed-on: https://gerrit.libreoffice.org/57802
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 1695e40cfed7..bdf9b0bcee1a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1695e40cfed7931a86ba56686c97032ccd6c77ee
+Subproject commit bdf9b0bcee1afadc80a41d548803c33cd3b755ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/link.txt.xsl help3xsl/online_transform.xsl

2018-07-27 Thread Libreoffice Gerrit user

 help3xsl/link.txt.xsl | 1724 ++
 help3xsl/online_transform.xsl |8 
 2 files changed, 1731 insertions(+), 1 deletion(-)

New commits:
commit fb39a0102eb66c281f3db6433468a2c9574fa65b
Author: Olivier Hallot 
AuthorDate: Sat Jul 21 11:08:23 2018 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jul 27 14:29:36 2018 +0200

tdf#118844 Add missing icons in Help pages

Apply strategy #1 described in tdf#118844 comment #3

Change-Id: I072bf837217acc8dc84ff1104324df69e33a22bd
Reviewed-on: https://gerrit.libreoffice.org/57803
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/link.txt.xsl b/help3xsl/link.txt.xsl
new file mode 100644
index 0..0d3c219f5
--- /dev/null
+++ b/help3xsl/link.txt.xsl
@@ -0,0 +1,1724 @@
+
+
+
+
+http://www.w3.org/1999/XSL/Transform";>
+
+
+
+
+
+cmd/sc_open.png
+cmd/sc_runbasic.png
+cmd/sc_mediapause.png
+cmd/sc_basicstop.png
+cmd/sc_mediarepeat.png
+cmd/sc_ok.png
+cmd/sc_mediamute.png
+cmd/lc_open.png
+cmd/lc_runbasic.png
+cmd/lc_mediapause.png
+cmd/lc_basicstop.png
+cmd/lc_mediarepeat.png
+cmd/lc_ok.png
+cmd/lc_mediamute.png
+
+cmd/sc_insertrowsafter.png
+cmd/sc_insertcolumnsafter.png
+cmd/sc_deleterows.png
+cmd/sc_deletecolumns.png
+cmd/sc_insertcellsright.png
+cmd/sc_insertcellsdown.png
+cmd/sc_insertcolumnsafter.png
+cmd/sc_insertcolumns.png
+cmd/sc_insertrowsbefore.png
+formula/res/refinp1.png
+
+cmd/lc_datefield.png
+cmd/lc_insertplugin.png
+cmd/lc_inserttable.png
+cmd/lc_inserttable.png
+cmd/sc_datefield.png
+cmd/sc_insertplugin.png
+cmd/sc_inserttable.png
+cmd/sc_inserttable.png
+
+
+cmd/lc_editannotation.png
+cmd/sc_editannotation.png
+
+
+cmd/lc_newdoc.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_avmediaplayer.png
+cmd/lc_formattedfield.png
+cmd/lc_datefield.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_dbviewaliases.png
+cmd/lc_edit.png
+cmd/lc_addfield.png
+cmd/lc_inserttable.png
+cmd/lc_open.png
+cmd/lc_formattedfield.png
+cmd/lc_checkbox.png
+cmd/lc_combobox.png
+cmd/lc_listbox.png
+cmd/lc_radiobutton.png
+cmd/lc_spinbutton.png
+cmd/lc_dbviewfunctions.png
+cmd/lc_scrollbar.png
+cmd/lc_insertframe.png
+cmd/lc_insertframe.png
+cmd/lc_drawchart.png
+cmd/lc_numberformatstandard.png
+cmd/lc_numberformatstandard.png
+cmd/lc_listbox.png
+cmd/lc_insertframe.png
+cmd/lc_insertmath.png
+cmd/lc_patternfield.png
+cmd/lc_pushbutton.png
+cmd/lc_insertpagebreak.png
+cmd/lc_togglesheetgrid.png
+cmd/lc_timefield.png
+
+cmd/sc_newdoc.png
+cmd/sc_togglesheetgrid.png
+cmd/sc_avmediaplayer.png
+cmd/sc_formattedfield.png
+cmd/sc_datefield.png
+cmd/sc_dbviewaliases.png
+cmd/sc_text.png
+cmd/sc_addfield.png
+cmd/sc_inserttable.png
+cmd/sc_open.png
+cmd/sc_formattedfield.png
+cmd/sc_checkbox.png
+cmd/sc_combobox.png
+cmd/sc_listbox.png
+cmd/sc_radiobutton.png
+cmd/sc_spinbutton.png
+cmd/sc_dbviewfunctions.png
+cmd/sc_scrollbar.png
+cmd/sc_scrollbar.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_drawchart.png
+cmd/sc_drawchart.png
+cmd/sc_numberformatstandard.png
+cmd/sc_numberformatstandard.png
+cmd/sc_listbox.png
+cmd/sc_insertframe.png
+cmd/sc_insertframe.png
+cmd/sc_insertmath.png
+cmd/sc_patternfield.png
+cmd/sc_pushbutton.png
+cmd/sc_insertpagebreak.png
+cmd/sc_togglesheetgrid.png
+cmd/sc_timefield.png
+cmd/sc_addwatch.png
+cmd/lc_addwatch.png
+cmd/sc_trackchanges.png
+cmd/lc_trackchanges.png
+cmd/sc_basicshapes.round-quadrat.png
+
+
+cmd/lc_zoomprevious.png
+cmd/lc_zoomout.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomin.png
+cmd/lc_zoomoptimal.png
+cmd/lc_zoomoptimal.png
+cmd/lc_view100.png
+cmd/sc_zoomprevious.png
+cmd/sc_zoomout.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomin.png
+cmd/sc_zoomoptimal.png
+cmd/sc_zoomoptimal.png
+cmd/sc_view100.png
+
+
+cmd/lc_saveas.png
+cmd/lc_save.png
+cmd/lc_save.png
+cmd/sc_saveas.png
+cmd/sc_save.png
+cmd/sc_save.png
+
+
+cmd/lc_text_marquee.png
+cmd/lc_text.png
+cmd/lc_text.png
+cmd/lc_pickthrough.png
+cmd/lc_spacing.png
+cmd/lc_scaletext.png
+cmd/sc_text_marquee.png
+cmd/sc_text.png
+cmd/sc_text.png
+cmd/sc_text.png
+cmd/sc_pickthrough.png
+cmd/sc_spacing.png
+cmd/sc_scaletext.png
+
+
+cmd/lc_dbnewform.png
+cmd/sc_dbnewform.png
+
+
+cmd/lc_cube.png
+cmd/lc_cube.png
+cmd/lc_convertinto3dlathe.png
+cmd/sc_cube.png
+cmd/sc_cube.png
+cmd/sc_convertinto3dlathe.png
+
+
+cmd/lc_controlproperties.png
+cmd/sc_controlproperties.png
+cmd/lc_controlproperties.png
+cmd/sc_controlproperties.png
+
+
+cmd/lc_toggleanchortype.png
+cmd/lc_colorscaleformatdialog.png
+cmd/sc_colorscaleformatdialog.png
+cmd/sc_color.png
+cmd/sc_spacepara15.png
+cmd/sc_alignblock.png
+cmd/sc_defaultbullet.png
+cmd/sc_gallery.png
+cmd/sc_framedialog.png
+
+
+cmd/lc_browseview.png
+cmd/lc_browseview.png
+cmd/sc_browseview.png
+cmd/sc_browseview.png
+
+
+cmd/lc_scrollbar.png
+cmd/sc_scrollbar.png
+cmd/lc_insertformhscroll.png
+cmd/sc_insertformhscro

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - helpcontent2

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit bafb24d7e73ccc84d42cba6cf1bdfb689e0c363f
Author: Olivier Hallot 
AuthorDate: Sat Jul 21 11:08:23 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Jul 27 14:29:36 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-1'
  - tdf#118844 Add missing icons in Help pages

Apply strategy #1 described in tdf#118844 comment #3

Change-Id: I072bf837217acc8dc84ff1104324df69e33a22bd
Reviewed-on: https://gerrit.libreoffice.org/57803
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 8bddc0324cab..fb39a0102eb6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8bddc0324cab7ed288fddaf6562cb2d2fc83942d
+Subproject commit fb39a0102eb66c281f3db6433468a2c9574fa65b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/default.css

2018-07-27 Thread Libreoffice Gerrit user

 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 50347faccb79482074b625eda391d8b08edcfec0
Author: Olivier Hallot 
AuthorDate: Sun Jul 22 08:10:59 2018 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jul 27 14:54:59 2018 +0200

Restore 'GLOBAL' label in Index

GLOBAL is the external nam of the SHARED bookmarks.

Change-Id: If4a877cc26dddb3fa99e5369ef63c7333aa53ffe
Reviewed-on: https://gerrit.libreoffice.org/57815
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 0901f95273cc31db84d31a11cb22187f73cad128)
Reviewed-on: https://gerrit.libreoffice.org/57816
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index 092ed89ef..88c24facf 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -536,7 +536,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 font-weight: bold;
 color: #148603;
 }
-#GLOBAL::before {
+#SHARED::before {
 content: "GLOBAL";
 display: block;
 font-size: 22px;
___
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' - helpcontent2

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit 03cac18046bfd03c297adfad193d36c086befd2d
Author: Olivier Hallot 
AuthorDate: Sun Jul 22 08:10:59 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Jul 27 14:54:59 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-1'
  - Restore 'GLOBAL' label in Index

GLOBAL is the external nam of the SHARED bookmarks.

Change-Id: If4a877cc26dddb3fa99e5369ef63c7333aa53ffe
Reviewed-on: https://gerrit.libreoffice.org/57815
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 0901f95273cc31db84d31a11cb22187f73cad128)
Reviewed-on: https://gerrit.libreoffice.org/57816
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index fb39a0102eb6..50347faccb79 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fb39a0102eb66c281f3db6433468a2c9574fa65b
+Subproject commit 50347faccb79482074b625eda391d8b08edcfec0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 readlicense_oo/license/CREDITS.fodt | 2784 ++--
 1 file changed, 1410 insertions(+), 1374 deletions(-)

New commits:
commit cba1c7421338324cb6c91511a294c4861e665c29
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:08:10 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:08:10 2018 +0200

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eabe2a917b2e..51b2f54a3572 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.4.2$Linux_X86_64
 
LibreOffice_project/9b0d9b32d5dcda91d2f1a96dc04c645c450872bf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.5.2$Linux_X86_64
 
LibreOffice_project/54c8cbb85f300ac59db32fe8a675ff7683cd5a162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   579
+   116926
501
41965
-   20242
+   21327
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 579
+ 116926
  42464
- 20819
+ 138252
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7852923
+   7870590
false
false
false
@@ -321,17 +321,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -393,23 +399,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -507,6 +516,9 @@
   

   
+  
+   
+  
   

   
@@ -1039,14 +1051,14 @@

   
  Credits
-1346 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-06-14 16:54:11.
+1352 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-07-27 09:55:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1066,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24344Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24493Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16101Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16229Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
9508Joined: 2011-12-12
+   *Noel GrandinCommits: 
9830Joined: 2011-12-12
   
  
  
@@ -1080,10 +1092,10 @@
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Tor 
LillqvistCommits: 8277Joined: 
2010-03-23
+   Tor 
LillqvistCommits:

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - readlicense_oo/license

2018-07-27 Thread Libreoffice Gerrit user

 readlicense_oo/license/CREDITS.fodt | 2784 ++--
 1 file changed, 1410 insertions(+), 1374 deletions(-)

New commits:
commit 28720483896211b54a606f7c4bed4b4b1e3239a3
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:08:10 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:09:13 2018 +0200

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f
(cherry picked from commit cba1c7421338324cb6c91511a294c4861e665c29)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eabe2a917b2e..51b2f54a3572 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.4.2$Linux_X86_64
 
LibreOffice_project/9b0d9b32d5dcda91d2f1a96dc04c645c450872bf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.5.2$Linux_X86_64
 
LibreOffice_project/54c8cbb85f300ac59db32fe8a675ff7683cd5a162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   579
+   116926
501
41965
-   20242
+   21327
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 579
+ 116926
  42464
- 20819
+ 138252
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7852923
+   7870590
false
false
false
@@ -321,17 +321,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -393,23 +399,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -507,6 +516,9 @@
   

   
+  
+   
+  
   

   
@@ -1039,14 +1051,14 @@

   
  Credits
-1346 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-06-14 16:54:11.
+1352 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-07-27 09:55:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1066,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24344Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24493Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16101Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16229Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
9508Joined: 2011-12-12
+   *Noel GrandinCommits: 
9830Joined: 2011-12-12
   
  
  
@@ -1080,10 +1092,10 @@
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Tor

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - readlicense_oo/license

2018-07-27 Thread Libreoffice Gerrit user

 readlicense_oo/license/CREDITS.fodt | 2784 ++--
 1 file changed, 1410 insertions(+), 1374 deletions(-)

New commits:
commit 27ce1843b6629e766a7bc27fb4d99e23faf91002
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:08:10 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:09:53 2018 +0200

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f
(cherry picked from commit cba1c7421338324cb6c91511a294c4861e665c29)
(cherry picked from commit 28720483896211b54a606f7c4bed4b4b1e3239a3)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eabe2a917b2e..51b2f54a3572 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.4.2$Linux_X86_64
 
LibreOffice_project/9b0d9b32d5dcda91d2f1a96dc04c645c450872bf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.5.2$Linux_X86_64
 
LibreOffice_project/54c8cbb85f300ac59db32fe8a675ff7683cd5a162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   579
+   116926
501
41965
-   20242
+   21327
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 579
+ 116926
  42464
- 20819
+ 138252
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7852923
+   7870590
false
false
false
@@ -321,17 +321,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -393,23 +399,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -507,6 +516,9 @@
   

   
+  
+   
+  
   

   
@@ -1039,14 +1051,14 @@

   
  Credits
-1346 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-06-14 16:54:11.
+1352 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-07-27 09:55:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1066,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24344Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24493Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16101Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16229Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
9508Joined: 2011-12-12
+   *Noel GrandinCommits: 
9830Joined: 2011-12-12
   
  
  
@@ -1080,10 +1092,10 @@
Ivo

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

2018-07-27 Thread Libreoffice Gerrit user

 readlicense_oo/license/CREDITS.fodt | 2784 ++--
 1 file changed, 1410 insertions(+), 1374 deletions(-)

New commits:
commit 961974a2c507ab34734dabb76e567310ed25a7d7
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:08:10 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:10:50 2018 +0200

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f
(cherry picked from commit cba1c7421338324cb6c91511a294c4861e665c29)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eabe2a917b2e..51b2f54a3572 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.4.2$Linux_X86_64
 
LibreOffice_project/9b0d9b32d5dcda91d2f1a96dc04c645c450872bf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.5.2$Linux_X86_64
 
LibreOffice_project/54c8cbb85f300ac59db32fe8a675ff7683cd5a162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   579
+   116926
501
41965
-   20242
+   21327
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 579
+ 116926
  42464
- 20819
+ 138252
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7852923
+   7870590
false
false
false
@@ -321,17 +321,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -393,23 +399,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -507,6 +516,9 @@
   

   
+  
+   
+  
   

   
@@ -1039,14 +1051,14 @@

   
  Credits
-1346 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-06-14 16:54:11.
+1352 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-07-27 09:55:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1066,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24344Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24493Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16101Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16229Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
9508Joined: 2011-12-12
+   *Noel GrandinCommits: 
9830Joined: 2011-12-12
   
  
  
@@ -1080,10 +1092,10 @@
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
   
   
-   Tor

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - readlicense_oo/license

2018-07-27 Thread Libreoffice Gerrit user

 readlicense_oo/license/CREDITS.fodt | 2784 ++--
 1 file changed, 1410 insertions(+), 1374 deletions(-)

New commits:
commit 2061207e2e28c05e0be0dbd0731595ff4caf4912
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:08:10 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:13:13 2018 +0200

update credits

Change-Id: I11206cbe209fc61c59af4d3be1c85168a518003f
(cherry picked from commit cba1c7421338324cb6c91511a294c4861e665c29)
(cherry picked from commit 961974a2c507ab34734dabb76e567310ed25a7d7)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index eabe2a917b2e..51b2f54a3572 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.4.2$Linux_X86_64
 
LibreOffice_project/9b0d9b32d5dcda91d2f1a96dc04c645c450872bf2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.0.5.2$Linux_X86_64
 
LibreOffice_project/54c8cbb85f300ac59db32fe8a675ff7683cd5a162012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   579
+   116926
501
41965
-   20242
+   21327
true
true

@@ -16,9 +16,9 @@
  3649
  3471
  501
- 579
+ 116926
  42464
- 20819
+ 138252
  0
  0
  false
@@ -72,7 +72,7 @@
false
false
true
-   7852923
+   7870590
false
false
false
@@ -321,17 +321,23 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

   
+  
+   
+  
   

   
@@ -393,23 +399,26 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -507,6 +516,9 @@
   

   
+  
+   
+  
   

   
@@ -1039,14 +1051,14 @@

   
  Credits
-1346 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-06-14 16:54:11.
+1352 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2018-07-27 09:55:44.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1066,13 +1078,13 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 24344Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 24493Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 16101Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 16229Joined: 
2000-10-04
   
   
-   *Noel GrandinCommits: 
9508Joined: 2011-12-12
+   *Noel GrandinCommits: 
9830Joined: 2011-12-12
   
  
  
@@ -1080,10 +1092,10 @@
Ivo

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - configure.ac

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit 19e4c9da2553458c62dfc5d75df3a6624ec63144
Author: Christian Lohmaier 
AuthorDate: Fri Jul 27 15:16:41 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Jul 27 15:16:41 2018 +0200

bump product version to 6.0.6.2.0+

Change-Id: I5a88b75561bdc7e36aa8f734c3509e9f418790ba

diff --git a/configure.ac b/configure.ac
index c58139a96459..c656a4e40f10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.6.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.6.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.0.6.2'

2018-07-27 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.0.6.2' created by Christian Lohmaier 
 at 2018-07-27 13:16 +

Tag libreoffice-6.0.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbWxsfAAoJEPQ0oe+v7q6jAZEQAMIfN49KFDCkWTCKr9P9GVlA
UKtXL6m7q8pNzDFjBvo3NYvSwgf+I3xNhisjfCWps7CMSV261iRAViD8MsDmsPez
nkPvvnhMs2fTpM0hTCkLe/GbM+NSq9QCiOgSyv/EeXudyjsjZAtVLQ+BhMDMJ1E7
EML6sDkuxuCaKmZ7CkQDfQVA8pqa8Hs5E76pGl6/ndSB4RboAtb2VN1Cs8hx9ez8
HM0P94XPO8fM4vcUv+ZS/DMJ3tSJCCF1nU5RQHXKArdaxrS1neRgyZ/EZphvMPZc
uuTOFs3zdO/pQGT19Zp4oMSRMHLZ8EPgbh4p66321IIqXQ4ymoV+9wpnq+sD6N2j
2PHo2/2COnd5orh7sIsR0ZYOGDaZmY6Igx1QjLHQhFqDpskkWWh+Bk5G8VZXC/VB
JNELZvjk2Zr+BHuEq8DVLS/vL5Dmu9vLhI5wcuqq6w6cnbiDDzslF8HfloZJwqZv
IgXqu+bwwP904fdOPBg6zHde1ob/oZOgzSOVT3zNXNLBncNNxuDwLLE8ua5dvZ6d
b2UTBkv8wvjyKCZFnMiQknyyjig3o/fglxQYBV/e5+8Jyn6zFn5wE3GmtfcmqWzw
4bo9q2V9bMvPSjaBZJVLMYUGGTWgasnMkBeJ6HtG2jnP/MiyNkiZC85kchrtPsCO
w72KBFHsxjvQ7LjPHiyv
=PHPH
-END PGP SIGNATURE-

Changes since cp-6.0-branch-point-341:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.0.6.2'

2018-07-27 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.0.6.2' created by Christian Lohmaier 
 at 2018-07-27 13:16 +

Tag libreoffice-6.0.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbWxsaAAoJEPQ0oe+v7q6j+RAP/ii//2SN7z1lCpyEfaKtIP/8
y2nGwdjvslfPX6cib/pKhgYlWEOLM5J5eGz171swOWzN7cax+zqiAsDM+62p68Jg
Z4l9qZseHkVlPmdf6B4PuhjJSyjZo4Rs3EqQS2wFJIH3jb5nFM1NrVgjE6tIq3Zf
3qMVx+8+0UnMsYEUvVB5N3HSApL1Tx4JlMx/6Z9PqI6ZDrjrKG1oXsvdL0PB+rnn
RE4Gc5KTDRqCsx9W9MyOP6/5+beEnVK8D/YvW2zBKXVtiK33xVHzYcpbIS9NYKp+
X3J15OBj4AE6HLsBDomgpglFYZHckO/8n+33RCf6R4rdp0LE1gufS3U4nF0zl9Is
S7TA5S4tYMocibPJmybUMLp8BIgzwTX/CNVsaoGUz7bQqeOqIlHhFDMT1YiIIEtC
bj53r0fL+9W8xmZu2/kSO9SyFjk2aCWibb18Jt3jiJ1zSkgAoqj1g4kxNiuIdGFt
lSl49g1d986HBBkbnuMJWGoCmBDHKGBpvWoHGDrFkRtvx1gBwpHNqRkLpn+UCyJT
2u/ZsIUdpDvN8gDHaEb15KM7i1dWS2LyqJZfdIWLAQ4D35oQ3qRYsQIP7hUpTiSO
CaHV+T6yVBoTGlTMZLO3OuSBC7M977NTjc9//glBjF03IrlDCcEJfpSvAzG+wQbC
RT8Tj6mouudSDosWYY3M
=HB5G
-END PGP SIGNATURE-

Changes since cp-6.0-6-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.0.6.2'

2018-07-27 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.0.6.2' created by Christian Lohmaier 
 at 2018-07-27 13:16 +

Tag libreoffice-6.0.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbWxsdAAoJEPQ0oe+v7q6jz6EP/iMp18RKJvwbTGFlSYisHqVN
5GJqy4q8zN0HWL64HxAMPmcAEIhiCjcefEdSJ+tX0MHwEHjxg5PVRcauOihZHVee
lWdtBv387gxNTUgI0hsHS5OlGOW6eeciB02xrA02akxZYFqOEY2h1A8mHe0Hzmv9
iZ8qkgCQveBKY9JLZe0cgk9ZEGL8SdnIiMBImaRJyPM/x8wa1ARblDhPVFExFSQl
bGc30Sc4QDdKYsSmfIdarnf26kl5t5hOQfowAGeqR4atpV/vJ2z5KJc81WVWVrMw
mD1jIHoeB/Sz1F41hGe/MNySH8EuvMXC1Blo+L2mfyXjZXC+oVGS8HAtFD6ohu+N
rvQzE/EVRvaQ997VdrSqZzWGIOP59M0E9g5KlhhTqpy0Qlgq8TWRTLeRBvH7lavJ
ar4p/LRpzkD+gbrcdxdy5xLErcoRvG0kR/LURiC0CG8EX1vkvFtm6pd66f6tfj7s
OI2+IN21bBTrFSOpG1ZOP29hSGrHWInsAzRTCsEFQil9B+UlEsyqzOEx75LSGxIj
Jz2UMJcyE+Cf0gE1Afr5naHoMnCT8hgU477ShA1qr1+d/+Bea6A94zDo/caBafc1
z6V294vQKagVvcBMS7uvCuntQ3IMfRyt5QJG3kutbc9Io4f7tujuO0SkKkQ1/19h
7BQq9Ik6pnhT6S+4HTe5
=LzBE
-END PGP SIGNATURE-

Changes since libreoffice-6.0.6.1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.0.6.2'

2018-07-27 Thread Libreoffice Gerrit user

Tag 'libreoffice-6.0.6.2' created by Christian Lohmaier 
 at 2018-07-27 13:16 +

Tag libreoffice-6.0.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbWxsUAAoJEPQ0oe+v7q6jRxAP/jJvPxg4nxxL37zQMGR1gcHz
CMcOqW45ZZZ9MA3idGXFwylQqAStyAVrpwEiOCnbu3J9a+gLE4a3DEwKQD4JzT7i
HEN8AKBFptBbkXOx+L3JBXI3EAtlOdST+WVJvdyqSu/GN0S59GQdxzgCQIA6P3mS
/EOopFlTfhOBxMTfnsVzD3FO5YSOFWtzJPe7eFlrqragG43HSSUJYdhEaDoeyXGm
/ik05uX1e7wuNr/vfvMN04C6J7M5gZRTSf4VGbIvSDfuSV8HgNj77PCU37knCozx
J7CNsgMb8JBsB7A7iqvqDzc7/kCIOlRlZafX2/wN+UIbHPvHsl4jahiEyAVtpkzP
XWWUmdKaOFwhCKyfy4ZIq7RMWMUw0iNO00g/rn3k9Gy0THHiB/I5Xcf1eEyDqkuI
1hwAEAdFZH3L+qmrFQ1b2hIjKmd88ooCY7ZBjUxKSV0D3+TTnXv+3sfk3fQaWH3J
xgjlwgs5e76E27vhXkK3sS2m9xIjFUsPh3sbbvM6DfSwhhktRdE0MlDeXUq4BNFV
62sb/7g3Eft4R3wmxy2+NH20YjOUSJtx/H7ktJEdhFlHrXSPq9/sted9mERN9Sb/
8uKg9Nb3Y5G/CLn2iyy8Rh6Xgqxa+z7QBWR8FNnZLVJ7nxUKnuDYdjWg9IPDBh7N
SIx4yGKL3Qa3e7zQKw0K
=HJoC
-END PGP SIGNATURE-

Changes since cp-6.0-5-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How to insert extra and hidden information for each element of document via LibreOffice API?

2018-07-27 Thread Miklos Vajna

Hi,

On Tue, Jul 24, 2018 at 11:20:44AM +, MUNOZ JULHO Yupanqui 
 wrote:
> In the users mailing list, Regina Henschel, suggested me to use
> bookmarks. It is a good idea, but, if is possible, I want to hide this
> information.

Did you consider RDF annotations? See
.

Regards,

Miklos


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

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

2018-07-27 Thread Libreoffice Gerrit user

 slideshow/source/engine/activities/activitiesfactory.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9605b998438a62501f58c6e028f79b679629b333
Author: Mark Hung 
AuthorDate: Thu Jul 26 20:19:34 2018 +0800
Commit: Mark Hung 
CommitDate: Fri Jul 27 16:23:39 2018 +0200

tdf#76436 initialize maStartInterpolationValue.

Fix regrssion caused by 372c47309a192e67220913309fa1ccffdff8cde1,
where a from-to or from-by animation always interpolate with a
empty maStartInterpolationValue, ignoring original from value.

That also affect many animations, such as unexpected magnify effect
at the end of put-on-the-brake animation.

Change-Id: If63960816f2f284774c51e12be2fcac8c8a1b57e
Reviewed-on: https://gerrit.libreoffice.org/58109
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx 
b/slideshow/source/engine/activities/activitiesfactory.cxx
index dadd590257e0..1955be399fe1 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -208,6 +208,7 @@ public:
 maStartValue = *maFrom;
 maEndValue = maStartValue + *maBy;
 }
+maStartInterpolationValue = maStartValue;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/source/filter/xml/xmlimp.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit aca1bcb5a28c35de1b893388ec6327a66ce97ef7
Author: Caolán McNamara 
AuthorDate: Fri Jul 27 12:20:35 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 16:37:33 2018 +0200

ofz#9607 Abrt

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

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7370eba1f353..598d12fead74 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1893,16 +1893,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool 
TestImportDOCX(SvStream &rStream)
 {
 ret = xFilter->filter(aArgs);
 }
-catch (const css::io::IOException&)
-{
-}
-catch (const css::lang::IllegalArgumentException&)
-{
-}
-catch (const css::lang::WrappedTargetRuntimeException&)
-{
-}
-catch (const std::exception&)
+catch (...)
 {
 }
 xDocSh->SetLoading(SfxLoadedFlags::ALL);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 lotuswordpro/source/filter/lwplayout.cxx |   31 ---
 lotuswordpro/source/filter/lwplayout.hxx |   12 ++--
 2 files changed, 26 insertions(+), 17 deletions(-)

New commits:
commit d97dd0d7e9075f5cdb5f3b6a62256d0fdca6d425
Author: Caolán McNamara 
AuthorDate: Fri Jul 27 08:58:56 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 17:15:10 2018 +0200

ofz#9603 infinite recursion

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

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 487058cbb08b..5e548d1a6019 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -588,6 +588,7 @@ void LwpLayoutMisc::Read(LwpObjectStream* pStrm)
 LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* 
pStrm )
 : LwpVirtualLayout(objHdr, pStrm)
 , m_bGettingGeometry(false)
+, m_bGettingBackgroundStuff(false)
 {
 }
 
@@ -655,21 +656,28 @@ rtl::Reference 
LwpMiddleLayout::GetBasedOnStyle()
 * @descr:   Get the geometry of current layout
 *
 */
-LwpLayoutGeometry* LwpMiddleLayout::Geometry()
+LwpLayoutGeometry* LwpMiddleLayout::GetGeometry()
 {
+if (m_bGettingGeometry)
+throw std::runtime_error("recursion in layout");
+m_bGettingGeometry = true;
+
+LwpLayoutGeometry* pRet = nullptr;
 if( !m_LayGeometry.IsNull() )
 {
-return dynamic_cast (m_LayGeometry.obj().get());
+pRet = dynamic_cast (m_LayGeometry.obj().get());
 }
 else
 {
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
 {
-return pLay->GetGeometry();
+pRet = pLay->GetGeometry();
 }
 }
-return nullptr;
+
+m_bGettingGeometry = false;
+return pRet;
 }
 
 /**
@@ -818,21 +826,30 @@ LwpBorderStuff* LwpMiddleLayout::GetBorderStuff()
 */
 LwpBackgroundStuff* LwpMiddleLayout::GetBackgroundStuff()
 {
+if (m_bGettingBackgroundStuff)
+throw std::runtime_error("recursion in layout");
+m_bGettingBackgroundStuff = true;
+
+LwpBackgroundStuff* pRet = nullptr;
+
 if(m_nOverrideFlag & OVER_BACKGROUND)
 {
 LwpLayoutBackground* pLayoutBackground = 
dynamic_cast(m_LayBackgroundStuff.obj().get());
-return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() : 
nullptr;
+pRet = pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() : 
nullptr;
 }
 else
 {
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpMiddleLayout* pLay = 
dynamic_cast(xBase.get()))
 {
-return pLay->GetBackgroundStuff();
+pRet = pLay->GetBackgroundStuff();
 }
 }
-return nullptr;
+
+m_bGettingBackgroundStuff = false;
+return pRet;
 }
+
 /**
  * @descr:  create xfborder.
 */
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index 2d0694b67864..98d7ca515906 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -347,19 +347,11 @@ class LwpMiddleLayout : public LwpVirtualLayout
 public:
 LwpMiddleLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
 virtual ~LwpMiddleLayout() override;
-LwpLayoutGeometry* GetGeometry()
-{
-if (m_bGettingGeometry)
-throw std::runtime_error("recursion in layout");
-m_bGettingGeometry = true;
-auto pRet = Geometry();
-m_bGettingGeometry = false;
-return pRet;
-}
 double GetGeometryHeight();
 double GetGeometryWidth();
 LwpBorderStuff* GetBorderStuff();
 LwpBackgroundStuff* GetBackgroundStuff();
+LwpLayoutGeometry* GetGeometry();
 enumXFTextDir GetTextDirection();
 XFBorders* GetXFBorders();
 LwpColor* GetBackColor();
@@ -402,7 +394,6 @@ protected:
 virtual bool IsAutoGrowDown() override;
 private:
 LwpObjectID m_BasedOnStyle;
-LwpLayoutGeometry* Geometry();
 protected:
 enum
 {
@@ -422,6 +413,7 @@ protected:
 LwpObjectID m_LayBackgroundStuff;
 LwpObjectID m_LayExtBorderStuff;
 boolm_bGettingGeometry;
+boolm_bGettingBackgroundStuff;
 public:
 LwpObjectID& GetContent() { return m_Content; }
 LwpTabOverride* GetTabOverride();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/CppunitTest_sc_headerfootercontentobj.mk

2018-07-27 Thread Libreoffice Gerrit user

 sc/CppunitTest_sc_headerfootercontentobj.mk |   31 
 1 file changed, 1 insertion(+), 30 deletions(-)

New commits:
commit 36e1f6ebf0c74b4b90bbf1aab8d9ab69b8746f3a
Author: Jens Carl 
AuthorDate: Fri Jul 27 03:25:10 2018 +
Commit: Jens Carl 
CommitDate: Fri Jul 27 17:39:00 2018 +0200

Remove obsolete (cargo-cult copied) dependencies

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

diff --git a/sc/CppunitTest_sc_headerfootercontentobj.mk 
b/sc/CppunitTest_sc_headerfootercontentobj.mk
index d8f13f4f66d7..a46b53029211 100644
--- a/sc/CppunitTest_sc_headerfootercontentobj.mk
+++ b/sc/CppunitTest_sc_headerfootercontentobj.mk
@@ -18,43 +18,14 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,sc_headerfootercontentobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_headerfootercontentobj, \
-   basegfx \
-   comphelper \
cppu \
-   cppuhelper \
-   drawinglayer \
-   editeng \
-   for \
-   forui \
-   i18nlangtag \
-   msfilter \
-   oox \
sal \
-   salhelper \
-   sax \
-   sb \
-   sc \
-   sfx \
-   sot \
subsequenttest \
-   svl \
-   svt \
-   svx \
-   svxcore \
test \
-   tk \
-   tl \
-   ucbhelper \
unotest \
-   utl \
-   vbahelper \
-   vcl \
-   xo \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,sc_headerfootercontentobj,\
-   -I$(SRCDIR)/sc/source/ui/inc \
-   -I$(SRCDIR)/sc/inc \
$$(INCLUDE) \
 ))
 
@@ -64,7 +35,7 @@ $(eval $(call 
gb_CppunitTest_use_ure,sc_headerfootercontentobj))
 $(eval $(call gb_CppunitTest_use_vcl,sc_headerfootercontentobj))
 
 $(eval $(call gb_CppunitTest_use_components,sc_headerfootercontentobj,\
-$(sc_unoapi_common_components) \
+   $(sc_unoapi_common_components) \
 ))
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_headerfootercontentobj))
___
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' - canvas/Library_vclcanvas.mk canvas/source

2018-07-27 Thread Libreoffice Gerrit user

 canvas/Library_vclcanvas.mk|5 -
 canvas/source/vcl/spritehelper.cxx |6 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a44843e8e324e00995dd4be0bd3244c85d91bd85
Author: Miklos Vajna 
AuthorDate: Fri Jul 20 14:09:36 2018 +0200
Commit: Michael Meeks 
CommitDate: Fri Jul 27 17:46:08 2018 +0200

tdf#118107 canvas opengl: avoid assertion failure with negative widths

In case an Impress shape has a "Fade in and Swivel" animation attached,
canvas calls OutputDevice::DrawBitmapEx() with a negative width. This
results in a call to OutputDevice::DrawDeviceAlphaBitmap(), which
asserts that the height/width is not negative.

Fix the problem by transforming the bitmap before calling
OutputDevice::DrawBitmapEx() in the GL case, similarly to how "complex"
transformations are handled already.

(cherry picked from commit 76b43425d764fbc9bf4dac52054b1d94344f26b0)

Change-Id: I65ccc8a984132c5921d6096bfe9c7a8fcfacd8dd
Reviewed-on: https://gerrit.libreoffice.org/57781
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 805cefc43c77..6ff19eba6130 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,vclcanvas))
 
 $(eval $(call 
gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
 
-$(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
+$(eval $(call gb_Library_use_externals,vclcanvas,\
+   boost_headers \
+   epoxy \
+))
 
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
diff --git a/canvas/source/vcl/spritehelper.cxx 
b/canvas/source/vcl/spritehelper.cxx
index 9424d4ec54b9..be70d6e2ff6b 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -182,8 +183,11 @@ namespace vclcanvas
 
 if( !bIdentityTransform )
 {
+// Avoid the trick with the negative width in the OpenGL case,
+// OutputDevice::DrawDeviceAlphaBitmap() doesn't like it.
 if( !::basegfx::fTools::equalZero( aTransform.get(0,1) ) ||
-!::basegfx::fTools::equalZero( aTransform.get(1,0) ) )
+!::basegfx::fTools::equalZero( aTransform.get(1,0) ) ||
+OpenGLHelper::isVCLOpenGLEnabled())
 {
 // "complex" transformation, employ affine
 // transformator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild

2018-07-27 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/macosx.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 922f6c6244631cbd61c6a683e88c4040af35a614
Author: Jim Jagielski 
AuthorDate: Fri Jul 27 14:59:56 2018 +
Commit: Jim Jagielski 
CommitDate: Fri Jul 27 14:59:56 2018 +

Force .jnilibs to be folded in. Patch via Damjan.

NOTE: AUXTARGETS is there to add additional targets that must/should
delivered w/ the original libs. Good Tribal Knowledge

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index de50050fce45..5312895fdb7b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -387,6 +387,9 @@ $(call gb_Library_get_target,$(1)) \
 $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS +=  \
$(call gb_Library_get_target,$(1)).$(gb_UDK_MAJOR)
 endif
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
+   $(patsubst %.dylib,%.jnilib,$(call gb_Library_get_target,$(1)))
 
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/mst/sw_redlinehide_2'

2018-07-27 Thread Libreoffice Gerrit user

New branch 'private/mst/sw_redlinehide_2' available with the following commits:
commit 4bdc98547c33b74f6451baf854d88a7d32f06ce3
Author: Michael Stahl 
Date:   Fri Jul 27 18:25:59 2018 +0200

sw_redlinehide_2: improve SwRootFrame::SetHideRedlines()

Change-Id: If54585d20bbe0fbf5c071e3a96737015d7d62c05

commit 03077e560d4cec9f074563a907081c522faad948
Author: Michael Stahl 
Date:   Fri Jul 27 18:43:37 2018 +0200

sw_redlinehide_2: fix CanSkipOverRedline crash

Change-Id: Ia7efc0639650af570acc98f62f9f36f683beb1fa

commit 1410f7227a56f16bf79823252863ffd1d11bb4a5
Author: Michael Stahl 
Date:   Fri Jul 27 17:38:43 2018 +0200

sw_redlinehide_2: SwContentNode::DelFrames(): ignore merged...

... frames unless the node is the owner / first node of the frame.

Not sure what should happen if the node *is* the first node of a merged
frame; let's not create a frame for the 2nd... node for now.

Change-Id: I5b105d0745d67012bbbdf778811e417efaae8490

commit cef927195031891359bf87f4042bc7ad58a3555a
Author: Michael Stahl 
Date:   Fri Jul 27 17:35:21 2018 +0200

sw_redlinehide_2: InsertCnt_(): skip merged nodes

Change-Id: I3363c787779364e771e0406b0f9e90b0337bf03d

commit 46548ff3cb0012fd81103d13bee848b70859d586
Author: Michael Stahl 
Date:   Fri Jul 27 17:33:47 2018 +0200

sw_redlinehide_2: assert that SwContentFrame is created only when allowed

Change-Id: I1b42b386eb7323dcbf40d4086276bd0a74d581b9

commit 47430b92c958a057670c5ef8f13117b47c0c5c58
Author: Michael Stahl 
Date:   Fri Jul 27 16:07:15 2018 +0200

sw_redlinehide_2: SetMergedPara must ensure that frame is...

... registered as listener on a node somehow.

Change-Id: I1100726d3dd9cf46e1cc48e992cc5a1a0187b7c5

commit 0dd629ce3e3c35be0a0e1504223da03cc18015eb
Author: Michael Stahl 
Date:   Fri Jul 27 16:04:48 2018 +0200

sw_redlinehide_2: SwView::GetState must be in sync with Execute

Because FN_REDLINE_SHOW is TOGGLE so it reads the existing state to
invert it.

Change-Id: I43053c28085722c869f1e8b0cb989d0956c2e00b

commit 9a7804d2c8d59c8347697d6b439daee94fa62bc0
Author: Michael Stahl 
Date:   Thu Jul 26 16:12:57 2018 +0200

sw: assert in SwFrameFormat::MakeFrames()

This is an oddity, where the base class has an unimplemented
MakeFrames() but an implemented DelFrames(), where the latter is relied
upon by subclasses that do override MakeFrames().

Not sure if there are subclasses that don't override MakeFrames()
but which still require this base class DelFrames().

Change-Id: I5bc8a8d5cb99c9ce80fc14ef33a038e9d88eaecd

commit 7a0fe79b61a168683f89c048c569ab91f23f043f
Author: Michael Stahl 
Date:   Thu Jul 26 14:12:53 2018 +0200

sw_redlinehide_2: add *another* flag to DocumentRedlineManager

Sadly the SwRootFrame is created too late, so we have to store the
"ShowRedlineChanges" value that is imported from ODF settings.xml
somewhere, and we can't store it in SfxBaseModel::setViewData() because
it's not in "Views" map.

Change-Id: I30eefcb0262048f7141a719917aff77182765946

commit 1fa7905733ee1da0c3ed467b66113fbde42bfac8
Author: Michael Stahl 
Date:   Thu Jul 26 14:01:53 2018 +0200

sw: convert some obvious asserts in MakeFrames/InsertCnt_

Those are postconditions of SwNode2Lay

Change-Id: If5af97cb0fb050c95690796bcd708a31a1bdf49f

commit 93c3ab2ce1f32d3e53a15e80a8dcbdaee249fb3f
Author: Michael Stahl 
Date:   Wed Jul 25 15:37:58 2018 +0200

sw: convert obvious asserts in SwNode2Lay

Change-Id: Ib3a4d6071ad03e68385ef5be74427282d374e966

commit c24e49b02028f4c32fc2dc9145c8b9054f05e982
Author: Michael Stahl 
Date:   Tue Jul 24 17:00:10 2018 +0200

sw: disambiguate SwNode2Layout

For the first constructor, only RestoreUpperFrames is ever called, while
all of the other methods are called on instances created by the second
constructor.  Why aren't there 2 distinct classes?

Change-Id: I1c9e8432f127a71732c762104605680089039973

commit eadb64e7c95190d9c69bf27e84fe3bddb9b5ee55
Author: Michael Stahl 
Date:   Tue Jul 24 14:10:13 2018 +0200

sw: rename SwNode MakeFrame overloads

Change-Id: Ida4f6d55801292c509e577056140d9ff7608de9b

commit cbcc1bceefd01b30e47488b01cdfa2f3346dab45
Author: Michael Stahl 
Date:   Mon Jul 23 17:23:32 2018 +0200

sw_redlinehide_2 more invalidations

Change-Id: Ie9d136f58ea4d81d76459663fbb70c9f07203fe2

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

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

2018-07-27 Thread Libreoffice Gerrit user

 svx/source/unodraw/UnoGraphicExporter.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit b197a4488adcf37b5460f5f7a5edc8adff0edabb
Author: Miklos Vajna 
AuthorDate: Fri Jul 27 15:23:18 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 19:51:25 2018 +0200

svx UnoGraphicExporter: allow a custom AA just for that particular export

This has an effect for text only since the cairo text renderer no longer
ignores the "disable AA" requests.

To use it, instantiate com.sun.star.drawing.GraphicExportFilter, call
its filter() method with an argument that has a FilterData, which has an
AntiAliasing sub-key with a boolean value.

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

diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index ffb4675e6500..e5a410b07f54 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -108,6 +108,8 @@ namespace {
 FractionmaScaleX;
 FractionmaScaleY;
 
+TriState meAntiAliasing = TRISTATE_INDET;
+
 explicit ExportSettings(const SdrModel* pSdrModel);
 };
 
@@ -584,6 +586,12 @@ void GraphicExporter::ParseSettings( const Sequence< 
PropertyValue >& aDescripto
 if( pDataValues->Value >>= nVal )
 rSettings.maScaleY = Fraction( 
rSettings.maScaleY.GetNumerator(), nVal );
 }
+else if (pDataValues->Name == "AntiAliasing")
+{
+bool bAntiAliasing;
+if (pDataValues->Value >>= bAntiAliasing)
+rSettings.meAntiAliasing = bAntiAliasing ? 
TRISTATE_TRUE : TRISTATE_FALSE;
+}
 
 pDataValues++;
 }
@@ -1020,7 +1028,16 @@ sal_Bool SAL_CALL GraphicExporter::filter( const 
Sequence< PropertyValue >& aDes
 
 ErrCode nStatus = ERRCODE_NONE;
 if (!maGraphic)
+{
+SvtOptionsDrawinglayer aOptions;
+bool bAntiAliasing = aOptions.IsAntiAliasing();
+if (aSettings.meAntiAliasing != TRISTATE_INDET)
+// This is safe to do globally as we own the solar mutex.
+aOptions.SetAntiAliasing(aSettings.meAntiAliasing == 
TRISTATE_TRUE);
 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? 
ERRCODE_NONE : ERRCODE_GRFILTER_FILTERERROR;
+if (aSettings.meAntiAliasing != TRISTATE_INDET)
+aOptions.SetAntiAliasing(bAntiAliasing);
+}
 
 if( nStatus == ERRCODE_NONE )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 svl/source/numbers/zforscan.cxx |   47 
 1 file changed, 24 insertions(+), 23 deletions(-)

New commits:
commit e545e16d043cb583156abf9a531b4dd2542959b5
Author: Caolán McNamara 
AuthorDate: Fri Jul 27 12:10:22 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 19:52:23 2018 +0200

ofz#7960 tight OUString concat loop causes libfuzzer oom

it doesn't get a chance to release memory and falls over with
an oom. Or something like that anyway.

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

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ea9e24236b4c..debfc1e70370 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -815,7 +815,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 const LocaleDataWrapper* pLoc = pFormatter->GetLocaleData();
 short eType = 0;
 ScanState eState = SsStart;
-sSymbol.clear();
+OUStringBuffer sSymbolBuffer;
 while ( nPos < rStr.getLength() && eState != SsStop )
 {
 sal_Unicode cToken = rStr[nPos++];
@@ -858,28 +858,28 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 case ':':
 case '-':
 eType = NF_SYMBOLTYPE_DEL;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 eState = SsStop;
 break;
 case '*':
 eType = NF_SYMBOLTYPE_STAR;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 eState = SsGetStar;
 break;
 case '_':
 eType = NF_SYMBOLTYPE_BLANK;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 eState = SsGetBlank;
 break;
 case '"':
 eType = NF_SYMBOLTYPE_STRING;
 eState = SsGetString;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 break;
 case '\\':
 eType = NF_SYMBOLTYPE_STRING;
 eState = SsGetChar;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 break;
 case '$':
 case '+':
@@ -887,7 +887,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 case ')':
 eType = NF_SYMBOLTYPE_STRING;
 eState = SsStop;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 break;
 default :
 if (StringEqualsChar( pFormatter->GetNumDecimalSep(), cToken) 
||
@@ -898,7 +898,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 {
 // Another separator than pre-known ASCII
 eType = NF_SYMBOLTYPE_DEL;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 eState = SsStop;
 }
 else if ( pChrCls->isLetter( rStr, nPos-1 ) )
@@ -923,7 +923,7 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 if ( bCurrency )
 {
 eState = SsGetWord;
-sSymbol += OUStringLiteral1(cToken);
+sSymbolBuffer.append(OUStringLiteral1(cToken));
 }
 else
 {
@@ -936,13 +936,13 @@ short ImpSvNumberformatScan::Next_Symbol( const OUString& 
rStr,
 {
 nLen = sEnglishKeyword[eType].getLength();
 // Use the locale's General keyword name, not 
uppercase.
-sSymbol = (eType == NF_KEY_GENERAL ? 
sNameStandardFormat : sKeyword[eType]);
+sSymbolBuffer = (eType == NF_KEY_GENERAL ? 
sNameStandardFormat : sKeyword[eType]);
 }
 else
 {
 nLen = sKeyword[eType].getLength();
 // Preserve a locale's keyword's case as 
entered.
-sSymbol = rStr.copy( nPos-1, nLen);
+sSymbolBuffer = rStr.copy( nPos-1, nLen);
 }
 if ((eType ==

[SOLVED]Re: Is there someone who successfully make their own build of LibreOffice with Visual Studio 15.8.0 Preview 3.0 ?

2018-07-27 Thread himajin100000

I've updated my environment to Visual Studio 15.8 Preview 5.0 and now I 
successfully built my own build.

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

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

2018-07-27 Thread Libreoffice Gerrit user

 include/vcl/settings.hxx  |3 +++
 svx/source/unodraw/UnoGraphicExporter.cxx |   14 ++
 vcl/source/app/settings.cxx   |   19 +++
 vcl/unx/generic/gdi/cairotextrender.cxx   |5 -
 4 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit e6538f5bdd876911ea30f84a6512c03908e620fd
Author: Miklos Vajna 
AuthorDate: Fri Jul 27 17:40:31 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 20:52:17 2018 +0200

tdf#118966 vcl: add a flag to determine if AA of fonts is used from the 
system

This is on by default (as there are loads of vcl users who expect font
AA working even if the default is off and they don't enable it), but the
svx UnoGraphicExporter disables it to make everyone happy.

The reason in practice AA was on by default is that the gtk backend uses
the system settings in GtkInstance::GetCairoFontOptions() (and not the
AA setting from the UI), and lclGetSystemTextAntiAliasMode() does the
same on Windows (at least in the direct write case). So now these
defaults again have higher priority than leaving the vcl-level default
unchanged.

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

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index a004b23e8ebc..6eb7be25d438 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -409,6 +409,9 @@ public:
 voidSetUseSystemUIFonts( bool 
bUseSystemUIFonts );
 boolGetUseSystemUIFonts() const;
 
+void SetUseFontAAFromSystem(bool bUseFontAAFromSystem);
+bool GetUseFontAAFromSystem() const;
+
 voidSetUseFlatBorders( bool bUseFlatBorders );
 boolGetUseFlatBorders() const;
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index e5a410b07f54..fc3fb3b22eb9 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1031,12 +1031,26 @@ sal_Bool SAL_CALL GraphicExporter::filter( const 
Sequence< PropertyValue >& aDes
 {
 SvtOptionsDrawinglayer aOptions;
 bool bAntiAliasing = aOptions.IsAntiAliasing();
+AllSettings aAllSettings = Application::GetSettings();
+StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
+bool bUseFontAAFromSystem = aStyleSettings.GetUseFontAAFromSystem();
 if (aSettings.meAntiAliasing != TRISTATE_INDET)
+{
 // This is safe to do globally as we own the solar mutex.
 aOptions.SetAntiAliasing(aSettings.meAntiAliasing == 
TRISTATE_TRUE);
+// Opt in to have AA affect font rendering as well.
+aStyleSettings.SetUseFontAAFromSystem(false);
+aAllSettings.SetStyleSettings(aStyleSettings);
+Application::SetSettings(aAllSettings);
+}
 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? 
ERRCODE_NONE : ERRCODE_GRFILTER_FILTERERROR;
 if (aSettings.meAntiAliasing != TRISTATE_INDET)
+{
 aOptions.SetAntiAliasing(bAntiAliasing);
+aStyleSettings.SetUseFontAAFromSystem(bUseFontAAFromSystem);
+aAllSettings.SetStyleSettings(aStyleSettings);
+Application::SetSettings(aAllSettings);
+}
 }
 
 if( nStatus == ERRCODE_NONE )
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4354ff573bee..0dc2558ab36a 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -168,6 +168,11 @@ struct ImplStyleData
 StyleSettingsOptionsmnOptions;
 boolmbHighContrast;
 boolmbUseSystemUIFonts;
+/**
+ * Disabling AA doesn't actually disable AA of fonts, instead it is taken
+ * from system settings.
+ */
+bool mbUseFontAAFromSystem;
 boolmbAutoMnemonic;
 TriStatemeUseImagesInMenus;
 boolmnUseFlatBorders;
@@ -582,6 +587,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
 mnOptions(rData.mnOptions),
 mbHighContrast(rData.mbHighContrast),
 mbUseSystemUIFonts(rData.mbUseSystemUIFonts),
+mbUseFontAAFromSystem(rData.mbUseFontAAFromSystem),
 mbAutoMnemonic(rData.mbAutoMnemonic),
 meUseImagesInMenus(rData.meUseImagesInMenus),
 mnUseFlatBorders(rData.mnUseFlatBorders),
@@ -697,6 +703,7 @@ void ImplStyleData::SetStandardStyles()
 mnFloatTitleHeight  = 13;
 mbHighContrast  = false;
 mbUseSystemUIFonts  = true;
+mbUseFontAAFromSystem = true;
 mnUseFlatBorders= false;
 mnUseFlatMenus  = false;
 mbPreferred

[Libreoffice-commits] core.git: desktop/source drawinglayer/source include/ucbhelper sfx2/source ucbhelper/source ucb/source

2018-07-27 Thread Libreoffice Gerrit user

 desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx  |5 -
 desktop/source/deployment/manager/dp_manager.cxx  |   10 --
 desktop/source/deployment/registry/component/dp_component.cxx |   13 --
 desktop/source/deployment/registry/dp_backend.cxx |2 
 desktop/source/deployment/registry/package/dp_package.cxx |   14 +--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |   12 +-
 drawinglayer/source/processor2d/vclpixelprocessor2d.hxx   |2 
 include/ucbhelper/content.hxx |2 
 sfx2/source/doc/docfile.cxx   |   44 +++---
 sfx2/source/doc/doctemplates.cxx  |   11 +-
 ucb/source/core/FileAccess.cxx|2 
 ucbhelper/source/client/content.cxx   |3 
 12 files changed, 48 insertions(+), 72 deletions(-)

New commits:
commit 53491f8a66d72176aab332983f9aff47ecd3d654
Author: Noel Grandin 
AuthorDate: Fri Jul 27 14:15:41 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 21:17:20 2018 +0200

loplugin:returnconstant in ucbhelper,drawinglayer

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

diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx 
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 4a0090456217..8ab299c8b46a 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -598,9 +598,10 @@ bool UpdateInstallDialog::Thread::download(OUString const 
& sDownloadURL, Update
 
 const OUString sTitle( StrTitle::getTitle( sourceContent ) );
 
-if (destFolderContent.transferContent(
+destFolderContent.transferContent(
 sourceContent, ::ucbhelper::InsertOperation::Copy,
-sTitle, css::ucb::NameClash::OVERWRITE ))
+sTitle, css::ucb::NameClash::OVERWRITE );
+
 {
 //the user may have cancelled the dialog because downloading took to 
long
 SolarMutexGuard g;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index 3618ec5cd4eb..3b6e66598c81 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -635,10 +635,9 @@ OUString PackageManagerImpl::insertToActivationLayer(
 sourceContent = ::ucbhelper::Content(
 buf.makeStringAndClear(), xCmdEnv, m_xComponentContext );
 }
-if (! destFolderContent.transferContent(
+destFolderContent.transferContent(
 sourceContent, ::ucbhelper::InsertOperation::Copy,
-title, NameClash::OVERWRITE ))
-throw RuntimeException( "UCB transferContent() failed!", nullptr );
+title, NameClash::OVERWRITE );
 
 
 // write to DB:
@@ -746,11 +745,10 @@ Reference 
PackageManagerImpl::addPackage(
 ::ucbhelper::Content docFolderContent;
 create_folder( &docFolderContent, m_context, xCmdEnv );
 // copy into document, first:
-if (! docFolderContent.transferContent(
+docFolderContent.transferContent(
 sourceContent, ::ucbhelper::InsertOperation::Copy,
 OUString(),
-NameClash::ASK /* xxx todo: ASK not needed? */))
-throw RuntimeException("UCB transferContent() failed!", 
nullptr );
+NameClash::ASK /* xxx todo: ASK not needed? */);
 // set media-type:
 ::ucbhelper::Content docContent(
 makeURL( m_context, title_enc ), xCmdEnv, m_xComponentContext 
);
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx 
b/desktop/source/deployment/registry/component/dp_component.cxx
index 40ccfd8f6bef..e92dffe5c52d 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -425,13 +425,9 @@ void BackendImpl::initServiceRdbFiles()
 m_commonRDB = m_commonRDB_orig == "common.rdb" ? OUString("common_.rdb") : 
OUString("common.rdb");
 if (oldRDB.get().is())
 {
-if (! cacheDir.transferContent(
+cacheDir.transferContent(
 oldRDB, ::ucbhelper::InsertOperation::Copy,
-m_commonRDB, NameClash::OVERWRITE ))
-{
-
-throw RuntimeException( "UCB transferContent() failed!", nullptr );
-}
+m_commonRDB, NameClash::OVERWRITE );
 oldRDB = ::ucbhelper::Content();
 }
 // switch native rdb:
@@ -446,10 +442,9 @@ void BackendImpl::initServiceRdbFiles()
 m_nativeRDB = (m_nativeRDB_orig == plt_rdb ) ? plt_rdb_ : plt_rdb;
 if (oldRDB.get().is())
 {
-if (! cacheDir.transferContent(
+

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

2018-07-27 Thread Libreoffice Gerrit user

 filter/source/msfilter/svdfppt.cxx  |4 ++--
 include/filter/msfilter/svdfppt.hxx |3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3e41c06607737e3ab91545644abe2761dcba1157
Author: Noel Grandin 
AuthorDate: Fri Jul 27 15:38:29 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 21:17:36 2018 +0200

use boost::optional for OUString instead of std::unique_ptr

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

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index d31da869b523..a7f5cd0fab9d 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6774,7 +6774,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, 
SdrPowerPointImport& rSdrPowerPointImport
 if 
(rPersistEntry.xHeaderFooterEntry->nAtom & 0x2)// auto date time
 
xEntry->SetDateTime(rPersistEntry.xHeaderFooterEntry->nAtom & 0xff);
 else
-xEntry->xString.reset(new 
OUString(rPersistEntry.xHeaderFooterEntry->pPlaceholder[nVal]));
+xEntry->xString = 
rPersistEntry.xHeaderFooterEntry->pPlaceholder[nVal];
 }
 }
 break;
@@ -6826,7 +6826,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, 
SdrPowerPointImport& rSdrPowerPointImport
 else if (!n)
 {
 // End of 
format string
-
xEntry->xString.reset(new OUString( aStr ));
+
xEntry->xString = aStr;
 break;
 }
 else if (!inquote)
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 044ad88b43d2..5600200334d9 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace boost {
 template  class optional;
@@ -495,7 +496,7 @@ struct MSFILTER_DLLPUBLIC PPTFieldEntry
 sal_uInt16  nTextRangeEnd;
 std::unique_ptr xField1;
 std::unique_ptr xField2;
-std::unique_ptr xString;
+boost::optional xString;
 
 PPTFieldEntry()
 : nPos(0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 cui/source/dialogs/zoom.cxx |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 59981d24e2aa4bb50c63f1f14deeb80d258fb847
Author: Muhammet Kara 
AuthorDate: Fri Jul 27 18:53:53 2018 +0300
Commit: Noel Grandin 
CommitDate: Fri Jul 27 21:21:27 2018 +0200

Merge identical conditional branches in ViewLayoutUserHdl

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

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 9ff5d03f9ace..a4d3bef88261 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -301,12 +301,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, 
weld::ToggleButton&, void)
 {
 m_bModified = true;
 
-if (m_xAutomaticBtn->get_active())
-{
-m_xColumnsEdit->set_sensitive(false);
-m_xBookModeChk->set_sensitive(false);
-}
-else if (m_xSingleBtn->get_active())
+if (m_xAutomaticBtn->get_active() || m_xSingleBtn->get_active())
 {
 m_xColumnsEdit->set_sensitive(false);
 m_xBookModeChk->set_sensitive(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 canvas/source/cairo/cairo_canvas.hxx |2 --
 canvas/source/directx/dx_canvas.hxx  |3 ---
 canvas/source/vcl/canvas.hxx |2 --
 3 files changed, 7 deletions(-)

New commits:
commit 8f817e953e57d2e055c770856dad35ffbdfd7935
Author: Muhammet Kara 
AuthorDate: Fri Jul 27 19:23:52 2018 +0300
Commit: Noel Grandin 
CommitDate: Fri Jul 27 21:21:43 2018 +0200

Remove unused type declaration CanvasRef

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

diff --git a/canvas/source/cairo/cairo_canvas.hxx 
b/canvas/source/cairo/cairo_canvas.hxx
index 3a5ec2cd0aa9..6de087c61894 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.hxx
@@ -141,8 +141,6 @@ namespace cairocanvas
  private:
 css::uno::Sequence< css::uno::Any >maArguments;
 };
-
-typedef ::rtl::Reference< Canvas > CanvasRef;
 }
 
 #endif
diff --git a/canvas/source/directx/dx_canvas.hxx 
b/canvas/source/directx/dx_canvas.hxx
index f4ec2f777122..61974735d1bf 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -99,9 +99,6 @@ namespace dxcanvas
 css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
 };
 
-typedef ::rtl::Reference< Canvas > CanvasRef;
-
-
 typedef ::cppu::WeakComponentImplHelper< css::rendering::XBitmapCanvas,
  css::rendering::XIntegerBitmap,
  css::rendering::XGraphicDevice,
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 6ce9b5e193b6..957e9c4822f2 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -113,8 +113,6 @@ namespace vclcanvas
 private:
 css::uno::Sequence< css::uno::Any >maArguments;
 };
-
-typedef ::rtl::Reference< Canvas > CanvasRef;
 }
 
 #endif
___
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' - 2 commits - sc/source

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/tool/interpr1.cxx |   48 ++-
 sc/source/core/tool/parclass.cxx |1 
 2 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit c20eb29560fa9d9e552c799203156c0742451eba
Author: Eike Rathke 
AuthorDate: Thu Jul 26 15:00:09 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Jul 27 21:49:45 2018 +0200

Related: tdf#91502 handle FORMULA() pCur->IsInForceArray() as well

... so using it in SUMPRODUCT() and other ForceArray context works
as expected.

Change-Id: I60197301edcd2c24f8cb0c5fcf4dc4699d9a6165
Reviewed-on: https://gerrit.libreoffice.org/58118
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 2008a520e429bc2581001d61b63ff934c2255be0)
Reviewed-on: https://gerrit.libreoffice.org/58175
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3eb8fab7b968..c0558c869ad4 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2759,7 +2759,7 @@ void ScInterpreter::ScFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
-if (bMatrixFormula)
+if (bMatrixFormula || pCur->IsInForceArray())
 {
 SCCOL nCol1, nCol2;
 SCROW nRow1, nRow2;
commit f3b221773c9a1afb88d4675c303f0f03a7ccaaea
Author: Eike Rathke 
AuthorDate: Thu Jul 26 14:47:57 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Jul 27 21:49:30 2018 +0200

Resolves: tdf#91502 handle ISFORMULA() in array context

Obtaining the usual matrix for iterated scalar values doesn't work
here because we don't want the formulas' results but whether there
are formulas at the referenced positions.

Change-Id: I7912f9019d21b803ca327cb022df2014d3cc5c5a
Reviewed-on: https://gerrit.libreoffice.org/58115
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit a44d1b8d47e0ef6645c7c5def1fe5d34d470ae0b)
Reviewed-on: https://gerrit.libreoffice.org/58174
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c83951d59b79..3eb8fab7b968 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2691,6 +2691,52 @@ void ScInterpreter::ScIsFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
+if (bMatrixFormula || pCur->IsInForceArray())
+{
+SCCOL nCol1, nCol2;
+SCROW nRow1, nRow2;
+SCTAB nTab1, nTab2;
+PopDoubleRef( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+if (nGlobalError != FormulaError::NONE)
+{
+PushError( nGlobalError);
+return;
+}
+if (nTab1 != nTab2)
+{
+PushIllegalArgument();
+return;
+}
+
+ScMatrixRef pResMat = GetNewMat( static_cast(nCol2 - 
nCol1 + 1),
+static_cast(nRow2 - nRow1 + 1), true);
+if (!pResMat)
+{
+PushError( FormulaError::MatrixSize);
+return;
+}
+
+/* TODO: we really should have a gap-aware cell iterator. */
+SCSIZE i=0, j=0;
+ScAddress aAdr( 0, 0, nTab1);
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+aAdr.SetCol(nCol);
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+aAdr.SetRow(nRow);
+ScRefCellValue aCell(*pDok, aAdr);
+pResMat->PutBoolean( (aCell.meType == 
CELLTYPE_FORMULA), i,j);
+++j;
+}
+++i;
+j = 0;
+}
+
+PushMatrix( pResMat);
+return;
+}
+SAL_FALLTHROUGH;
 case svSingleRef :
 {
 ScAddress aAdr;
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 7464dbf9a843..a4c3e7241087 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -158,6 +158,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocIndirect,{{ Value, Value   
  }, 0, Reference }},
 { ocIntercept,   {{ ForceArray, ForceArray 
  }, 0, Value }},
 { ocIntersect,   {{ Reference, Reference   
  }, 0, Reference }},
+{ ocIsFormula,   {{ Reference  
  }, 0, Value }},
 { ocIsRef,   {{ Reference

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

2018-07-27 Thread Libreoffice Gerrit user

 include/editeng/numitem.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3280281b8f766490688a6e27130418981ee31b05
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:50:14 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:12:11 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

(the SvxNumberType ctors/dtor update static nRefCount, so the copy ctor 
cannot
be defaulted)

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

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 520e12cfbdc5..9c434419058e 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -65,6 +65,7 @@ public:
 explicit SvxNumberType(SvxNumType nType = SVX_NUM_ARABIC);
 SvxNumberType(const SvxNumberType& rType);
 ~SvxNumberType();
+SvxNumberType & operator =(SvxNumberType const &) = default;
 
 OUStringGetNumStr( sal_Int32 nNo ) const;
 OUStringGetNumStr( sal_Int32 nNo, const css::lang::Locale& rLocale 
) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 include/editeng/colritem.hxx|1 +
 include/editeng/contouritem.hxx |1 +
 include/editeng/crossedoutitem.hxx  |1 +
 include/editeng/fhgtitem.hxx|1 +
 include/editeng/fontitem.hxx|1 +
 include/editeng/formatbreakitem.hxx |1 +
 include/editeng/frmdiritem.hxx  |2 ++
 include/editeng/justifyitem.hxx |2 ++
 include/editeng/keepitem.hxx|1 +
 include/editeng/langitem.hxx|1 +
 include/editeng/lrspitem.hxx|1 +
 include/editeng/opaqitem.hxx|1 +
 include/editeng/postitem.hxx|1 +
 include/editeng/protitem.hxx|1 +
 include/editeng/shaditem.hxx|1 +
 include/editeng/shdditem.hxx|2 +-
 include/editeng/sizeitem.hxx|1 +
 include/editeng/tstpitem.hxx|1 +
 include/editeng/udlnitem.hxx|1 +
 include/editeng/ulspitem.hxx|1 +
 include/editeng/wghtitem.hxx|1 +
 include/svx/algitem.hxx |2 ++
 sw/inc/fmtftntx.hxx |2 ++
 sw/inc/fmtornt.hxx  |2 ++
 sw/inc/paratr.hxx   |1 +
 sw/source/uibase/inc/envimg.hxx |1 +
 sw/source/uibase/inc/labimg.hxx |1 +
 27 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit dea2c65032eafb0398ffd10bcd3485499be17eb4
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 10:26:52 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:12:53 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

...in SfxPoolItem-derived classes that have a user-provided copy assignment 
op
(to override the explicitly deleted one of SfxPoolItem, cf.
727878a7d8ae25342db75173cc314fa330ccc077 "Remove unused copy assignment ops 
of
SfxPoolItem-derived classes"), so GCC 9 would warn about the 
implicitly-defined
copy ctor.  Mark all those with "SfxPoolItem copy function dichotomy" 
comments
so they can be found again should the odd design of SfxPoolItem ever be 
changed.

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

diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index d58ee5866817..49415c9a7b82 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -61,6 +61,7 @@ public:
 SetValue(rColor.GetValue());
 return *this;
 }
+SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function 
dichotomy
 
 const Color& GetValue() const
 {
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 34602f575ede..d0514da0d174 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -51,6 +51,7 @@ public:
 SetValue(rCont.GetValue());
 return *this;
 }
+SvxContourItem(SvxContourItem const &) = default; // SfxPoolItem copy 
function dichotomy
 };
 
 #endif
diff --git a/include/editeng/crossedoutitem.hxx 
b/include/editeng/crossedoutitem.hxx
index 536d1fd44f03..834f4840fb15 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -64,6 +64,7 @@ public:
 SetValue( rCross.GetValue() );
 return *this;
 }
+SvxCrossedOutItem(SvxCrossedOutItem const &) = default; // SfxPoolItem 
copy function dichotomy
 
 // enum cast
 FontStrikeout   GetStrikeout() const
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 799c17cc6da3..de6079c221f8 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -72,6 +72,7 @@ public:
 ePropUnit = rSize.ePropUnit;
 return *this;
 }
+SvxFontHeightItem(SvxFontHeightItem const &) = default; // SfxPoolItem 
copy function dichotomy
 
 void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100,
  MapUnit eUnit = MapUnit::MapRelative );
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index ddb974acbea5..224ebf682002 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -107,6 +107,7 @@ public:
 }
 
 SvxFontItem& operator=(const SvxFontItem& rFont);
+SvxFontItem(SvxFontItem const &) = default; // SfxPoolItem copy function 
dichotomy
 
 void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/editeng/formatbreakitem.hxx 
b/include/editeng/formatbreakitem.hxx
index 2a1292e4e4af..f26f516d72b9 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -41,6 +41,7 @@ public:
 inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/,
 const sal_uInt16 nWhich );
 inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
+SvxFormatBreakItem(SvxFormatBreakItem const &) = defaul

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

2018-07-27 Thread Libreoffice Gerrit user

 compilerplugins/clang/unreffun.cxx |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 446f1720577db659525e773211e2a1a3a19bb460
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 12:30:30 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:18:41 2018 +0200

Prevent loplugin:unreffun on explicitly defaulted special members

...as started to appear (with sufficiently recent Clang versions only, it
appears) after c5fcb476ac8eab18152a7f6d0487daa56231fcf8 "toolkit: avoid
-Werror=deprecated-copy (GCC trunk towards GCC 9)":

> [CXX] toolkit/source/controls/spinningprogress.cxx
> toolkit/source/controls/spinningprogress.cxx:38:5: error: Unreferenced 
externally invisible function definition [loplugin:unreffun]
> SpinningProgressControlModel(SpinningProgressControlModel &&) = 
default;
> 
^~~

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

diff --git a/compilerplugins/clang/unreffun.cxx 
b/compilerplugins/clang/unreffun.cxx
index bfd48b328300..629e369dadc7 100644
--- a/compilerplugins/clang/unreffun.cxx
+++ b/compilerplugins/clang/unreffun.cxx
@@ -51,6 +51,19 @@ Decl const * getPreviousNonFriendDecl(Decl const * decl) {
 }
 }
 
+bool isSpecialMemberFunction(FunctionDecl const * decl) {
+if (auto const ctor = dyn_cast(decl)) {
+return ctor->isDefaultConstructor() || ctor->isCopyOrMoveConstructor();
+}
+if (isa(decl)) {
+return true;
+}
+if (auto const meth = dyn_cast(decl)) {
+return meth->isCopyAssignmentOperator() || 
meth->isMoveAssignmentOperator();
+}
+return false;
+}
+
 class UnrefFun: public RecursiveASTVisitor, public loplugin::Plugin {
 public:
 explicit UnrefFun(loplugin::InstantiationData const & data): Plugin(data) 
{}
@@ -141,6 +154,14 @@ bool UnrefFun::VisitFunctionDecl(FunctionDecl const * 
decl) {
 {
 return true;
 }
+if (canon->isExplicitlyDefaulted() && isSpecialMemberFunction(canon)) {
+// If a special member function is explicitly defaulted on the first 
declaration, assume
+// that its presence is always due to some interface design 
consideration, not to explicitly
+// request a definition that might be worth to flag as unused (and 
C++20 may extend
+// defaultability beyond special member functions to comparison 
operators, therefore
+// explicitly check here for special member functions only):
+return true;
+}
 LinkageInfo info(canon->getLinkageAndVisibility());
 if (info.getLinkage() == ExternalLinkage
 && hasCLanguageLinkageType(canon) && canon->isDefined()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/source/uibase/inc/colex.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 983664aea83914aa273c07e1e7dd3ddefec86e11
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 12:57:49 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:19:12 2018 +0200

Missing include (Windows --disable-pch)

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

diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index 38f534a1e573..b6db861c1829 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -57,8 +58,6 @@ public:
 void UpdateExample( const SfxItemSet& rSet );
 };
 
-class SwTextGridItem;
-
 class SW_DLLPUBLIC SwPageGridExample : public PageExample
 {
 std::unique_ptr pGridItem;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e06ec84a80ee7e8f493f0c032f1586cbcd2be533
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 13:00:40 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:20:04 2018 +0200

Mark workaround for compiler bug as such

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

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 72679c5a0e30..04484f007413 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -22,6 +22,8 @@ gb_CPUDEFS := -D_X86_=1
 
 include $(GBUILDDIR)/platform/com_MSC_defs.mk
 
+# Work around MSVC 2017 compiler bug (see comments at 

+# "Fix Win32 warning C4702: unreachable code":
 gb_CXXFLAGS += \
 $(if $(filter 0,$(gb_DEBUGLEVEL)),-wd4702) \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/qa/unit/datatransformation_test.cxx   |   19 
 sc/source/ui/dataprovider/datatransformation.cxx |   49 +++
 sc/source/ui/inc/datatransformation.hxx  |   16 +++
 3 files changed, 83 insertions(+), 1 deletion(-)

New commits:
commit 0c350906b1d6dc27383619dd3338fe28768f1c2e
Author: Vikas 
AuthorDate: Tue Jul 24 21:36:07 2018 +0530
Commit: Markus Mohrhard 
CommitDate: Sat Jul 28 01:04:24 2018 +0200

Added ReplaceNullTransformation

Change-Id: Ic233a9d13312568ac7f25f919d85ca776a47df88
Reviewed-on: https://gerrit.libreoffice.org/58151
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/datatransformation_test.cxx 
b/sc/qa/unit/datatransformation_test.cxx
index 00b6b69d4946..06d82181657c 100644
--- a/sc/qa/unit/datatransformation_test.cxx
+++ b/sc/qa/unit/datatransformation_test.cxx
@@ -51,6 +51,7 @@ public:
 void testNumberEven();
 void testNumberOdd();
 void testNumberSign();
+void testReplaceNull();
 
 CPPUNIT_TEST_SUITE(ScDataTransformationTest);
 CPPUNIT_TEST(testColumnRemove);
@@ -76,6 +77,7 @@ public:
 CPPUNIT_TEST(testNumberEven);
 CPPUNIT_TEST(testNumberOdd);
 CPPUNIT_TEST(testNumberSign);
+CPPUNIT_TEST(testReplaceNull);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -486,6 +488,23 @@ void ScDataTransformationTest::testNumberSign()
 CPPUNIT_ASSERT_EQUAL(-1.0, m_pDoc->GetValue(2, 3, 0));
 }
 
+void ScDataTransformationTest::testReplaceNull()
+{
+m_pDoc->SetString(2, 0, 0, "Berlin");
+m_pDoc->SetString(2, 1, 0, "");
+m_pDoc->SetString(2, 2, 0, "");
+m_pDoc->SetString(2, 3, 0, "Peking");
+
+sc::ReplaceNullTransformation aTransform({2}, "Empty");
+aTransform.Transform(*m_pDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Berlin"), m_pDoc->GetString(2, 0, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Empty"), m_pDoc->GetString(2, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Empty"), m_pDoc->GetString(2, 2, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("Peking"), m_pDoc->GetString(2, 3, 0));
+
+}
+
 ScDataTransformationTest::ScDataTransformationTest() :
 ScBootstrapFixture( "sc/qa/unit/data/dataprovider" ),
 m_pDoc(nullptr)
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx 
b/sc/source/ui/dataprovider/datatransformation.cxx
index 53d6745cb689..9efe3ed447e9 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -648,6 +648,55 @@ std::set NumberTransformation::getColumn() const
 {
 return mnCol;
 }
+
+ReplaceNullTransformation::ReplaceNullTransformation(const std::set 
nCol, const OUString sReplaceWith):
+mnCol(nCol),
+msReplaceWith(sReplaceWith)
+{
+}
+
+void ReplaceNullTransformation::Transform(ScDocument& rDoc) const
+{
+if (mnCol.empty())
+return;
+
+SCROW nEndRow = 0;
+for(auto& rCol : mnCol)
+{
+nEndRow = getLastRow(rDoc, rCol);
+}
+
+for(auto& rCol : mnCol)
+{
+for (SCROW nRow = 0; nRow < nEndRow; ++nRow)
+{
+CellType eType;
+rDoc.GetCellType(rCol, nRow, 0, eType);
+if (eType == CELLTYPE_NONE)
+{
+   // OUString aStr = rDoc.GetString(rCol, nRow, 0);
+   // if (aStr == "" || aStr.isEmpty())
+rDoc.SetString(rCol, nRow, 0, msReplaceWith);
+}
+}
+}
+
+}
+
+std::set ReplaceNullTransformation::getColumn() const
+{
+return mnCol;
+}
+
+OUString ReplaceNullTransformation::getReplaceString() const
+{
+return msReplaceWith;
+}
+
+TransformationType ReplaceNullTransformation::getTransformationType() const
+{
+ return TransformationType::REMOVE_NULL_TRANSFORMATION;
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/datatransformation.hxx 
b/sc/source/ui/inc/datatransformation.hxx
index 0096e0c5a623..48651699a4ef 100644
--- a/sc/source/ui/inc/datatransformation.hxx
+++ b/sc/source/ui/inc/datatransformation.hxx
@@ -29,7 +29,8 @@ enum class TransformationType
 SORT_TRANSFORMATION,
 TEXT_TRANSFORMATION,
 AGGREGATE_FUNCTION,
-NUMBER_TRANSFORMATION
+NUMBER_TRANSFORMATION,
+REMOVE_NULL_TRANSFORMATION
 };
 
 enum class TEXT_TRANSFORM_TYPE { TO_LOWER, TO_UPPER, CAPITALIZE, TRIM };
@@ -148,6 +149,19 @@ class SC_DLLPUBLIC NumberTransformation : public 
DataTransformation
 std::set getColumn() const;
 };
 
+class SC_DLLPUBLIC ReplaceNullTransformation : public DataTransformation
+{
+std::set mnCol;
+OUString msReplaceWith;
+
+public:
+ReplaceNullTransformation(const std::set nCol, const OUString 
sReplaceWith);
+virtual void Transform(ScDocument& rDoc) const override;
+virtual TransformationType getTransformationType() const override;
+std::set getColumn() const;
+OUString getReplaceString() const;
+};
+
 }
 
 #endif
___
Libreoffice-commits mailing list
li

[Libreoffice-commits] core.git: include/vcl offapi/com uitest/demo_ui vcl/source

2018-07-27 Thread Libreoffice Gerrit user

 include/vcl/uitest/uitest.hxx |8 
 offapi/com/sun/star/ui/test/XUITest.idl   |4 
 uitest/demo_ui/command_with_parameters.py |   24 
 vcl/source/uitest/uitest.cxx  |   19 +++
 vcl/source/uitest/uno/uitest_uno.cxx  |   10 ++
 5 files changed, 65 insertions(+)

New commits:
commit f458dabcaa18d66b054d00f5d9a389c06240f0eb
Author: Saurav Chirania 
AuthorDate: Mon Jul 23 14:32:24 2018 +0530
Commit: Markus Mohrhard 
CommitDate: Sat Jul 28 01:10:23 2018 +0200

uitest: support parameters when sending UNO commands

This patch introduces a new function to send parameters
with UNO commands in UI Tests and adds a test which
uses the function to change the color of text in writer.

Change-Id: Ic687872ab826b50360e1bd042d9668a9f6ddbf63
Reviewed-on: https://gerrit.libreoffice.org/57857
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 4031402e8fc0..1759ea7656b0 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -12,6 +12,11 @@
 #include 
 
 #include 
+#include 
+
+namespace com { namespace sun { namespace star {
+namespace beans { struct PropertyValue; }
+} } }
 
 class UIObject;
 
@@ -21,6 +26,9 @@ public:
 
 static bool executeCommand(const OUString& rCommand);
 
+static bool executeCommandWithParameters(const OUString& rCommand,
+const css::uno::Sequence< css::beans::PropertyValue >& rArgs);
+
 static bool executeDialog(const OUString& rCommand);
 
 static std::unique_ptr getFocusTopWindow();
diff --git a/offapi/com/sun/star/ui/test/XUITest.idl 
b/offapi/com/sun/star/ui/test/XUITest.idl
index f4926a19bd09..b8dba4f9a901 100644
--- a/offapi/com/sun/star/ui/test/XUITest.idl
+++ b/offapi/com/sun/star/ui/test/XUITest.idl
@@ -11,6 +11,7 @@
 #define __com_sun_star_ui_test_XUITest_idl__
 
 #include 
+#include 
 
 module com { module sun { module star { module ui { module test {
 
@@ -18,6 +19,9 @@ interface XUITest
 {
 boolean executeCommand([in] string command);
 
+boolean executeCommandWithParameters([in] string command,
+[in] com::sun::star::beans::PropertyValues propValues);
+
 boolean executeDialog([in] string command);
 
 XUIObject getTopFocusWindow();
diff --git a/uitest/demo_ui/command_with_parameters.py 
b/uitest/demo_ui/command_with_parameters.py
new file mode 100644
index ..3fd8c85e3ca7
--- /dev/null
+++ b/uitest/demo_ui/command_with_parameters.py
@@ -0,0 +1,24 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class CommandWithParametersTest(UITestCase):
+
+def test_text_color_change(self):
+
+self.ui_test.create_doc_in_start_center("writer")
+
+self.xUITest.executeCommandWithParameters(".uno:Color",
+mkPropertyValues({"Color": 16776960}))
+xWriterEdit = self.xUITest.getTopFocusWindow().getChild("writer_edit")
+type_text(xWriterEdit, "Libreoffice")
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx
index 658b8cf75a82..bf1f69bfe54b 100644
--- a/vcl/source/uitest/uitest.cxx
+++ b/vcl/source/uitest/uitest.cxx
@@ -25,6 +25,25 @@ bool UITest::executeCommand(const OUString& rCommand)
   css::beans::PropertyState_DIRECT_VALUE}});
 }
 
+bool UITest::executeCommandWithParameters(const OUString& rCommand,
+const css::uno::Sequence< css::beans::PropertyValue >& rArgs)
+{
+css::uno::Sequence< css::beans::PropertyValue > lNewArgs =
+{{"SynchronMode", -1, css::uno::Any(true),
+  css::beans::PropertyState_DIRECT_VALUE}};
+
+sal_uInt32 nArgs = rArgs.getLength();
+if ( nArgs > 0 )
+{
+sal_uInt32 nIndex( lNewArgs.getLength() );
+lNewArgs.realloc( lNewArgs.getLength()+rArgs.getLength() );
+
+for ( sal_uInt32 i = 0; i < nArgs; i++ )
+lNewArgs[nIndex++] = rArgs[i];
+}
+return comphelper::dispatchCommand(rCommand,lNewArgs);
+}
+
 bool UITest::executeDialog(const OUString& rCommand)
 {
 return comphelper::dispatchCommand(
diff --git a/vcl/source/uitest/uno/uitest_uno.cxx 
b/vcl/source/uitest/uno/uitest_uno.cxx
index a625e670667e..69d0c717a9bb 100644
--- a/vcl/source/uitest/uno/uitest_uno.cxx
+++ b/vcl/source/uitest/uno/uitest_uno.cxx
@@ -40,6 +40,9 @@ public:
 
 sal_Bool SAL_CALL executeCommand(const OUString& rCommand) override;
 
+sal_Bool SAL_CALL executeCommandWithPara

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/qa/extras/ooxmlexport/data/noDefault.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   28 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 +
 3 files changed, 35 insertions(+)

New commits:
commit a56e2bba046b569e8923a438996bc6185037d3ed
Author: Justin Luth 
AuthorDate: Fri Jul 27 07:22:02 2018 +0300
Commit: Justin Luth 
CommitDate: Sat Jul 28 06:16:38 2018 +0200

writerfilter: unit test that no w:default still uses "Normal"

Note: the unit test does NOT test the changes in
GetCurrentParaStyleName. That is just a logical change and this
unit test asserts the validity of the intention.

Word 2013 was used to confirm that Normal is used for styleless
paragraphs even if it is not marked as "default".

Change-Id: I405591b40ed9028b292e99ba2833c25a24e089ac
Reviewed-on: https://gerrit.libreoffice.org/58161
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/noDefault.docx 
b/sw/qa/extras/ooxmlexport/data/noDefault.docx
new file mode 100644
index ..56bc2669110a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/noDefault.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 5f8b5bb2a3b6..bb5d91500cb3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -479,6 +479,34 @@ DECLARE_OOXMLEXPORT_TEST(testOpenDocumentAsReadOnly, 
"open-as-read-only.docx")
 CPPUNIT_ASSERT(pTextDoc->GetDocShell()->IsSecurityOptOpenReadOnly());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testNoDefault, "noDefault.docx")
+{
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xCell->getText(), uno::UNO_QUERY);
+uno::Reference xParaEnum = 
xParaEnumAccess->createEnumeration();
+uno::Reference xPara(xParaEnum->nextElement(), 
uno::UNO_QUERY);
+
+// Row 1: color directly applied to the paragraph, overrides table and 
style colors
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x2E74B5), 
getProperty(getRun(xPara,1), "CharColor"));
+
+// Row2: (still part of firstRow table-style) ought to use the Normal 
style color, not the table-style color(5B9BD5)
+//xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY);
+//xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+//xParaEnum = xParaEnumAccess->createEnumeration();
+//xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+//CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_LIGHTMAGENTA), 
getProperty(getRun(xPara,1), "CharColor"));
+
+// Row 3+: Normal style still applied, even if nothing is specified with 
w:default="1"
+xCell.set(xTable->getCellByName("A3"), uno::UNO_QUERY);
+xParaEnumAccess.set(xCell->getText(), uno::UNO_QUERY);
+xParaEnum = xParaEnumAccess->createEnumeration();
+xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_LIGHTMAGENTA), 
getProperty(getRun(xPara,1), "CharColor"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testMarginsFromStyle, "margins_from_style.docx")
 {
 // tdf#118521 paragraphs with direct formatting of top or bottom margins 
have
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6bfb6d7b65b6..469d8d0ce1fd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -662,6 +662,13 @@ const OUString DomainMapper_Impl::GetCurrentParaStyleName()
 if ( pParaContext && pParaContext->isSet(PROP_PARA_STYLE_NAME) )
 pParaContext->getProperty(PROP_PARA_STYLE_NAME)->second >>= sName;
 
+// In rare situations the name might still be blank, so use the default 
style,
+// despite documentation that states, "If this attribute is not specified 
for any style,
+// then no properties shall be applied to objects of the specified type."
+// Word, however, assigns "Normal" style even in these situations.
+if ( !m_bInStyleSheetImport && sName.isEmpty() )
+sName = GetDefaultParaStyleName();
+
 return sName;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Windows Tinderbox Needed

2018-07-27 Thread Luke Benes

This week, I needed a daily Windows build to verify a bugfix, but found that 
none of the win tinderboxes are operational.  After reaching out to the 
owners, I learned that the only tinderbox that has been working for the past 
year, @42, “is really aging.”

Having a reliable Windows tinderbox is invaluable to QA. Over the years, I’ve 
used

https://dev-builds.libreoffice.org/daily/

builds to confirm hundreds bugs and verify fixes. And, I’m sure I’m not alone. 
Does TDF have hardware that could be repurposed for this?

 


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

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

2018-07-27 Thread Libreoffice Gerrit user

 sd/source/ui/unoidl/unopage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93baa280670367ef6246d837080706f2c80eab0b
Author: Noel Grandin 
AuthorDate: Fri Jul 27 21:20:13 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Jul 28 08:40:49 2018 +0200

tdf#118948 - Date format in Impress header/footer is lost when saving

regression from
commit 7d14555ef7e867c5b1a0e195e3ef056885697c59
convert SvxDateFormat to scoped enum

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

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 8749fa94d287..5afbce097cee 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1262,7 +1262,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const 
OUString& PropertyName )
 case WID_PAGE_DATETIMEFORMAT:
 {
 auto const & rSettings = GetPage()->getHeaderFooterSettings();
-sal_Int32 x = static_cast(rSettings.meDateFormat) & 
(static_cast(rSettings.meTimeFormat) << 4);
+sal_Int32 x = static_cast(rSettings.meDateFormat) | 
(static_cast(rSettings.meTimeFormat) << 4);
 aAny <<= x;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 external/pdfium/0001-Add-FPDFTextObj_GetFontSize-API.patch.patch.1  |   67 
++
 external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2   |   25 
---
 external/pdfium/0004-svx-support-PDF-text-color.patch.2 |   13 
-
 external/pdfium/0012-svx-import-processed-PDF-text.patch.2  |4 
 external/pdfium/0015-svx-set-the-font-name-of-imported-PDF-text.patch.2 |4 
 external/pdfium/UnpackedTarball_pdfium.mk   |2 
 6 files changed, 77 insertions(+), 38 deletions(-)

New commits:
commit f26ca9283beaa03c7155d567622281b952337488
Author: Miklos Vajna 
AuthorDate: Thu Jul 26 21:25:11 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 09:02:15 2018 +0200

pdfium: replace FPDFTextObj_GetFontSize() patch with backport

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

diff --git a/external/pdfium/0001-Add-FPDFTextObj_GetFontSize-API.patch.patch.1 
b/external/pdfium/0001-Add-FPDFTextObj_GetFontSize-API.patch.patch.1
new file mode 100644
index ..6c5dda58f76d
--- /dev/null
+++ b/external/pdfium/0001-Add-FPDFTextObj_GetFontSize-API.patch.patch.1
@@ -0,0 +1,67 @@
+From b9d88e52f8c1a4a27daab5739e6c777f2dbb655a Mon Sep 17 00:00:00 2001
+Date: Tue, 26 Jun 2018 15:12:48 +
+Subject: [PATCH] Add FPDFTextObj_GetFontSize() API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In contrast with FPDFText_GetFontSize(), this exposes the font size of
+the text object according to the text state, rather than the font size
+of a particular character.
+
+Change-Id: Iac88d1aea8fb6bb5522bdaf01363aa6d32025b8f
+Reviewed-on: https://pdfium-review.googlesource.com/35931
+Reviewed-by: Nicolás Peña Moreno 
+Commit-Queue: Nicolás Peña Moreno 
+---
+ fpdfsdk/fpdf_edit_embeddertest.cpp |  3 +++
+ fpdfsdk/fpdf_edittext.cpp  | 11 +++
+ fpdfsdk/fpdf_view_c_api_test.c |  1 +
+ public/fpdf_edit.h |  9 +
+ 4 files changed, 24 insertions(+)
+
+diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
+index a927e16e1..e339c2412 100644
+--- a/fpdfsdk/fpdf_edittext.cpp
 b/fpdfsdk/fpdf_edittext.cpp
+@@ -511,6 +511,17 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV 
FPDFText_GetMatrix(FPDF_PAGEOBJECT text,
+   return true;
+ }
+ 
++FPDF_EXPORT double FPDF_CALLCONV FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT 
text) {
++  if (!text)
++return 0;
++
++  CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
++  if (!pTextObj)
++return 0;
++
++  return pTextObj->GetFontSize();
++}
++
+ FPDF_EXPORT void FPDF_CALLCONV FPDFFont_Close(FPDF_FONT font) {
+   CPDF_Font* pFont = CPDFFontFromFPDFFont(font);
+   if (!pFont)
+diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
+index 6df5e3237..6e613bca0 100644
+--- a/public/fpdf_edit.h
 b/public/fpdf_edit.h
+@@ -1090,6 +1090,15 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV 
FPDFText_GetMatrix(FPDF_PAGEOBJECT text,
+double* e,
+double* f);
+ 
++// Experimental API.
++// Get the font size of a text object.
++//
++//   text - handle to a text.
++//
++// Returns the font size of the text object, measured in points (about 1/72
++// inch) on success; 0 on failure.
++FPDF_EXPORT double FPDF_CALLCONV FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT 
text);
++
+ // Close a loaded PDF font.
+ //
+ // font   - Handle to the loaded font.
+-- 
+2.16.4
+
diff --git a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2 
b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
index ef6649b5f4cb..e880d99b8619 100644
--- a/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
+++ b/external/pdfium/0002-svx-more-accurate-PDF-text-importing.patch.2
@@ -20,7 +20,7 @@ index 912df63..3244943 100644
  #include "core/fpdfapi/page/cpdf_form.h"
  #include "core/fpdfapi/page/cpdf_formobject.h"
  #include "core/fpdfapi/page/cpdf_imageobject.h"
-@@ -440,6 +441,26 @@ FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object,
+@@ -440,6 +441,16 @@ FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object,
pPageObj->Transform(matrix);
  }
  
@@ -34,23 +34,13 @@ index 912df63..3244943 100644
 +  return pTxtObj->CountChars();
 +}
 +
-+FPDF_EXPORT int FPDF_CALLCONV
-+FPDFTextObj_GetFontSize(FPDF_PAGEOBJECT text_object)
-+{
-+  if (!text_object)
-+return 0;
-+
-+  CPDF_TextObject* pTxtObj = static_cast(text_object);
-+  return pTxtObj->GetFontSize();
-+}
-+
  FPDF_EXPORT void FPDF_CALLCONV
  FPDFPageObj_SetBlendMode(FPDF_PAGEOBJECT page_object,
   FPDF_BYTESTRING blend_mode) {
 diff --git a/pdfium/public/fpdf_edit.h b/pdfium/public/fpdf_edit.h
 --- a/pdfium/public/fpdf_edit.h
 +++ b/pdfium/public/fpdf_edit.h
-@@ -1107,6 +1107,26 @@ FPDFPageObj_CreateTextObj(FPDF_

Re: Compiler baselines

2018-07-27 Thread Stephan Bergmann


On 26/07/18 18:10, slacka wrote:

devtoolset-7 for i386 is over here:

https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-i386/00756569-devtoolset-7/

Is that what you're looking for?


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

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/CppunitTest_sc_subsequent_filters_test.mk |2 ++
 sc/qa/unit/data/ods/vba_macro_functions.ods  |binary
 sc/qa/unit/subsequent_filters-test.cxx   |   15 +++
 3 files changed, 17 insertions(+)

New commits:
commit b45926a3a1dd89ffec3ed766ab5647604c23eec0
Author: Markus Mohrhard 
AuthorDate: Thu Jul 26 23:57:28 2018 +0200
Commit: Markus Mohrhard 
CommitDate: Fri Jul 27 09:18:30 2018 +0200

add test for tdf#109132

Change-Id: I115590658708bafc7c7778612251ad7eb716b30b
Reviewed-on: https://gerrit.libreoffice.org/58150
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk 
b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 2127e1e81f42..7be332992978 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -73,6 +73,7 @@ $(eval $(call 
gb_CppunitTest_use_vcl,sc_subsequent_filters_test))
 
 $(eval $(call gb_CppunitTest_use_components,sc_subsequent_filters_test,\
basic/util/sb \
+   basctl/util/basctl \
 chart2/source/chartcore \
 chart2/source/controller/chartcontroller \
 comphelper/util/comphelp \
@@ -95,6 +96,7 @@ $(eval $(call 
gb_CppunitTest_use_components,sc_subsequent_filters_test,\
 scaddins/source/datefunc/date \
 sc/util/sc \
 sc/util/scfilt \
+sc/util/vbaobj \
 sfx2/util/sfx \
 sot/util/sot \
 svl/util/svl \
diff --git a/sc/qa/unit/data/ods/vba_macro_functions.ods 
b/sc/qa/unit/data/ods/vba_macro_functions.ods
new file mode 100644
index ..62bbe339a393
Binary files /dev/null and b/sc/qa/unit/data/ods/vba_macro_functions.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index f9a35f334156..882750621586 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -247,6 +247,7 @@ public:
 void testHiddenRowsColumnsXLSXML();
 void testColumnWidthRowHeightXLSXML();
 void testTdf62268();
+void testVBAMacroFunctionODS();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -380,6 +381,7 @@ public:
 CPPUNIT_TEST(testColumnWidthRowHeightXLSXML);
 CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
 CPPUNIT_TEST(testTdf62268);
+CPPUNIT_TEST(testVBAMacroFunctionODS);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4113,6 +4115,19 @@ void ScFiltersTest::testTdf62268()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testVBAMacroFunctionODS()
+{
+ScDocShellRef xDocSh = loadDoc("vba_macro_functions.", FORMAT_ODS);
+ScDocument& rDoc = xDocSh->GetDocument();
+
+OUString aFunction;
+rDoc.GetFormula(2, 0, 0, aFunction);
+std::cout << aFunction << std::endl;
+CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, rDoc.GetValue(2, 0, 0), 1e-6);
+
+xDocSh->DoClose();
+}
+
 ScFiltersTest::ScFiltersTest()
   : ScBootstrapFixture( "sc/qa/unit/data" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/filter/xml/xmldpimp.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 3ff27fbcc23f4f076a9ca5edd25eebce9dbe24af
Author: Caolán McNamara 
AuthorDate: Thu Jul 26 13:36:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 09:26:13 2018 +0200

pDPObject can never be null

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

diff --git a/sc/source/filter/xml/xmldpimp.cxx 
b/sc/source/filter/xml/xmldpimp.cxx
index 3c9a29439652..ecfae1ab28a2 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -96,7 +96,8 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( 
ScXMLImport& rImport,
   const 
rtl::Reference& rAttrList ) :
 ScXMLImportContext( rImport ),
 pDoc(GetScImport().GetDocument()),
-pDPObject(nullptr),
+pDPObject(new ScDPObject(pDoc)),
+pDPSave(new ScDPSaveData()),
 pDPDimSaveData(nullptr),
 sDataPilotTableName(),
 sApplicationData(),
@@ -194,9 +195,6 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( 
ScXMLImport& rImport,
 }
 }
 }
-
-pDPObject = new ScDPObject(pDoc);
-pDPSave.reset(new ScDPSaveData());
 }
 
 ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext()
@@ -390,8 +388,7 @@ void ScXMLDataPilotTableContext::SetButtons()
 }
 }
 
-if ( pDPObject )
-pDPObject->RefreshAfterLoad();
+pDPObject->RefreshAfterLoad();
 }
 
 void ScXMLDataPilotTableContext::SetSelectedPage( const OUString& rDimName, 
const OUString& rSelected )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/inc/dpobject.hxx|2 
 sc/qa/unit/ucalc_pivottable.cxx|  145 ++---
 sc/source/core/data/dpobject.cxx   |3 
 sc/source/filter/excel/xipivot.cxx |2 
 sc/source/filter/xml/xmldpimp.cxx  |6 -
 sc/source/ui/docshell/dbdocfun.cxx |4 -
 sc/source/ui/undo/undodat.cxx  |6 -
 7 files changed, 62 insertions(+), 106 deletions(-)

New commits:
commit 870c5443a5fb5e5981c1916cc2ff09dad984f225
Author: Caolán McNamara 
AuthorDate: Thu Jul 26 13:26:56 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 09:25:48 2018 +0200

InsertNewTable always returns true

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

diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 9ea215f2f9eb..df422a461c97 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -392,7 +392,7 @@ public:
 OUString CreateNewName() const;
 
 void FreeTable(const ScDPObject* pDPObj);
-SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
+SC_DLLPUBLIC void InsertNewTable(ScDPObject* pDPObj);
 SC_DLLPUBLIC bool HasTable(const ScDPObject* pDPObj) const;
 
 SC_DLLPUBLIC SheetCaches& GetSheetCaches();
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 40c72e1b9bd3..01d922201fdf 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -222,8 +222,7 @@ void Test::testPivotTable()
 m_pDoc, ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0), aFields, 
nFieldCount, false);
 
 ScDPCollection* pDPs = m_pDoc->GetDPCollection();
-bool bSuccess = pDPs->InsertNewTable(pDPObj);
-CPPUNIT_ASSERT_MESSAGE("failed to insert a new datapilot object into 
document", bSuccess);
+pDPs->InsertNewTable(pDPObj);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be only one data pilot table.",
size_t(1), pDPs->GetCount());
 pDPObj->SetName(pDPs->CreateNewName());
@@ -248,7 +247,7 @@ void Test::testPivotTable()
 { "Total Result", "50", "57", "23", "130" }
 };
 
-bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
+bool bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be only one data cache.", 
size_t(1), pDPs->GetSheetCaches().size());
@@ -267,8 +266,7 @@ void Test::testPivotTable()
 // don't reload the cache which should force the copy to use the old data
 // from the cache.
 ScDPObject* pDPObj2 = new ScDPObject(*pDPObj);
-bSuccess = pDPs->InsertNewTable(pDPObj2);
-CPPUNIT_ASSERT_MESSAGE("failed to insert a new datapilot object into 
document", bSuccess);
+pDPs->InsertNewTable(pDPObj2);
 
 aOutRange = pDPObj2->GetOutRange();
 pDPObj2->ClearTableData();
@@ -287,7 +285,7 @@ void Test::testPivotTable()
 { "Total Result", "50", "57", "23", "130" }
 };
 
-bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (from old cache)");
+bool bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (from old cache)");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -324,7 +322,7 @@ void Test::testPivotTable()
 { "Total Result", "300", "700", "1100", "2100" }
 };
 
-bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (refreshed)");
+bool bSuccess = checkDPTableOutput(m_pDoc, aOutRange, aOutputCheck, 
"DataPilot table output (refreshed)");
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
@@ -353,8 +351,7 @@ void Test::testPivotTable()
 
 pDPObj = createDPFromRange(
 m_pDoc, ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0), aFields, 
nFieldCount, false);
-bSuccess = pDPs->InsertNewTable(pDPObj);
-CPPUNIT_ASSERT_MESSAGE("failed to insert a new datapilot object into 
document", bSuccess);
+pDPs->InsertNewTable(pDPObj);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be only one data pilot table.",
size_t(1), pDPs->GetCount());
 pDPObj->SetName(pDPs->CreateNewName());
@@ -404,8 +401,7 @@ void Test::testPivotTableLabels()
 m_pDoc, ScRange(nCol1, nRow1, 0, nCol2, nRow2, 0), aFields, 
nFieldCount, false);
 
 ScDPCollection* pDPs = m_pDoc->GetDPCollection();
-bool bSuccess = pDPs->InsertNewTable(pDPObj);
-CPPUNIT_ASSERT_MESSAGE("failed to insert a new datapilot object into 
document", bSuccess);
+pDPs->InsertNewTable(pDPObj);
 CPPUNIT_ASSERT_EQUAL_MESSAGE("there should be only one data pilot table.",
size_t(1), pDP

[Libreoffice-commits] core.git: 6 commits - bridges/source comphelper/source cppu/source framework/source idlc/source include/LibreOfficeKit registry/source sal/osl sal/rtl sc/source sd/source sfx2/so

2018-07-27 Thread Libreoffice Gerrit user

 bridges/source/cpp_uno/shared/bridge.cxx   |2 
 bridges/source/jni_uno/jni_bridge.cxx  |4 
 bridges/source/jni_uno/jni_info.cxx|6 -
 comphelper/source/misc/threadpool.cxx  |2 
 cppu/source/typelib/static_types.cxx   |2 
 cppu/source/typelib/typelib.cxx|2 
 framework/source/accelerators/acceleratorconfiguration.cxx |4 
 idlc/source/parser.y   |2 
 include/LibreOfficeKit/LibreOfficeKitInit.h|6 -
 registry/source/regimpl.cxx|6 -
 sal/osl/unx/file.cxx   |4 
 sal/osl/unx/pipe.cxx   |9 -
 sal/osl/unx/profile.cxx|1 
 sal/osl/w32/file.cxx   |4 
 sal/rtl/alloc_arena.cxx|2 
 sal/rtl/alloc_cache.cxx|6 -
 sc/source/core/tool/compiler.cxx   |1 
 sc/source/filter/xml/xmldpimp.cxx  |6 -
 sc/source/filter/xml/xmldpimp.hxx  |3 
 sc/source/ui/view/viewdata.cxx |2 
 sd/source/ui/animations/CustomAnimationPane.cxx|2 
 sd/source/ui/unoidl/unosrch.cxx|   71 -
 sfx2/source/control/itemdel.cxx|2 
 soltools/cpp/_unix.c   |1 
 soltools/mkdepend/parse.c  |1 
 svtools/source/svhtml/htmlout.cxx  |2 
 sw/source/ui/index/cnttab.cxx  |9 -
 unoidl/source/legacyprovider.cxx   |   32 +++--
 unotest/source/cpp/officeconnection.cxx|2 
 vcl/source/gdi/pdfwriter_impl.cxx  |1 
 30 files changed, 93 insertions(+), 104 deletions(-)

New commits:
commit ba1e1727c238210b022741a710486964f28bb065
Author: Caolán McNamara 
AuthorDate: Thu Jul 26 12:22:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 09:32:19 2018 +0200

Related: rhbz#1602589 add comments to coverity annotations

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

diff --git a/bridges/source/cpp_uno/shared/bridge.cxx 
b/bridges/source/cpp_uno/shared/bridge.cxx
index 556350022e48..186d89aa1956 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -144,7 +144,7 @@ uno_Mapping * Bridge::createMapping(
 bool bExportCpp2Uno)
 {
 Bridge * bridge = new Bridge(pCppEnv, pUnoEnv, bExportCpp2Uno);
-//coverity[leaked_storage]
+// coverity[leaked_storage] - on purpose
 return bExportCpp2Uno ? &bridge->aCpp2Uno : &bridge->aUno2Cpp;
 }
 
diff --git a/bridges/source/jni_uno/jni_bridge.cxx 
b/bridges/source/jni_uno/jni_bridge.cxx
index 4a0d4b30af53..7f38d3221420 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -552,7 +552,7 @@ SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping(
 uno_registerMapping(
 &mapping, Bridge_free,
 pFrom, &pTo->pExtEnv->aBase, nullptr );
-// coverity[leaked_storage]
+// coverity[leaked_storage] - on purpose
 }
 else if ( from_env_typename == UNO_LB_UNO && to_env_typename == 
UNO_LB_JAVA )
 {
@@ -562,7 +562,7 @@ SAL_DLLPUBLIC_EXPORT void uno_ext_getMapping(
 uno_registerMapping(
 &mapping, Bridge_free,
 &pFrom->pExtEnv->aBase, pTo, nullptr );
-// coverity[leaked_storage]
+// coverity[leaked_storage] - on purpose
 }
 }
 catch (const BridgeRuntimeError & err)
diff --git a/bridges/source/jni_uno/jni_info.cxx 
b/bridges/source/jni_uno/jni_info.cxx
index 9b43356856af..045ac44ee6be 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -103,7 +103,7 @@ JNI_interface_type_info::JNI_interface_type_info(
 typelib_InterfaceTypeDescription * td =
 reinterpret_cast< typelib_InterfaceTypeDescription * >(
 m_td.get() );
-// coverity [ctor_dtor_leak]
+// coverity[ctor_dtor_leak] - on purpose
 m_methods.reset(new jmethodID[ td->nMapFunctionIndexToMemberIndex 
]);
 sal_Int32 nMethodIndex = 0;
 typelib_TypeDescriptionReference ** ppMembers = td->ppMembers;
@@ -288,7 +288,7 @@ JNI_compound_type_info::JNI_compound_type_info(
 td->aBase.pWeakRef,
 jni_info->m_RuntimeException

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

2018-07-27 Thread Libreoffice Gerrit user

 include/toolkit/controls/dialogcontrol.hxx   |   15 +++
 toolkit/source/controls/spinningprogress.cxx |5 +
 2 files changed, 20 insertions(+)

New commits:
commit c5fcb476ac8eab18152a7f6d0487daa56231fcf8
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 11:22:07 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 09:33:41 2018 +0200

toolkit: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.

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

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 970226416253..df643f47f450 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -170,6 +170,11 @@ public:
 UnoMultiPageModel( const css::uno::Reference< css::uno::XComponentContext 
>& rxContext );
 virtual ~UnoMultiPageModel() override;
 
+UnoMultiPageModel(UnoMultiPageModel const &) = default;
+UnoMultiPageModel(UnoMultiPageModel &&) = default;
+UnoMultiPageModel & operator =(UnoMultiPageModel const &) = default;
+UnoMultiPageModel & operator =(UnoMultiPageModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoMultiPageModel, 
ControlModelContainerBase, "com.sun.star.awt.UnoMultiPageModel" )
@@ -244,6 +249,11 @@ public:
 UnoPageModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoPageModel() override;
 
+UnoPageModel(UnoPageModel const &) = default;
+UnoPageModel(UnoPageModel &&) = default;
+UnoPageModel & operator =(UnoPageModel const &) = default;
+UnoPageModel & operator =(UnoPageModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoPageModel, ControlModelContainerBase, 
"com.sun.star.awt.UnoPageModel" )
@@ -277,6 +287,11 @@ public:
 UnoFrameModel( const css::uno::Reference< css::uno::XComponentContext >& 
rxContext );
 virtual ~UnoFrameModel() override;
 
+UnoFrameModel(UnoFrameModel const &) = default;
+UnoFrameModel(UnoFrameModel &&) = default;
+UnoFrameModel & operator =(UnoFrameModel const &) = default;
+UnoFrameModel & operator =(UnoFrameModel &&) = default;
+
 rtl::Reference Clone() const override;
 
 DECLIMPL_SERVICEINFO_DERIVED( UnoFrameModel, ControlModelContainerBase, 
"com.sun.star.awt.UnoFrameModel" )
diff --git a/toolkit/source/controls/spinningprogress.cxx 
b/toolkit/source/controls/spinningprogress.cxx
index 096de0c98bfd..4792b98fae27 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -34,6 +34,11 @@ class SpinningProgressControlModel : public 
SpinningProgressControlModel_Base
 public:
 explicit SpinningProgressControlModel( css::uno::Reference< 
css::uno::XComponentContext > const & i_factory );
 
+SpinningProgressControlModel(SpinningProgressControlModel const &) = 
default;
+SpinningProgressControlModel(SpinningProgressControlModel &&) = default;
+SpinningProgressControlModel & operator =(SpinningProgressControlModel 
const &) = default;
+SpinningProgressControlModel & operator =(SpinningProgressControlModel &&) 
= default;
+
 virtual rtl::Reference Clone() const override;
 
 // XPropertySet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/inc/formulagroup.hxx  |2 ++
 sc/source/core/data/column2.cxx  |   14 ++
 sc/source/core/tool/formulagroup.cxx |7 +++
 3 files changed, 23 insertions(+)

New commits:
commit 8af5cb7870032fbdb50f0b3ad6d855e488af4b99
Author: Luboš Luňák 
AuthorDate: Tue Jul 24 12:47:26 2018 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 27 09:43:30 2018 +0200

do not keep incorrect calc values in the cache

All these calls first entered the whole array into the cache and
only then filled it up with values. If that failed, the values
stayed in the cache and could be reused by something else.
Testcase is sc/qa/.../linest.fods, where the error in X19 prevents
caching of that column for the formula in AA24:AA28. Since currently
ScFormulaCell::InterpretFormulaGroup() calls InterpretFormulaGroupOpenCL()
twice, the first ScGroupTokenConverter::convert() call cached
the incomplete column and then failed, and the second call simply reused
the value. But this could presumably happen for multiple formulas using
data in the same column as well, even without the double call.

Change-Id: Iaa55671936fe61f72dfa35940db8deaf27d1c22d
Reviewed-on: https://gerrit.libreoffice.org/57912
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index f0dcb4888a72..db37426df05f 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -94,6 +94,8 @@ struct FormulaGroupContext
 ColArray* setCachedColArray(
 SCTAB nTab, SCCOL nCol, NumArrayType* pNumArray, StrArrayType* 
pStrArray );
 
+void discardCachedColArray(SCTAB nTab, SCCOL nCol);
+
 void ensureStrArray( ColArray& rColArray, size_t nArrayLen );
 void ensureNumArray( ColArray& rColArray, size_t nArrayLen );
 
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 21f38f54711d..183a219f1f4a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2711,7 +2711,10 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( 
SCROW nRow1, SCROW nRow2
 size_t nPos = itBlk->size;
 ++itBlk;
 if (!appendToBlock(pDocument, rCxt, *pColArray, nPos, nRow2+1, 
itBlk, maCells.end()))
+{
+rCxt.discardCachedColArray(nTab, nCol);
 return 
formula::VectorRefArray(formula::VectorRefArray::Invalid);
+}
 
 rtl_uString** pStr = nullptr;
 if (pColArray->mpStrArray && hasNonEmpty(*pColArray->mpStrArray, 
nRow1, nRow2))
@@ -2744,7 +2747,10 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( 
SCROW nRow1, SCROW nRow2
 size_t nPos = itBlk->size;
 ++itBlk;
 if (!appendToBlock(pDocument, rCxt, *pColArray, nPos, nRow2+1, 
itBlk, maCells.end()))
+{
+rCxt.discardCachedColArray(nTab, nCol);
 return 
formula::VectorRefArray(formula::VectorRefArray::Invalid);
+}
 
 assert(pColArray->mpStrArray);
 
@@ -2781,13 +2787,18 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( 
SCROW nRow1, SCROW nRow2
 
 pColArray = copyFirstFormulaBlock(rCxt, itBlk, nRow2+1, nTab, 
nCol);
 if (!pColArray)
+{
 // Failed to insert a new cached column array.
 return 
formula::VectorRefArray(formula::VectorRefArray::Invalid);
+}
 
 size_t nPos = itBlk->size;
 ++itBlk;
 if (!appendToBlock(pDocument, rCxt, *pColArray, nPos, nRow2+1, 
itBlk, maCells.end()))
+{
+rCxt.discardCachedColArray(nTab, nCol);
 return 
formula::VectorRefArray(formula::VectorRefArray::Invalid);
+}
 
 const double* pNum = nullptr;
 rtl_uString** pStr = nullptr;
@@ -2817,7 +2828,10 @@ formula::VectorRefArray ScColumn::FetchVectorRefArray( 
SCROW nRow1, SCROW nRow2
 size_t nPos = itBlk->size;
 ++itBlk;
 if (!appendToBlock(pDocument, rCxt, *pColArray, nPos, nRow2+1, 
itBlk, maCells.end()))
+{
+rCxt.discardCachedColArray(nTab, nCol);
 return 
formula::VectorRefArray(formula::VectorRefArray::Invalid);
+}
 
 if (pColArray->mpStrArray && hasNonEmpty(*pColArray->mpStrArray, 
nRow1, nRow2))
 return 
formula::VectorRefArray(&(*pColArray->mpNumArray)[nRow1], 
&(*pColArray->mpStrArray)[nRow1]);
diff --git a/sc/source/core/tool/formulagroup.cxx 
b/sc/source/core/tool/formulagroup.cxx
index cd4a4ccecaf3..4304e1b08e04 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -104,6 +104,13 @@ FormulaGroupContext::ColArray* 
FormulaGroupContext::setCachedColArray(
 return &rArray;
 }
 
+void FormulaGroupContext::discardCachedColArray( SCTAB nTab, SCCOL nCol )
+{
+

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/qa/extras/ooxmlexport/data/tdf117988.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |5 +
 writerfilter/source/filter/WriterFilter.cxx  |2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680
Author: Justin Luth 
AuthorDate: Wed Jul 25 16:33:47 2018 +0300
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 09:45:54 2018 +0200

tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculation

Introduced in LO 4.0 in a mass copy of compat settings in
commit 355d25eac764713f4d52eac801ade6e2ff1deab0

Change-Id: I0d95941ff2815a43e571be1a6a0dbab1d12185d6
Reviewed-on: https://gerrit.libreoffice.org/57991
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf117988.docx 
b/sw/qa/extras/ooxmlexport/data/tdf117988.docx
new file mode 100644
index ..86f1672fa023
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf117988.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 229b3d66096c..5f8b5bb2a3b6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -177,6 +177,11 @@ DECLARE_OOXMLEXPORT_TEST(testDefaultStyle, 
"defaultStyle.docx")
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testParagraphSplitOnSectionBorder, 
"parasplit-on-section-border.odt")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/filter/WriterFilter.cxx 
b/writerfilter/source/filter/WriterFilter.cxx
index 655b0e57b17e..08bc0c420ec7 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -286,7 +286,7 @@ void WriterFilter::setTargetDocument(const uno::Reference< 
lang::XComponent >& x
 xSettings->setPropertyValue("ConsiderTextWrapOnObjPos", 
uno::makeAny(true));
 xSettings->setPropertyValue("UseFormerTextWrapping", uno::makeAny(false));
 xSettings->setPropertyValue("TableRowKeep", uno::makeAny(true));
-xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", 
uno::makeAny(true));
+xSettings->setPropertyValue("IgnoreTabsAndBlanksForLineCalculation", 
uno::makeAny(false));
 xSettings->setPropertyValue("InvertBorderSpacing", uno::makeAny(true));
 xSettings->setPropertyValue("CollapseEmptyCellPara", uno::makeAny(true));
 xSettings->setPropertyValue("TabOverflow", uno::makeAny(true));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/qa/unit/data/functions/mathematical/fods/add.fods | 2573 +++
 sc/qa/unit/data/functions/mathematical/fods/sub.fods | 2536 ++
 2 files changed, 5109 insertions(+)

New commits:
commit 5da06c77f154ecfb4a1517718c615ba7bf2ef4cc
Author: Luboš Luňák 
AuthorDate: Thu Jul 26 11:58:50 2018 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 27 09:52:12 2018 +0200

add simple calc tests for ocAdd and ocSub

Triggered by 710aeefd2 ("make opencl also use approximate add and sub"),
OpenCL doesn't actually get used to check these because it's not used
for single formulas, but it looks like handling of imprecise doubles
is not checked anywhere, so add a test.

Change-Id: I7a73af508d6ea5f141397ebf11f246cf0a622fed
Reviewed-on: https://gerrit.libreoffice.org/58068
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/qa/unit/data/functions/mathematical/fods/add.fods 
b/sc/qa/unit/data/functions/mathematical/fods/add.fods
new file mode 100644
index ..b83fbd3b1efd
--- /dev/null
+++ b/sc/qa/unit/data/functions/mathematical/fods/add.fods
@@ -0,0 +1,2573 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-06-25T07:16:38.437590147P0D1LibreOfficeDev/6.2.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/5e9ab742cd1fdfb33e247c5f485c940b65c4
+ 
+  
+   0
+   0
+   30908
+   3160
+   
+
+ view1
+ 
+  
+   0
+   4
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   0
+   2
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1738
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   true
+   false
+   1270
+   7
+   false
+   1
+   true
+   true
+   false
+   1
+   true
+   true
+   true
+   12632256
+   true
+   true
+   false
+   true
+   true
+   1270
+   3
+   true
+   
+
+ en
+ US
+ 
+ 
+ 
+
+   
+   Generic 
Printer
+   false
+   kQH+/0dlbmVyaWMgUHJpbnRlcgAAU0dFTlBSVAAWAAMAsgAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   false
+   false
+   true
+   0
+   false
+   true
+   false
+   true
+   false
+   true
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/opencl/formulagroupcl.cxx |   42 +--
 1 file changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 2abdcdfae6eddb08de8fade2392963fda81851ab
Author: Luboš Luňák 
AuthorDate: Tue Jul 24 12:04:13 2018 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jul 27 09:51:43 2018 +0200

make opencl also use approximate add and sub

Code basically taken from rtl::math::approxAdd() and friends. Without this
OpenCL will sometimes not get results as 0 because of rounding errors
(sc/qa/.../linest.fods with minimum formula size disabled).

Change-Id: Ib66f5eb1c6aeb9c95047406de1442b388ccc7f5f
Reviewed-on: https://gerrit.libreoffice.org/57911
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 7067ec0fa5c8..fa5b37e969f2 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -83,6 +83,44 @@ static const char* const publicFunc =
  "double fsub(double a, double b) { return a-b; }\n"
  "double fdiv(double a, double b) { return a/b; }\n"
  "double strequal(unsigned a, unsigned b) { return (a==b)?1.0:0; }\n"
+ "int is_representable_integer(double a) {\n"
+ "long kMaxInt = (1L << 53) - 1;\n"
+ "if (a <= as_double(kMaxInt))\n"
+ "{\n"
+ "long nInt = as_long(a);\n"
+ "double fInt;\n"
+ "return (nInt <= kMaxInt &&\n"
+ "(!((fInt = as_double(nInt)) < a) && !(fInt > a)));\n"
+ "}\n"
+ "return 0;\n"
+ "}\n"
+ "int approx_equal(double a, double b) {\n"
+ "double e48 = 1.0 / (16777216.0 * 16777216.0);\n"
+ "double e44 = e48 * 16.0;\n"
+ "if (a == b)\n"
+ "return 1;\n"
+ "if (a == 0.0 || b == 0.0)\n"
+ "return 0;\n"
+ "double d = fabs(a - b);\n"
+ "if (!isfinite(d))\n"
+ "return 0;   // Nan or Inf involved\n"
+ "if (d > ((a = fabs(a)) * e44) || d > ((b = fabs(b)) * e44))\n"
+ "return 0;\n"
+ "if (is_representable_integer(d) && is_representable_integer(a) && 
is_representable_integer(b))\n"
+ "return 0;   // special case for representable integers.\n"
+ "return (d < a * e48 && d < b * e48);\n"
+ "}\n"
+ "double fsum_approx(double a, double b) {\n"
+ "if ( ((a < 0.0 && b > 0.0) || (b < 0.0 && a > 0.0))\n"
+ " && approx_equal( a, -b ) )\n"
+ "return 0.0;\n"
+ "return a + b;\n"
+ "}\n"
+ "double fsub_approx(double a, double b) {\n"
+ "if ( ((a < 0.0 && b < 0.0) || (a > 0.0 && b > 0.0)) && approx_equal( a, 
b ) )\n"
+ "return 0.0;\n"
+ "return a - b;\n"
+ "}\n"
  ;
 
 #include 
@@ -1670,7 +1708,7 @@ public:
 virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) 
const override
 {
 std::stringstream ss;
-ss << "((" << lhs << ")+(" << rhs << "))";
+ss << "fsum_approx((" << lhs << "),(" << rhs << "))";
 return ss.str();
 }
 virtual std::string BinFuncName() const override { return "fsum"; }
@@ -1700,7 +1738,7 @@ public:
 virtual std::string GetBottom() override { return "0"; }
 virtual std::string Gen2( const std::string& lhs, const std::string& rhs ) 
const override
 {
-return lhs + "-" + rhs;
+return "fsub_approx(" + lhs + "," + rhs + ")";
 }
 virtual std::string BinFuncName() const override { return "fsub"; }
 };
___
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-0' - sfx2/source

2018-07-27 Thread Libreoffice Gerrit user

 sfx2/source/doc/objxtor.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78d3a5e26fae5f957c082e798e18808f0624bc4a
Author: Markus Mohrhard 
AuthorDate: Sat Jul 21 01:57:27 2018 +0200
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 10:05:45 2018 +0200

fix shutdown crash when SfxApplication has already been destroyed

See e.g. 
http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7

Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea
Reviewed-on: https://gerrit.libreoffice.org/57789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32)
Reviewed-on: https://gerrit.libreoffice.org/57808
Reviewed-by: Michael Meeks 
(cherry picked from commit 7b62c5266e62c3fb0ce1285949d51020075a3f81)
Reviewed-on: https://gerrit.libreoffice.org/57858
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index a71748111969..88270d13f4a2 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -313,13 +313,13 @@ SfxObjectShell::~SfxObjectShell()
 DELETEZ( pImpl->pReloadTimer );
 
 SfxApplication *pSfxApp = SfxGetpApp();
-if ( USHRT_MAX != pImpl->nVisualDocumentNumber )
+if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp )
 pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber);
 
 // Destroy Basic-Manager
 pImpl->aBasicManager.reset( nullptr );
 
-if ( pSfxApp->GetDdeService() )
+if ( pSfxApp && pSfxApp->GetDdeService() )
 pSfxApp->RemoveDdeTopic( this );
 
 pImpl->pBaseModel.set( nullptr );
___
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-0' - solenv/flatpak-manifest.in

2018-07-27 Thread Libreoffice Gerrit user

 solenv/flatpak-manifest.in |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7515d87f8b4701b103974a2439f171ee748edf8c
Author: Stephan Bergmann 
AuthorDate: Wed Jul 25 12:52:38 2018 +0200
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 10:06:08 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst changes

(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e)
Conflicts:
solenv/flatpak-manifest.in

Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/57984
Reviewed-by: Eike Rathke 
Reviewed-by: Michael Stahl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c2d4b20ffd06..5ee8909a84c1 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -279,10 +279,10 @@
 "dest-filename": 
"external/tarballs/libfreehand-0.1.2.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2";,
-"sha256": 
"b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854",
+"url": 
"https://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2";,
+"sha256": 
"14c21f4533ca74e3af9e09184d6756a750d0cd46099015ba8c595e48499aa878",
 "type": "file",
-"dest-filename": 
"external/tarballs/language-subtag-registry-2018-03-30.tar.bz2"
+"dest-filename": 
"external/tarballs/language-subtag-registry-2018-04-23.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
@@ -405,10 +405,10 @@
 "dest-filename": "external/tarballs/liborcus-0.13.4.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";,
-"sha256": 
"a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641",
+"url": 
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";,
+"sha256": 
"2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7",
 "type": "file",
-"dest-filename": "external/tarballs/poppler-0.59.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.66.0.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";,
___
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-0' - sw/source

2018-07-27 Thread Libreoffice Gerrit user

 sw/source/core/text/porfld.cxx  |2 +-
 sw/source/uibase/uiview/viewtab.cxx |   12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5e013eab178df3a27fe036230c80611dd1dccc7d
Author: Noel Grandin 
AuthorDate: Mon Jul 23 15:08:41 2018 +0200
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 10:06:40 2018 +0200

tdf#118716 Inner border of an embedded table can't be dragged around

regression from
commit f14b9d30293f180500fc56d81e5390021758e7c1
convert (a>b?a:b) to std::max(a,b)

In this code
   int a;
   std::max(a,0)
std::max will first convert a and b to sal_uInt16, therefore potentially
converting a negative number to a positive number due to the conversion
rules. Then it will take the larger number.

While this code
int a;
static_cast(a > 0 ? a : 0)
will compare first, and then convert the larger number to sal_uInt16,
which might result in making a "a" that is larger than 2^16 into a
smaller value, but which will never convert a negative "a" value into a
positive value.

Change-Id: Id4f6df0089b1a74ea4ac1c5d05655e7c1d8f0c7f
Reviewed-on: https://gerrit.libreoffice.org/57846
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c13865a4caf7898c4e59a5b22bbd493d6dad9661)
Reviewed-on: https://gerrit.libreoffice.org/57909
Tested-by: Xisco Faulí 
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index d40ff3ed3dc0..ac3596f78262 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -830,7 +830,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf )
 const bool bFull = rInf.Width() < rInf.X() + Width();
 const bool bFly = rInf.GetFly() ||
 ( rInf.GetLast() && rInf.GetLast()->IsFlyPortion() );
-SetAscent( std::max(GetRelPos(), 0) );
+SetAscent( GetRelPos() > 0 ? GetRelPos() : 0 );
 if( GetAscent() > Height() )
 Height( GetAscent() );
 
diff --git a/sw/source/uibase/uiview/viewtab.cxx 
b/sw/source/uibase/uiview/viewtab.cxx
index 4dab2bb0a4bf..545b3f2e48ab 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -1700,8 +1700,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nRgt = (bTableVertical ? nPageHeight : nPageWidth) -
  (aTabCols.GetLeftMin() + aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 
0));
+const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 
0));
 
 SvxColumnItem aColItem(nNum, nL, nR);
 
@@ -1937,8 +1937,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nRgt = (bVerticalWriting ? nPageWidth : nPageHeight) 
-
  (aTabCols.GetLeftMin() + aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 
0));
+const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 
0));
 
 SvxColumnItem aColItem(0, nL, nR);
 
@@ -2011,8 +2011,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
 const int nLft = aTabCols.GetLeftMin() + 
aTabCols.GetLeft();
 const int nRgt = nPageWidth -(aTabCols.GetLeftMin() + 
aTabCols.GetRight());
 
-const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0);
-const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0);
+const sal_uInt16 nL = static_cast< sal_uInt16 
>(std::max(nLft, 0));
+const sal_uInt16 nR = static_cast< sal_uInt16 
>(std::max(nRgt, 0));
 
 aRectangle.SetLeft( nL );
 if(nNum > 1)
___
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-0' - editeng/source

2018-07-27 Thread Libreoffice Gerrit user

 editeng/source/misc/svxacorr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28f8e7434065e040e17562014db3624a8d3cd6ea
Author: Xisco Fauli 
AuthorDate: Mon Jul 23 22:00:25 2018 +0200
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 10:07:06 2018 +0200

tdf#118517: Use xStg before resetting it

Regression from 0f166ef5240ee155bf2544e6bc3c985b1e3bf646
Change-Id: I083951700895a00be8d4407871c27804ca3e5f30
Reviewed-on: https://gerrit.libreoffice.org/57881
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 
(cherry picked from commit a61d61f66f80c91c14825f8fe8fb9bd3f295591b)
Reviewed-on: https://gerrit.libreoffice.org/57907
Reviewed-by: Eike Rathke 
Reviewed-by: Michael Stahl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 556f60b9c426..b890b5cd0984 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2568,9 +2568,9 @@ void SvxAutoCorrectLanguageLists::PutText( const 
OUString& rShort,
 try
 {
 uno::Reference < embed::XStorage > xStg = 
comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, 
embed::ElementModes::READWRITE );
+bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, 
rShell, sLong );
 xStg = nullptr;
 
-bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, 
rShell, sLong );
 // Update the word list
 if( bRet )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/tool/interpr1.cxx |   46 +++
 sc/source/core/tool/parclass.cxx |1 
 2 files changed, 47 insertions(+)

New commits:
commit a44d1b8d47e0ef6645c7c5def1fe5d34d470ae0b
Author: Eike Rathke 
AuthorDate: Thu Jul 26 14:47:57 2018 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 27 10:47:14 2018 +0200

Resolves: tdf#91502 handle ISFORMULA() in array context

Obtaining the usual matrix for iterated scalar values doesn't work
here because we don't want the formulas' results but whether there
are formulas at the referenced positions.

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

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c83951d59b79..3eb8fab7b968 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2691,6 +2691,52 @@ void ScInterpreter::ScIsFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
+if (bMatrixFormula || pCur->IsInForceArray())
+{
+SCCOL nCol1, nCol2;
+SCROW nRow1, nRow2;
+SCTAB nTab1, nTab2;
+PopDoubleRef( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
+if (nGlobalError != FormulaError::NONE)
+{
+PushError( nGlobalError);
+return;
+}
+if (nTab1 != nTab2)
+{
+PushIllegalArgument();
+return;
+}
+
+ScMatrixRef pResMat = GetNewMat( static_cast(nCol2 - 
nCol1 + 1),
+static_cast(nRow2 - nRow1 + 1), true);
+if (!pResMat)
+{
+PushError( FormulaError::MatrixSize);
+return;
+}
+
+/* TODO: we really should have a gap-aware cell iterator. */
+SCSIZE i=0, j=0;
+ScAddress aAdr( 0, 0, nTab1);
+for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
+{
+aAdr.SetCol(nCol);
+for (SCROW nRow = nRow1; nRow <= nRow2; ++nRow)
+{
+aAdr.SetRow(nRow);
+ScRefCellValue aCell(*pDok, aAdr);
+pResMat->PutBoolean( (aCell.meType == 
CELLTYPE_FORMULA), i,j);
+++j;
+}
+++i;
+j = 0;
+}
+
+PushMatrix( pResMat);
+return;
+}
+SAL_FALLTHROUGH;
 case svSingleRef :
 {
 ScAddress aAdr;
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 7464dbf9a843..a4c3e7241087 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -158,6 +158,7 @@ const ScParameterClassification::RawData 
ScParameterClassification::pRawData[] =
 { ocIndirect,{{ Value, Value   
  }, 0, Reference }},
 { ocIntercept,   {{ ForceArray, ForceArray 
  }, 0, Value }},
 { ocIntersect,   {{ Reference, Reference   
  }, 0, Reference }},
+{ ocIsFormula,   {{ Reference  
  }, 0, Value }},
 { ocIsRef,   {{ Reference  
  }, 0, Value }},
 { ocKurt,{{ Reference  
  }, 1, Value }},
 { ocLCM, {{ Reference  
  }, 1, Value }},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/tool/interpr1.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2008a520e429bc2581001d61b63ff934c2255be0
Author: Eike Rathke 
AuthorDate: Thu Jul 26 15:00:09 2018 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 27 10:48:06 2018 +0200

Related: tdf#91502 handle FORMULA() pCur->IsInForceArray() as well

... so using it in SUMPRODUCT() and other ForceArray context works
as expected.

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

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3eb8fab7b968..c0558c869ad4 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2759,7 +2759,7 @@ void ScInterpreter::ScFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
-if (bMatrixFormula)
+if (bMatrixFormula || pCur->IsInForceArray())
 {
 SCCOL nCol1, nCol2;
 SCROW nRow1, nRow2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/inc/interpre.hxx  |9 +
 sc/source/core/tool/interpr1.cxx |4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0d9f755fec6f29b72e9e4d110da3175ade46588c
Author: Eike Rathke 
AuthorDate: Thu Jul 26 15:30:21 2018 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 27 10:49:16 2018 +0200

Introduce and use ScInterpreter::IsInArrayContext(), tdf#91502 follow-up

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

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index e7d7f5e2aff8..ae62eae0dc2d 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -391,6 +391,10 @@ private:
 void ConvertMatrixJumpConditionToMatrix();
 // If MatrixFormula or ForceArray: ConvertMatrixParameters()
 inline bool MatrixParameterConversion();
+// If MatrixFormula or ForceArray. Can be used within spreadsheet functions
+// that do not depend on the formula cell's matrix size, for which only
+// bMatrixFormula can be used.
+inline bool IsInArrayContext() const;
 ScMatrixRef PopMatrix();
 sc::RangeMatrix PopRangeMatrix();
 void QueryMatrixType(const ScMatrixRef& xMat, SvNumFormatType& 
rRetTypeExpr, sal_uInt32& rRetIndexExpr);
@@ -1013,6 +1017,11 @@ public:
 sal_uLong   GetRetFormatIndex() const   { return 
nRetFmtIndex; }
 };
 
+inline bool ScInterpreter::IsInArrayContext() const
+{
+return bMatrixFormula || pCur->IsInForceArray();
+}
+
 inline void ScInterpreter::MatrixJumpConditionToMatrix()
 {
 if (bMatrixFormula || pCur->IsInForceArray())
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index c0558c869ad4..3baa2793d9ad 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2691,7 +2691,7 @@ void ScInterpreter::ScIsFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
-if (bMatrixFormula || pCur->IsInForceArray())
+if (IsInArrayContext())
 {
 SCCOL nCol1, nCol2;
 SCROW nRow1, nRow2;
@@ -2759,7 +2759,7 @@ void ScInterpreter::ScFormula()
 switch ( GetStackType() )
 {
 case svDoubleRef :
-if (bMatrixFormula || pCur->IsInForceArray())
+if (IsInArrayContext())
 {
 SCCOL nCol1, nCol2;
 SCROW nRow1, nRow2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/source/core/inc/interpre.hxx  |4 ++--
 sc/source/core/tool/interpr4.cxx |2 +-
 sc/source/core/tool/interpr6.cxx |2 +-
 sc/source/core/tool/interpr7.cxx |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a0a8c958e358d93bb84e26e307d95df05be7f31a
Author: Eike Rathke 
AuthorDate: Thu Jul 26 16:03:44 2018 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 27 10:49:47 2018 +0200

Use IsInArrayContext() instead of (bMatrixFormula || pCur->IsInForceArray())

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

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index ae62eae0dc2d..e7aec8766811 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -1024,13 +1024,13 @@ inline bool ScInterpreter::IsInArrayContext() const
 
 inline void ScInterpreter::MatrixJumpConditionToMatrix()
 {
-if (bMatrixFormula || pCur->IsInForceArray())
+if (IsInArrayContext())
 ConvertMatrixJumpConditionToMatrix();
 }
 
 inline bool ScInterpreter::MatrixParameterConversion()
 {
-if ( (bMatrixFormula || pCur->IsInForceArray() || 
ScParameterClassification::HasForceArray( pCur->GetOpCode())) &&
+if ( (IsInArrayContext() || ScParameterClassification::HasForceArray( 
pCur->GetOpCode())) &&
 !pJumpMatrix && sp > 0 )
 return ConvertMatrixParameters();
 return false;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index fe02c2fe765d..4b51b676cc4f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1495,7 +1495,7 @@ bool ScInterpreter::ConvertMatrixParameters()
 // has ForceArray or ReferenceOrForceArray
 // parameter *somewhere else*) pick a normal
 // position dependent implicit intersection later.
-(eType != formula::ParamClass::Value || 
bMatrixFormula || pCur->IsInForceArray()))
+(eType != formula::ParamClass::Value || 
IsInArrayContext()))
 {
 SCCOL nCol1, nCol2;
 SCROW nRow1, nRow2;
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index b8ffd45e57db..f1eb0713fc2a 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -464,7 +464,7 @@ void IterateMatrix(
 size_t ScInterpreter::GetRefListArrayMaxSize( short nParamCount )
 {
 size_t nSize = 0;
-if (bMatrixFormula || pCur->IsInForceArray())
+if (IsInArrayContext())
 {
 for (short i=1; i <= nParamCount; ++i)
 {
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index e2dd62717fb9..22c8cb33b3e9 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -47,7 +47,7 @@ void ScInterpreter::ScFilterXML()
 // In array/matrix context node elements' results are to be
 // subsequently stored. Check this before obtaining any argument from
 // the stack so the stack type can be used.
-if (pJumpMatrix || bMatrixFormula || pCur->IsInForceArray())
+if (pJumpMatrix || IsInArrayContext())
 {
 if (pJumpMatrix)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ad/e5a721b1be8c114670b08b261deca37ea27e6a

2018-07-27 Thread Libreoffice Gerrit user

 ad/e5a721b1be8c114670b08b261deca37ea27e6a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0316c678788b24c50207722a7446bd62e8f00476
Author: Caolán McNamara 
AuthorDate: Fri Jul 27 09:50:02 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 09:50:02 2018 +0100

Notes added by 'git notes add'

diff --git a/ad/e5a721b1be8c114670b08b261deca37ea27e6a 
b/ad/e5a721b1be8c114670b08b261deca37ea27e6a
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/ad/e5a721b1be8c114670b08b261deca37ea27e6a
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8c/ed7bb207219980fdc4f05cadb3dd4acdb13f24

2018-07-27 Thread Libreoffice Gerrit user

 8c/ed7bb207219980fdc4f05cadb3dd4acdb13f24 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c8970414ab2f3cb166f2fa21c5d12e1e1dda135b
Author: Caolán McNamara 
AuthorDate: Fri Jul 27 09:49:19 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 27 09:49:19 2018 +0100

Notes added by 'git notes add'

diff --git a/8c/ed7bb207219980fdc4f05cadb3dd4acdb13f24 
b/8c/ed7bb207219980fdc4f05cadb3dd4acdb13f24
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/8c/ed7bb207219980fdc4f05cadb3dd4acdb13f24
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 i18npool/source/calendar/calendar_gregorian.cxx |9 +
 i18npool/source/localedata/data/ja_JP.xml   |7 +++
 svl/source/numbers/zformat.cxx  |3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit cacbb0faef77ae8462de9ff5c7307a6a2e28b2bb
Author: Eike Rathke 
AuthorDate: Thu Jul 26 20:46:23 2018 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 27 10:50:15 2018 +0200

Prepare for "Japan's Y2K" Gengou calendar era switch after 2019-04-30

The emperor Akihito will abdicate on 2019-04-30. The next emperor
will be Naruhito, but so far neither the new era name (Heisei for
Akihito) nor its abbreviation or a Unicode character are
determined. At least introduce the new era with some dummy names
(Naruhito,Na,N).

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

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index a4ac0acfe53d..056d25dd2823 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -205,10 +205,11 @@ Calendar_hanja::loadCalendar( const OUString& 
/*uniqueID*/, const css::lang::Loc
 }
 
 static const Era gengou_eraArray[] = {
-{1868,  1,  1, 0},
-{1912,  7, 30, 0},
-{1926, 12, 25, 0},
-{1989,  1,  8, 0},
+{1868,  1,  1, 0},  // Meiji
+{1912,  7, 30, 0},  // Taisho
+{1926, 12, 25, 0},  // Showa
+{1989,  1,  8, 0},  // Heisei
+{2019,  5,  1, 0},  //(Naruhito) (TODO: real era name not known yet 
(2018-07-26))
 {0, 0, 0, 0}
 };
 Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray)
diff --git a/i18npool/source/localedata/data/ja_JP.xml 
b/i18npool/source/localedata/data/ja_JP.xml
index 7d7526062799..fe4c247485f9 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -480,6 +480,13 @@
   平
   平成
 
+
+  
+  Naruhito
+  Na
+  Naruhito
+
   
   
 sun
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 53e7a02e9acf..213e83a60a8c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -3409,6 +3409,9 @@ void SvNumberformat::ImpAppendEraG( OUStringBuffer& 
OutString,
 case 4:
 cEra = 'H';
 break;
+case 5:
+cEra = 'N'; /* TODO: the real one letter era name is not known 
yet (2018-07-26) */
+break;
 default:
 cEra = '?';
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 vcl/source/edit/textdoc.cxx  |8 
 vcl/source/edit/texteng.cxx  |   19 +--
 vcl/source/gdi/pdfwriter_impl.cxx|8 
 vcl/unx/generic/dtrans/X11_selection.cxx |6 +++---
 vcl/unx/gtk/a11y/atkwrapper.cxx  |6 --
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |   19 +--
 6 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 82a4ef72d6e34c2f5075069a1b353f7fd41c7595
Author: Noel Grandin 
AuthorDate: Thu Jul 26 15:04:06 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 11:06:44 2018 +0200

loplugin:stringloop in vcl

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

diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index 68fa2e8f7398..d9b540ddf86d 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -403,17 +403,17 @@ OUString TextDoc::GetText( const sal_Unicode* pSep ) const
 {
 sal_uInt32 nNodes = static_cast(maTextNodes.size());
 
-OUString aASCIIText;
+OUStringBuffer aASCIIText;
 const sal_uInt32 nLastNode = nNodes-1;
 for ( sal_uInt32 nNode = 0; nNode < nNodes; ++nNode )
 {
 TextNode* pNode = maTextNodes[ nNode ].get();
-aASCIIText += pNode->GetText();
+aASCIIText.append(pNode->GetText());
 if ( pSep && ( nNode != nLastNode ) )
-aASCIIText += pSep;
+aASCIIText.append(pSep);
 }
 
-return aASCIIText;
+return aASCIIText.makeStringAndClear();
 }
 
 OUString TextDoc::GetText( sal_uInt32 nPara ) const
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 17e1fe0de42e..3205651c6f05 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -262,7 +262,7 @@ OUString TextEngine::GetText( LineEnd aSeparator ) const
 
 OUString TextEngine::GetTextLines( LineEnd aSeparator ) const
 {
-OUString aText;
+OUStringBuffer aText;
 const sal_uInt32 nParas = mpTEParaPortions->Count();
 const sal_Unicode* pSep = static_getLineEndText( aSeparator );
 for ( sal_uInt32 nP = 0; nP < nParas; ++nP )
@@ -273,12 +273,12 @@ OUString TextEngine::GetTextLines( LineEnd aSeparator ) 
const
 for ( size_t nL = 0; nL < nLines; ++nL )
 {
 TextLine& rLine = pTEParaPortion->GetLines()[nL];
-aText += pTEParaPortion->GetNode()->GetText().copy( 
rLine.GetStart(), rLine.GetEnd() - rLine.GetStart() );
+aText.append( pTEParaPortion->GetNode()->GetText().copy( 
rLine.GetStart(), rLine.GetEnd() - rLine.GetStart() ) );
 if ( pSep && ( ( (nP+1) < nParas ) || ( (nL+1) < nLines ) ) )
-aText += pSep;
+aText.append(pSep);
 }
 }
-return aText;
+return aText.makeStringAndClear();
 }
 
 OUString TextEngine::GetText( sal_uInt32 nPara ) const
@@ -393,14 +393,13 @@ void TextEngine::ImpInitDoc()
 
 OUString TextEngine::GetText( const TextSelection& rSel, LineEnd aSeparator ) 
const
 {
-OUString aText;
-
 if ( !rSel.HasRange() )
-return aText;
+return OUString();
 
 TextSelection aSel( rSel );
 aSel.Justify();
 
+OUStringBuffer aText;
 const sal_uInt32 nStartPara = aSel.GetStart().GetPara();
 const sal_uInt32 nEndPara = aSel.GetEnd().GetPara();
 const sal_Unicode* pSep = static_getLineEndText( aSeparator );
@@ -415,11 +414,11 @@ OUString TextEngine::GetText( const TextSelection& rSel, 
LineEnd aSeparator ) co
 if ( nNode == nEndPara ) // may also be == nStart!
 nEndPos = aSel.GetEnd().GetIndex();
 
-aText += pNode->GetText().copy( nStartPos, nEndPos-nStartPos );
+aText.append(pNode->GetText().copy( nStartPos, nEndPos-nStartPos ));
 if ( nNode < nEndPara )
-aText += pSep;
+aText.append(pSep);
 }
-return aText;
+return aText.makeStringAndClear();
 }
 
 void TextEngine::ImpRemoveText()
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index b7b5546acafc..85d71d4c7844 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9160,14 +9160,14 @@ OString 
PDFWriterImpl::copyExternalResources(filter::PDFObjectElement& rPage, co
 }
 
 // Build the dictionary entry string.
-OString sRet = "/" + rKind + "<<";
+OStringBuffer sRet("/" + rKind + "<<");
 for (const auto& rPair : aRet)
 {
-sRet += "/" + rPair.first + " " + OString::number(rPair.second) + " 0 
R";
+sRet.append("/").append(rPair.first).append(" 
").append(OString::number(rPair.second)).append(" 0 R");
 }
-sRet += ">>";
+sRet.append(">>");
 
-return sRet;
+return sRet.makeStringAndClear();
 }
 
 void PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit)
diff --git a/vcl/unx/generic/dtrans/X11_select

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang i18nlangtag/source i18npool/source l10ntools/source opencl/source solenv/CompilerTest_compilerplugins_clang.mk svl/source tools/

2018-07-27 Thread Libreoffice Gerrit user

 UnoControls/source/controls/progressmonitor.cxx|   24 +-
 comphelper/source/misc/mimeconfighelper.cxx|9 -
 compilerplugins/clang/stringloop.cxx   |  170 +
 compilerplugins/clang/test/stringloop.cxx  |   38 
 i18nlangtag/source/languagetag/languagetag.cxx |   13 -
 i18npool/source/indexentry/genindex_data.cxx   |5 
 l10ntools/source/po.cxx|8 
 opencl/source/openclconfig.cxx |   11 -
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 svl/source/items/slstitm.cxx   |9 -
 svl/source/items/style.cxx |9 -
 svl/source/numbers/zformat.cxx |   12 -
 svl/source/passwordcontainer/passwordcontainer.cxx |   26 +--
 tools/source/inet/inetmime.cxx |   35 ++--
 unoidl/source/sourceprovider-parser.y  |   10 -
 unotools/source/config/defaultoptions.cxx  |   14 -
 16 files changed, 306 insertions(+), 88 deletions(-)

New commits:
commit c8fa03b1f565461364b9f6423b65680e09281c14
Author: Noel Grandin 
AuthorDate: Thu Jul 26 13:15:05 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 11:15:46 2018 +0200

new loplugin:stringloop, and applied in various

look for OUString being appended to in a loop, better to use
OUStringBuffer to accumulate the results.

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

diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index b43afd5d6e73..c7da6f15ab17 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -721,31 +721,31 @@ void ProgressMonitor::impl_rebuildFixedText ()
 // Rebuild left site of text
 if (m_xTopic_Top.is())
 {
-OUString aCollectString;
+OUStringBuffer aCollectString;
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
 for (auto const & pSearchItem : maTextlist_Top)
 {
-aCollectString  +=  pSearchItem->sTopic + "\n";
+aCollectString.append(pSearchItem->sTopic).append("\n");
 }
 
-m_xTopic_Top->setText ( aCollectString );
+m_xTopic_Top->setText ( aCollectString.makeStringAndClear() );
 }
 
 // Rebuild right site of text
 if (m_xText_Top.is())
 {
-OUStringaCollectString;
+OUStringBuffer aCollectString;
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
 for (auto const & pSearchItem : maTextlist_Top)
 {
-aCollectString  +=  pSearchItem->sText + "\n";
+aCollectString.append(pSearchItem->sText).append("\n");
 }
 
-m_xText_Top->setText ( aCollectString );
+m_xText_Top->setText ( aCollectString.makeStringAndClear() );
 }
 
 // Rebuild fixedtext below progress
@@ -753,31 +753,31 @@ void ProgressMonitor::impl_rebuildFixedText ()
 // Rebuild left site of text
 if (m_xTopic_Bottom.is())
 {
-OUStringaCollectString;
+OUStringBuffer aCollectString;
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
 for (auto const & pSearchItem : maTextlist_Bottom)
 {
-aCollectString  +=  pSearchItem->sTopic + "\n";
+aCollectString.append(pSearchItem->sTopic).append("\n");
 }
 
-m_xTopic_Bottom->setText ( aCollectString );
+m_xTopic_Bottom->setText ( aCollectString.makeStringAndClear() );
 }
 
 // Rebuild right site of text
 if (m_xText_Bottom.is())
 {
-OUStringaCollectString;
+OUStringBuffer aCollectString;
 
 // Collect all topics from list and format text.
 // "\n" MUST BE at the end of line!!! => Else ... topic and his text 
are not in the same line!!!
 for (auto const & pSearchItem : maTextlist_Bottom)
 {
-aCollectString  +=  pSearchItem->sText + "\n";
+aCollectString.append(pSearchItem->sText).append("\n");
 }
 
-m_xText_Bottom->setText ( aCollectString );
+m_xText_Bottom->setText ( aCollectString.makeStringAndClear() );
 }
 }
 
diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index 08ac2f958f37..c027bc1ff00f 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/CppunitTest_sw_uiwriter.mk   |1 
 sw/qa/extras/uiwriter/data2/tdf101534.fodt  |   28 +++
 sw/qa/extras/uiwriter/uiwriter2.cxx |   60 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 -
 4 files changed, 92 insertions(+), 1 deletion(-)

New commits:
commit 93dce15827cc8bd69a9abb5e70a5df0292719a9a
Author: Miklos Vajna 
AuthorDate: Thu Jul 19 15:32:59 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Jul 27 11:16:24 2018 +0200

tdf#101534 sw: fix lost indent attributes when copying into numbered 
paragraph

Commit aa91dc0ccbe53ffcec9dbfec2265de057775d4e3 (CWS-TOOLING: integrate
CWS sw32numbf01, 2009-09-08) replaced the SwDoc::ReplaceNumRule() call
with SwDoc::SetNumRule(), as the later handles list ids. This required a
decision if resetting of the indent attributes is needed or not, but it
did not document why resetting was chosen.

On the other hand, the current bugdoc shows why resetting is a bad idea:
this way if you paste into a numbered paragraph which has a non-zero
paragraph indent inherited from the numbering + zero indent as direct
formatting, then this later is lost during paste.

(cherry picked from commit 340eaa6aa15c18cc2696a4a304350810cb36565c)

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

diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index 05ce1b5c90d8..68d0056172ac 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_uiwriter))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_uiwriter, \
 sw/qa/extras/uiwriter/uiwriter \
+sw/qa/extras/uiwriter/uiwriter2 \
 ))
 
 # note: this links msword only for the reason to have a order dependency,
diff --git a/sw/qa/extras/uiwriter/data2/tdf101534.fodt 
b/sw/qa/extras/uiwriter/data2/tdf101534.fodt
new file mode 100644
index ..e1db2f08ee08
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data2/tdf101534.fodt
@@ -0,0 +1,28 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+  
+
+
+  
+
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+
+  Lorem ipsum dolor sit amet.
+  
+
+  Quo dolor dolore ea, vis te dicunt 
evertitur. Quo idque nostrud referrentur at, saperet volumus sententiae ut 
pro.
+
+  
+
+  
+
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
new file mode 100644
index ..239700294b71
--- /dev/null
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -0,0 +1,60 @@
+/* -*- 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/.
+ */
+
+#include 
+#include 
+#include 
+#include 
+
+namespace
+{
+cha

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - svx/uiconfig

2018-07-27 Thread Libreoffice Gerrit user

 svx/uiconfig/ui/colorwindow.ui |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 73c593fe334cdd6928987f3506468295aef622d0
Author: Caolán McNamara 
AuthorDate: Tue Jun 26 16:05:14 2018 +0100
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 11:20:44 2018 +0200

allow popover direction to depend on position of parent widget in dialog

use the same setting as the emoji popover so that at the top of a dialog the
popover pops down and at the bottom of a dialog is pops up.

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

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 1c2e815eba12..ed28ce5ee80f 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -25,8 +25,6 @@
 True
 True
 4
-bottom
-none
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - svx/source vcl/opengl

2018-07-27 Thread Libreoffice Gerrit user

 svx/source/svdraw/svdograf.cxx |3 +++
 vcl/opengl/salbmp.cxx  |6 ++
 2 files changed, 9 insertions(+)

New commits:
commit 2038ab9d4cbb7282172a65352e4ed1a852404b29
Author: Miklos Vajna 
AuthorDate: Wed Jul 25 17:02:21 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 11:21:07 2018 +0200

tdf#118860 svx opengl: avoid SalBitmap creation without solar mutex

The bugdoc has 2 slides. When switching to the second slide, the graphic
is loaded in the background, but OpenGLSalBitmap::Create() can't work
correctly if the caller doesn't own the solar mutex.

This already asserts in OpenGLContext::prepareForYield() in a less
obvious way.

Focus on the correctness, so just hold the solar mutex during the whole
ImportGrpahic() call. If it turns out that the purpose of running this
on a thread is to avoid synchronous network traffic, then the data could
be first copied to a memory stream, and only then take the lock + import
the graphic.

(cherry picked from commit 919ccaba419531d689231b76a43ab29c6a9ec65a)

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

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 3eb3abfe0953..ab179960f88c 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -93,6 +93,9 @@ const Graphic ImpLoadLinkedGraphic( const OUString& 
aFileName, const OUString& a
 aFilterData[ 0 ].Name = "CreateNativeLink";
 aFilterData[ 0 ].Value <<= true;
 
+// Need to own the solar mutex while creating a SalBitmap.
+SolarMutexGuard aGuard;
+
 // #i123042# for e.g SVG the path is needed, so hand it over here. I 
have no real idea
 // what consequences this may have; maybe this is not handed over by 
purpose here. Not
 // handing it over means that any GraphicFormat that internally needs 
a path as base
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 1ae3e2ae4a01..a68c2f38129f 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -117,6 +117,7 @@ OpenGLSalBitmap::~OpenGLSalBitmap()
 
 bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, long nX, long nY, 
long nWidth, long nHeight )
 {
+DBG_TESTSOLARMUTEX();
 static const BitmapPalette aEmptyPalette;
 OpenGLVCLContextZone aContextZone;
 
@@ -160,6 +161,7 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, 
long nX, long nY, long
 
 bool OpenGLSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const 
BitmapPalette& rBitmapPalette )
 {
+DBG_TESTSOLARMUTEX();
 OpenGLVCLContextZone aContextZone;
 
 Destroy();
@@ -185,16 +187,19 @@ bool OpenGLSalBitmap::Create( const Size& rSize, 
sal_uInt16 nBits, const BitmapP
 
 bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp )
 {
+DBG_TESTSOLARMUTEX();
 return Create( rSalBmp, rSalBmp.GetBitCount() );
 }
 
 bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics 
)
 {
+DBG_TESTSOLARMUTEX();
 return Create( rSalBmp, pGraphics ? pGraphics->GetBitCount() : 
rSalBmp.GetBitCount() );
 }
 
 bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 
nNewBitCount )
 {
+DBG_TESTSOLARMUTEX();
 OpenGLZone aZone;
 
 // check that carefully only in the debug mode
@@ -233,6 +238,7 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, 
sal_uInt16 nNewBitCount
 
 bool OpenGLSalBitmap::Create( const css::uno::Reference< 
css::rendering::XBitmapCanvas >& /*xBitmapCanvas*/, Size& /*rSize*/, bool 
/*bMask*/ )
 {
+DBG_TESTSOLARMUTEX();
 // TODO Is this method needed?
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/qa/extras/layout/data/tdf109077.docx |binary
 sw/qa/extras/layout/layout.cxx  |   14 ++
 sw/source/core/text/porfly.cxx  |8 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 87efbfc5198727c8bf357849833e0bb120458d64
Author: Miklos Vajna 
AuthorDate: Thu Jul 26 09:04:41 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri Jul 27 11:26:33 2018 +0200

tdf#109077 sw textbox: fix as-char shapes with custom print area in para

Regression from d379d18666aa42031359ca8eb34b0021960347ae (oox: import
WPS shape with text as shape with textbox, 2014-06-18), the position of
the textbox should be relative to the print area of the text frame, not
to the text frame itself.

(cherry picked from commit 11d87b35474b642e99e7aa397aa18992c1bc20c9)

Conflicts:
sw/qa/extras/layout/layout.cxx

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

diff --git a/sw/qa/extras/layout/data/tdf109077.docx 
b/sw/qa/extras/layout/data/tdf109077.docx
new file mode 100644
index ..c0a67d2765c0
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf109077.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 2356832cc4ba..f9da84956c5f 100755
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -24,6 +24,7 @@ public:
 void testTableExtrusion2();
 void testTdf116848();
 void testTdf117245();
+void testTdf109077();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
@@ -34,6 +35,7 @@ public:
 CPPUNIT_TEST(testTableExtrusion2);
 CPPUNIT_TEST(testTdf116848);
 CPPUNIT_TEST(testTdf117245);
+CPPUNIT_TEST(testTdf109077);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -194,6 +196,18 @@ void SwLayoutWriter::testTdf117245()
 assertXPath(pXmlDoc, "/root/page/body/txt[2]/LineBreak", 1);
 }
 
+void SwLayoutWriter::testTdf109077()
+{
+createDoc("tdf109077.docx");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+sal_Int32 nShapeTop
+= getXPath(pXmlDoc, "//anchored/SwAnchoredDrawObject/bounds", 
"top").toInt32();
+sal_Int32 nTextBoxTop = getXPath(pXmlDoc, "//anchored/fly/infos/bounds", 
"top").toInt32();
+// This was 281: the top of the shape and its textbox should match, though
+// tolerate differences <= 1px (about 15 twips).
+CPPUNIT_ASSERT_LESS(static_cast(15), nTextBoxTop - nShapeTop);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 19084dfe8379..b74c28d8ec7a 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -351,16 +351,20 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, 
const Point &rBase,
 {
 // It has, so look up its text rectangle, and adjust the position
 // of the textbox accordingly.
+// Both rectangles are absolute, SwFormatHori/VertOrient's position
+// is relative to the print area of the anchor text frame.
 tools::Rectangle aTextRectangle = 
SwTextBoxHelper::getTextRectangle(pShape);
 
 SwFormatHoriOrient aHori(pTextBox->GetHoriOrient());
 aHori.SetHoriOrient(css::text::HoriOrientation::NONE);
-sal_Int32 nLeft = aTextRectangle.getX() - 
rFrame.getFrameArea().Left();
+sal_Int32 nLeft = aTextRectangle.getX() - 
rFrame.getFrameArea().Left()
+  - rFrame.getFramePrintArea().Left();
 aHori.SetPos(nLeft);
 
 SwFormatVertOrient aVert(pTextBox->GetVertOrient());
 aVert.SetVertOrient(css::text::VertOrientation::NONE);
-sal_Int32 const nTop = aTextRectangle.getY() - 
rFrame.getFrameArea().Top();
+sal_Int32 const nTop = aTextRectangle.getY() - 
rFrame.getFrameArea().Top()
+   - rFrame.getFramePrintArea().Top();
 aVert.SetPos(nTop);
 
 pTextBox->LockModify();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sc/qa/uitest/calc_tests/data/tdf100793.ods   |binary
 sc/qa/uitest/conditional_format/tdf100793.py |  103 +++
 2 files changed, 103 insertions(+)

New commits:
commit 86be39afd5b142f7cbdbe0107b394c5924c414cc
Author: Zdeněk Crhonek 
AuthorDate: Wed Jul 25 09:57:44 2018 +0200
Commit: Zdenek Crhonek 
CommitDate: Fri Jul 27 11:27:56 2018 +0200

uitest for bug tdf#100793

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

diff --git a/sc/qa/uitest/calc_tests/data/tdf100793.ods 
b/sc/qa/uitest/calc_tests/data/tdf100793.ods
new file mode 100644
index ..e68efdb92678
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf100793.ods differ
diff --git a/sc/qa/uitest/conditional_format/tdf100793.py 
b/sc/qa/uitest/conditional_format/tdf100793.py
new file mode 100644
index ..5d6c95126159
--- /dev/null
+++ b/sc/qa/uitest/conditional_format/tdf100793.py
@@ -0,0 +1,103 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+import os
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.calc.document import get_sheet_from_doc
+from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+import org.libreoffice.unotest
+import pathlib
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Bug 100793 - FORMATTING - conditional formatting gets corrupted upon 
copy/paste/insert
+class tdf100793(UITestCase):
+def test_tdf100793(self):
+
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf100793.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+sheet = get_sheet_from_doc(calc_doc, 2)
+conditional_format_list = get_conditional_format_from_sheet(sheet)
+self.assertEqual(conditional_format_list.getLength(), 1)
+#2) Go to sheet "plan"
+gridwin.executeAction("SELECT", mkPropertyValues({"TABLE": "2"}))
+#3) Open the conditional formatting management dialog-> The indicated 
range should be G18:K29,F18,F20:F29
+
self.ui_test.execute_dialog_through_command(".uno:ConditionalFormatManagerDialog")
+
+xCondFormatMgr = self.xUITest.getTopFocusWindow()
+
+# check that we have exactly one conditional formats in the beginning
+xList = xCondFormatMgr.getChild("CONTAINER")
+list_state = get_state_as_dict(xList)
+self.assertEqual(list_state['Children'], '1')
+
+#3) Click Edit & try to change to intended one, F18:K33
+xEditBtn = xCondFormatMgr.getChild("edit")
+self.ui_test.execute_dialog_through_action(xEditBtn, "CLICK", 
event_name = "ModelessDialogVisible")
+xCondFormatDlg = self.xUITest.getTopFocusWindow()
+
+#modify textbox
+xedassign = xCondFormatDlg.getChild("edassign")
+#go at the beginning
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "END"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "HOME"}))
+# 11x right
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+xedassign.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RIGHT"}))
+#now I'm at F18 - write :K33
+xedassign.executeAction("TYPE", mkPropertyValues({"TEXT":":K33"}))
+
+xCondFormatOkBtn = xCondFormatDlg.getChild("ok")
+self.ui_test.close_dialog_through_button(xCondFormatOkBtn)
+
+# we need to get a pointer again as the old window has been deleted
+xCondFormatMgr = self.xUITest.getTopFocusWindow()
+
+# check again that we still have 1 entry in the list
+# and still only 1 conditional format in the document

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/source/uibase/dochdl/swdtflvr.cxx |   23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit 73bd150048d056fb6e00de3f8b91347b7f642e91
Author: László Németh 
AuthorDate: Fri Jul 20 17:49:21 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 11:31:34 2018 +0200

tdf#37223 Writer: insert 1-cell tables as text instead of OLE object

to get a user-friendly solution to copy Calc cell content to a text
document and to its native tables.

NOTE: MSO does the same for copying 1-cell tables, while LibreOffice
was able to do this only with paste special as RTF.

Change-Id: I6156333055aa9bed4cf56ff12f913e89d3f5700c
Reviewed-on: https://gerrit.libreoffice.org/57783
Tested-by: Jenkins
Reviewed-by: László Németh 
Reviewed-on: https://gerrit.libreoffice.org/57814
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 4e69db27180e..2eac04a31e5d 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1128,6 +1128,7 @@ bool SwTransferable::Paste(SwWrtShell& rSh, 
TransferableDataHelper& rData, RndSt
 SotExchangeDest nDestination = SwTransferable::GetSotDestination( rSh );
 SotClipboardFormatId nFormat = SotClipboardFormatId::NONE;
 SotExchangeActionFlags nActionFlags = SotExchangeActionFlags::NONE;
+bool bSingleCellTable = false;
 
 if( GetSwTransferable( rData ) )
 {
@@ -1153,8 +1154,26 @@ bool SwTransferable::Paste(SwWrtShell& rSh, 
TransferableDataHelper& rData, RndSt
 &nActionFlags );
 }
 
-// special case for tables from draw application
-if( EXCHG_OUT_ACTION_INSERT_DRAWOBJ == nAction )
+// content of 1-cell tables is inserted as simple text
+if( EXCHG_OUT_ACTION_INSERT_OLE == nAction && ( rData.HasFormat( 
SotClipboardFormatId::SYLK ) ||
+  rData.HasFormat( SotClipboardFormatId::SYLK_BIGCAPS ) ) )
+{
+OUString aExpand;
+if( rData.GetString( SotClipboardFormatId::STRING, aExpand ))
+{
+const sal_Int32 
nNewlines{comphelper::string::getTokenCount(aExpand, '\n')};
+const sal_Int32 nRows = nNewlines ? nNewlines-1 : 0;
+if ( nRows == 1 )
+{
+const sal_Int32 nCols = 
comphelper::string::getTokenCount(aExpand.getToken(0, '\n'), '\t');
+if (nCols == 1)
+bSingleCellTable = true;
+}
+}
+}
+
+// special case for tables from draw application or 1-cell tables
+if( EXCHG_OUT_ACTION_INSERT_DRAWOBJ == nAction || bSingleCellTable )
 {
 if( rData.HasFormat( SotClipboardFormatId::RTF ) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 basic/source/comp/codegen.cxx  |8 +--
 basic/source/runtime/methods1.cxx  |8 +--
 basic/source/sbx/sbxexec.cxx   |6 +-
 basic/source/sbx/sbxvar.cxx|   30 ++---
 framework/source/accelerators/storageholder.cxx|7 +--
 framework/source/fwe/xml/menudocumenthandler.cxx   |8 +--
 framework/source/fwe/xml/toolboxdocumenthandler.cxx|8 +--
 framework/source/uielement/langselectionmenucontroller.cxx |6 --
 sax/source/tools/converter.cxx |6 +-
 svtools/source/contnr/fileview.cxx |3 -
 svtools/source/contnr/svtabbx.cxx  |   16 +++---
 svtools/source/contnr/treelistbox.cxx  |6 +-
 12 files changed, 55 insertions(+), 57 deletions(-)

New commits:
commit b83cc2b0108a4ec2087221a6150a66578788e5b4
Author: Noel Grandin 
AuthorDate: Thu Jul 26 17:16:16 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 11:35:24 2018 +0200

loplugin:stringloop in basic, framework, sax, svtools

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

diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index 4e13f6a83336..fc234dfa1579 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -189,7 +189,7 @@ void SbiCodeGen::Save()
 if( pProc && pProc->IsDefined() )
 {
 OUString aProcName = pProc->GetName();
-OUString aIfaceProcName;
+OUStringBuffer aIfaceProcName;
 OUString aIfaceName;
 sal_uInt16 nPassCount = 1;
 if( nIfaceCount )
@@ -210,9 +210,9 @@ void SbiCodeGen::Save()
 {
 if( nPropPrefixFound == 0 )
 {
-aIfaceProcName += aPropPrefix;
+aIfaceProcName.append(aPropPrefix);
 }
-aIfaceProcName += aPureProcName.copy( 
rIfaceName.getLength() + 1 );
+aIfaceProcName.append(aPureProcName.copy( 
rIfaceName.getLength() + 1 ));
 aIfaceName = rIfaceName;
 nPassCount = 2;
 break;
@@ -224,7 +224,7 @@ void SbiCodeGen::Save()
 {
 if( nPass == 1 )
 {
-aProcName = aIfaceProcName;
+aProcName = aIfaceProcName.toString();
 }
 PropertyMode ePropMode = pProc->getPropertyMode();
 if( ePropMode != PropertyMode::NONE )
diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 8c8c3dcbcd7d..4b59ea081c28 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1550,20 +1550,20 @@ void SbRtl_Join(StarBASIC *, SbxArray & rPar, bool)
 {
 aDelim = " ";
 }
-OUString aRetStr;
+OUStringBuffer aRetStr;
 short nLower, nUpper;
 pArr->GetDim( 1, nLower, nUpper );
 short aIdx[1];
 for (aIdx[0] = nLower; aIdx[0] <= nUpper; ++aIdx[0])
 {
 OUString aStr = pArr->Get(aIdx)->GetOUString();
-aRetStr += aStr;
+aRetStr.append(aStr);
 if (aIdx[0] != nUpper)
 {
-aRetStr += aDelim;
+aRetStr.append(aDelim);
 }
 }
-rPar.Get(0)->PutString( aRetStr );
+rPar.Get(0)->PutString( aRetStr.makeStringAndClear() );
 }
 else
 {
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index a74cdf5c2655..7f177c27814d 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -140,7 +140,7 @@ static SbxVariableRef Operand
 else if( !bVar && *p == '"' )
 {
 // A string
-OUString aString;
+OUStringBuffer aString;
 p++;
 for( ;; )
 {
@@ -157,9 +157,9 @@ static SbxVariableRef Operand
 break;
 }
 }
-aString += OUStringLiteral1(*p++);
+aString.append(*p++);
 }
-refVar->PutString( aString );
+refVar->PutString( aString.makeStringAndClear() );
 }
 else
 {
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 59751d4d6288..3172cf5f686e 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -233,7 +233,7 @@ const OUString& SbxVariable::GetName( SbxNameType t ) const
 return maName;
 }
 sal_Unicode cType = ' ';
-OUString aTmp( maName );
+OUStringBuffer aTmp( maName );
 // short type? Then fetch it, possible this is 0.
 SbxDat

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

2018-07-27 Thread Libreoffice Gerrit user

 include/cppuhelper/implbase.hxx   |   10 ++
 include/cppuhelper/implbase1.hxx  |8 
 include/cppuhelper/implbase10.hxx |8 
 include/cppuhelper/implbase11.hxx |8 
 include/cppuhelper/implbase12.hxx |8 
 include/cppuhelper/implbase13.hxx |8 
 include/cppuhelper/implbase2.hxx  |8 
 include/cppuhelper/implbase3.hxx  |8 
 include/cppuhelper/implbase4.hxx  |8 
 include/cppuhelper/implbase5.hxx  |8 
 include/cppuhelper/implbase6.hxx  |8 
 include/cppuhelper/implbase7.hxx  |8 
 include/cppuhelper/implbase8.hxx  |8 
 include/cppuhelper/implbase9.hxx  |8 
 14 files changed, 114 insertions(+)

New commits:
commit c441672c0d99e08faa0667afd0ea804732b66c22
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 14:13:51 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 11:35:39 2018 +0200

cppuhelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.  (For LIBO_INTERNAL_ONLY.)

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

diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index cfd68022c1e6..c946fb9cb052 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -104,6 +104,11 @@ protected:
 virtual ~WeakImplHelper() override {}
 
 public:
+WeakImplHelper(WeakImplHelper const &) = default;
+WeakImplHelper(WeakImplHelper &&) = default;
+WeakImplHelper & operator =(WeakImplHelper const &) = default;
+WeakImplHelper & operator =(WeakImplHelper &&) = default;
+
 css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) 
override
 { return WeakImplHelper_query(aType, cd::get(), this, this); }
 
@@ -152,6 +157,11 @@ protected:
 virtual ~ImplInheritanceHelper() {}
 
 public:
+ImplInheritanceHelper(ImplInheritanceHelper const &) = default;
+ImplInheritanceHelper(ImplInheritanceHelper &&) = default;
+ImplInheritanceHelper & operator =(ImplInheritanceHelper const &) = 
default;
+ImplInheritanceHelper & operator =(ImplInheritanceHelper &&) = default;
+
 css::uno::Any SAL_CALL queryInterface(css::uno::Type const & aType) 
override
 {
 css::uno::Any ret(ImplHelper_queryNoXInterface(aType, cd::get(), 
this));
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 395723fe98e0..d274d661b4f7 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -69,6 +69,14 @@ namespace cppu
 {
 struct cd : public rtl::StaticAggregate< class_data, ImplClassData1 < 
Ifc1, ImplHelper1 > > {};
 public:
+#if defined LIBO_INTERNAL_ONLY
+ImplHelper1() = default;
+ImplHelper1(ImplHelper1 const &) = default;
+ImplHelper1(ImplHelper1 &&) = default;
+ImplHelper1 & operator =(ImplHelper1 const &) = default;
+ImplHelper1 & operator =(ImplHelper1 &&) = default;
+#endif
+
 virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & 
rType ) SAL_OVERRIDE
 { return ImplHelper_query( rType, cd::get(), this ); }
 virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() 
SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase10.hxx 
b/include/cppuhelper/implbase10.hxx
index 75d4e10d1203..d4278d551c2a 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -79,6 +79,14 @@ namespace cppu
 {
 struct cd : public rtl::StaticAggregate< class_data, ImplClassData10< 
Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, ImplHelper10 > > {};
 public:
+#if defined LIBO_INTERNAL_ONLY
+ImplHelper10() = default;
+ImplHelper10(ImplHelper10 const &) = default;
+ImplHelper10(ImplHelper10 &&) = default;
+ImplHelper10 & operator =(ImplHelper10 const &) = default;
+ImplHelper10 & operator =(ImplHelper10 &&) = default;
+#endif
+
 virtual css::uno::Any SAL_CALL queryInterface( css::uno::Type const & 
rType ) SAL_OVERRIDE
 { return ImplHelper_query( rType, cd::get(), this ); }
 virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() 
SAL_OVERRIDE
diff --git a/include/cppuhelper/implbase11.hxx 
b/include/cppuhelper/implbase11.hxx
index 6082880d88e7..937705b3c2a5 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -80,6 +80,14 @@ namespace cppu
 {
 str

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

2018-07-27 Thread Libreoffice Gerrit user

 include/sfx2/sidebar/ContextList.hxx |1 -
 sfx2/inc/preventduplicateinteraction.hxx |7 ---
 sfx2/source/sidebar/ContextList.cxx  |4 
 3 files changed, 12 deletions(-)

New commits:
commit 02dc2cafbb0364556a4145633485f3c9f082b43d
Author: Stephan Bergmann 
AuthorDate: Thu Jul 26 13:45:04 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 11:36:33 2018 +0200

svx: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future.  (Even if a dtor 
was
declared non-inline in an include file, the apparently-used 
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)

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

diff --git a/include/sfx2/sidebar/ContextList.hxx 
b/include/sfx2/sidebar/ContextList.hxx
index 8e9c1ce48ef4..7db19ffeb590 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/include/sfx2/sidebar/ContextList.hxx
@@ -33,7 +33,6 @@ class ContextList
 {
 public:
 ContextList();
-~ContextList();
 
 class Entry
 {
diff --git a/sfx2/inc/preventduplicateinteraction.hxx 
b/sfx2/inc/preventduplicateinteraction.hxx
index 5e1db5043aec..46e998a213e7 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -188,13 +188,6 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
 , m_nMaxCount   (nMaxCount   )
 , m_nCallCount  (0   )
 {}
-
-InteractionInfo(const InteractionInfo& aCopy)
-: m_aInteraction(aCopy.m_aInteraction)
-, m_nMaxCount   (aCopy.m_nMaxCount   )
-, m_nCallCount  (aCopy.m_nCallCount  )
-, m_xRequest(aCopy.m_xRequest)
-{}
 };
 
 typedef ::std::vector< InteractionInfo > InteractionList;
diff --git a/sfx2/source/sidebar/ContextList.cxx 
b/sfx2/source/sidebar/ContextList.cxx
index fb841f081543..12a21ca43de9 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -28,10 +28,6 @@ ContextList::ContextList()
 {
 }
 
-ContextList::~ContextList()
-{
-}
-
 const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const
 {
 const ::std::vector::const_iterator iEntry = 
FindBestMatch(rContext);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl sd/source vcl/inc vcl/opengl vcl/source vcl/unx

2018-07-27 Thread Libreoffice Gerrit user

 include/vcl/GraphicNativeTransform.hxx   |2 
 include/vcl/alpha.hxx|2 
 include/vcl/button.hxx   |4 
 include/vcl/field.hxx|8 -
 include/vcl/help.hxx |8 -
 include/vcl/opengl/OpenGLContext.hxx |2 
 include/vcl/pdfextoutdevdata.hxx |   24 -
 include/vcl/region.hxx   |   14 +--
 include/vcl/textview.hxx |2 
 sd/source/ui/func/futext.cxx |6 -
 vcl/inc/brdwin.hxx   |2 
 vcl/inc/opengl/program.hxx   |2 
 vcl/inc/opengl/salbmp.hxx|2 
 vcl/inc/opengl/x11/gdiimpl.hxx   |2 
 vcl/inc/openglgdiimpl.hxx|2 
 vcl/inc/unx/printerjob.hxx   |2 
 vcl/opengl/gdiimpl.cxx   |9 --
 vcl/opengl/program.cxx   |4 
 vcl/opengl/salbmp.cxx|4 
 vcl/opengl/x11/gdiimpl.cxx   |   13 +-
 vcl/source/app/help.cxx  |7 -
 vcl/source/app/salvtables.cxx|6 -
 vcl/source/control/button.cxx|6 -
 vcl/source/control/field.cxx |   51 ---
 vcl/source/control/field2.cxx|   20 +---
 vcl/source/edit/textview.cxx |3 
 vcl/source/filter/GraphicNativeTransform.cxx |4 
 vcl/source/filter/ixbm/xbmread.cxx   |8 -
 vcl/source/fontsubset/cff.cxx|   10 --
 vcl/source/gdi/alpha.cxx |3 
 vcl/source/gdi/pdfextoutdevdata.cxx  |   12 --
 vcl/source/gdi/region.cxx|  120 ---
 vcl/source/opengl/OpenGLContext.cxx  |4 
 vcl/source/window/brdwin.cxx |7 -
 vcl/source/window/winproc.cxx|6 -
 vcl/unx/generic/print/glyphset.cxx   |4 
 vcl/unx/generic/print/glyphset.hxx   |2 
 vcl/unx/generic/print/printerjob.cxx |4 
 38 files changed, 157 insertions(+), 234 deletions(-)

New commits:
commit bd28564be85ee51dc08cb2591840e1cb00263e28
Author: Noel Grandin 
AuthorDate: Thu Jul 26 12:27:10 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 11:42:27 2018 +0200

loplugin:returnconstant in vcl

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

diff --git a/include/vcl/GraphicNativeTransform.hxx 
b/include/vcl/GraphicNativeTransform.hxx
index f2f142f5ba57..04bdf4817dd0 100644
--- a/include/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
@@ -27,7 +27,7 @@ class VCL_DLLPUBLIC GraphicNativeTransform final
 Graphic& mrGraphic;
 
 bool rotateBitmapOnly (sal_uInt16 aRotation);
-bool rotateJPEG   (sal_uInt16 aRotation);
+void rotateJPEG   (sal_uInt16 aRotation);
 bool rotateGeneric(sal_uInt16 aRotation, const OUString& aType);
 
 public:
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index e91845c638a8..b1133b967957 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -58,7 +58,7 @@ public:
 Bitmap const & GetBitmap() const;
 
 voidErase( sal_uInt8 cTransparency );
-boolReplace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency );
+voidReplace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency );
 voidReplace( sal_uInt8 cSearchTransparency, sal_uInt8 
cReplaceTransparency );
 
 BitmapReadAccess*  AcquireReadAccess() { return 
Bitmap::AcquireReadAccess(); }
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 85f798af5c90..ddc61afdd02d 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -81,7 +81,7 @@ public:
 
 static OUString GetStandardText( StandardButtonType eButton );
 
-boolSetModeImage( const Image& rImage );
+voidSetModeImage( const Image& rImage );
 Image const &   GetModeImage( ) const;
 boolHasImage() const;
 voidSetImageAlign( ImageAlign eAlign );
@@ -341,7 +341,7 @@ public:
 voidEnableRadioCheck( bool bRadioCheck ) { mbRadioCheck = 
bRadioCheck; }
 boolIsRadioCheckEnabled() const { return mbRadioCheck; }
 
-boolSetModeRadioImage( const Image& rImage );
+voidSetModeRadioImage( const Image& rImage );
 const Image&GetModeRadioImage( ) const { return maImage;}
 
 voidSetState( bool bCheck );
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 4b79e4ad8ea9..ff9eae27377e 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -248,7 +248,7 @@ protected:
 
 MetricFormatter();
 
-SAL_DLLPRIVATE bool ImplMetr

Re: How to insert extra and hidden information for each element of document via LibreOffice API?

2018-07-27 Thread Wols Lists

On 24/07/18 12:20, MUNOZ JULHO Yupanqui wrote:
> Hi everyone,
> 
> I am working with the Eclipse Papyrus team on a UML to odt generator.
> Besides one way generating, it should be able to handle bidirectional
> synchronization between these two "worlds".
> For reaching this goal, I need to map each model element with its
> respective doc element. For example, a package name will be transformed
> to a section in a document or a comment in a paragraph. I am looking for
> a way to reference the UML element from the odt document, for example
> adding the ID of the UML element to an odt "paragraph".
> 
> In the users mailing list, Regina Henschel, suggested me to use
> bookmarks. It is a good idea, but, if is possible, I want to hide this
> information.
> 
> Does anyone have another suggestion?
> 
Might need someone to suggest a change to the Open Document format, but
is there anything about "preserved but ignored" elements?

WordPerfect had such a thing with their new layout for v6 (crumbs,
that's 1994!). They defined a certain layout for their tags - bit like
an XML element - but also explicitly stated that unrecognised properly
formed tags would be "preserved and ignored".

So if say v8 introduced a whole bunch of new tags, the resulting
document could be round-tripped through v6, and unless the user
*ex*plicitly deleted the tags in v6, they would still be there when the
document was returned back to v8.

If you could guarantee that unrecognised elements would be preserved,
you could simply stick them in the XML that makes up the odt, knowing
that when it's retrieved back in to Papyrus, they would still be there.

Cheers,
Wol

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

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

2018-07-27 Thread Libreoffice Gerrit user

 include/svl/filenotation.hxx  |2 +-
 include/svtools/colorcfg.hxx  |2 +-
 include/svtools/extcolorcfg.hxx   |2 +-
 include/svtools/imap.hxx  |4 ++--
 include/svtools/svlbitm.hxx   |2 +-
 svl/source/fsstor/fsstorage.cxx   |5 ++---
 svl/source/misc/filenotation.cxx  |6 +++---
 svtools/source/config/colorcfg.cxx|3 +--
 svtools/source/config/extcolorcfg.cxx |3 +--
 svtools/source/contnr/svlbitm.cxx |3 +--
 svtools/source/misc/imap2.cxx |   12 
 svtools/source/uno/unoimap.cxx|9 -
 12 files changed, 22 insertions(+), 31 deletions(-)

New commits:
commit 928dfebe109794eb079469a46f549e25b3b1e89d
Author: Noel Grandin 
AuthorDate: Thu Jul 26 14:36:38 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 12:16:53 2018 +0200

loplugin:returnconstant in svl,svtools

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

diff --git a/include/svl/filenotation.hxx b/include/svl/filenotation.hxx
index e5cf1c78a320..d33e442b9396 100644
--- a/include/svl/filenotation.hxx
+++ b/include/svl/filenotation.hxx
@@ -47,7 +47,7 @@ namespace svt
 private:
 SVL_DLLPRIVATE void construct( const OUString& _rUrlOrPath );
 SVL_DLLPRIVATE boolimplInitWithSystemNotation( const OUString& 
_rSystemPath );
-SVL_DLLPRIVATE boolimplInitWithURLNotation( const OUString& _rURL 
);
+SVL_DLLPRIVATE voidimplInitWithURLNotation( const OUString& _rURL 
);
 
 OUString m_sSystem;
 OUString m_sFileURL;
diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx
index 450eed0e82c0..381ef70570c4 100644
--- a/include/svtools/colorcfg.hxx
+++ b/include/svtools/colorcfg.hxx
@@ -121,7 +121,7 @@ public:
 css::uno::Sequence< OUString >  GetSchemeNames() const;
 voidDeleteScheme(const OUString& rScheme );
 voidAddScheme(const OUString& rScheme );
-boolLoadScheme(const OUString& rScheme );
+voidLoadScheme(const OUString& rScheme );
 const OUString& GetCurrentSchemeName() const;
 voidSetCurrentSchemeName(const OUString& rScheme);
 
diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx
index 17e885661371..752784c92390 100644
--- a/include/svtools/extcolorcfg.hxx
+++ b/include/svtools/extcolorcfg.hxx
@@ -87,7 +87,7 @@ public:
 
 voidDeleteScheme(const OUString& rScheme );
 voidAddScheme(const OUString& rScheme );
-boolLoadScheme(const OUString& rScheme );
+voidLoadScheme(const OUString& rScheme );
 voidSetCurrentSchemeName(const OUString& rScheme);
 
 sal_Int32   GetComponentCount() const;
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 232248d20039..af094cbab817 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -46,8 +46,8 @@ private:
 // Import/Export
 voidImpWriteCERN( SvStream& rOStm ) const;
 voidImpWriteNCSA( SvStream& rOStm ) const;
-sal_uLong   ImpReadCERN( SvStream& rOStm );
-sal_uLong   ImpReadNCSA( SvStream& rOStm );
+voidImpReadCERN( SvStream& rOStm );
+voidImpReadNCSA( SvStream& rOStm );
 
 voidImpReadCERNLine( const OString& rLine );
 static PointImpReadCERNCoords( const char** ppStr );
diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx
index a6ca61dceef0..3b603f47bbcf 100644
--- a/include/svtools/svlbitm.hxx
+++ b/include/svtools/svlbitm.hxx
@@ -154,7 +154,7 @@ public:
   SvViewDataItem* pViewData = nullptr) override;
 
 virtual SvLBoxItemType GetType() const override;
-bool ClickHdl( SvTreeListEntry* );
+void ClickHdl( SvTreeListEntry* );
 
 virtual void Paint(const Point& rPos,
SvTreeListBox& rOutDev,
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 6a28dc07d422..f01d7c583b9e 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -700,11 +700,10 @@ void SAL_CALL FSStorage::renameElement( const OUString& 
aElementName, const OUSt
 uno::Reference< ucb::XCommandEnvironment > xDummyEnv;
 ::ucbhelper::Content aSourceContent( aOldURL.GetMainURL( 
INetURLObject::DecodeMechanism::NONE ), xDummyEnv, 
comphelper::getProcessComponentContext() );
 
-if ( !GetContent()->transferContent( aSourceContent,
+GetContent()->transferContent( aSourceContent,
 ::ucbhelper::InsertOpera

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

2018-07-27 Thread Libreoffice Gerrit user

 framework/inc/dispatch/startmoduledispatcher.hxx  |5 -
 framework/inc/uielement/toolbarmerger.hxx |8 +-
 framework/source/dispatch/startmoduledispatcher.cxx   |8 +-
 framework/source/uiconfiguration/imagemanagerimpl.cxx |6 --
 framework/source/uiconfiguration/imagemanagerimpl.hxx |2 
 framework/source/uielement/toolbarmerger.cxx  |   52 +-
 6 files changed, 28 insertions(+), 53 deletions(-)

New commits:
commit a4901e73b7ec1acab95fec7a04b688368786a234
Author: Noel Grandin 
AuthorDate: Thu Jul 26 14:36:12 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 27 12:24:04 2018 +0200

loplugin:returnconstant in framework

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

diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx 
b/framework/inc/dispatch/startmoduledispatcher.hxx
index 6dc49f794135..8c5dc34dace6 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -105,11 +105,8 @@ class StartModuleDispatcher : public  
::cppu::WeakImplHelper<
 bool implts_isBackingModePossible();
 
 /** @short  open the special BackingComponent (now StartModule)
-
-@return [bool]
-sal_True if operation was successfully.
  */
-bool implts_establishBackingMode();
+void implts_establishBackingMode();
 
 /** @short  notify a DispatchResultListener.
 
diff --git a/framework/inc/uielement/toolbarmerger.hxx 
b/framework/inc/uielement/toolbarmerger.hxx
index 2c2890fb4e1d..802b9bd080cb 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -72,7 +72,7 @@ class ToolBarMerger
 public:
 static bool   IsCorrectContext( const OUString& aContext, const 
OUString& aModuleIdentifier );
 
-static bool   ConvertSeqSeqToVector( const css::uno::Sequence< 
css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
+static void   ConvertSeqSeqToVector( const css::uno::Sequence< 
css::uno::Sequence< css::beans::PropertyValue > >& rSequence,
  AddonToolbarItemContainer& 
rContainer );
 
 static void   ConvertSequenceToValues( const css::uno::Sequence< 
css::beans::PropertyValue >& rSequence,
@@ -104,7 +104,7 @@ class ToolBarMerger
 const OUString&   
rMergeFallback,
 const 
AddonToolbarItemContainer& rItems );
 
-static bool   MergeItems( ToolBox*  pToolbar,
+static void   MergeItems( ToolBox*  pToolbar,
   ToolBox::ImplToolItems::size_type nPos,
   sal_uInt16nModIndex,
   sal_uInt16&   rItemId,
@@ -112,14 +112,14 @@ class ToolBarMerger
   const OUString&   
rModuleIdentifier,
   const AddonToolbarItemContainer& 
rAddonToolbarItems );
 
-static bool   ReplaceItem( ToolBox*  pToolbar,
+static void   ReplaceItem( ToolBox*  pToolbar,
ToolBox::ImplToolItems::size_type nPos,
sal_uInt16&   rItemId,
CommandToInfoMap& rCommandMap,
const OUString&   
rModuleIdentifier,
const AddonToolbarItemContainer& 
rAddonToolbarItems );
 
-static bool   RemoveItems( ToolBox*   pToolbar,
+static void   RemoveItems( ToolBox*   pToolbar,
ToolBox::ImplToolItems::size_type nPos,
const OUString&
rMergeCommandParameter );
 
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx 
b/framework/source/dispatch/startmoduledispatcher.cxx
index 69dadf214b6d..f6538f701be3 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -67,8 +67,8 @@ void SAL_CALL 
StartModuleDispatcher::dispatchWithNotification(const css::util::U
 nResult = css::frame::DispatchResultState::FAILURE;
 if (implts_isBackingModePossible ())
 {
-if (implts_establishBackingMode ())
-nResult = css::frame::DispatchResultState::SUCCESS;
+implts_establishBackingMode ();
+nResult = css::frame::DispatchResultState::SUCCESS;
 }
 }
 
@@ -119,7 +119,7 @@ bool StartModuleDispatcher::implts_isBackingModePossi

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-1' - source/sl

2018-07-27 Thread Libreoffice Gerrit user

 source/sl/dictionaries/id.po  |   10 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |4 
 source/sl/helpcontent2/source/text/sbasic/shared/03.po|  152 --
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/helpcontent2/source/text/shared/00.po   |   20 
 source/sl/helpcontent2/source/text/shared/01.po   |  254 ++-
 source/sl/helpcontent2/source/text/shared/optionen.po |8 
 source/sl/helpcontent2/source/text/simpress/01.po |   12 
 source/sl/helpcontent2/source/text/swriter.po |4 
 source/sl/helpcontent2/source/text/swriter/00.po  |4 
 source/sl/helpcontent2/source/text/swriter/01.po  |4 
 source/sl/helpcontent2/source/text/swriter/guide.po   |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   11 
 source/sl/sc/messages.po  |   22 
 source/sl/scp2/source/ooo.po  |   22 
 source/sl/sfx2/messages.po|4 
 source/sl/svtools/messages.po |4 
 source/sl/svx/messages.po |   28 
 source/sl/sw/messages.po  |  747 --
 19 files changed, 662 insertions(+), 656 deletions(-)

New commits:
commit d47af98a966ff72f60492aeded35b52637294a61
Author: Andras Timar 
AuthorDate: Fri Jul 27 12:33:08 2018 +0200
Commit: Andras Timar 
CommitDate: Fri Jul 27 12:33:08 2018 +0200

Updated Slovenian translation

Change-Id: I35b6df1e23e86b91106b09af83f97f5a580f0520

diff --git a/source/sl/dictionaries/id.po b/source/sl/dictionaries/id.po
index 0436be92112..9447d7fd434 100644
--- a/source/sl/dictionaries/id.po
+++ b/source/sl/dictionaries/id.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-04-12 14:27+0200\n"
-"PO-Revision-Date: 2018-04-05 11:19+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
+"PO-Revision-Date: 2018-07-26 18:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -21,5 +21,5 @@ msgctxt ""
 "description.xml\n"
 "dispname\n"
 "description.text"
-msgid "Indonesian spelling dictionary and thesaurus"
-msgstr "Indonezijski jezik - slovar za preverjanje črkovanja in slovar 
sopomenk"
+msgid "Indonesian spelling dictionary, hyphenation rules, and thesaurus"
+msgstr "Indonezijski jezik – slovar za preverjanje črkovanja, vzorci za 
deljenje besed in slovar sopomenk"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index 49d1439a34a..f2ed1003b16 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-06-27 07:13+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
 "PO-Revision-Date: 2018-06-27 10:25+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared/03.po 
b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
index 92536a35fe5..d54f47f1b27 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-06-27 07:13+0200\n"
-"PO-Revision-Date: 2018-06-27 10:21+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
+"PO-Revision-Date: 2018-07-26 18:26+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -73,29 +73,29 @@ msgctxt ""
 msgid "The FormWizard 
Library"
 msgstr "Knjižnica FormWizard"
 
-#: lib_gimnicks.xhp
+#: lib_gimmicks.xhp
 msgctxt ""
-"

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - translations

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit 68edc66937a365a6e2a2b8d9c02745bcc733ba46
Author: Andras Timar 
AuthorDate: Fri Jul 27 12:33:08 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jul 27 12:33:25 2018 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-1'
  - Updated Slovenian translation

Change-Id: I35b6df1e23e86b91106b09af83f97f5a580f0520

diff --git a/translations b/translations
index 8a7d2f577bb9..d47af98a966f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8a7d2f577bb9f9f540c61f775244a8d2af052048
+Subproject commit d47af98a966ff72f60492aeded35b52637294a61
___
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-0' - translations

2018-07-27 Thread Libreoffice Gerrit user

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

New commits:
commit e1bd442b496a01f47418abb391f84d152b7f95ab
Author: Andras Timar 
AuthorDate: Fri Jul 27 12:33:08 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jul 27 12:34:20 2018 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-1-0'
  - Updated Slovenian translation

Change-Id: I35b6df1e23e86b91106b09af83f97f5a580f0520
(cherry picked from commit d47af98a966ff72f60492aeded35b52637294a61)

diff --git a/translations b/translations
index 2d871cb15014..6329e980b326 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 2d871cb15014b07939c7bc8c880c86bb38f4dcd7
+Subproject commit 6329e980b3264ad84f40416345934adff58b62a7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-1-0' - source/sl

2018-07-27 Thread Libreoffice Gerrit user

 source/sl/dictionaries/id.po  |   10 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |4 
 source/sl/helpcontent2/source/text/sbasic/shared/03.po|  152 --
 source/sl/helpcontent2/source/text/scalc/01.po|4 
 source/sl/helpcontent2/source/text/shared/00.po   |   20 
 source/sl/helpcontent2/source/text/shared/01.po   |  254 ++-
 source/sl/helpcontent2/source/text/shared/optionen.po |8 
 source/sl/helpcontent2/source/text/simpress/01.po |   12 
 source/sl/helpcontent2/source/text/swriter.po |4 
 source/sl/helpcontent2/source/text/swriter/00.po  |4 
 source/sl/helpcontent2/source/text/swriter/01.po  |4 
 source/sl/helpcontent2/source/text/swriter/guide.po   |4 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   11 
 source/sl/sc/messages.po  |   22 
 source/sl/scp2/source/ooo.po  |   22 
 source/sl/sfx2/messages.po|4 
 source/sl/svtools/messages.po |4 
 source/sl/svx/messages.po |   28 
 source/sl/sw/messages.po  |  747 --
 19 files changed, 662 insertions(+), 656 deletions(-)

New commits:
commit 6329e980b3264ad84f40416345934adff58b62a7
Author: Andras Timar 
AuthorDate: Fri Jul 27 12:33:08 2018 +0200
Commit: Andras Timar 
CommitDate: Fri Jul 27 12:34:13 2018 +0200

Updated Slovenian translation

Change-Id: I35b6df1e23e86b91106b09af83f97f5a580f0520
(cherry picked from commit d47af98a966ff72f60492aeded35b52637294a61)

diff --git a/source/sl/dictionaries/id.po b/source/sl/dictionaries/id.po
index 0436be92112..9447d7fd434 100644
--- a/source/sl/dictionaries/id.po
+++ b/source/sl/dictionaries/id.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-04-12 14:27+0200\n"
-"PO-Revision-Date: 2018-04-05 11:19+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
+"PO-Revision-Date: 2018-07-26 18:23+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -21,5 +21,5 @@ msgctxt ""
 "description.xml\n"
 "dispname\n"
 "description.text"
-msgid "Indonesian spelling dictionary and thesaurus"
-msgstr "Indonezijski jezik - slovar za preverjanje črkovanja in slovar 
sopomenk"
+msgid "Indonesian spelling dictionary, hyphenation rules, and thesaurus"
+msgstr "Indonezijski jezik – slovar za preverjanje črkovanja, vzorci za 
deljenje besed in slovar sopomenk"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared.po 
b/source/sl/helpcontent2/source/text/sbasic/shared.po
index 49d1439a34a..f2ed1003b16 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-06-27 07:13+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
 "PO-Revision-Date: 2018-06-27 10:25+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/helpcontent2/source/text/sbasic/shared/03.po 
b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
index 92536a35fe5..d54f47f1b27 100644
--- a/source/sl/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/sl/helpcontent2/source/text/sbasic/shared/03.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-06-27 07:13+0200\n"
-"PO-Revision-Date: 2018-06-27 10:21+0200\n"
+"POT-Creation-Date: 2018-07-26 07:48+0200\n"
+"PO-Revision-Date: 2018-07-26 18:26+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
 "Language: sl\n"
@@ -73,29 +73,29 @@ msgctxt ""
 msgid "The FormWizard 
Library"
 msgstr "Knjižni

[Libreoffice-commits] core.git: package/Library_package2.mk package/source

2018-07-27 Thread Libreoffice Gerrit user

 package/Library_package2.mk |3 ++-
 package/source/zipapi/XUnbufferedStream.cxx |4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 959f22c4e41c42851c2dde3884cf24da4b9eb606
Author: Caolán McNamara 
AuthorDate: Thu Jul 26 14:27:16 2018 +0100
Commit: Noel Grandin 
CommitDate: Fri Jul 27 12:41:10 2018 +0200

skip checking zip crcs when fuzzing

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

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 0ff715e031c1..75a15f0e0d08 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -30,8 +30,9 @@ $(eval $(call gb_Library_use_libraries,package2,\
cppuhelper \
sal \
sax \
-   ucbhelper \
salhelper \
+   ucbhelper \
+   utl \
 ))
 
 $(eval $(call gb_Library_use_externals,package2,\
diff --git a/package/source/zipapi/XUnbufferedStream.cxx 
b/package/source/zipapi/XUnbufferedStream.cxx
index 0aedfac09402..9925d1d5dd5c 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace ::com::sun::star;
 using namespace com::sun::star::packages::zip::ZipConstants;
 using namespace com::sun::star::io;
@@ -61,7 +63,7 @@ XUnbufferedStream::XUnbufferedStream(
 , mnZipEnd ( 0 )
 , mnZipSize ( 0 )
 , mnMyCurrent ( 0 )
-, mbCheckCRC( !bRecoveryMode )
+, mbCheckCRC(!bRecoveryMode && !utl::ConfigManager::IsFuzzing())
 {
 mnZipCurrent = maEntry.nOffset;
 if ( mbRawStream )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |3 ---
 dbaccess/source/ui/browser/unodatbr.cxx|1 -
 dbaccess/source/ui/control/tabletree.cxx   |1 -
 3 files changed, 5 deletions(-)

New commits:
commit 825df05602ba4387d927ddcf74f34aca29564837
Author: Muhammet Kara 
AuthorDate: Fri Jul 27 09:06:54 2018 +0300
Commit: Noel Grandin 
CommitDate: Fri Jul 27 12:42:14 2018 +0200

Remove unused local variable aImageProvider

It is no longer needed for the cases where
oly the static methods are called

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

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 7216fc949575..496e5f1de0ac 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -582,8 +582,6 @@ void OAppDetailPageHelper::createTablesPage(const 
Reference< XConnection>& _xCon
 
 OUString OAppDetailPageHelper::getElementIcons(ElementType _eType)
 {
-ImageProvider aImageProvider;
-
 sal_Int32 nDatabaseObjectType( 0 );
 switch(_eType )
 {
@@ -603,7 +601,6 @@ void OAppDetailPageHelper::createPage(ElementType 
_eType,const Reference< XNameA
 OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
 OString sHelpId;
-ImageProvider aImageProvider;
 Image aFolderImage;
 switch( _eType )
 {
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index 6eb0557ceed3..178b37c4f59b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2004,7 +2004,6 @@ void SbaTableQueryBrowser::implAddDatasource(const 
OUString& _rDbName, Image& _r
 if (_rTableName.isEmpty())
 _rTableName = DBA_RES(RID_STR_TABLES_CONTAINER);
 
-ImageProvider aImageProvider;
 if (!_rQueryImage)
 _rQueryImage = ImageProvider::getFolderImage( DatabaseObject::QUERY );
 if (!_rTableImage)
diff --git a/dbaccess/source/ui/control/tabletree.cxx 
b/dbaccess/source/ui/control/tabletree.cxx
index f9c21a7c8f45..2d7489323c4a 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -79,7 +79,6 @@ VCL_BUILDER_FACTORY_CONSTRUCTOR(OTableTreeListBox, 0)
 
 void OTableTreeListBox::implSetDefaultImages()
 {
-ImageProvider aImageProvider;
 SetDefaultExpandedEntryBmp(  ImageProvider::getFolderImage( 
DatabaseObject::TABLE ) );
 SetDefaultCollapsedEntryBmp( ImageProvider::getFolderImage( 
DatabaseObject::TABLE ) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 l10ntools/inc/xmlparse.hxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 228b9801f1ec440cf3090a6f2ff24722c5bc26d0
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:36:05 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 12:54:32 2018 +0200

l10ntools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.

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

diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 027076f39725..d07dd1b86afb 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -82,6 +82,11 @@ protected:
 public:
 virtual XMLNodeType GetNodeType() const = 0;
 virtual ~XMLNode(){}
+
+XMLNode(XMLNode const &) = default;
+XMLNode(XMLNode &&) = default;
+XMLNode & operator =(XMLNode const &) = default;
+XMLNode & operator =(XMLNode &&) = default;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sd/source/ui/sidebar/SlideBackground.cxx |   20 +---
 1 file changed, 5 insertions(+), 15 deletions(-)

New commits:
commit c57f10b67fceef47d304d74dce93be7389a7720c
Author: Xisco Fauli 
AuthorDate: Sat Jul 14 20:37:56 2018 +0200
Commit: Xisco Faulí 
CommitDate: Fri Jul 27 13:09:06 2018 +0200

tdf#111306: Hide background widget in sidebar in master and notes view

Background is lost if it's changed from the sidebar in master or
notes view, thus hide the widget for now, until the real issue is fixed.

Keep the insert image button visible as it works.

The background can be changed from the page properties dialog

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

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index 08042defd663..f4e4d045e174 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -244,11 +244,11 @@ void SlideBackground::HandleContextChange(
 mpMasterSlide->Disable();
 mpDspMasterBackground->Disable();
 mpDspMasterObjects->Disable();
-mpFillStyle->Show();
-mpBackgroundLabel->Show();
+mpFillStyle->Hide();
+mpBackgroundLabel->Hide();
 mpInsertImage->Show();
 }
-else if ( maContext == maImpressHandoutContext )
+else if ( maContext == maImpressHandoutContext  || maContext == 
maImpressNotesContext )
 {
 mpCloseMaster->Hide();
 mpEditMaster->Hide();
@@ -270,17 +270,7 @@ void SlideBackground::HandleContextChange(
 mpBackgroundLabel->Show();
 mpInsertImage->Show();
 }
-else if (maContext == maImpressNotesContext)
-{
-mpCloseMaster->Hide();
-mpEditMaster->Hide();
-mpMasterSlide->Disable();
-mpDspMasterBackground->Disable();
-mpDspMasterObjects->Disable();
-mpFillStyle->Show();
-mpBackgroundLabel->Show();
-mpInsertImage->Hide();
-}
+
 // Need to do a relayouting, otherwise the panel size is not updated 
after show / hide controls
 sfx2::sidebar::Panel* pPanel = 
dynamic_cast(GetParent());
 if(pPanel)
@@ -296,7 +286,7 @@ void SlideBackground::Update()
 {
 eFillStyle nPos = 
static_cast(mpFillStyle->GetSelectedEntryPos());
 
-if(maContext == maImpressHandoutContext)
+if(maContext != maImpressOtherContext)
 nPos = NONE;
 
 SfxObjectShell* pSh = SfxObjectShell::Current();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 include/editeng/flditem.hxx  |5 +
 include/editeng/measfld.hxx  |5 +
 include/editeng/tstpitem.hxx |8 
 include/editeng/unoedsrc.hxx |6 ++
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit c21612e5e18d632fd2073e4f3c717613051133ed
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:43:17 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 13:31:56 2018 +0200

editeng: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined 
counterparts,
but may prevent implicitly declared copy functions from being defined as 
non-
deleted in the future.  (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)

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

diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 9ed775c01c1c..47dbe869be9b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -52,6 +52,11 @@ public:
 SvxFieldData();
 virtual ~SvxFieldData();
 
+SvxFieldData(SvxFieldData const &) = default;
+SvxFieldData(SvxFieldData &&) = default;
+SvxFieldData & operator =(SvxFieldData const &) = default;
+SvxFieldData & operator =(SvxFieldData &&) = default;
+
 virtual std::unique_ptr Clone() const;
 virtual booloperator==( const SvxFieldData& ) const;
 
diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx
index 2422ed9a8462..a860dc2d91f0 100644
--- a/include/editeng/measfld.hxx
+++ b/include/editeng/measfld.hxx
@@ -38,6 +38,11 @@ public:
 virtual std::unique_ptr Clone() const override;
 virtual bool operator==(const SvxFieldData&) const override;
 SdrMeasureFieldKind GetMeasureFieldKind() const { return 
eMeasureFieldKind; }
+
+SdrMeasureField(SdrMeasureField const &) = default;
+SdrMeasureField(SdrMeasureField &&) = default;
+SdrMeasureField & operator =(SdrMeasureField const &) = default;
+SdrMeasureField & operator =(SdrMeasureField &&) = default;
 };
 
 
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 35032596883e..1e8c061ecf03 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -77,14 +77,6 @@ public:
 booloperator <( const SvxTabStop& rTS ) const
 { return nTabPos < rTS.nTabPos; }
 
-SvxTabStop& operator=( const SvxTabStop& rTS )
-{
-nTabPos = rTS.nTabPos;
-eAdjustment = rTS.eAdjustment;
-m_cDecimal = rTS.m_cDecimal;
-cFill = rTS.cFill;
-return *this;
-}
 void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index c4077bccc758..3c7952bad1cc 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -56,6 +56,12 @@ typedef std::vector< SvxUnoTextRangeBase* > 
SvxUnoTextRangeBaseVec;
 class EDITENG_DLLPUBLIC SvxEditSource
 {
 public:
+SvxEditSource() = default;
+SvxEditSource(SvxEditSource const &) = default;
+SvxEditSource(SvxEditSource &&) = default;
+SvxEditSource & operator =(SvxEditSource const &) = default;
+SvxEditSource & operator =(SvxEditSource &&) = default;
+
 virtual ~SvxEditSource();
 
 /// Returns a new reference to the same object. This is a shallow copy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 writerfilter/source/ooxml/README|2 +-
 writerfilter/source/ooxml/factory_ns.py |1 +
 writerfilter/source/ooxml/factoryimpl_ns.py |1 +
 writerfilter/source/ooxml/qnametostr.py |1 +
 writerfilter/source/ooxml/resourceids.py|1 +
 writerfilter/source/ooxml/tox.ini   |2 +-
 6 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5d23851b572346d35c9fcf5a8266db38cb5f8555
Author: Miklos Vajna 
AuthorDate: Fri Jul 27 09:35:20 2018 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 27 13:42:41 2018 +0200

writerfilter python: 2 blank lines after class/function definition

To be in sync with PEP8.

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

diff --git a/writerfilter/source/ooxml/README b/writerfilter/source/ooxml/README
index fd71540c4cdd..c72b341aef65 100644
--- a/writerfilter/source/ooxml/README
+++ b/writerfilter/source/ooxml/README
@@ -7,7 +7,7 @@ This directory uses the PEP 8 (see
 Please run
 
 
-pep8 *.py
+pycodestyle *.py
 
 
 before committing.
diff --git a/writerfilter/source/ooxml/factory_ns.py 
b/writerfilter/source/ooxml/factory_ns.py
index 507f8f012430..17ae4e756288 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -67,6 +67,7 @@ protected:
 }}
 #endif //INCLUDED_OOXML_FACTORY_%s_HXX""" % nsToken.upper())
 
+
 modelPath = sys.argv[1]
 filePath = sys.argv[2]
 model = minidom.parse(modelPath)
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py 
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 682239cf95ee..f810f24c86b4 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -746,6 +746,7 @@ def main():
 nsName = filePath.split('OOXMLFactory_')[1].split('.cxx')[0]
 createImpl(modelNode, nsName)
 
+
 if __name__ == "__main__":
 main()
 
diff --git a/writerfilter/source/ooxml/qnametostr.py 
b/writerfilter/source/ooxml/qnametostr.py
index 7b6f8de0f9f3..6e02d2c69f98 100644
--- a/writerfilter/source/ooxml/qnametostr.py
+++ b/writerfilter/source/ooxml/qnametostr.py
@@ -46,6 +46,7 @@ void QNameToString::init()
 print("""mMap[NS_ooxml::LN_%s] = "ooxml:%s";""" % 
(token, token))
 self.tokens.append(token)
 
+
 parser = xml.sax.make_parser()
 parser.setContentHandler(ContentHandler())
 parser.parse(sys.argv[1])
diff --git a/writerfilter/source/ooxml/resourceids.py 
b/writerfilter/source/ooxml/resourceids.py
index 087f00c83f86..c66a3367b5e0 100644
--- a/writerfilter/source/ooxml/resourceids.py
+++ b/writerfilter/source/ooxml/resourceids.py
@@ -53,6 +53,7 @@ namespace NS_ooxml
 self.tokens.append(token)
 self.counter += 1
 
+
 parser = xml.sax.make_parser()
 parser.setContentHandler(ContentHandler())
 parser.parse(sys.argv[1])
diff --git a/writerfilter/source/ooxml/tox.ini 
b/writerfilter/source/ooxml/tox.ini
index 7c1de86cadb7..c1781905c427 100644
--- a/writerfilter/source/ooxml/tox.ini
+++ b/writerfilter/source/ooxml/tox.ini
@@ -1,2 +1,2 @@
-[pep8]
+[pycodestyle]
 ignore = E501
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/inc/docary.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit d77d6983602cb468621b34e3561a85040f5a3018
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 10:09:25 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 13:49:48 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

SwVectorModifyBase and its DestructorPolicy look like they beg for clean 
up, but
it's not immediately clear to me what the best solution would be, so just 
mark
the dangerous status quo with a TODO comment for now.

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

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c3c4724ab505..5c92a68d1c31 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -110,6 +110,14 @@ public:
 delete *it;
 }
 
+//TODO: These functions are apparently brittle (but the copy functions are 
actually used by the
+// code; the move functions will be implicitly-defined as deleted anyway) 
and should probably
+// only be used with DestructorPolicy::KeepELements:
+SwVectorModifyBase(SwVectorModifyBase const &) = default;
+SwVectorModifyBase(SwVectorModifyBase &&) = default;
+SwVectorModifyBase & operator =(SwVectorModifyBase const &) = default;
+SwVectorModifyBase & operator =(SwVectorModifyBase &&) = default;
+
 void DeleteAndDestroy(int aStartIdx, int aEndIdx)
 {
 if (aEndIdx < aStartIdx)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user

 sw/inc/SwRewriter.hxx   |1 -
 sw/inc/ccoll.hxx|4 
 sw/inc/cellfml.hxx  |5 +
 sw/inc/docary.hxx   |6 ++
 sw/inc/fldbas.hxx   |5 +
 sw/inc/fmtline.hxx  |5 +
 sw/inc/frmfmt.hxx   |5 +
 sw/inc/postithelper.hxx |5 +
 sw/inc/printdata.hxx|5 +
 sw/source/core/access/accfrmobj.hxx |5 +
 sw/source/core/inc/docsort.hxx  |6 ++
 sw/source/core/text/porlay.hxx  |2 --
 sw/source/core/undo/SwRewriter.cxx  |4 
 sw/source/filter/ww8/ww8par.hxx |5 +
 sw/source/uibase/config/caption.cxx |2 --
 sw/source/uibase/inc/caption.hxx|1 -
 sw/source/uibase/inc/uiitems.hxx|5 +
 17 files changed, 61 insertions(+), 10 deletions(-)

New commits:
commit 0920b06d3d8a148ff547ca2b373edc62cc280357
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:55:44 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 13:53:57 2018 +0200

sw: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined 
counterparts,
but may prevent implicitly declared copy functions from being defined as 
non-
deleted in the future.  (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)

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

diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 4fc2658a801f..0adc40e87780 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -39,7 +39,6 @@ class SW_DLLPUBLIC SwRewriter
 
 public:
 SwRewriter();
-~SwRewriter();
 
 void AddRule(SwUndoArg eWhat, const OUString & rWith);
 
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 4ffbd9e77af9..3b6ef8b7d11b 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -46,6 +46,10 @@ public:
 SwCondCollItem();
 virtual ~SwCondCollItem() override;
 
+SwCondCollItem(SwCondCollItem const &) = default;
+SwCondCollItem(SwCondCollItem &&) = default;
+SwCondCollItem & operator =(SwCondCollItem const &) = default;
+SwCondCollItem & operator =(SwCondCollItem &&) = default;
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 virtual booloperator==( const SfxPoolItem& ) const 
override;
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 1828c1b1be4f..2d6a64b4d3ec 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -110,6 +110,11 @@ public:
 
 virtual ~SwTableFormula();
 
+SwTableFormula(SwTableFormula const &) = default;
+SwTableFormula(SwTableFormula &&) = default;
+SwTableFormula & operator =(SwTableFormula const &) = default;
+SwTableFormula & operator =(SwTableFormula &&) = default;
+
 /// create from the internal formula (for CORE) the external formula (for 
UI)
 void PtrToBoxNm( const SwTable* pTable );
 /// create from the external formula the internal
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 5c92a68d1c31..20871385fa97 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -53,6 +53,12 @@ public:
 virtual size_t GetFormatCount() const = 0;
 virtual SwFormat* GetFormat(size_t idx) const = 0;
 virtual ~SwFormatsBase() {};
+
+SwFormatsBase() = default;
+SwFormatsBase(SwFormatsBase const &) = default;
+SwFormatsBase(SwFormatsBase &&) = default;
+SwFormatsBase & operator =(SwFormatsBase const &) = default;
+SwFormatsBase & operator =(SwFormatsBase &&) = default;
 };
 
 template
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 0093ce66b337..8765362f6754 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -298,6 +298,11 @@ protected:
 public:
 virtual ~SwField();
 
+SwField(SwField const &) = default;
+SwField(SwField &&) = default;
+SwField & operator =(SwField const &) = default;
+SwField & operator =(SwField &&) = default;
+
 inline SwFieldType* GetTyp() const;
 
 /// Set new type (used for copying among documents).
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 8bba534cd392..405176cf0e53 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -35,6 +35,11 @@ public:
 SwFormatL

92 matches

Mail list logo