Re: 32-bit Linux build error: no matching function for call to 'assertEquals'

[Samuel Mehrbrodt]

Hi Luke,

can you try if casting "4" to sal_Int32 makes this better?

Regards
Samuel

Am 08.05.20 um 04:59 schrieb Luke Benes:

[CXX] toolkit/qa/cppunit/EventContainer.cxx
/core/toolkit/qa/cppunit/EventContainer.cxx:73:5: error: no matching function 
for call to 'assertEquals'
 CPPUNIT_ASSERT_EQUAL(4, nEventCount);
 ^~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:333:5: note: 
expanded from macro 'CPPUNIT_ASSERT_EQUAL'
   ( CPPUNIT_NS::assertEquals( (expected),  \
 ^~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/Portability.h:107:21: 
note: expanded from macro 'CPPUNIT_NS'
# define CPPUNIT_NS CppUnit
 ^
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:161:6: note: 
candidate template ignored: deduced conflicting types for parameter 'T' ('int' 
vs. 'long')
void assertEquals( const T& expected,
  ^
1 error generated.
make[1]: *** [/core/solenv/gbuild/LinkTarget.mk:306: 
/core/workdir/CxxObject/toolkit/qa/cppunit/EventContainer.o] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:282: build] Error 2

This looks to have begun after:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4021fedf758b

Samuel,
Any idea what's wrong?

-Luke

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

[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/css/mobilewizard.css   |9 +
 loleaflet/css/notebookbar.css|2 +-
 loleaflet/src/control/Control.JSDialogBuilder.js |   11 +--
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 3bc5ffc0c0a942c32507c97ed83a1cec5b59f00d
Author: Szymon Kłos 
AuthorDate: Thu May 7 15:26:53 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 8 08:34:41 2020 +0200

jsdialog: introduce disabled state for unobutton

Change-Id: I5b81cbdda56acc64aac8516e3b97697a0c11395c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93654
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 33f770257..d62cf279b 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -348,6 +348,15 @@ p.mobile-wizard.ui-combobox-text.selected {
background-color: #e6e6e640;
 }
 
+.unotoolbutton.disabled {
+   color: #707070;
+}
+
+.unotoolbutton.disabled img {
+   -webkit-filter: grayscale(90%);
+   filter: grayscale(90%);
+}
+
 #mobile-wizard-content .ui-content > table > tr > td > table > table > 
tr:first-child > td > img{
margin-top: 0px !important;
 }
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 957f36e75..b5572ebe5 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -66,7 +66,7 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
box-shadow: 0 0 0px 4px #e6e6e640 !important;
 }
 
-.unotoolbutton.notebookbar:hover, #clearFormatting.notebookbar div img:hover {
+.unotoolbutton.notebookbar:not(.disabled):hover, #clearFormatting.notebookbar 
div img:hover {
box-shadow: 0 0 0px 4px #e6e6e6b0;
border-radius: 0.1px;
background-color: #e6e6e6b0;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index b4179fa60..28c0e7544 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1584,6 +1584,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
$(button).addClass('selected');
else
$(button).removeClass('selected');
+
+   if (state && state === 'disabled')
+   $(div).addClass('disabled');
+   else
+   $(div).removeClass('disabled');
};
 
updateFunction();
@@ -1600,8 +1605,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
 
$(div).click(function () {
-   builder.refreshSidebar = true;
-   builder.callback('toolbutton', 'click', button, 
data.command, builder);
+   if (!$(div).hasClass('disabled')) {
+   builder.refreshSidebar = true;
+   builder.callback('toolbutton', 'click', button, 
data.command, builder);
+   }
});
 
if (data.enabled == 'false')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/css/notebookbar.css   |   88 
 loleaflet/src/control/Control.NotebookbarImpress.js | 2160 +++-
 2 files changed, 2238 insertions(+), 10 deletions(-)

New commits:
commit a59be0f3cd07ef175f5d9ae5f185c6364775d552
Author: Szymon Kłos 
AuthorDate: Thu May 7 14:14:14 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 8 08:33:17 2020 +0200

notebookbar: impress tabs layout

Change-Id: Iecd60b8c5fdbe9cfabdf4af44a84d37292e13e31
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93652
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index eb083b6e9..957f36e75 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -131,17 +131,13 @@ div[id*='Row'].notebookbar, 
div[id*='Column'].notebookbar, #SendToBack.notebookb
margin-top: -5px;
 }
 
-#Copy.notebookbar, #clearFormatting.notebookbar, #table-GroupB20.notebookbar {
+#Copy.notebookbar, #clearFormatting.notebookbar, #table-Home-Section-Insert 
#table-GroupB20.notebookbar {
margin-top: 10px;
 }
 
-/* Inset Tab */
-
-#table-Insert-Container {
-   margin-top: 5px;
-}
+/* Insert Tab */
 
-#InsertReferenceField.notebookbar, #InsertSection.notebookbar, 
#BasicShapes.notebookbar {
+#InsertReferenceField.notebookbar, #InsertSection.notebookbar, #table-shapes6 
#BasicShapes.notebookbar {
margin-top: 10px;
 }
 
@@ -234,6 +230,13 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
width: 32px !important;
 }
 
+#table-Table-Section-Merge #table-GroupB61 #SplitCell.notebookbar img,
+#table-Table-Section-Select #table-GroupB65 #SelectTable.notebookbar img
+{
+   height: 24px !important;
+   width: 24px !important;
+}
+
 #table-SectionBottom40.notebookbar,
 #SplitTable.notebookbar,
 #EntireRow.notebookbar,
@@ -279,6 +282,15 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
 
 /* Calc */
 
+/* Home tab */
+
+#table-HomeBox #table-PasteBox1 #table-SectionBottom10 
#SortAscending.notebookbar,
+#table-HomeBox #table-PasteBox1 #table-SectionBottom10 
#DataFilterAutoFilter.notebookbar,
+#table-Home-Section-Find #SearchDialog.notebookbar
+{
+   display: none;
+}
+
 /* Insert Tab */
 
 #table-InsertBox {
@@ -310,4 +322,66 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
 {
height: 32px !important;
width: 32px !important;
+}
+
+/* Impress */
+
+/* Home Tab */
+
+#table-Home-Section-Slide #table-LineB9.notebookbar
+{
+   margin-top: 10px;
+}
+
+#table-shapes15 #BasicShapes.notebookbar
+{
+   display: none;
+}
+
+#table-SectionBottom5 #Text.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
+
+/* Insert Tab */
+
+#table-Insert-Section-DrawText #Text.notebookbar img,
+#table-Insert-Section-Slide #InsertPage.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
+
+/* Review Tab */
+
+#table-GroupB40 #Hyphenation.notebookbar
+{
+   margin-top: 10px;
+}
+
+#table-GroupB42 #DeleteAllAnnotation.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
+
+#table-GroupB37 #InsertAnnotation.notebookbar
+{
+   display: none;
+}
+
+/* Table Tab */
+
+#table-box11 #FrameLineColor.notebookbar img,
+#table-Table-Section-Merge #SplitCell.notebookbar img,
+#table-Table-Section-Select #SelectTable.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
+
+#table-Table-Section-Layout #table-SectionBottom57.notebookbar
+{
+   margin-top: 10px;
 }
\ No newline at end of file
commit 2db2ebfc3d87f1be943381e5c0fa72ff819817a9
Author: Szymon Kłos 
AuthorDate: Thu May 7 11:42:16 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 8 08:33:09 2020 +0200

notebookbar: add tab data for impress

Change-Id: Id4ebd847e5c211ceb8404a2f0891f7ddb34c3783
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93651
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarImpress.js 
b/loleaflet/src/control/Control.NotebookbarImpress.js
index 15a20daaf..d1a983014 100644
--- a/loleaflet/src/control/Control.NotebookbarImpress.js
+++ b/loleaflet/src/control/Control.NotebookbarImpress.js
@@ -19,6 +19,10 @@ L.Control.NotebookbarImpress = 
L.Control.NotebookbarWriter.extend({
case 'ReviewLabel':
this.loadTab(this.getReviewTab());
break;
+
+   case 'TableLabel':
+   this.loadTab(this.getTableTab());
+   break;
}
},

@@ -38,20 +42,2170 @@ L.Control.NotebookbarImpress = 
L.Control.NotebookbarWriter.extend({
'text': '~Review',
'id': '6',

[Libreoffice-commits] online.git: loleaflet/images

[Szymon Kłos (via logerrit)]

 loleaflet/images/lc_deleteallannotation.svg |1 +
 loleaflet/images/lc_deleteannotation.svg|1 +
 loleaflet/images/lc_hyphenation.svg |1 +
 loleaflet/images/lc_setdefault.svg  |1 +
 4 files changed, 4 insertions(+)

New commits:
commit 5bc2e1f22201c00e9a8b6fb45073fcb4b38b995c
Author: Szymon Kłos 
AuthorDate: Thu May 7 14:17:17 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 8 08:32:22 2020 +0200

notebookbar: import icons for impress tabs

Change-Id: If4e86e6c8e86de08332dc870ba322e5ac5619331
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93653
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/images/lc_deleteallannotation.svg 
b/loleaflet/images/lc_deleteallannotation.svg
new file mode 100644
index 0..d5c04051a
--- /dev/null
+++ b/loleaflet/images/lc_deleteallannotation.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_deleteannotation.svg 
b/loleaflet/images/lc_deleteannotation.svg
new file mode 100644
index 0..baa15e5ab
--- /dev/null
+++ b/loleaflet/images/lc_deleteannotation.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_hyphenation.svg 
b/loleaflet/images/lc_hyphenation.svg
new file mode 100644
index 0..978d9c9d5
--- /dev/null
+++ b/loleaflet/images/lc_hyphenation.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_setdefault.svg 
b/loleaflet/images/lc_setdefault.svg
new file mode 100644
index 0..43e931497
--- /dev/null
+++ b/loleaflet/images/lc_setdefault.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/Makefile.am loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/Makefile.am   |2 
 loleaflet/src/control/Control.NotebookbarCalc.js| 1899 +++-
 loleaflet/src/control/Control.NotebookbarImpress.js |   60 
 loleaflet/src/control/Control.UIManager.js  |2 
 4 files changed, 1962 insertions(+), 1 deletion(-)

New commits:
commit 5ea3e965a5b8b01ad3fa2a4e6f1b38b5b9a79ce2
Author: Szymon Kłos 
AuthorDate: Mon May 4 10:26:43 2020 +0200
Commit: Szymon Kłos 
CommitDate: Fri May 8 08:32:50 2020 +0200

notebookbar: add tabs data for Calc

Change-Id: If67de1f908b37c84de8251c67aee6691d1770878
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93649
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js 
b/loleaflet/src/control/Control.NotebookbarCalc.js
index 3b530d922..08a7875cc 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -43,7 +43,1904 @@ L.Control.NotebookbarCalc = 
L.Control.NotebookbarWriter.extend({
},
 
getHomeTab: function() {
-   return '';
+   return {
+   'id': 'NotebookBar',
+   'type': 'notebookbar',
+   'children': [
+   {
+   'id': 'box1',
+   'type': 'container',
+   'children': [
+   {
+   'id': 
'ContextContainer',
+   'type': 'tabcontrol',
+   'children': [
+   {
+   'id': 
'',
+   'type': 
'tabpage',
+   
'children': [
+   
{
+   
'id': 'HomeBox',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'Home-PasteBox',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'FileSection7',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'SectionBottom87',
+   
'type': 'toolbox',
+   
'children': [
+   
{
+   
'type': 
'toolitem',
+   
'text': 
'Paste',
+   

'command': '.uno:Paste'
+   
}
+

32-bit Linux build error: no matching function for call to 'assertEquals'

[Luke Benes]

[CXX] toolkit/qa/cppunit/EventContainer.cxx
/core/toolkit/qa/cppunit/EventContainer.cxx:73:5: error: no matching function 
for call to 'assertEquals'
CPPUNIT_ASSERT_EQUAL(4, nEventCount);
^~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:333:5: note: 
expanded from macro 'CPPUNIT_ASSERT_EQUAL'
  ( CPPUNIT_NS::assertEquals( (expected),  \
^~~~
/core/workdir/UnpackedTarball/cppunit/include/cppunit/Portability.h:107:21: 
note: expanded from macro 'CPPUNIT_NS'
# define CPPUNIT_NS CppUnit
^
/core/workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:161:6: note: 
candidate template ignored: deduced conflicting types for parameter 'T' ('int' 
vs. 'long')
void assertEquals( const T& expected,
 ^
1 error generated.
make[1]: *** [/core/solenv/gbuild/LinkTarget.mk:306: 
/core/workdir/CxxObject/toolkit/qa/cppunit/EventContainer.o] Error 1
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:282: build] Error 2

This looks to have begun after:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4021fedf758b

Samuel,
Any idea what's wrong?

-Luke

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

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx  |4 +++-
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx |   13 +++--
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx|   13 +++--
 3 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 99c337d1d3831ce9d2c7dc1cbff713f4ac49d6ac
Author: Mike Kaganski 
AuthorDate: Thu May 7 08:03:22 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 23:12:41 2020 +0200

tdf#132199: put glow before shadow, to have shadow of the glow

Also take modified color into account when drawing glow.

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

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 6c14c09c1a19..cb0e3124b19d 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -975,7 +975,9 @@ void VclPixelProcessor2D::processGlowPrimitive2D(const 
primitive2d::GlowPrimitiv
 BitmapFilter::Filter(mask, BitmapFilterStackBlur(fBlurRadius));
 
 // The end result is the bitmap filled with glow color and blurred 
8-bit alpha mask
-bitmap.Erase(rCandidate.getGlowColor());
+const basegfx::BColor aGlowColor(
+
maBColorModifierStack.getModifiedColor(rCandidate.getGlowColor().getBColor()));
+bitmap.Erase(Color(aGlowColor));
 // alpha mask will be scaled up automatically to match bitmap
 BitmapEx result(bitmap, AlphaMask(mask.GetBitmap()));
 
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 804a653c86b2..378d78f5c6f6 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -52,6 +52,13 @@ namespace drawinglayer::primitive2d
 getWordWrap()));
 }
 
+// tdf#132199: put glow before shadow, to have shadow of the glow, 
not the opposite
+if (!aRetval.empty() && !getSdrSTAttribute().getGlow().isDefault())
+{
+// glow
+aRetval = createEmbeddedGlowPrimitive(aRetval, 
getSdrSTAttribute().getGlow());
+}
+
 // add shadow
 if(!aRetval.empty() && 
!getSdrSTAttribute().getShadow().isDefault())
 {
@@ -71,12 +78,6 @@ namespace drawinglayer::primitive2d
 }
 }
 
-if(!aRetval.empty() && !getSdrSTAttribute().getGlow().isDefault())
-{
-// glow
-aRetval = createEmbeddedGlowPrimitive(aRetval, 
getSdrSTAttribute().getGlow());
-}
-
 rContainer.insert(rContainer.end(), aRetval.begin(), 
aRetval.end());
 }
 
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 9f15f4d9fc41..2a83e5b6aeed 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -115,6 +115,13 @@ namespace drawinglayer::primitive2d
 false));
 }
 
+// tdf#132199: put glow before shadow, to have shadow of the glow, 
not the opposite
+if (!aRetval.empty() && 
!getSdrLFSTAttribute().getGlow().isDefault())
+{
+// glow
+aRetval = createEmbeddedGlowPrimitive(aRetval, 
getSdrLFSTAttribute().getGlow());
+}
+
 // add shadow
 if(!getSdrLFSTAttribute().getShadow().isDefault())
 {
@@ -125,12 +132,6 @@ namespace drawinglayer::primitive2d
 aTranslateGrf.getY());
 }
 
-if (!aRetval.empty() && 
!getSdrLFSTAttribute().getGlow().isDefault())
-{
-// glow
-aRetval = createEmbeddedGlowPrimitive(aRetval, 
getSdrLFSTAttribute().getGlow());
-}
-
 rContainer.insert(rContainer.end(), aRetval.begin(), 
aRetval.end());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 oox/source/drawingml/shape.cxx   |2 +-
 oox/source/export/drawingml.cxx  |6 --
 sd/qa/unit/data/odg/glow.odg |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |8 
 sd/qa/unit/export-tests.cxx  |4 ++--
 sd/qa/unit/import-tests.cxx  |8 
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |2 +-
 svx/source/sidebar/glow/GlowPropertyPanel.cxx|   13 ++---
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx|   10 +++---
 9 files changed, 25 insertions(+), 28 deletions(-)

New commits:
commit a640676e06bdab3471f5c9f04dd9403bc66ddc22
Author: Mike Kaganski 
AuthorDate: Thu May 7 15:40:57 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 23:07:45 2020 +0200

tdf#101181: store glow radius in 100ths of mm instead of EMUs

... as we do for all metric values. This fixes storing values like
"190.5cm" in ODF for 15 pt (should be "0.529cm").

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 959f99ecffb4..92629b2419b5 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1470,7 +1470,7 @@ Reference< XShape > const & Shape::createAndInsert(
 {
 uno::Reference propertySet (mxShape, 
uno::UNO_QUERY);
 propertySet->setPropertyValue("GlowEffect", makeAny(true));
-propertySet->setPropertyValue("GlowEffectRad", 
makeAny(static_cast(aEffectProperties.maGlow.moGlowRad.get(;
+propertySet->setPropertyValue("GlowEffectRad", 
makeAny(convertEmuToHmm(aEffectProperties.maGlow.moGlowRad.get(;
 propertySet->setPropertyValue("GlowEffectColor", 
makeAny(aEffectProperties.maGlow.moGlowColor.getColor(rGraphicHelper)));
 propertySet->setPropertyValue("GlowEffectTransparency", 
makeAny(aEffectProperties.maGlow.moGlowColor.getTransparency()));
 }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 17b56e8e4f91..aebd6901c864 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -3635,7 +3635,7 @@ void DrawingML::WriteShapeEffect( const OUString& sName, 
const Sequence< Propert
 }
 else if( rOuterShdwProp.Name == "rad" )
 {
-sal_Int32 nVal = 0;
+sal_Int64 nVal = 0;
 rOuterShdwProp.Value >>= nVal;
 aOuterShdwAttrList->add( XML_rad, OString::number( nVal 
).getStr() );
 }
@@ -3846,9 +3846,11 @@ void DrawingML::WriteGlowEffect(const Reference< 
XPropertySet >& rXPropSet)
 if(!hasGlow)
 return;
 
+sal_Int32 nRad = 0;
+rXPropSet->getPropertyValue("GlowEffectRad") >>= nRad;
 Sequence< PropertyValue > aGlowAttribs(1);
 aGlowAttribs[0].Name = "rad";
-aGlowAttribs[0].Value = rXPropSet->getPropertyValue("GlowEffectRad");
+aGlowAttribs[0].Value <<= oox::drawingml::convertHmmToEmu(nRad);
 Sequence< PropertyValue > aGlowProps(3);
 aGlowProps[0].Name = "Attribs";
 aGlowProps[0].Value <<= aGlowAttribs;
diff --git a/sd/qa/unit/data/odg/glow.odg b/sd/qa/unit/data/odg/glow.odg
index 11d697c491da..9020f663b92c 100644
Binary files a/sd/qa/unit/data/odg/glow.odg and b/sd/qa/unit/data/odg/glow.odg 
differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index a530631761a4..6bb672641d56 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -2855,15 +2855,15 @@ void SdOOXMLExportTest2::testShapeGlowEffect()
 bool bHasGlow = false;
 xShape->getPropertyValue("GlowEffect") >>= bHasGlow;
 CPPUNIT_ASSERT(bHasGlow);
-sal_Int64 nRadius = -1;
+sal_Int32 nRadius = -1;
 xShape->getPropertyValue("GlowEffectRad") >>= nRadius;
-CPPUNIT_ASSERT_EQUAL(sal_Int64(139700l), nRadius);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(388), nRadius); // 139700 EMU = 388.0556 
mm/100
 Color nColor;
 xShape->getPropertyValue("GlowEffectColor") >>= nColor;
 CPPUNIT_ASSERT_EQUAL(Color(0xFFC000), nColor);
-sal_uInt16 nTransparency;
+sal_Int16 nTransparency;
 xShape->getPropertyValue("GlowEffectTransparency") >>= nTransparency;
-CPPUNIT_ASSERT_EQUAL(sal_uInt16(60), nTransparency);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(60), nTransparency);
 }
 
 void SdOOXMLExportTest2::testTdf119087()
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 2f8dd6056a8e..516eaf6df3c9 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1272,7 +1272,7 @@ void SdExportTest::testGlow()
 CPPUNIT_ASSERT(bGlowEffect);
 sal_Int32 nGlowEffectRad = 0;
  

[Libreoffice-commits] online.git: wsd/ServerURL.hpp

[Michael Meeks (via logerrit)]

 wsd/ServerURL.hpp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 73a002c783160d613a79638ff4a2295981be0a30
Author: Michael Meeks 
AuthorDate: Thu May 7 20:06:01 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu May 7 22:29:25 2020 +0200

Avoid unexpected exception in the iOS app

Essentially restoring 5d0c8587 and mending 18c4301a1f

Change-Id: I0219b61a20ee5b36ec32d62123e5c1d98c8e2af8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93675
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/wsd/ServerURL.hpp b/wsd/ServerURL.hpp
index 647ca966d..bfe9992b4 100644
--- a/wsd/ServerURL.hpp
+++ b/wsd/ServerURL.hpp
@@ -26,7 +26,13 @@ class ServerURL
 public:
 ServerURL(const Poco::Net::HTTPRequest &request)
 {
+#if MOBILEAPP
+(void)request;
+// getHost fires an exception on mobile.
+init("mobile", "");
+#else
 init(request.getHost(), request.get("ProxyPrefix", ""));
+#endif
 }
 
 explicit ServerURL()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/qa/unit/export-tests.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dcd1795c4934e66378d4b88c914f8e9bb1678ba7
Author: Caolán McNamara 
AuthorDate: Thu May 7 21:16:08 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu May 7 22:21:44 2020 +0200

fix build

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

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index de092590f2cd..2f8dd6056a8e 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1281,7 +1281,7 @@ void SdExportTest::testGlow()
 CPPUNIT_ASSERT_EQUAL(sal_Int16(60), nGlowEffectTransparency); // 60%
 
 // Test ODF element
-xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
+xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "content.xml");
 
 // check that we actually test graphic style
 assertXPath(pXmlDoc, 
"/office:document-content/office:automatic-styles/style:style[2]",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ridljar/pom.libreoffice.xml

[Rene Engelhard (via logerrit)]

 ridljar/pom.libreoffice.xml |   44 
 1 file changed, 44 insertions(+)

New commits:
commit a743df4f1e2d20e75b67c33a290aa398852026c3
Author: Rene Engelhard 
AuthorDate: Thu May 7 07:32:47 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 22:10:48 2020 +0200

add pom for libreoffice.jar

was missed in   35518c92365cc183ba6cce2a4d284a130c0ca13f

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

diff --git a/ridljar/pom.libreoffice.xml b/ridljar/pom.libreoffice.xml
new file mode 100644
index ..ca6438ebe3b0
--- /dev/null
+++ b/ridljar/pom.libreoffice.xml
@@ -0,0 +1,44 @@
+
+  4.0.0
+  org.libreoffice
+  libreoffice
+  @version@
+  jar
+  LibreOffice - Public UNO Java Classes
+  Public UNO Java Classes (formerly 
jurt,juh,ridl,unoil)
+  https://www.libreoffice.org
+
+  
+
+  Mozilla Public License, Version 2.0
+  https://www.mozilla.org/en-US/MPL/2.0
+  repo
+
+  
+
+  
+https://cgit.freedesktop.org/libreoffice/core
+
https://gerrit.libreoffice.org/#/admin/projects/core
+  
+
+  
+
+  The Document Foundation
+
+  
+
+  
+
+  LibreOffice Development Mailing List
+  libreoffice@lists.freedesktop.org
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  
http://lists.freedesktop.org/mailman/listinfo/libreoffice
+  http://lists.freedesktop.org/archives/libreoffice
+
+  
+
+  
+https://bugs.documentfoundation.org
+LibreOffice Issue Tracker
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - include/vcl vcl/CppunitTest_vcl_graphic_test.mk vcl/Library_vcl.mk vcl/qa vcl/source

[Tomaž Vajngerl (via logerrit)]

 include/vcl/VectorGraphicSearch.hxx|   39 ++
 vcl/CppunitTest_vcl_graphic_test.mk|7 -
 vcl/Library_vcl.mk |1 
 vcl/qa/cppunit/VectorGraphicSearchTest.cxx |   50 
 vcl/qa/cppunit/data/Pangram.pdf|binary
 vcl/source/graphic/VectorGraphicSearch.cxx |  168 +
 6 files changed, 262 insertions(+), 3 deletions(-)

New commits:
commit 09e15db17c05a4631ee876964a31d903cf07904f
Author: Tomaž Vajngerl 
AuthorDate: Thu May 7 22:01:22 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Thu May 7 22:01:22 2020 +0200

vcl: VectorGraphicSearch - for searching text inside PDF

Change-Id: Iee940a3927330c8739774ff3c1af15998f89193b

diff --git a/include/vcl/VectorGraphicSearch.hxx 
b/include/vcl/VectorGraphicSearch.hxx
new file mode 100644
index ..3411d0a931e6
--- /dev/null
+++ b/include/vcl/VectorGraphicSearch.hxx
@@ -0,0 +1,39 @@
+/* -*- 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/.
+ *
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+
+class SearchContext;
+
+class VCL_DLLPUBLIC VectorGraphicSearch final
+{
+private:
+Graphic maGraphic;
+FPDF_DOCUMENT mpPdfDocument;
+std::unique_ptr mpSearchContext;
+bool searchPDF(std::shared_ptr const& rData, OUString 
const& rSearchString);
+
+public:
+VectorGraphicSearch(Graphic const& rGraphic);
+~VectorGraphicSearch();
+bool search(OUString const& rSearchString);
+bool next();
+int index();
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/CppunitTest_vcl_graphic_test.mk 
b/vcl/CppunitTest_vcl_graphic_test.mk
index 7b042f84d7da..ea49eacdb781 100644
--- a/vcl/CppunitTest_vcl_graphic_test.mk
+++ b/vcl/CppunitTest_vcl_graphic_test.mk
@@ -14,11 +14,12 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,vcl_graphic_test, \
 vcl/qa/cppunit/GraphicDescriptorTest \
 vcl/qa/cppunit/GraphicFormatDetectorTest \
 vcl/qa/cppunit/GraphicNativeMetadataTest \
+vcl/qa/cppunit/VectorGraphicSearchTest \
 ))
 
-$(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test,\
-   boost_headers \
-   glm_headers \
+$(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test, \
+boost_headers \
+$(if $(filter PDFIUM,$(BUILD_TYPE)),pdfium) \
 ))
 
 $(eval $(call gb_CppunitTest_set_include,vcl_graphic_test,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 3a56406b9adf..12cb40226c82 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -329,6 +329,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/graphic/UnoGraphicObject \
 vcl/source/graphic/UnoGraphicProvider \
 vcl/source/graphic/UnoGraphicTransformer \
+vcl/source/graphic/VectorGraphicSearch \
 vcl/source/bitmap/bitmap \
 vcl/source/bitmap/bitmapfilter \
 vcl/source/bitmap/BitmapAlphaClampFilter \
diff --git a/vcl/qa/cppunit/VectorGraphicSearchTest.cxx 
b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
new file mode 100644
index ..0ed21ccf9e26
--- /dev/null
+++ b/vcl/qa/cppunit/VectorGraphicSearchTest.cxx
@@ -0,0 +1,50 @@
+/* -*- 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 
+
+#include 
+#include 
+#include 
+#include 
+
+class VectorGraphicSearchTest : public test::BootstrapFixtureBase
+{
+OUString getFullUrl(const OUString& sFileName)
+{
+return m_directories.getURLFromSrc("/vcl/qa/cppunit/data/") + 
sFileName;
+}
+
+void test();
+
+CPPUNIT_TEST_SUITE(VectorGraphicSearchTest);
+CPPUNIT_TEST(test);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void VectorGraphicSearchTest::test()
+{
+OUString aURL = getFullUrl("Pangram.pdf");
+SvFileStream aStream(aURL, StreamMode::READ);
+GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter();
+Graphic aGraphic = rGraphicFilter.ImportUnloadedGraphic(aStream);
+aGraphic.makeAvailable();
+
+VectorGraphicSearch aSearch(aGraphic);
+CPPUNIT_ASSERT_EQUAL(true, aSearch.search("lazy"));
+CPPUNIT_ASSERT_EQUAL(true, aSearch.next());
+CPPUNIT_ASSERT_EQUAL(34, aSearch.index());
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(VectorGraphicSearchTest);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/data/Pangram.pdf b/vcl/qa/cppunit/data/Pangram.pdf
new file mode 100644
index ..0714fda4e4

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/attribute/sdrglowattribute.cxx  |   27 -
 drawinglayer/source/primitive2d/glowprimitive2d.cxx |   24 ++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |   80 +++-
 include/drawinglayer/attribute/sdrglowattribute.hxx |   15 +--
 include/drawinglayer/primitive2d/glowprimitive2d.hxx|   16 +--
 include/vcl/BitmapFilterStackBlur.hxx   |3 
 svx/source/sdr/primitive2d/sdrattributecreator.cxx  |7 +
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx|5 -
 vcl/qa/cppunit/BitmapFilterTest.cxx |6 -
 vcl/source/bitmap/BitmapFilterStackBlur.cxx |   46 -
 10 files changed, 94 insertions(+), 135 deletions(-)

New commits:
commit 08ebcff89f56bec3b0f9b346504748e4eb1687af
Author: Mike Kaganski 
AuthorDate: Fri May 1 01:05:24 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 21:57:37 2020 +0200

tdf#101181: improve glow effect

The shadow of objects must not be scaled: this displaces any internal
areas that need blur, e.g. holes. Instead, it needs to dilate the
shadow using kernel with radius equal to blur radius: this allows the
borders of dilated objects to be in the middle of the blur area. The
following blur makes those new margin points to have 50% intensity,
and full glow intensity at the point of old object margins. This also
removed artifacts when moving objects with glow effect caused by
mismatch between scaling and D2D range calculation.

The D2D range therefore is not calculated by scaling, but using grow.
Blur filter's "extend bitmap by blur radius" option got obsoleted and
removed.

There's no need to blur the glow color (24-bit RGB). Instead, glow
bitmap must be filled by glow color, and have an alpha mask that is
blurred accordingly. This makes the glow properly transparent, and
also reduces the blur complexity which now only needs to process 8
bits of alpha channel.

The object shadow is created using basegfx::BColorModifier_replace
inserted into the 2d decomposition of the effect, as before. To make
sure that any non-fully-transparent pixel will become black pixel in
the shadow, black color is used, and the result is further processed
in VclPixelProcessor2D::processGlowPrimitive2D with monochrome filter
using threshold 255.

Glow transparency attribute is taken into account: the initial value
at the margins of the objects. Color replacement filter is used to
replace the object shadow with the attribute value before blur pass.

Correct blur radius is used, calculated from glow effect radius,
instead of hardcoded value of 5 pixels. This makes the glow to fade
gradually along the full width of the effect, instead of only fading
in narrow outer border previously.

Since blur filter is only implemented for radius up to 254 pixels,
and since downsampling the shadow before blur increases performance
without noticeable quality loss, the image is downsampled before
filtering.

It should be noted that the glow effect is almost identical to soft
shadow effect, likely with the only difference of using dilation in
the former, but not in the latter. The code might be reused later to
implement soft shadow as well.

Change-Id: I728c532f9df7ccf85f353c23c6c7d8352d7b2086
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93235
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Mike Kaganski 

diff --git a/drawinglayer/source/attribute/sdrglowattribute.cxx 
b/drawinglayer/source/attribute/sdrglowattribute.cxx
index 4295aef23ae3..90367ff67ea0 100644
--- a/drawinglayer/source/attribute/sdrglowattribute.cxx
+++ b/drawinglayer/source/attribute/sdrglowattribute.cxx
@@ -21,7 +21,7 @@ namespace drawinglayer
 {
 namespace attribute
 {
-SdrGlowAttribute::SdrGlowAttribute(sal_Int32 nRadius, const basegfx::BColor& 
rColor)
+SdrGlowAttribute::SdrGlowAttribute(sal_Int32 nRadius, const Color& rColor)
 : m_nRadius(nRadius)
 , m_color(rColor)
 {
@@ -44,31 +44,6 @@ bool SdrGlowAttribute::operator==(const SdrGlowAttribute& 
rCandidate) const
 return m_nRadius == rCandidate.m_nRadius && m_color == rCandidate.m_color;
 }
 
-const basegfx::B2DHomMatrix& 
SdrGlowAttribute::GetTransfMatrix(basegfx::B2DRange nRange) const
-{
-if (!m_oTransfCache)
-{
-double dRadius100mm = static_cast(m_nRadius) / 360.0;
-// Apply a scaling with the center point of the shape as origin.
-// 1) translate shape to the origin
-basegfx::B2DHomMatrix matrix = 
basegfx::utils::createCoordinateSystemTransform(
-nRange.getCenter(), basegfx::B2DVector(-1, 0), 
basegfx::B2DVector(0, -1));
-
-basegfx::B2DHomMatrix inverse(matrix);
-inverse.invert();
-
-// 2) Scale up
-double scale_x = (nRange.getWidth() + dRadius1

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

[Mike Kaganski (via logerrit)]

 include/vcl/BitmapColorReplaceFilter.hxx   |   44 
 vcl/Library_vcl.mk |1 
 vcl/source/bitmap/BitmapColorReplaceFilter.cxx |   45 +
 3 files changed, 90 insertions(+)

New commits:
commit a98bdbae459ad7341bf7f484c402e77e4062cd16
Author: Mike Kaganski 
AuthorDate: Wed May 6 11:23:26 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 21:57:18 2020 +0200

Add color replacement bitmap filter

It replaces colors in bitmap by modifying pixels, without shortcuts
like replacing entries in bitmap palette.
Needed for glow effect (tdf#101181)

Change-Id: I9af734ce8ebbc57f723ab75c5b8406eb6fd6e31b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93553
Tested-by: Jenkins
Tested-by: Mike Kaganski 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/BitmapColorReplaceFilter.hxx 
b/include/vcl/BitmapColorReplaceFilter.hxx
new file mode 100644
index ..caeac83d0fda
--- /dev/null
+++ b/include/vcl/BitmapColorReplaceFilter.hxx
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_INCLUDE_VCL_BITMAPCOLORREPLACEFILTER_HXX
+#define INCLUDED_INCLUDE_VCL_BITMAPCOLORREPLACEFILTER_HXX
+
+#include 
+
+class VCL_DLLPUBLIC BitmapColorReplaceFilter final : public BitmapFilter
+{
+public:
+/** Replaces a color with another by changing pixels, without shortcuts 
like modifying palette
+(that is how it's different from using Bitmap::Replace).
+
+@param cReplaceWhat
+Color that will be replaced.
+
+@param cReplaceTo
+New color that will replace cReplaceWhat.
+
+ */
+BitmapColorReplaceFilter(const Color& cReplaceWhat, const Color& 
cReplaceTo)
+: m_aReplaceWhat(cReplaceWhat)
+, m_aReplaceTo(cReplaceTo)
+{
+}
+
+virtual BitmapEx execute(BitmapEx const& rBitmapEx) const override;
+
+private:
+Color m_aReplaceWhat;
+Color m_aReplaceTo;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index ffe065b24fff..def727918433 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -332,6 +332,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/bitmapfilter \
 vcl/source/bitmap/BitmapAlphaClampFilter \
 vcl/source/bitmap/BitmapBasicMorphologyFilter \
+vcl/source/bitmap/BitmapColorReplaceFilter \
 vcl/source/bitmap/BitmapMonochromeFilter \
 vcl/source/bitmap/BitmapSmoothenFilter \
 vcl/source/bitmap/BitmapLightenFilter \
diff --git a/vcl/source/bitmap/BitmapColorReplaceFilter.cxx 
b/vcl/source/bitmap/BitmapColorReplaceFilter.cxx
new file mode 100644
index ..151cfbfbb48b
--- /dev/null
+++ b/vcl/source/bitmap/BitmapColorReplaceFilter.cxx
@@ -0,0 +1,45 @@
+/* -*- 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 
+
+#include 
+
+BitmapEx BitmapColorReplaceFilter::execute(BitmapEx const& aBitmapEx) const
+{
+Bitmap aBitmap = aBitmapEx.GetBitmap();
+
+if (BitmapScopedWriteAccess pWriteAcc{ aBitmap })
+{
+const BitmapColor 
aReplaceWhat(pWriteAcc->GetBestMatchingColor(m_aReplaceWhat));
+const BitmapColor 
aReplaceTo(pWriteAcc->GetBestMatchingColor(m_aReplaceTo));
+const long nWidth = pWriteAcc->Width();
+const long nHeight = pWriteAcc->Height();
+
+for (long nY = 0; nY < nHeight; nY++)
+{
+Scanline pScanline = pWriteAcc->GetScanline(nY);
+for (long nX = 0; nX < nWidth; nX++)
+{
+if (pWriteAcc->GetPixelFromData(pScanline, nX) == aReplaceWhat)
+{
+pWriteAcc->SetPixelOnData(pScanline, nX, aReplaceTo);
+}
+}
+}
+}
+
+return BitmapEx(aBitmap);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 include/vcl/BitmapBasicMorphologyFilter.hxx|   60 ++
 vcl/Library_vcl.mk |1 
 vcl/qa/cppunit/BitmapFilterTest.cxx|   78 ++
 vcl/qa/cppunit/data/testBasicMorphology.png|binary
 vcl/qa/cppunit/data/testBasicMorphologyDilated1.png|binary
 vcl/qa/cppunit/data/testBasicMorphologyDilated1Eroded1.png |binary
 vcl/qa/cppunit/data/testBasicMorphologyDilated2.png|binary
 vcl/qa/cppunit/data/testBasicMorphologyDilated2Eroded1.png |binary
 vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx  |  358 +
 9 files changed, 486 insertions(+), 11 deletions(-)

New commits:
commit 84808eed2405ed6ee586e87bb664a816f7b91b70
Author: Mike Kaganski 
AuthorDate: Wed May 6 11:08:22 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 21:56:23 2020 +0200

Add basic morphology (erode/dilate) bitmap filter

Needed for glow effect (tdf#101181)

Change-Id: Id41daa1dc17e3749a30ce75fa3127878b9e0cfd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93552
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/BitmapBasicMorphologyFilter.hxx 
b/include/vcl/BitmapBasicMorphologyFilter.hxx
new file mode 100644
index ..ade82adaa957
--- /dev/null
+++ b/include/vcl/BitmapBasicMorphologyFilter.hxx
@@ -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/.
+ *
+ */
+
+#ifndef INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
+#define INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
+
+#include 
+#include 
+#include 
+
+enum class BasicMorphologyOp
+{
+erode,
+dilate
+};
+
+/* Black is foreground, white is background */
+class VCL_DLLPUBLIC BitmapBasicMorphologyFilter : public BitmapFilter
+{
+public:
+BitmapBasicMorphologyFilter(BasicMorphologyOp op, sal_Int32 nRadius);
+virtual ~BitmapBasicMorphologyFilter();
+
+virtual BitmapEx execute(BitmapEx const& rBitmap) const override;
+
+private:
+Bitmap filter(Bitmap const& rBitmap) const;
+
+BasicMorphologyOp m_eOp;
+sal_Int32 m_nRadius;
+};
+
+class BitmapErodeFilter : public BitmapBasicMorphologyFilter
+{
+public:
+BitmapErodeFilter(sal_Int32 nRadius)
+: BitmapBasicMorphologyFilter(BasicMorphologyOp::erode, nRadius)
+{
+}
+};
+
+class BitmapDilateFilter : public BitmapBasicMorphologyFilter
+{
+public:
+BitmapDilateFilter(sal_Int32 nRadius)
+: BitmapBasicMorphologyFilter(BasicMorphologyOp::dilate, nRadius)
+{
+}
+};
+
+#endif // INCLUDED_VCL_BITMAPBASICMORPHOLOGYFILTER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9780ca3575a1..ffe065b24fff 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -331,6 +331,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/bitmap/bitmap \
 vcl/source/bitmap/bitmapfilter \
 vcl/source/bitmap/BitmapAlphaClampFilter \
+vcl/source/bitmap/BitmapBasicMorphologyFilter \
 vcl/source/bitmap/BitmapMonochromeFilter \
 vcl/source/bitmap/BitmapSmoothenFilter \
 vcl/source/bitmap/BitmapLightenFilter \
diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx 
b/vcl/qa/cppunit/BitmapFilterTest.cxx
index a28057a4bf57..fec21fa118f0 100644
--- a/vcl/qa/cppunit/BitmapFilterTest.cxx
+++ b/vcl/qa/cppunit/BitmapFilterTest.cxx
@@ -7,10 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
-#include 
-#include 
-#include 
+#include 
 
 #include 
 #include 
@@ -19,6 +16,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -29,15 +27,48 @@ namespace
 constexpr bool constWriteResultBitmap(false);
 constexpr bool constEnablePerformanceTest(false);
 
-class BitmapFilterTest : public CppUnit::TestFixture
+class BitmapFilterTest : public test::BootstrapFixture
 {
+public:
+BitmapFilterTest()
+: test::BootstrapFixture(true, false)
+{
+}
+
 void testBlurCorrectness();
+void testBasicMorphology();
 void testPerformance();
 
 CPPUNIT_TEST_SUITE(BitmapFilterTest);
 CPPUNIT_TEST(testBlurCorrectness);
+CPPUNIT_TEST(testBasicMorphology);
 CPPUNIT_TEST(testPerformance);
 CPPUNIT_TEST_SUITE_END();
+
+private:
+OUString getFullUrl(const OUString& sFileName)
+{
+return m_directories.getURLFromSrc("vcl/qa/cppunit/data/") + sFileName;
+}
+
+BitmapEx loadBitmap(const OUString& sFileName)
+{
+Graphic aGraphic;
+const OUString aURL(getFullUrl(sFileName));
+SvFileStream aFileStream(aURL, StreamMode::READ);
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+ErrCode 

[Libreoffice-commits] online.git: wsd/ServerURL.hpp

[Michael Meeks (via logerrit)]

 wsd/ServerURL.hpp |   18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 526dd304b7625087d54a75df034058c493321999
Author: Michael Meeks 
AuthorDate: Thu May 7 17:30:04 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu May 7 21:00:04 2020 +0200

Proxy: getSubURLForEndpoint - don't return wss:// URLs in error.

Separate _ssl and _websocket state and construct the URLs from them.

Change-Id: Ida4eee868c7815eb68e3029682d603d13d193153
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93669
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/wsd/ServerURL.hpp b/wsd/ServerURL.hpp
index 3e96fff98..647ca966d 100644
--- a/wsd/ServerURL.hpp
+++ b/wsd/ServerURL.hpp
@@ -19,7 +19,8 @@
  */
 class ServerURL
 {
-std::string _schemeProtocol;
+bool_ssl;
+bool_websocket;
 std::string _schemeAuthority;
 std::string _pathPlus;
 public:
@@ -38,9 +39,9 @@ public:
 // The user can override the ServerRoot with a new prefix.
 _pathPlus = LOOLWSD::ServiceRoot;
 
-bool ssl = (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination());
+_ssl = (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination());
+_websocket = true;
 std::string serverName = LOOLWSD::ServerName.empty() ? host : 
LOOLWSD::ServerName;
-_schemeProtocol = (ssl ? "wss://" : "ws://");
 _schemeAuthority = serverName;
 
 // A well formed ProxyPrefix will override it.
@@ -54,7 +55,9 @@ public:
 auto hostEndPos = url.find("/", pos);
 if (hostEndPos != std::string::npos)
 {
-_schemeProtocol = url.substr(0, pos);
+_websocket = false;
+std::string schemeProtocol = url.substr(0, pos);
+_ssl = (schemeProtocol != "http://";);
 _schemeAuthority = url.substr(pos, hostEndPos - pos);
 _pathPlus = url.substr(hostEndPos);
 return;
@@ -72,12 +75,15 @@ public:
 
 std::string getWebSocketUrl() const
 {
-return _schemeProtocol + _schemeAuthority;
+std::string schemeProtocol = (_websocket ? "ws" : "http");
+if (_ssl)
+schemeProtocol += "s";
+return schemeProtocol + "://" + _schemeAuthority;
 }
 
 std::string getSubURLForEndpoint(const std::string &path) const
 {
-return _schemeProtocol + _schemeAuthority + _pathPlus + path;
+return std::string("http") + (_ssl ? "s" : "") + "://" + 
_schemeAuthority + _pathPlus + path;
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

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

New commits:
commit 547b2891d9fe97dee9df14106e91dc4df659d4d5
Author: Noel Grandin 
AuthorDate: Thu May 7 15:00:00 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu May 7 20:43:07 2020 +0200

fix use after std::move

regression from
commit 5efd34eabcbd374f0f06cac12b7b25f955db7965
loplugin:makeshared in sc

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

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index d8e5ded30a7b..f505e23c97d5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -2704,7 +2704,7 @@ static std::shared_ptr 
VectorRefFactory( const ScCalcConf
 
 DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& 
config,
 const std::string& s, const FormulaTreeNodeRef& ft, 
std::shared_ptr pCodeGen, int nResultSize ) :
-DynamicKernelArgument(config, s, ft), mpCodeGen(std::move(pCodeGen)), 
mpClmem2(nullptr)
+DynamicKernelArgument(config, s, ft), mpCodeGen(pCodeGen), 
mpClmem2(nullptr)
 {
 size_t nChildren = ft->Children.size();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   89 +
 1 file changed, 89 insertions(+)

New commits:
commit e89e66a4d7c0f26222cd12ebe23b4061784a813e
Author: Xisco Fauli 
AuthorDate: Thu May 7 15:45:35 2020 +0200
Commit: Xisco Faulí 
CommitDate: Thu May 7 20:21:38 2020 +0200

CppUnittest: ooxmlexport10: Assert pages where possible

Change-Id: I40cc389edf9d072f643c724bdb2c70c48edced63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93645
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 4ba57fabc25f..dbd1ef17f3b3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -102,6 +102,7 @@ protected:
 
 DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference xDraws = 
xDrawPageSupplier->getDrawPage();
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount()); // One groupshape 
in the doc
@@ -126,6 +127,7 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testFdo69548, "fdo69548.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 if (!mbExported)
 return;
 
@@ -135,6 +137,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69548, "fdo69548.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testWpsOnly, "wps-only.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 // Document has wp:anchor, not wp:inline, so handle it accordingly.
 uno::Reference xShape = getShape(1);
 text::TextContentAnchorType eValue = 
getProperty(xShape, "AnchorType");
@@ -158,6 +161,7 @@ DECLARE_OOXMLEXPORT_TEST(testWpsOnly, "wps-only.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xShape = getShape(1);
 // Check position, it was nearly 0. This is a shape, so use getPosition(), 
not a property.
 CPPUNIT_ASSERT_EQUAL(oox::drawingml::convertEmuToHmm(548005), 
xShape->getPosition().X);
@@ -165,6 +169,7 @@ DECLARE_OOXMLEXPORT_TEST(testWpgOnly, "wpg-only.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testWpgNested, "wpg-nested.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xGroup(getShape(1), uno::UNO_QUERY);
 uno::Reference 
xShapeDescriptor(xGroup->getByIndex(0), uno::UNO_QUERY);
 // This was a com.sun.star.drawing.CustomShape, due to lack of handling of 
groupshapes inside groupshapes.
@@ -187,6 +192,7 @@ DECLARE_OOXMLEXPORT_TEST(testWpgNested, "wpg-nested.docx")
 
 DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly, "textbox-wpg-only.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xShape = getShape(1);
 // The relativeFrom attribute was ignored for groupshapes, i.e. these were 
text::RelOrientation::FRAME.
 CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, 
getProperty(xShape, "HoriOrientRelation"));
@@ -206,6 +212,7 @@ DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly, 
"textbox-wpg-only.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript, 
"tdf120412_400PercentSubscript.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xPara = getParagraph(1);
 // The word "Base" should not be subscripted.
 CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty(getRun(xPara, 1, 
"Base"), "CharEscapement"), 0);
@@ -215,6 +222,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript, 
"tdf120412_400Percen
 
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFontEsc, "test_tdf120412.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 xmlDocUniquePtr pXmlDoc =parseExport("word/document.xml");
 // don't lose the run with superscript formatting
 assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r", 2);
@@ -226,6 +234,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFontEsc, 
"test_tdf120412.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 // Make sure that we read the primary branch, if wpg is requested as a 
feature.
 uno::Reference xGroup(getShape(1), 
uno::UNO_QUERY);
 uno::Reference xText = 
uno::Reference(xGroup->getByIndex(0), 
uno::UNO_QUERY_THROW)->getText();
@@ -235,6 +244,7 @@ DECLARE_OOXMLEXPORT_TEST(testMceWpg, "mce-wpg.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 // Vertical position of the shape was incorrect due to incorrect nested 
mce handling.
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 // positionV's posOffset from the bugdoc, was 0.
@@ -258,6 +268,7 @@ DECLARE_OOXMLEXPORT_TEST(testMceNested, "mce-nested.docx")
 
 DECLARE_OOXMLEXPORT_TEST(testMissingPath, "missing-path.docx")
 {
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 comphelper::SequenceAsHashMap 
aCustomShapeGeometry(getProperty(getShape(1), 
"CustomShapeGeometry"));
 comphe

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

[Noel Grandin (via logerrit)]

 embeddedobj/source/commonembedding/embedobj.cxx |6 ++--
 embeddedobj/source/commonembedding/miscobj.cxx  |   31 
 embeddedobj/source/inc/commonembobj.hxx |3 +-
 3 files changed, 11 insertions(+), 29 deletions(-)

New commits:
commit 8544e0a20bd8f8d8c918f91f90768019fa8099d7
Author: Noel Grandin 
AuthorDate: Thu May 7 15:34:12 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu May 7 19:28:23 2020 +0200

m_aVerbTable can be a std::map

instead of using the heavyweight Sequence datastructures

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

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index 6250555e05ec..abc43f42736f 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -74,9 +74,9 @@ awt::Rectangle GetRectangleInterception( const 
awt::Rectangle& aRect1, const awt
 
 sal_Int32 OCommonEmbeddedObject::ConvertVerbToState_Impl( sal_Int32 nVerb )
 {
-for ( sal_Int32 nInd = 0; nInd < m_aVerbTable.getLength(); nInd++ )
-if ( m_aVerbTable[nInd][0] == nVerb )
-return m_aVerbTable[nInd][1];
+auto it = m_aVerbTable.find( nVerb );
+if (it != m_aVerbTable.end())
+return it->second;
 
 throw lang::IllegalArgumentException(); // TODO: unexpected verb provided
 }
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx 
b/embeddedobj/source/commonembedding/miscobj.cxx
index 71f79fabd96d..3363a02bfd02 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -161,50 +161,31 @@ void OCommonEmbeddedObject::CommonInit_Impl( const 
uno::Sequence< beans::NamedVa
 m_pIntermediateStatesSeqs[4][0][0] = embed::EmbedStates::RUNNING;
 
 // verbs table
-sal_Int32 nVerbTableSize = 0;
 for ( sal_Int32 nVerbInd = 0; nVerbInd < m_aObjectVerbs.getLength(); 
nVerbInd++ )
 {
 if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_PRIMARY )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = 
embed::EmbedStates::UI_ACTIVE;
+m_aVerbTable.insert( { m_aObjectVerbs[nVerbInd].VerbID, 
embed::EmbedStates::UI_ACTIVE } );
 }
 else if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_SHOW )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = 
embed::EmbedStates::UI_ACTIVE;
+m_aVerbTable.insert( { m_aObjectVerbs[nVerbInd].VerbID, 
embed::EmbedStates::UI_ACTIVE } );
 }
 else if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_OPEN )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = embed::EmbedStates::ACTIVE;
+m_aVerbTable.insert( { m_aObjectVerbs[nVerbInd].VerbID, 
embed::EmbedStates::ACTIVE } );
 }
 else if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_IPACTIVATE )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = 
embed::EmbedStates::INPLACE_ACTIVE;
+m_aVerbTable.insert( { m_aObjectVerbs[nVerbInd].VerbID, 
embed::EmbedStates::INPLACE_ACTIVE } );
 }
 else if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_UIACTIVATE )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = 
embed::EmbedStates::UI_ACTIVE;
+m_aVerbTable.insert( { m_aObjectVerbs[nVerbInd].VerbID, 
embed::EmbedStates::UI_ACTIVE } );
 }
 else if ( m_aObjectVerbs[nVerbInd].VerbID == 
embed::EmbedVerbs::MS_OLEVERB_HIDE )
 {
-m_aVerbTable.realloc( ++nVerbTableSize );
-m_aVerbTable[nVerbTableSize - 1].realloc( 2 );
-m_aVerbTable[nVerbTableSize - 1][0] = 
m_aObjectVerbs[nVerbInd].VerbID;
-m_aVerbTable[nVerbTableSize - 1][1] = embed::Embe

[Libreoffice-commits] core.git: 2 commits - canvas/source leak-suppress.txt

[Noel Grandin (via logerrit)]

 canvas/source/tools/canvastools.cxx |2 +-
 leak-suppress.txt   |3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ca21e8618f446733ab5d046178ebb47c2d204840
Author: Noel Grandin 
AuthorDate: Thu May 7 15:44:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu May 7 19:28:07 2020 +0200

ignore leaks in idlc

which seems to be leaking deliberately and we don't really care
about leaks in this tool

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

diff --git a/leak-suppress.txt b/leak-suppress.txt
index 6f00829c78ca..e3700295304d 100644
--- a/leak-suppress.txt
+++ b/leak-suppress.txt
@@ -51,3 +51,6 @@ leak:_PyMem_RawMalloc
 
 # ignore leak in gpgmepp external library
 leak:mkdefsinc
+
+# idlc deliberately leaks
+leak:idlc/source/idlcmain.cxx
commit 4c016865f9ea78813d5cde84a4d214b34f2f1dd9
Author: Noel Grandin 
AuthorDate: Thu May 7 15:40:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu May 7 19:27:58 2020 +0200

fix bug in extracting property

introduced with
commit 17cd7dd708631f7af9e66860b403627416e4545e
tdf#43671 set emphasis mark of vcl::Font (windows).
but has probably never been a problem because I guess this
propertyset almost always has 0 or 1 element.

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

diff --git a/canvas/source/tools/canvastools.cxx 
b/canvas/source/tools/canvastools.cxx
index 54e93fcb3625..2ca1b5081724 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1317,7 +1317,7 @@ namespace canvas::tools
 for(sal_Int32 nIdx = 0; nIdx < rExtraFontProperties.getLength(); 
++nIdx)
 {
 if (rExtraFontProperties[nIdx].Name == "EmphasisMark")
-rExtraFontProperties[0].Value >>= rEmphasisMark;
+rExtraFontProperties[nIdx].Value >>= rEmphasisMark;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |   24 +
 sd/qa/unit/data/odg/glow.odg|binary
 sd/qa/unit/export-tests.cxx |   50 
 3 files changed, 74 insertions(+)

New commits:
commit 5ac2075d56cfff57f2254e4e5bd5a1e3a3579f83
Author: Mike Kaganski 
AuthorDate: Thu May 7 14:24:44 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 19:24:52 2020 +0200

tdf#101181: unit test for glow attributes in ODF

Tests loext:glow,
  loext:glow-radius,
  loext:glow-color,
  loext:glow-transparency

There's original decision to keep EMUs in GlowEffectRad property,
which makes this to be stored as hundreds of cm in ODF. I suppose
we should change this in a follow-up to use mm100s instead.

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

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng 
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index a61f6da11f71..5e1a587fda74 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -920,6 +920,30 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
+
+
+  
+
+  visible
+  hidden
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
   
 
 
diff --git a/sd/qa/unit/data/odg/glow.odg b/sd/qa/unit/data/odg/glow.odg
new file mode 100644
index ..11d697c491da
Binary files /dev/null and b/sd/qa/unit/data/odg/glow.odg differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 285294bca8ea..de092590f2cd 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -74,6 +74,7 @@ public:
 void testTdf123557();
 void testTdf113822();
 void testTdf126761();
+void testGlow();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
 
@@ -108,6 +109,7 @@ public:
 CPPUNIT_TEST(testTdf123557);
 CPPUNIT_TEST(testTdf113822);
 CPPUNIT_TEST(testTdf126761);
+CPPUNIT_TEST(testGlow);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1257,6 +1259,54 @@ void SdExportTest::testTdf126761()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testGlow()
+{
+auto xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/glow.odg"), ODG);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile);
+uno::Reference xShape(getShapeFromPage(0, 0, 
xDocShRef));
+
+// Check glow properties
+bool bGlowEffect = false;
+CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffect") >>= bGlowEffect);
+CPPUNIT_ASSERT(bGlowEffect);
+sal_Int32 nGlowEffectRad = 0;
+CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectRad") >>= 
nGlowEffectRad);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(190500), nGlowEffectRad); // 15 pt = 190500 
EMU
+sal_Int32 nGlowEffectColor = 0;
+CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectColor") >>= 
nGlowEffectColor);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00FF4000), nGlowEffectColor); // "Brick"
+sal_Int16 nGlowEffectTransparency = 0;
+CPPUNIT_ASSERT(xShape->getPropertyValue("GlowEffectTransparency") >>= 
nGlowEffectTransparency);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(60), nGlowEffectTransparency); // 60%
+
+// Test ODF element
+xmlDocPtr pXmlDoc = parseExport(tempFile, "content.xml");
+
+// check that we actually test graphic style
+assertXPath(pXmlDoc, 
"/office:document-content/office:automatic-styles/style:style[2]",
+"family", "graphic");
+// check loext graphic attributes
+assertXPath(
+pXmlDoc,
+
"/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties",
+"glow", "visible");
+assertXPath(
+pXmlDoc,
+
"/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties",
+"glow-radius", "190.5cm"); // ???
+assertXPath(
+pXmlDoc,
+
"/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties",
+"glow-color", "#ff4000");
+assertXPath(
+pXmlDoc,
+
"/office:document-content/office:automatic-styles/style:style[2]/style:graphic-properties",
+"glow-transparency", "60%");
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/l

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

[Michael Stahl (via logerrit)]

 include/xmloff/xmlnmspe.hxx |   60 
 1 file changed, 33 insertions(+), 27 deletions(-)

New commits:
commit 36110559e9cd2b4f7c3dd173cb1cd60bb8d3df6f
Author: Michael Stahl 
AuthorDate: Mon Apr 27 18:01:43 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 19:17:10 2020 +0200

xmloff: rearrange XML_NAMESPACE_* and add some comments

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

diff --git a/include/xmloff/xmlnmspe.hxx b/include/xmloff/xmlnmspe.hxx
index 3c5e679ee5d8..d45832f02d81 100644
--- a/include/xmloff/xmlnmspe.hxx
+++ b/include/xmloff/xmlnmspe.hxx
@@ -25,6 +25,7 @@
 // current namespaces
 // These namespaces have the same index in the namespace table as prefix used.
 // If a namespace is added, XML_OLD_NAMESPACE_BASE has to be adjusted!
+// * standard ODF elements and attributes
 constexpr sal_uInt16 XML_NAMESPACE_OFFICE =   0;
 constexpr sal_uInt16 XML_NAMESPACE_STYLE =1;
 constexpr sal_uInt16 XML_NAMESPACE_TEXT = 2;
@@ -42,29 +43,34 @@ constexpr sal_uInt16 XML_NAMESPACE_DR3D =13;
 constexpr sal_uInt16 XML_NAMESPACE_MATH =14;
 constexpr sal_uInt16 XML_NAMESPACE_FORM =15;
 constexpr sal_uInt16 XML_NAMESPACE_SCRIPT =  16;
-constexpr sal_uInt16 XML_NAMESPACE_BLOCKLIST =   17;
-constexpr sal_uInt16 XML_NAMESPACE_FRAMEWORK =   18;
-constexpr sal_uInt16 XML_NAMESPACE_CONFIG =  19;
-constexpr sal_uInt16 XML_NAMESPACE_OOO = 20;
-constexpr sal_uInt16 XML_NAMESPACE_OOOW =21;
-constexpr sal_uInt16 XML_NAMESPACE_OOOC =22;
-constexpr sal_uInt16 XML_NAMESPACE_DOM = 23;
-constexpr sal_uInt16 XML_NAMESPACE_TCD = 24;   // text conversion 
dictionary
-constexpr sal_uInt16 XML_NAMESPACE_DB =  25;
-constexpr sal_uInt16 XML_NAMESPACE_DLG = 26;
-constexpr sal_uInt16 XML_NAMESPACE_XFORMS =  27;
-constexpr sal_uInt16 XML_NAMESPACE_XSD = 28;
-constexpr sal_uInt16 XML_NAMESPACE_XSI = 29;
-constexpr sal_uInt16 XML_NAMESPACE_SMIL =30;
-constexpr sal_uInt16 XML_NAMESPACE_ANIMATION =   31;
-constexpr sal_uInt16 XML_NAMESPACE_XML = 32;
-constexpr sal_uInt16 XML_NAMESPACE_REPORT =  33;
-constexpr sal_uInt16 XML_NAMESPACE_OF =  34;   // OpenFormula aka 
ODFF
-constexpr sal_uInt16 XML_NAMESPACE_XHTML =   35;
-constexpr sal_uInt16 XML_NAMESPACE_GRDDL =   36;
+constexpr sal_uInt16 XML_NAMESPACE_CONFIG =  17;
+constexpr sal_uInt16 XML_NAMESPACE_DB =  18;
+constexpr sal_uInt16 XML_NAMESPACE_XFORMS =  19;
+constexpr sal_uInt16 XML_NAMESPACE_SMIL =20;
+constexpr sal_uInt16 XML_NAMESPACE_ANIMATION =   21;
+constexpr sal_uInt16 XML_NAMESPACE_XML = 22;
+constexpr sal_uInt16 XML_NAMESPACE_XHTML =   23;
+constexpr sal_uInt16 XML_NAMESPACE_GRDDL =   24;
+// * formula attribute values (standard ODF)
+constexpr sal_uInt16 XML_NAMESPACE_OF =  25;   // OpenFormula aka 
ODFF
+// * event attribute values (standard W3C)
+constexpr sal_uInt16 XML_NAMESPACE_DOM = 26;
+// * XForms attribute values (standard W3C)
+constexpr sal_uInt16 XML_NAMESPACE_XSD = 27;
+constexpr sal_uInt16 XML_NAMESPACE_XSI = 28;
+// * following 3 namespaces are used for non-standard attribute values and 
non-ODF XML
+constexpr sal_uInt16 XML_NAMESPACE_OOO = 29; // lots of 
attributes, settings.xml, non-ODF XML
+constexpr sal_uInt16 XML_NAMESPACE_OOOW =30; // formula attribute 
values
+constexpr sal_uInt16 XML_NAMESPACE_OOOC =31; // formula attribute 
values
+// non-ODF XML namespaces
+constexpr sal_uInt16 XML_NAMESPACE_BLOCKLIST =   32;
+constexpr sal_uInt16 XML_NAMESPACE_FRAMEWORK =   33;
+constexpr sal_uInt16 XML_NAMESPACE_TCD = 34;   // text conversion 
dictionary
+constexpr sal_uInt16 XML_NAMESPACE_DLG = 35;
+constexpr sal_uInt16 XML_NAMESPACE_REPORT =  36;
 constexpr sal_uInt16 XML_NAMESPACE_VERSIONS_LIST =   37;
 
-// namespaces for odf extended formats
+// namespaces for ODF extended formats
 constexpr sal_uInt16 XML_NAMESPACE_EXT_BASE   = 50;
 constexpr sal_uInt16 XML_NAMESPACE_OFFICE_EXT = XML_NAMESPACE_EXT_BASE + 0;
 constexpr sal_uInt16 XML_NAMESPACE_TABLE_EXT  = XML_NAMESPACE_EXT_BASE + 1;
@@ -73,6 +79,12 @@ constexpr sal_uInt16 XML_NAMESPACE_DRAW_EXT   = 
XML_NAMESPACE_EXT_BASE + 3;
 constexpr sal_uInt16 XML_NAMESPACE_CALC_EXT   = XML_NAMESPACE_EXT_BASE + 4;
 constexpr sal_uInt16 XML_NAMESPACE_LO_EXT = XML_NAMESPACE_EXT_BASE + 5;
 
+// experimental ODF extended namespaces
+constexpr sal_uInt16 XML_NAMESPACE_FIELD  = XML_NAMESPACE_EXT_BASE + 6;
+constexpr sal_uInt16 XML_NAMESPACE_CSS3TEXT   = XML_NAMESPACE_EXT_B

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

[Michael Stahl (via logerrit)]

 sw/qa/inc/swmodeltestbase.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 638feb0e062537dd0f41b7b977b5b9fa1ac096ae
Author: Michael Stahl 
AuthorDate: Wed Apr 29 19:33:38 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 19:14:17 2020 +0200

sw: fix SwModelTestBase::parseExportedFile()

Both tests in fodfexport.cxx didn't test anything becuase this was
called twice and the first time the stream was created for 0-sized file
and the 2nd time the existing stream was reused so still no data.

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

diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index 44bfe8158cec..a7be42da2bd4 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -933,7 +933,8 @@ protected:
  */
 xmlDocUniquePtr parseExportedFile()
 {
-return parseXmlStream(maTempFile.GetStream(StreamMode::READ));
+auto stream(SvFileStream(maTempFile.GetURL(), StreamMode::READ | 
StreamMode::TEMPORARY));
+return parseXmlStream(&stream);
 }
 
 std::unique_ptr parseExportStream(const OUString& url, const 
OUString& rStreamName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/source/window/bufferdevice.cxx   |   10 +-
 vcl/source/window/bufferdevice.hxx   |2 ++
 vcl/source/window/menufloatingwindow.cxx |   11 +++
 3 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit a65ec136fbd0dae889b20fba657b40af467fcb27
Author: Miklos Vajna 
AuthorDate: Thu May 7 15:38:49 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 19:13:35 2020 +0200

tdf#132267 vcl: fix missing scrollers with non-native rendering

Regression from c04169c586ef1d55b1d0ac469bb4fbd4f50bd08a (tdf#125415 vcl
menu floating window: avoid flicker, 2019-05-21) the problem was that
the clip region was set on the buffer, not on the render context. This
means the original clip was used to determine what gets copied from the
buffer to the screen, so the scroller arrows were not rendered.

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

diff --git a/vcl/source/window/bufferdevice.cxx 
b/vcl/source/window/bufferdevice.cxx
index 0092d1ab97e4..188fbb1acc1c 100644
--- a/vcl/source/window/bufferdevice.cxx
+++ b/vcl/source/window/bufferdevice.cxx
@@ -23,12 +23,20 @@ BufferDevice::BufferDevice(const VclPtr& 
pWindow, vcl::RenderContex
 m_pBuffer->EnableRTL(rRenderContext.IsRTLEnabled());
 }
 
-BufferDevice::~BufferDevice()
+void BufferDevice::Dispose()
 {
+if (m_bDisposed)
+{
+return;
+}
+
 m_rRenderContext.DrawOutDev(Point(0, 0), m_pWindow->GetOutputSizePixel(), 
Point(0, 0),
 m_pWindow->GetOutputSizePixel(), *m_pBuffer);
+m_bDisposed = true;
 }
 
+BufferDevice::~BufferDevice() { Dispose(); }
+
 vcl::RenderContext* BufferDevice::operator->() { return m_pBuffer.get(); }
 
 vcl::RenderContext& BufferDevice::operator*() { return *m_pBuffer; }
diff --git a/vcl/source/window/bufferdevice.hxx 
b/vcl/source/window/bufferdevice.hxx
index 5f2471cd26d9..f785b6bdcbee 100644
--- a/vcl/source/window/bufferdevice.hxx
+++ b/vcl/source/window/bufferdevice.hxx
@@ -21,10 +21,12 @@ class VCL_DLLPUBLIC BufferDevice
 ScopedVclPtr m_pBuffer;
 VclPtr m_pWindow;
 vcl::RenderContext& m_rRenderContext;
+bool m_bDisposed = false;
 
 public:
 BufferDevice(const VclPtr& pWindow, vcl::RenderContext& 
rRenderContext);
 ~BufferDevice();
+void Dispose();
 
 vcl::RenderContext* operator->();
 vcl::RenderContext& operator*();
diff --git a/vcl/source/window/menufloatingwindow.cxx 
b/vcl/source/window/menufloatingwindow.cxx
index 365f80614697..84e19a63e0b5 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1205,12 +1205,14 @@ void MenuFloatingWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::
 if (!pMenu)
 return;
 
+// Set the clip before the buffering starts: rPaintRect may be larger than 
the current clip,
+// this way the buffer -> render context copy happens with this clip.
+rRenderContext.Push(PushFlags::CLIPREGION);
+rRenderContext.SetClipRegion(vcl::Region(rPaintRect));
+
 // Make sure that all actual rendering happens in one go to avoid flicker.
 vcl::BufferDevice pBuffer(this, rRenderContext);
 
-pBuffer->Push(PushFlags::CLIPREGION);
-pBuffer->SetClipRegion(vcl::Region(rPaintRect));
-
 if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, 
ControlPart::Entire))
 {
 pBuffer->SetClipRegion();
@@ -1233,7 +1235,8 @@ void MenuFloatingWindow::Paint(vcl::RenderContext& 
rRenderContext, const tools::
 if (nHighlightedItem != ITEMPOS_INVALID)
 RenderHighlightItem(*pBuffer, nHighlightedItem);
 
-pBuffer->Pop();
+pBuffer.Dispose();
+rRenderContext.Pop();
 }
 
 void MenuFloatingWindow::ImplDrawScroller(vcl::RenderContext& rRenderContext, 
bool bUp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 xmloff/source/core/xmlimp.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d4d88774c505d3c6c6668dd06b941fb268e5a22b
Author: Michael Stahl 
AuthorDate: Wed Apr 29 12:28:30 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 19:13:12 2020 +0200

xmloff: ODF import: wrong Storage in SvXMLImport::IsODFVersionConsistent()

The XModel's storage is a temporary one created in
SfxObjectShell::GetStorage(), with the latest ODF version;
the check must use the source Storage that is being imported.

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

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index cc515c645a23..78c967fa72fc 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1705,9 +1705,8 @@ bool SvXMLImport::IsODFVersionConsistent( const OUString& 
aODFVersion )
 // check the consistency only for the ODF1.2 and later ( according to 
content.xml )
 // manifest.xml might have no version, it should be checked here and 
the correct version should be set
 try
-{
-uno::Reference< document::XStorageBasedDocument > xDoc( mxModel, 
uno::UNO_QUERY_THROW );
-uno::Reference< embed::XStorage > xStor = 
xDoc->getDocumentStorage();
+{   // don't use getDocumentStorage(), it's temporary and latest 
version
+uno::Reference const xStor(GetSourceStorage());
 uno::Reference< beans::XPropertySet > xStorProps( xStor, 
uno::UNO_QUERY_THROW );
 
 // the check should be done only for OASIS format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf132187.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   27 +++
 2 files changed, 27 insertions(+)

New commits:
commit d8388a729ff199f8fb98df21eff4e253dfd420d2
Author: Xisco Fauli 
AuthorDate: Tue May 5 15:26:49 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 19:03:44 2020 +0200

tdf#132187: sw: Add unittest

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93485
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 823a224843ee78a33f2d346c02344a88a77b2758)

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

diff --git a/sw/qa/extras/uiwriter/data/tdf132187.odt 
b/sw/qa/extras/uiwriter/data/tdf132187.odt
new file mode 100644
index ..27bea84b6584
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf132187.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index eacde2daf67d..2f22be303d35 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -233,6 +233,7 @@ public:
 void testSearchWithTransliterate();
 void testTdf73660();
 void testNewDocModifiedState();
+void testTdf132187();
 void testTdf77342();
 void testTdf63553();
 void testTdf74230();
@@ -440,6 +441,7 @@ public:
 CPPUNIT_TEST(testSearchWithTransliterate);
 CPPUNIT_TEST(testTdf73660);
 CPPUNIT_TEST(testNewDocModifiedState);
+CPPUNIT_TEST(testTdf132187);
 CPPUNIT_TEST(testTdf77342);
 CPPUNIT_TEST(testTdf63553);
 CPPUNIT_TEST(testTdf74230);
@@ -4217,6 +4219,31 @@ void SwUiWriterTest::testUnicodeNotationToggle()
 CPPUNIT_ASSERT_EQUAL( sDocString, sOriginalDocString );
 }
 
+void SwUiWriterTest::testTdf132187()
+{
+load(DATA_DIRECTORY, "tdf132187.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {});
+lcl_dispatchCommand(mxComponent, ".uno:Copy", {});
+lcl_dispatchCommand(mxComponent, ".uno:GoToEndOfDoc", {});
+
+for (sal_Int32 i = 0; i < 10; ++i)
+{
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+}
+
+//without the fix in place, this test would fail with:
+//- Expected: 1
+//- Actual  : 70
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 void SwUiWriterTest::testTdf34957()
 {
 load(DATA_DIRECTORY, "tdf34957.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source dbaccess/source reportdesign/source sc/source sd/source sfx2/source svx/source sw/source xmloff/source

[Michael Stahl (via logerrit)]

 chart2/source/tools/AxisHelper.cxx   |4 -
 chart2/source/tools/DiagramHelper.cxx|4 -
 dbaccess/source/core/dataaccess/databasedocument.cxx |6 -
 reportdesign/source/filter/xml/xmlExport.cxx |2 
 sc/source/filter/xml/XMLExportDataPilot.cxx  |   14 +--
 sc/source/filter/xml/xmlexprt.cxx|   36 -
 sd/source/ui/annotations/annotationmanager.cxx   |4 -
 sfx2/source/dialog/filedlghelper.cxx |2 
 sfx2/source/doc/objserv.cxx  |8 +-
 sfx2/source/doc/objstor.cxx  |   12 +--
 svx/source/xml/xmlgrhlp.cxx  |2 
 sw/source/core/doc/number.cxx|8 +-
 sw/source/filter/xml/xmlexp.cxx  |2 
 xmloff/source/chart/PropertyMaps.cxx |   10 +-
 xmloff/source/chart/SchXMLExport.cxx |   70 +--
 xmloff/source/chart/SchXMLTools.cxx  |4 -
 xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx  |4 -
 xmloff/source/core/xmlexp.cxx|   32 
 xmloff/source/draw/sdpropls.cxx  |4 -
 xmloff/source/draw/sdxmlexp.cxx  |6 -
 xmloff/source/draw/shapeexport.cxx   |   16 ++--
 xmloff/source/style/XMLPageExport.cxx|4 -
 xmloff/source/style/chrlohdl.cxx |4 -
 xmloff/source/style/styleexp.cxx |2 
 xmloff/source/style/xmlexppr.cxx |2 
 xmloff/source/style/xmlnume.cxx  |   22 ++---
 xmloff/source/style/xmlnumfe.cxx |2 
 xmloff/source/text/XMLSectionExport.cxx  |   10 +-
 xmloff/source/text/txtflde.cxx   |   16 ++--
 xmloff/source/text/txtparae.cxx  |   28 +++
 30 files changed, 170 insertions(+), 170 deletions(-)

New commits:
commit 45f2e81c98a5b7fe6f021923fd93d20b3c5f3815
Author: Michael Stahl 
AuthorDate: Tue Apr 21 18:57:52 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 19:01:01 2020 +0200

replace ODFDefaultVersion usage with ODFSaneDefaultVersion

Compare with ODFSVER_012 mostly works the same, except for places where
namespaces are defined where the ODFSVER_EXTENDED bit should be checked.

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

diff --git a/chart2/source/tools/AxisHelper.cxx 
b/chart2/source/tools/AxisHelper.cxx
index 6b5b43d0c891..c836d7646114 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -1161,8 +1161,8 @@ Reference< XChartType > 
AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisInd
 
 bool AxisHelper::isAxisPositioningEnabled()
 {
-const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( 
SvtSaveOptions().GetODFDefaultVersion() );
-return nCurrentVersion >= SvtSaveOptions::ODFVER_012;
+const SvtSaveOptions::ODFSaneDefaultVersion 
nCurrentVersion(SvtSaveOptions().GetODFSaneDefaultVersion());
+return nCurrentVersion >= SvtSaveOptions::ODFSVER_012;
 }
 
 } //namespace chart
diff --git a/chart2/source/tools/DiagramHelper.cxx 
b/chart2/source/tools/DiagramHelper.cxx
index 5f5abd19c191..d9b1bf064cdf 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1676,8 +1676,8 @@ bool 
DiagramHelper::switchDiagramPositioningToExcludingPositioning(
 ChartModel& rModel, bool bResetModifiedState, bool 
bConvertAlsoFromAutoPositioning )
 {
 //return true if something was changed
-const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( 
SvtSaveOptions().GetODFDefaultVersion() );
-if( nCurrentODFVersion > SvtSaveOptions::ODFVER_012 )
+const SvtSaveOptions::ODFSaneDefaultVersion 
nCurrentODFVersion(SvtSaveOptions().GetODFSaneDefaultVersion());
+if (SvtSaveOptions::ODFSVER_012 < nCurrentODFVersion)
 {
 uno::Reference< css::chart::XDiagramPositioning > xDiagramPositioning( 
rModel.getFirstDiagram(), uno::UNO_QUERY );
 if( xDiagramPositioning.is() && ( bConvertAlsoFromAutoPositioning || 
!xDiagramPositioning->isAutomaticDiagramPositioning() )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 922513a99e8d..ac21fa4c809f 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1658,11 +1658,11 @@ void ODatabaseDocument::impl_writeStorage_throw( const 
Reference< XStorage >& _r
 xProp->setPropertyValue( INFO_MEDIATYPE, makeAny( 
OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) );
 
 OUString aVersion;
-SvtSaveOptions::ODFDefaultVersion const nDefVersion =
-aSaveOpt.GetODFDefaultV

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

[Henry Castro (via logerrit)]

 loleaflet/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54ac186ed595fd8064eceecfb6088e11b373f351
Author: Henry Castro 
AuthorDate: Wed Apr 29 08:14:16 2020 -0400
Commit: Henry Castro 
CommitDate: Thu May 7 18:25:14 2020 +0200

loleaflet: makefile: no built-in rules

It is not needed to build loleaflet

Change-Id: I2eb0ed999a0463b3f69e98a6a450961a7e6723d0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93168
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 4bb2b1c84..f4f62f493 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -1,3 +1,4 @@
+MAKEFLAGS = --no-builtin-rules
 CTAGS = ctags
 
 L10N_PO = $(wildcard $(srcdir)/po/*.po)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/ProxyProtocol.cpp

[Michael Meeks (via logerrit)]

 wsd/ProxyProtocol.cpp |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 90b6216427898097b58feeb84c1e6176837539ec
Author: Michael Meeks 
AuthorDate: Thu May 7 16:05:14 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu May 7 18:03:57 2020 +0200

Proxy: send 200 back when there is no queue.

Keep errors for errors.

Change-Id: I6f93bf90e21e68b66fc3d1532ae3db2f2431fca5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93655
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/wsd/ProxyProtocol.cpp b/wsd/ProxyProtocol.cpp
index f11d7d942..26ea53e39 100644
--- a/wsd/ProxyProtocol.cpp
+++ b/wsd/ProxyProtocol.cpp
@@ -167,7 +167,8 @@ void ProxyProtocolHandler::handleRequest(bool isWaiting, 
const std::shared_ptrgetFD());
 // longer running 'write socket' (marked 'read' by the client)
@@ -185,7 +186,21 @@ void ProxyProtocolHandler::handleRequest(bool isWaiting, 
const std::shared_ptrsend(oss.str());
+}
+else
+LOG_TRC("Returned a reply immediately");
+
 socket->shutdown();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CI and `make screenshot`

[Stephan Bergmann]

On 06/05/2020 10:37, Stephan Bergmann wrote:
With a small --with-lang list, `make screenshot` executes rather 
quickly, and at least on Linux doesn't pop up any windows.  So the 
cheapest (in terms of coding) change to include it in 
 would be


diff --git a/bin/linux_clang_dbgutil_64.env 
b/bin/linux_clang_dbgutil_64.env

index aaeca80..f0610d0 100644
--- a/bin/linux_clang_dbgutil_64.env
+++ b/bin/linux_clang_dbgutil_64.env
@@ -5,5 +5,5 @@ export 
LD_LIBRARY_PATH=$LODE_HOME/opt_private/gcc-7.3.0/lib64

 export CCACHE_CPP2=Y
 export CCACHE_DIR=$HOME/.ccache_clang
 export CCACHE_COMPILERCHECK=none
-target=check
+target="check screenshot"
 keep_going=-k


in lode.  ( 
appears to build without an explicit --with-lang=... at all.)


Pushed that as 
 
"Add `make screenshot` to gerrit_linux_clang_dbgutil" now and rolled it 
out on Jenkins.


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 55e9293c342647ad89c3f081c5b5b677140ac847
Author: Gabor Kelemen 
AuthorDate: Tue Apr 28 18:07:44 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 16:54:34 2020 +0200

tdf#131366 Update graphite to 1.3.14

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

diff --git a/download.lst b/download.lst
index ee4953dafca7..479820f95a5e 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+export GRAPHITE_SHA256SUM := 
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 export HARFBUZZ_SHA256SUM := 
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
 export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting minutes: 2020-05-07

[Miklos Vajna]

* Present:
+ Stephan, Sophie, Michael W, Cloph, Heiko Caolan, Ilmari, Michael S, 
Olivier, Miklos, Thorsten, Xisco, Eike, Gabriel

* Completed Action Items:
+ Pranam, toggle the committer bit button (Cloph)
+ Install clang-cl on the Windows bots (buildbot owners)
  [ done earlier today ]

* Pending Action Items:
+ Pranam, send the new-committer mail (Kendy)
+ fix Jenkins_Callgrind at some stage (Cloph)
  [ must be an env var mismatch ]

* Release Engineering update (Cloph)
+ 7.0 status: alpha was tagged yesterday
  + problem with mac signing, fixed
+ 6.4 status: 6.4.4 rc2 will be tagged next week
+ 6.3 status: no more releases planned
+ Remotes
+ Android viewer
  + Android tinderbox has problems, need HW help -> still broken
  + maybe it’ll be moved to TDF infra
+ Online

* Documentation (Olivier)
+ New Help
   + CSS fixes (buovjaga)
   + patch to automate icon replacement table (ohallot)
+ Helpcontent2
   + Several fixes and enhancements (ohallot, libreofficiant, S. Schröder)
+ Guides
   + Published Getting Started Guide 6.4

+ Google Seasons of Doc
   + Awaiting response for application

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
244(244) (topicUI) bugs open, 264(264) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week 1 month3 months12 months
 added  12(-7) 26(-4)  84(-4) 170(-3)
 commented 109(-25)   377(-54)   1057(-20)   3378(51)
   removed   1(0)   3(1)   37(1)   45(1)
  resolved  17(11) 44(-2) 126(7)  319(7)
+ top 10 contributors:
  Heiko Tietze made 219 changes in 1 month, and 1881 changes in 1 year
  Kainz, Andreas made 110 changes in 1 month, and 467 changes in 1 year
  Foote, V Stuart made 52 changes in 1 month, and 560 changes in 1 year
  Dieter Praas made 47 changes in 1 month, and 497 changes in 1 year
  Telesto made 47 changes in 1 month, and 85 changes in 1 year
  Ilmari Lauhakangas made 46 changes in 1 month, and 103 changes in 1 
year
  Thomas Lendo made 19 changes in 1 month, and 253 changes in 1 year
  Timur made 18 changes in 1 month, and 208 changes in 1 year
  Rizal Muttaqin made 18 changes in 1 month, and 64 changes in 1 year
  Cor Nouws made 17 changes in 1 month, and 179 changes in 1 year

+ New tickets with needsUXEval Apr/30-May/07

  + 16 (not listing all)
  + image compression/resolution 132657, 132658, 132656
  + styles, templates 132718, 132798, 132625, 132572, 132570…

  + Change Arabic diacritics' colours separate from base font colour
+ https://bugs.documentfoundation.org/show_bug.cgi?id=129330
+ autocorrection to apply a character style?
  + FORMATTING: Clone Formatting should allow typing when in multiple
selection mode
+ https://bugs.documentfoundation.org/show_bug.cgi?id=128719
+ make functions sticky until escape?
+ did you research what the competition does? (Miklos)
  + not interesting, if that’s your workflow (Heiko)

* Crash Testing (Caolan)
+ 11(-5) import failure, 6(-1) export failures
  + bisected 1 export failure, results are sent to the list
+ 1 coverity issues
+ 9 Google / ossfuzz

* Crash Reporting (Xisco)
+ https://crashreport.libreoffice.org/stats/version/6.3.5.2
+ (+57) 1828 1771 1474 1755 1845 1565 1167 961 635 312 0
+ https://crashreport.libreoffice.org/stats/version/6.3.6.2
+ (+283) 283 0
+ https://crashreport.libreoffice.org/stats/version/6.4.1.2
+ (-178) 2017 2195 2230 1961 2884 4166 5344 5609 3687 2052 0
+ https://crashreport.libreoffice.org/stats/version/6.4.2.2
+ (-1443) 4322 5765 6869 6527 8046 6988 3716 0
+ https://crashreport.libreoffice.org/stats/version/6.4.3.2
+ (+1397) 5725 4328 2199 0
+ trend is ~OK
+ still researching what decides the lack of symbols (Windows version)

* GSoC 2020 (Ilmari)
+ Projects announced: 
https://blog.documentfoundation.org/blog/2020/05/05/9769/
+ June 1, 2020 - July 3, 2020: Students work on their projects
+ 6 projects accepted
+ mentors: please reach out to your students to start community bonding 
(Thorsten)
  + expect: students present themselves on the dev list during the next week

* Mentoring/easyhack update
+ reviewing patches from first contributors is much appreciated (Muhammet)
+ 
https://gerrit.libreoffice.org/q/status:open+-label:Code-Review=-1+-label:Verified=-1+-ownerin:Committers

  committer...   1 week 1 month  3 months 12 months
  open  98(-5) 163(7)   168(6)182(3)
   reviews 430(-80)   1442(-118)   4602(-196)   22341(-330)
merged 367(5) 1528(20) 4599(87) 18783(7

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

[Thorsten Behrens (via logerrit)]

 jvmfwk/inc/fwkutil.hxx  |2 
 jvmfwk/source/framework.cxx |  103 
 jvmfwk/source/fwkutil.cxx   |   48 
 3 files changed, 10 insertions(+), 143 deletions(-)

New commits:
commit 6ba74150866d71469827de9f4f19268dfa7db137
Author: Thorsten Behrens 
AuthorDate: Wed May 6 23:45:55 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 15:56:06 2020 +0200

jfw::isAccessibilitySupportDesired is obsolete

There's no platform left that would require java accessibility.

Change-Id: I2149f619e20aae70d7713d223985f8016ade8e77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93600
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/jvmfwk/inc/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx
index f2f6fcbdfb30..60ffa9fe89d0 100644
--- a/jvmfwk/inc/fwkutil.hxx
+++ b/jvmfwk/inc/fwkutil.hxx
@@ -89,8 +89,6 @@ enum FileStatus
  */
 FileStatus checkFileURL(const OUString & path);
 
-bool isAccessibilitySupportDesired();
-
 }
 #endif
 
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 67b65acb8a5c..d008b5d16ab2 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -153,32 +153,6 @@ javaFrameworkError jfw_startVM(
 if (!aInfo)
 return JFW_E_NO_SELECT;
 
-#ifdef _WIN32
-//Because on Windows there is no system setting that we can 
use to determine
-//if Assistive Technology Tool support is needed, we ship a 
.reg file that the
-//user can use to create a registry setting. When the user 
forgets to set
-//the key before he starts the office then a JRE may be 
selected without access bridge.
-//When he later sets the key then we select a JRE with 
accessibility support but
-//only if the user has not manually changed the selected JRE 
in the options dialog.
-if (jfw::isAccessibilitySupportDesired())
-{
-// If no JRE has been selected then we do not select one. 
This function shall then
-//return JFW_E_NO_SELECT
-if (aInfo &&
-(aInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE) == 0)
-{
-//has the user manually selected a JRE?
-if (settings.getJavaInfoAttrAutoSelect())
-{
-// if not then the automatism has previously 
selected a JRE
-//without accessibility support. We return 
JFW_E_NO_SELECT
-//to cause that we search for another JRE. The 
search code will
-//then prefer a JRE with accessibility support.
-return JFW_E_NO_SELECT;
-}
-}
-}
-#endif
 //check if the javavendors.xml has changed after a Java was 
selected
 OString sVendorUpdate = jfw::getElementUpdated();
 
@@ -304,12 +278,7 @@ javaFrameworkError 
jfw_findAndSelectJRE(std::unique_ptr *pInfo)
 osl::MutexGuard guard(jfw::FwkMutex::get());
 if (jfw::getMode() == jfw::JFW_MODE_DIRECT)
 return JFW_E_DIRECT_MODE;
-sal_uInt64 nFeatureFlags = 0;
 std::unique_ptr aCurrentInfo;
-//Determine if accessibility support is needed
-bool bSupportAccessibility = jfw::isAccessibilitySupportDesired();
-nFeatureFlags = bSupportAccessibility ?
-JFW_FEATURE_ACCESSBRIDGE : 0;
 
 
 // 'bInfoFound' indicates whether a Java installation has been found
@@ -327,13 +296,7 @@ javaFrameworkError 
jfw_findAndSelectJRE(std::unique_ptr *pInfo)
 aVendorSettings, &aCurrentInfo, infos)
 == javaPluginError::NONE)
 {
-// compare features
-// if the user does not require any features (nFeatureFlags = 0)
-// or the Java installation provides all features, then this 
installation is used
-if ((aCurrentInfo->nFeatures & nFeatureFlags) == nFeatureFlags)
-{
-bInfoFound = true;
-}
+bInfoFound = true;
 }
 
 // if no Java installation providing all features was detected by 
using JAVA_HOME,
@@ -345,24 +308,9 @@ javaFrameworkError 
jfw_findAndSelectJRE(std::unique_ptr *pInfo)
 aVendorSettings, vecJavaInfosFromPath, infos)
 == javaPluginError::NONE)
 {
-for (auto & pJInfo: vecJavaInfosFromPath)
-{
-// if the current Java installation implements all 
required features: use it
-if ((pJInfo->nFeatures & nFeatureFlags) == nFeatureFlags)
-{
-aCurrentInfo = std::move(pJInfo);
-bInfoFound 

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

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

 sc/source/core/data/table6.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 58c87f8261abf4f1528a43dc501e956cb9c1d2f2
Author: Luboš Luňák 
AuthorDate: Thu May 7 13:43:05 2020 +0200
Commit: Luboš Luňák 
CommitDate: Thu May 7 15:34:53 2020 +0200

sanitize properly Calc search bounds (tdf#132097)

The row/col handling seems really weird to me here in some places
(like starting actually at startcol+1 in some cases). But at least
properly limit the values to prevent out-of-bounds accesses.
This also reverts 2670e980c7dbadbdc20ff23d57ad892951edc254.

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

diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index a66822fcb9da..0605fa5683a4 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -339,17 +339,17 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, 
SCCOL& rCol, SCROW& rRow,
 bool bSkipFiltered = !rSearchItem.IsSearchFiltered();
 bool bSearchNotes = (rSearchItem.GetCellType() == SvxSearchCellType::NOTE);
 // We need to cache sc::ColumnBlockConstPosition per each column.
-std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 2 );
-for( SCCOL i = 0; i <= nLastCol+1; ++i )
+std::vector< sc::ColumnBlockConstPosition > blockPos( nLastCol + 1 );
+for( SCCOL i = 0; i <= nLastCol; ++i )
 aCol[ i ].InitBlockPosition( blockPos[ i ] );
 if (!bAll && rSearchItem.GetBackward())
 {
 SCROW nLastNonFilteredRow = pDocument->MaxRow() + 1;
-nCol = std::min(nCol, static_cast(nLastCol + 1));
-nRow = std::min(nRow, static_cast(nLastRow + 1));
 if (rSearchItem.GetRowDirection())
 {
 nCol--;
+nCol = std::min(nCol, nLastCol);
+nRow = std::min(nRow, nLastRow);
 while (!bFound && (nRow >= 0))
 {
 if (bSkipFiltered)
@@ -388,6 +388,8 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, 
SCCOL& rCol, SCROW& rRow,
 else
 {
 nRow--;
+nCol = std::min(nCol, nLastCol);
+nRow = std::min(nRow, nLastRow);
 while (!bFound && (nCol >= 0))
 {
 while (!bFound && (nRow >= 0))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.NotebookbarBuilder.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e6cd3a0f35a28ae7efab281b2f881f515a0a083f
Author: Szymon Kłos 
AuthorDate: Wed May 6 16:59:17 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu May 7 15:33:47 2020 +0200

notebookbar: hide unsupported items in calc

Change-Id: Ib45c2aeca3bc921ce0fbdb469399d32ab3d4da1f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93620
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js 
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index a07d5b3a1..85fc98816 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -82,6 +82,12 @@ L.Control.NotebookbarBuilder = 
L.Control.JSDialogBuilder.extend({
this._toolitemHandlers['.uno:DeleteComment'] = function() {};
this._toolitemHandlers['.uno:CompareDocuments'] = function() {};
this._toolitemHandlers['.uno:MergeDocuments'] = function() {};
+   this._toolitemHandlers['.uno:FunctionBox'] = function() {};
+   this._toolitemHandlers['.uno:EditAnnotation'] = function() {};
+   this._toolitemHandlers['.uno:ShowAllNotes'] = function() {};
+   this._toolitemHandlers['.uno:HideAllNotes'] = function() {};
+   this._toolitemHandlers['.uno:ShareDocument'] = function() {};
+   this._toolitemHandlers['.uno:EditDoc'] = function() {};
this._toolitemHandlers['vnd.sun.star.findbar:FocusToFindbar'] = 
function() {};
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/css

[Szymon Kłos (via logerrit)]

 loleaflet/css/menubar.css |1 +
 loleaflet/css/notebookbar.css |   37 +
 2 files changed, 38 insertions(+)

New commits:
commit db32e4fc3800ffad83ea82e4835b0653d26d1bae
Author: Szymon Kłos 
AuthorDate: Mon May 4 11:56:06 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu May 7 15:33:36 2020 +0200

notebookbar: don't cover the title field

Change-Id: I9e94863784150104d7588c8dac532343766f7154
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93619
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index c3dc4a8f5..a9031469a 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -39,6 +39,7 @@
 table-layout: fixed;
 border-spacing: 5px 0px;
 max-height: 39px;
+z-index: 10;
 }
 
 .main-nav {
commit cbaaeba9775a21a09c6a5bddc2132198dec60412
Author: Szymon Kłos 
AuthorDate: Thu May 7 10:50:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu May 7 15:33:28 2020 +0200

notebookbar: layout calc tabs

Change-Id: Iea602cc35c07653fd6ed862d356981d8fffe5523
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93622
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 1fbc5bc9f..eb083b6e9 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -94,6 +94,8 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
display: none;
 }
 
+/* Writer */
+
 /* Home tab */
 #clearFormatting.notebookbar div img {
width: 24px !important;
@@ -274,3 +276,38 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar, 
#SendToBack.notebookb
 {
margin-top: 10px !important;
 }
+
+/* Calc */
+
+/* Insert Tab */
+
+#table-InsertBox {
+   margin-top: 5px;
+}
+
+#DefineName.notebookbar {
+   margin-top: 10px !important;
+}
+
+#DataDataPilotRun.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
+
+/* Review Tab */
+
+#table-GroupB40 #Hyphenate.notebookbar,
+#DeleteAllNotes.notebookbar {
+   margin-top: 10px !important;
+}
+
+#SpellDialog.notebookbar img,
+#TraceChangeMode.notebookbar img,
+#AcceptChanges.notebookbar img,
+#Protect.notebookbar img,
+#ToolProtectionDocument.notebookbar img
+{
+   height: 32px !important;
+   width: 32px !important;
+}
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

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

New commits:
commit 142a2d3d51b8d1cacea6593a856ba7a7a1d477be
Author: Justin Luth 
AuthorDate: Mon May 4 10:31:17 2020 +0300
Commit: Michael Stahl 
CommitDate: Thu May 7 15:27:20 2020 +0200

writerfilter: remove unused xCrsr

This looks like copy/paste code.
xCrsr isn't really used, and I hardly doubt that it needs
to verify that a Crsr can exist in order to ensure
that the dummy paragraph is really created.

In fact, even checking for xTextAppend.is() shouldn't
be necessary because before this it was being used
without checking. But since I myself am a copy/paste
programmer, and I see lots of examples where this
is tested in similar situations, I leave it as it is
just to be safe.

Change-Id: Ie45d4bc9d0e1cf0a0d7602b83962805165c3b85d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93413
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Michael Stahl 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b538ba19f872..ec77ea4c55fa 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -466,8 +466,7 @@ void DomainMapper_Impl::AddDummyParaForTableInSection()
 if (!m_aTextAppendStack.empty())
 {
 uno::Reference< text::XTextAppend >  xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
-uno::Reference< text::XTextCursor > xCrsr = 
xTextAppend->getText()->createTextCursor();
-if (xCrsr.is())
+if (xTextAppend.is())
 {
 xTextAppend->finishParagraph(  uno::Sequence< beans::PropertyValue 
>() );
 SetIsDummyParaAddedForTableInSection(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2020-May-07

[Heiko Tietze]

Present: Heiko
Comments: Cor, Roman

Tickets/Topic

 * Provide context menu inside the area (rows, columns) where an Outline is 
set, with outline functions
   + https://bugs.documentfoundation.org/show_bug.cgi?id=76986
   + don't see any contextual functions that are needed there (Heiko)
 + Show/Hide Details (Cor)
 + but the bar can have multiple groups; still not convinced
   + tooltips make sense ("Grouping of B$:D$"\nClick to show/hide)
   + random values are recalculated on row/col hide (bug 132809)
   => change into tooltip request (or resolve as WFM)

 * UX: Ignore all option in spell check is an unexpected full session setting
   + https://bugs.documentfoundation.org/show_bug.cgi?id=132505
   + store ignored words at spellchecking in the document not the session?
   + ignore once/all as well as correct once/all should work at the current 
document,
 a further option should allow to add this word to a dictionary
   + changing the text language is pointless as the dialog does not offer any 
restart
   + also, options... are misplaced in this dialog
   + modifications to the text itself (paste) are questionable
   + the dialog shouldn't be amodal
   + the dialog should use system settings (currently dark font on dark 
background)
   + undo better done after close (every change stored separately)
   => add mockup to ticket

 * Change Arabic diacritics' colours separate from base font colour?
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129330
   + Apply character style per autotext or use direct formatting with 
hard-coded rules
   + find/replace approach should work like in indesign (see youtube video in 
c4)
   => no objection, comment on ticket

 * FORMATTING: Clone Formatting should allow typing when in multiple selection 
mode
   + https://bugs.documentfoundation.org/show_bug.cgi?id=128719
   => no objection so go for it

 * Provide a live preview of changes when creating or editing a pivot table
   + https://bugs.documentfoundation.org/show_bug.cgi?id=131654
   + mockup in c2 needs improvement for options and consideration of corner 
cases
   => no objection



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

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

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/about.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c206fd36389d0d96132c055dcb2afb2d6e02a9b5
Author: Heiko Tietze 
AuthorDate: Thu May 7 11:59:43 2020 +0200
Commit: Heiko Tietze 
CommitDate: Thu May 7 15:23:25 2020 +0200

Copy build ID in full length

Change-Id: Ic64f62cb0acc30efaaf24f9ce17c1f2d983c4e24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93628
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 953670ffa7ae..33d343b00a4f 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -260,7 +260,7 @@ IMPL_LINK_NOARG(AboutDialog, HandleClick, weld::Button &, 
void) {
 
   OUString sInfo;
   sInfo += "Version: " + m_pVersionLabel->get_label() + "\n";
-  sInfo += "Build ID: " + m_pBuildLabel->get_label() + "\n";
+  sInfo += "Build ID: " + GetBuildString() + "\n";
   sInfo += m_pEnvLabel->get_label();
   sInfo += m_pUILabel->get_label() + "\n";
   sInfo += "Locale: " + m_pLocaleLabel->get_label() + "\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/addresslistdialog.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 403776b17706107001d49cf5eed3c4415c4d8b9d
Author: Caolán McNamara 
AuthorDate: Thu May 7 09:13:22 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu May 7 15:21:21 2020 +0200

Related: tdf#132678 select first entry if nothing else selected

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

diff --git a/sw/source/ui/dbui/addresslistdialog.cxx 
b/sw/source/ui/dbui/addresslistdialog.cxx
index 977a81addb2b..77291826ebb0 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -161,6 +161,7 @@ 
SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
 
 bool bEnableEdit = false;
 bool bEnableOK = true;
+bool bSelected = false;
 m_xListLB->unselect_all();
 
 SwDBConfig aDb;
@@ -178,6 +179,7 @@ 
SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
 if (rName == rCurrentData.sDataSource)
 {
 m_xListLB->select(*m_xIter);
+bSelected = true;
 m_xListLB->set_text(*m_xIter, rCurrentData.sCommand, 1);
 pUserData->nCommandType = rCurrentData.nCommandType;
 pUserData->xSource = rConfigItem.GetSource();
@@ -203,7 +205,10 @@ 
SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent)
 }
 }
 
-m_xOK->set_sensitive(m_xListLB->n_children() > 0 && bEnableOK);
+bool bHasChildren = m_xListLB->n_children() > 0;
+if (bHasChildren && !bSelected)
+m_xListLB->select(0); // select the first entry if nothing else 
selected
+m_xOK->set_sensitive(bHasChildren && bEnableOK);
 m_xEditPB->set_sensitive(bEnableEdit);
 m_xRemovePB->set_sensitive(m_xListLB->n_children() > 0);
 m_xFilterPB->set_sensitive(m_xListLB->n_children() > 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/utlui/content.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fd1a4fddad5932c514199de0f8a7b5a2f82ce437
Author: Caolán McNamara 
AuthorDate: Thu May 7 11:06:51 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu May 7 15:20:43 2020 +0200

tdf#132477 don't leave removed row highlighted

so that an attempt is made to unhighlight it in dnd post-processing

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

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 87ae08cfcecb..44ce6c197a9e 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1092,6 +1092,9 @@ sal_Int8 SwContentTree::ExecuteDrop(const 
ExecuteDropEvent& rEvt)
 nTargetPos = 
GetWrtShell()->getIDocumentOutlineNodesAccess()->getOutlineNodesCount() - 1;
 }
 
+// remove the drop highlight before we change the contents of the tree 
so we don't
+// try and dereference a removed entry in post-processing drop
+m_xTreeView->unset_drag_dest_row();
 MoveOutline(nTargetPos);
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/images

[Szymon Kłos (via logerrit)]

 loleaflet/images/lc_acceptchanges.svg  |1 +
 loleaflet/images/lc_addname.svg|7 +++
 loleaflet/images/lc_datadatapilotrun.svg   |1 +
 loleaflet/images/lc_definename.svg |7 +++
 loleaflet/images/lc_deleteallnotes.svg |1 +
 loleaflet/images/lc_deletenote.svg |1 +
 loleaflet/images/lc_protect.svg|1 +
 loleaflet/images/lc_spelldialog.svg|1 +
 loleaflet/images/lc_toolprotectiondocument.svg |1 +
 loleaflet/images/lc_tracechangemode.svg|1 +
 10 files changed, 22 insertions(+)

New commits:
commit 5476715a5ce3413cd6db2beedb82884e593b9c69
Author: Szymon Kłos 
AuthorDate: Wed May 6 17:18:51 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu May 7 15:09:42 2020 +0200

notebookbar: import icons for calc

Change-Id: Idbf2ad55615e1609eda0c45dd4a1c448e397033a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93621
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/images/lc_acceptchanges.svg 
b/loleaflet/images/lc_acceptchanges.svg
new file mode 100644
index 0..4171c3929
--- /dev/null
+++ b/loleaflet/images/lc_acceptchanges.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_addname.svg b/loleaflet/images/lc_addname.svg
new file mode 100644
index 0..d3a9efe6c
--- /dev/null
+++ b/loleaflet/images/lc_addname.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; 
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; 
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; viewBox="0 0 24 
24" version="1.1">
+ 
+ 
+ 
+ 
+
diff --git a/loleaflet/images/lc_datadatapilotrun.svg 
b/loleaflet/images/lc_datadatapilotrun.svg
new file mode 100644
index 0..6a1d5d7e7
--- /dev/null
+++ b/loleaflet/images/lc_datadatapilotrun.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_definename.svg 
b/loleaflet/images/lc_definename.svg
new file mode 100644
index 0..d3a9efe6c
--- /dev/null
+++ b/loleaflet/images/lc_definename.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; 
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; 
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; viewBox="0 0 24 
24" version="1.1">
+ 
+ 
+ 
+ 
+
diff --git a/loleaflet/images/lc_deleteallnotes.svg 
b/loleaflet/images/lc_deleteallnotes.svg
new file mode 100644
index 0..d5c04051a
--- /dev/null
+++ b/loleaflet/images/lc_deleteallnotes.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_deletenote.svg 
b/loleaflet/images/lc_deletenote.svg
new file mode 100644
index 0..baa15e5ab
--- /dev/null
+++ b/loleaflet/images/lc_deletenote.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_protect.svg b/loleaflet/images/lc_protect.svg
new file mode 100644
index 0..c17729d33
--- /dev/null
+++ b/loleaflet/images/lc_protect.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_spelldialog.svg 
b/loleaflet/images/lc_spelldialog.svg
new file mode 100644
index 0..15faa1553
--- /dev/null
+++ b/loleaflet/images/lc_spelldialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_toolprotectiondocument.svg 
b/loleaflet/images/lc_toolprotectiondocument.svg
new file mode 100644
index 0..c17729d33
--- /dev/null
+++ b/loleaflet/images/lc_toolprotectiondocument.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_tracechangemode.svg 
b/loleaflet/images/lc_tracechangemode.svg
new file mode 100644
index 0..088300cc5
--- /dev/null
+++ b/loleaflet/images/lc_tracechangemode.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

 solenv/bin/macosx-codesign-app-bundle |2 +-
 solenv/bin/modules/installer/simplepackage.pm |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1742ac5b784922032fb9aae5e61909bd9ab3c578
Author: Christian Lohmaier 
AuthorDate: Thu May 7 14:31:25 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Thu May 7 14:31:25 2020 +0200

fix macOS codesigning when using a separate builddir

88453fd13a653963b394b8f865ff104b5545f137 changed the
hardened_runtime.xcent to a generated file

Change-Id: I54b927d1990835bb902f62e03d51b0e70735269c

diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
index db2f6ffc55d2..8a8f8445c629 100755
--- a/solenv/bin/macosx-codesign-app-bundle
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -36,7 +36,7 @@ if test -n "$ENABLE_MACOSX_SANDBOX"; then
 other_files=''
 else
 # We then want to sign data files, too, hmm.
-entitlements="--entitlements $SRCDIR/hardened_runtime.xcent"
+entitlements="--entitlements $BUILDDIR/hardened_runtime.xcent"
 other_files="\
  -or -name '*.fodt' -or -name 'schema.strings' -or -name 'schema.xml' \
  -or -name '*.jar' -or -name 'LICENSE' -or -name 'LICENSE.html' \
diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index b32f77d3bef6..7c7afe67d513 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -433,7 +433,7 @@ sub create_package
 opendir(my $dh, $sdkbindir);
 foreach my $sdkbinary (readdir $dh) {
 next unless -f "$sdkbindir/$sdkbinary";
-$systemcall = "codesign --force --verbose 
--options=runtime --identifier='$ENV{MACOSX_BUNDLE_IDENTIFIER}.$sdkbinary' 
--sign '$ENV{MACOSX_CODESIGNING_IDENTITY}' --entitlements 
$ENV{SRCDIR}/hardened_runtime.xcent $sdkbindir/$sdkbinary > 
/tmp/codesign_losdk_$sdkbinary.log 2>&1";
+$systemcall = "codesign --force --verbose 
--options=runtime --identifier='$ENV{MACOSX_BUNDLE_IDENTIFIER}.$sdkbinary' 
--sign '$ENV{MACOSX_CODESIGNING_IDENTITY}' --entitlements 
$ENV{BUILDDIR}/hardened_runtime.xcent $sdkbindir/$sdkbinary > 
/tmp/codesign_losdk_$sdkbinary.log 2>&1";
 print "... $systemcall ...\n";
 my $returnvalue = system($systemcall);
 $infoline = "Systemcall: $systemcall\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/ww8export3.cxx |5 +-
 sw/source/filter/ww8/wrtww8.cxx   |   64 --
 2 files changed, 64 insertions(+), 5 deletions(-)

New commits:
commit 99c4fefdbb6129a58421b9c7f4a005f868a0e701
Author: Justin Luth 
AuthorDate: Wed Apr 22 11:43:22 2020 +0300
Commit: Miklos Vajna 
CommitDate: Thu May 7 14:06:16 2020 +0200

tdf#98409 doc export: export (non-default) cell margins

Previously, the only cell margins that were being
exported were the row defaults from the last column.

These cell margins are tricky, because multiple
cells and multiple sides can be combined together
into a single definition.

A previous commit for tdf#73056 was needed to import
these sequences.

Change-Id: I513c432ec11a78c7bb52ac6fb628851192e88023
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92701
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index b447c7fd3225..f021491a164e 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -188,9 +188,8 @@ DECLARE_WW8EXPORT_TEST(testTdf73056_cellMargins, 
"tdf73056_cellMargins.doc")
 
 // only the first cell with specific margins was processed, leaving the 
rest at table defaults. Was 0.
 uno::Reference< beans::XPropertySet > xPropSet( xCell, 
uno::UNO_QUERY_THROW );
-if ( !mbExported )
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "bottom cell spacing to contents",
-sal_Int32(101), getProperty(xPropSet, 
"BottomBorderDistance" ) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "bottom cell spacing to contents",
+sal_Int32(101), getProperty(xPropSet, 
"BottomBorderDistance" ) );
 }
 DECLARE_WW8EXPORT_TEST(testTdf79435_legacyInputFields, 
"tdf79435_legacyInputFields.docx")
 {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6982cd7a8fcc..91d049a42e11 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2043,8 +2043,9 @@ void WW8AttributeOutput::TableInfoRow( 
ww8::WW8TableNodeInfoInner::Pointer_t pTa
 m_rWW8Export.pO->push_back( sal_uInt8(0x1) );
 }
 
-// Most of these are per-row definitions, not per-table,
-// so likely some the per-table functions are unnecessarily 
re-defined...
+// Most of these are per-row definitions, not per-table.
+// WW8 has no explicit table start/end markup,
+// simply rows with the same table properties that are grouped 
together as a table.
 TableBidi( pTableTextNodeInfoInner );
 TableOrientation( pTableTextNodeInfoInner );
 TableSpacing( pTableTextNodeInfoInner );
@@ -2566,6 +2567,21 @@ void WW8AttributeOutput::TableCellBorders(
 const SvxBoxItem * pLastBox = nullptr;
 sal_uInt8 nSeqStart = 0; // start of sequence of cells with same borders
 
+static const SvxBoxItemLine aBorders[] =
+{
+SvxBoxItemLine::TOP, SvxBoxItemLine::LEFT,
+SvxBoxItemLine::BOTTOM, SvxBoxItemLine::RIGHT
+};
+
+sal_uInt16 nDefaultMargin[4] = {31681, 31681, 31681, 31681};  // outside 
of documented valid range
+// last column in each row defines the row default in 
TableRowDefaultBorders()
+if ( nBoxes && rTabBoxes.size() == nBoxes )
+{
+const SvxBoxItem& rBox = rTabBoxes[ nBoxes-1 
]->GetFrameFormat()->GetBox();
+for ( int i = 0; i < 4; ++i )
+nDefaultMargin[i] = rBox.GetDistance( aBorders[i] );
+}
+
 // Detect sequences of cells which have the same borders, and output
 // a border description for each such cell range.
 for ( unsigned n = 0; n <= nBoxes; ++n )
@@ -2576,9 +2592,53 @@ void WW8AttributeOutput::TableCellBorders(
 pLastBox = pBox;
 else if( !pBox || *pLastBox != *pBox )
 {
+if ( !pLastBox )
+break;
+
 // This cell has different borders than the previous cell,
 // so output the borders for the preceding cell range.
 m_rWW8Export.Out_CellRangeBorders(pLastBox, nSeqStart, n);
+
+// The last column is used as the row default for margins, so we 
can ignore these matching ones
+if ( n == nBoxes )
+break;
+
+// Output cell margins.
+// One CSSA can define up to all four margins if they are the same 
size value.
+sal_uInt16 nMargin[4];
+sal_uInt8 nSideBits[4] = {0, 0, 0, 0}; // 0001:top, 0010:left, 
0100:bottom, 1000:right
+for ( int i = 0; i < 4; ++i )  // sides: top, left, bottom, right
+{
+nMargin[i] = std::min(sal_uInt16(31680), 
pLastBox->GetDistance( aBorders[i] ));
+if ( nMargin[i] == nDefaultMargin[i] )
+continue;
+
+// joi

[Libreoffice-commits] online.git: fuzzer/ClientSession.cpp wsd/LOOLWSD.hpp

[Miklos Vajna (via logerrit)]

 fuzzer/ClientSession.cpp |5 +++--
 wsd/LOOLWSD.hpp  |4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 19745e2e44362af2edb2e9086323a0a7b69b7d8f
Author: Miklos Vajna 
AuthorDate: Thu May 7 10:26:38 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 14:04:57 2020 +0200

libfuzzer: fix build

And bypass configuration access at two new places, so the fuzzer can
find more interesting failures.

Change-Id: I4c09172e781a7c6120b8c4befe1a84fdd74f2ddc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93617
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/fuzzer/ClientSession.cpp b/fuzzer/ClientSession.cpp
index a9a6ad657..edd4053d1 100644
--- a/fuzzer/ClientSession.cpp
+++ b/fuzzer/ClientSession.cpp
@@ -16,12 +16,13 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, 
size_t size)
 std::string uri;
 Poco::URI uriPublic;
 std::string docKey = "/fuzz/fuzz.odt";
-auto docBroker = std::make_shared(uri, uriPublic, docKey);
+auto docBroker = 
std::make_shared(DocumentBroker::ChildType::Interactive, uri,
+  uriPublic, docKey);
 
 std::shared_ptr ws;
 std::string id;
 bool isReadOnly = false;
-const ServerURL serverURL("", "");
+const ServerURL serverURL;
 auto session
 = std::make_shared(ws, id, docBroker, uriPublic, 
isReadOnly, serverURL);
 
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index dc0a68e06..3172f8bb7 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -273,7 +273,7 @@ public:
 static bool isSSLEnabled()
 {
 #if ENABLE_SSL
-return LOOLWSD::SSLEnabled.get();
+return !Util::isFuzzing() && LOOLWSD::SSLEnabled.get();
 #else
 return false;
 #endif
@@ -282,7 +282,7 @@ public:
 static bool isSSLTermination()
 {
 #if ENABLE_SSL
-return LOOLWSD::SSLTermination.get();
+return !Util::isFuzzing() && LOOLWSD::SSLTermination.get();
 #else
 return false;
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/helpers.hpp

[Michael Meeks (via logerrit)]

 test/helpers.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fe1d60b95b5c832011656346a5542c772e4b0a6
Author: Michael Meeks 
AuthorDate: Wed May 6 22:12:17 2020 +0100
Commit: Michael Meeks 
CommitDate: Thu May 7 13:15:01 2020 +0200

Use https sessions for wss:// as well as https://

Change-Id: I1b3f193a51b538c423589276b4ae61ba760b241e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93595
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/test/helpers.hpp b/test/helpers.hpp
index 341c5621c..bbbf3fc2a 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -229,7 +229,7 @@ inline
 Poco::Net::HTTPClientSession* createSession(const Poco::URI& uri)
 {
 #if ENABLE_SSL
-if (uri.getScheme() == "https")
+if (uri.getScheme() == "https" || uri.getScheme() == "wss")
 return new Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort());
 #endif
 return new Poco::Net::HTTPClientSession(uri.getHost(), uri.getPort());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf132187.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   27 +++
 2 files changed, 27 insertions(+)

New commits:
commit 0f73c9f8847c1febc9a01ee84625981005797a2e
Author: Xisco Fauli 
AuthorDate: Tue May 5 15:26:49 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 13:11:31 2020 +0200

tdf#132187: sw: Add unittest

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93485
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 823a224843ee78a33f2d346c02344a88a77b2758)

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

diff --git a/sw/qa/extras/uiwriter/data/tdf132187.odt 
b/sw/qa/extras/uiwriter/data/tdf132187.odt
new file mode 100644
index ..27bea84b6584
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf132187.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 88a8fe9d3930..74e5f93c8174 100755
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -220,6 +220,7 @@ public:
 void testSearchWithTransliterate();
 void testTdf73660();
 void testNewDocModifiedState();
+void testTdf132187();
 void testTdf77342();
 void testTdf63553();
 void testTdf74230();
@@ -418,6 +419,7 @@ public:
 CPPUNIT_TEST(testSearchWithTransliterate);
 CPPUNIT_TEST(testTdf73660);
 CPPUNIT_TEST(testNewDocModifiedState);
+CPPUNIT_TEST(testTdf132187);
 CPPUNIT_TEST(testTdf77342);
 CPPUNIT_TEST(testTdf63553);
 CPPUNIT_TEST(testTdf74230);
@@ -4149,6 +4151,31 @@ void SwUiWriterTest::testUnicodeNotationToggle()
 CPPUNIT_ASSERT_EQUAL( sDocString, sOriginalDocString );
 }
 
+void SwUiWriterTest::testTdf132187()
+{
+load(DATA_DIRECTORY, "tdf132187.odt");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {});
+lcl_dispatchCommand(mxComponent, ".uno:Copy", {});
+lcl_dispatchCommand(mxComponent, ".uno:GoToEndOfDoc", {});
+
+for (sal_Int32 i = 0; i < 10; ++i)
+{
+lcl_dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+}
+
+//without the fix in place, this test would fail with:
+//- Expected: 1
+//- Actual  : 70
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 void SwUiWriterTest::testTdf34957()
 {
 load(DATA_DIRECTORY, "tdf34957.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

New commits:
commit c6fbffea11aee015f941403f6613b964b01c1947
Author: Michael Stahl 
AuthorDate: Mon May 4 14:22:09 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu May 7 13:10:53 2020 +0200

tdf#132187 sw: fix creation of frames on end node in CopyWithFlyInFly()

The problem is that the rInsPos node is included in the range passed to
MakeFrames(), but it already has a frame, so now it has 2 and that
means the next call to MakeFrames() in this position will create all the
frames twice.

This is tricky because while in practice there is currently only one
layout in theory there could be multiple, and then it could happen that
RecreateStartTextFrames() will destroy the node's frame in one layout
but not the other, while MakeFrames() always works on all layouts.

Fix this by checking if all the existing frames survive
RecreateStartTextFrames() and if it's not the case (like in tdf#130685)
explicitly delete all the frames and including the node in MakeFrames().

(regression from 166b5010b402a41b192b1659093a25acf9065fd9)

Change-Id: I1bba11da053fe1c6359b2f76f3a352e44c6a2a1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93416
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 49f26e7dae550aff6ca90b3cda7f89e11ac8cfd4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93375
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d8bea028093fe3d4c0c0af0afad20c2c03bb9855)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93538
Tested-by: Michael Stahl 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 693b965b3b9b..b3243bd0e624 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3324,6 +3324,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 
 {
 bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
+bool isRecreateEndNode(false);
 --aSavePos;
 SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
 
@@ -3334,7 +3335,40 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 {   // recreate from previous node (could be merged now)
 if (SwTextNode *const pNode = aSavePos.GetNode().GetTextNode())
 {
+std::unordered_set frames;
+SwTextNode *const pEndNode = rInsPos.GetNode().GetTextNode();
+if (pEndNode)
+{
+SwIterator aIter(*pEndNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.insert(pFrame);
+}
+}
+}
 sw::RecreateStartTextFrames(*pNode);
+if (!frames.empty())
+{   // tdf#132187 check if the end node needs new frames
+SwIterator aIter(*pEndNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+auto const it = frames.find(pFrame);
+if (it != frames.end())
+{
+frames.erase(it);
+}
+}
+}
+if (!frames.empty()) // existing frame was deleted
+{   // all layouts because MakeFrames recreates all layouts
+pEndNode->DelFrames(nullptr);
+isRecreateEndNode = true;
+}
+}
 }
 }
 bool const isAtStartOfSection(aSavePos.GetNode().IsStartNode());
@@ -3346,7 +3380,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 // if it was the first node in the document so that MakeFrames()
 // will find the existing (wasn't deleted) frame on it
 SwNodeIndex const end(rInsPos,
-(rInsPos.GetNode().IsEndNode() || isAtStartOfSection)
+(!isRecreateEndNode || isAtStartOfSection)
 ? 0 : +1);
 ::MakeFrames(pDest, aSavePos, end);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 ios/Mobile.xcodeproj/project.pbxproj |   42 +++
 1 file changed, 42 insertions(+)

New commits:
commit 459cdc9c7347ce107da8ddbc1cbec7440a96d53c
Author: Tor Lillqvist 
AuthorDate: Thu May 7 13:44:24 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu May 7 13:44:42 2020 +0300

Add source files from framework/source/services

Change-Id: Ic1d905dfbb65d42da577a3d536742ad7c3893db3

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 783d80923..a7ab38573 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -1173,6 +1173,19 @@
BECBD41423D9C98500DA5582 /* svddrgmt.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svddrgmt.cxx; 
path = "../../ios-device/svx/source/svdraw/svddrgmt.cxx"; sourceTree = 
""; };
BECD983E24336DD400016117 /* device-mobile.css */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = 
"device-mobile.css"; path = "../../../loleaflet/dist/device-mobile.css"; 
sourceTree = ""; };
BECD983F24336DD400016117 /* device-tablet.css */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = 
"device-tablet.css"; path = "../../../loleaflet/dist/device-tablet.css"; 
sourceTree = ""; };
+   BEDCC943246175E100FB02BD /* sessionlistener.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
sessionlistener.cxx; path = 
"../../ios-device/framework/source/services/sessionlistener.cxx"; sourceTree = 
""; };
+   BEDCC944246175E100FB02BD /* substitutepathvars.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
substitutepathvars.cxx; path = 
"../../ios-device/framework/source/services/substitutepathvars.cxx"; sourceTree 
= ""; };
+   BEDCC945246175E100FB02BD /* pathsettings.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
pathsettings.cxx; path = 
"../../ios-device/framework/source/services/pathsettings.cxx"; sourceTree = 
""; };
+   BEDCC946246175E100FB02BD /* urltransformer.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
urltransformer.cxx; path = 
"../../ios-device/framework/source/services/urltransformer.cxx"; sourceTree = 
""; };
+   BEDCC947246175E100FB02BD /* dispatchhelper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
dispatchhelper.cxx; path = 
"../../ios-device/framework/source/services/dispatchhelper.cxx"; sourceTree = 
""; };
+   BEDCC948246175E200FB02BD /* autorecovery.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
autorecovery.cxx; path = 
"../../ios-device/framework/source/services/autorecovery.cxx"; sourceTree = 
""; };
+   BEDCC949246175E200FB02BD /* modulemanager.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
modulemanager.cxx; path = 
"../../ios-device/framework/source/services/modulemanager.cxx"; sourceTree = 
""; };
+   BEDCC94A246175E200FB02BD /* mediatypedetectionhelper.cxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
mediatypedetectionhelper.cxx; path = 
"../../ios-device/framework/source/services/mediatypedetectionhelper.cxx"; 
sourceTree = ""; };
+   BEDCC94B246175E200FB02BD /* ContextChangeEventMultiplexer.cxx 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
ContextChangeEventMultiplexer.cxx; path = 
"../../ios-device/framework/source/services/ContextChangeEventMultiplexer.cxx"; 
sourceTree = ""; };
+   BEDCC94C246175E200FB02BD /* desktop.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = desktop.cxx; 
path = "../../ios-device/framework/source/services/desktop.cxx"; sourceTree = 
""; };
+   BEDCC94D246175E200FB02BD /* frame.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = frame.cxx; 
path = "../../ios-device/framework/source/services/frame.cxx"; sourceTree = 
""; };
+   BEDCC94E246175E200FB02BD /* taskcreatorsrv.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
taskcreatorsrv.cxx; path = 
"../../ios-device/framework/source/services/taskcreatorsrv.cxx"; sourceTree = 
""; };
+   BEDCC94F246175E200FB02BD /* uriabbreviation.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
uriabbreviation.cxx; path = 
"../../ios-device/framework/source/services/uriabbreviation.cxx"; sourceTree = 
""; };
BEF755A723E8200A008A4BB2 /* drawdoc.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = drawdoc.cxx; 
path = "../../ios-device/sd/source/core/drawdoc.cxx"; sourceTree = ""; };
BEF755A823E8200A008A4BB2 /

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

[Mike Kaganski (via logerrit)]

 sc/source/filter/excel/excel.cxx |6 +-
 sc/source/filter/excel/impop.cxx |6 --
 sc/source/filter/excel/xistyle.cxx   |4 +---
 unotools/source/misc/defaultencoding.cxx |6 ++
 4 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit ac0112ecefd64094b150390fc36f9f56d19a4d87
Author: Mike Kaganski 
AuthorDate: Thu May 7 09:26:42 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu May 7 12:23:40 2020 +0200

tdf#132796: use LO language settings to set default XLS language

This partially reverts fixes for i#63105 and i#71033, i.e. parts of
commits 6ca96e7aee937affef218e0bb892e6904f4ef358 and
35777f0b401ba7bee21a24c32739e86598ba608b.

Instead of using hard-coded Win-1252 for Excel files by default, use
LibreOffice locale language or default document language (as used for
old WMF, DXF and RTF files - see
20f6a6b159c69771dc0e087f63b6c701908e32e2,
1a9a77f84cac68bd5374df3e9ee4df88dc87a0ac, and
f26bbdb386f9e66b1a154d0589b1a446ea2dd8d5).

When a font in XLS specifies ANSI_CHARSET (0), allow using the default
encoding, not the corresponding Win-1252. This mimics Excel behaviour
for such fonts.

Do not use first font's encoding as file default encoding, as Excel
doesn't do that.

Do not consider font-specified encoding in ImportExcel::Rstring to
mimic Excel behaviour for cell number formats (but keep using it in
ImportExcel::ReadLabel for cell content).

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

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index ca87efc2988c..386342988060 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -26,6 +26,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -118,7 +120,9 @@ ErrCode ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& 
rMedium, ScDocument*
 {
 pBookStrm->SetBufferSize( 0x8000 ); // still needed?
 
-XclImpRootData aImpData( eBiff, rMedium, xRootStrg, *pDocument, 
RTL_TEXTENCODING_MS_1252 );
+XclImpRootData aImpData(
+eBiff, rMedium, xRootStrg, *pDocument,
+
utl_getWinTextEncodingFromLangStr(utl_getLocaleForGlobalDefaultEncoding()));
 std::unique_ptr< ImportExcel > xFilter;
 switch( eBiff )
 {
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index f130a39fccdd..5151232e108d 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -908,13 +908,7 @@ void ImportExcel::Rstring()
 {
 // unformatted Unicode string with separate formatting information
 XclImpString aString;
-
-// #i63105# use text encoding from FONT record
-rtl_TextEncoding eOldTextEnc = GetTextEncoding();
-if( const XclImpFont* pFont = GetXFBuffer().GetFont( nXFIdx ) )
-SetTextEncoding( pFont->GetFontEncoding() );
 aString.Read( maStrm );
-SetTextEncoding( eOldTextEnc );
 
 // character formatting runs
 if( !aString.IsRich() )
diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 886f20dc5551..798dd8359ced 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -445,7 +445,7 @@ void XclImpFont::ReadFontData5( XclImpStream& rStrm )
 maData.mbStrikeout  = ::get_flag( nFlags, EXC_FONTATTR_STRIKEOUT );
 maData.mbOutline= ::get_flag( nFlags, EXC_FONTATTR_OUTLINE );
 maData.mbShadow = ::get_flag( nFlags, EXC_FONTATTR_SHADOW );
-mbHasCharSet = true;
+mbHasCharSet = maData.mnCharSet != 0;
 }
 
 void XclImpFont::ReadFontColor( XclImpStream& rStrm )
@@ -578,8 +578,6 @@ void XclImpFontBuffer::ReadFont( XclImpStream& rStrm )
 if( maFontList.size() == 1 )
 {
 UpdateAppFont( rFont.GetFontData(), rFont.HasCharSet() );
-// #i71033# set text encoding from application font, if CODEPAGE is 
missing
-SetAppFontEncoding( rFont.GetFontEncoding() );
 }
 }
 
diff --git a/unotools/source/misc/defaultencoding.cxx 
b/unotools/source/misc/defaultencoding.cxx
index b0e473d099bd..552f3b8c40d7 100644
--- a/unotools/source/misc/defaultencoding.cxx
+++ b/unotools/source/misc/defaultencoding.cxx
@@ -13,14 +13,20 @@
 #include 
 #include 
 #include 
+#include 
 
 OUString utl_getLocaleForGlobalDefaultEncoding()
 {
 if (utl::ConfigManager::IsFuzzing())
 return "en-US";
+// First try document default language
 OUString 
result(officecfg::Office::Linguistic::General::DefaultLocale::get());
+// Fallback to LO locale
 if (result.isEmpty())
 result = officecfg::Setup::L10N::ooSetupSystemLocale::get();
+// Fallback to system locale
+if (result.isEmpty

[Libreoffice-commits] core.git: accessibility/inc accessibility/source editeng/source include/editeng include/svx offapi/com offapi/UnoApi_offapi.mk sc/source sdext/source starmath/source svx/source s

[Colomban Wendling (via logerrit)]

 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx  |2 
 accessibility/inc/extended/AccessibleGridControlTableCell.hxx|2 
 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx |2 
 accessibility/inc/extended/accessiblelistboxentry.hxx|2 
 accessibility/inc/extended/textwindowaccessibility.hxx   |3 
 accessibility/inc/standard/vclxaccessibleedit.hxx|2 
 accessibility/inc/standard/vclxaccessiblelistitem.hxx|2 
 accessibility/inc/standard/vclxaccessiblemenuitem.hxx|2 
 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx   |2 
 accessibility/inc/standard/vclxaccessibletabpage.hxx |2 
 accessibility/inc/standard/vclxaccessibletextcomponent.hxx   |2 
 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |2 
 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx   |4 
 accessibility/source/extended/AccessibleGridControlTableCell.cxx |4 
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx  |5 
 accessibility/source/extended/accessiblelistboxentry.cxx |5 
 accessibility/source/extended/textwindowaccessibility.cxx|6 
 accessibility/source/standard/vclxaccessibleedit.cxx |4 
 accessibility/source/standard/vclxaccessiblelistitem.cxx |5 
 accessibility/source/standard/vclxaccessiblemenuitem.cxx |5 
 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx|5 
 accessibility/source/standard/vclxaccessibletabpage.cxx  |5 
 accessibility/source/standard/vclxaccessibletextcomponent.cxx|4 
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx  |5 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx  |5 
 editeng/source/accessibility/AccessibleStaticTextBase.cxx|5 
 include/editeng/AccessibleEditableTextPara.hxx   |2 
 include/editeng/AccessibleStaticTextBase.hxx |2 
 include/svx/AccessibleShape.hxx  |2 
 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/accessibility/AccessibleScrollType.idl   |   81 
++
 offapi/com/sun/star/accessibility/XAccessibleText.idl|   27 +++
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx  |5 
 sc/source/ui/inc/AccessibleCsvControl.hxx|3 
 sdext/source/presenter/PresenterAccessibility.cxx|   14 +
 starmath/source/accessibility.cxx|5 
 starmath/source/accessibility.hxx|2 
 svx/source/accessibility/AccessibleShape.cxx |1 
 sw/source/core/access/accnotextframe.cxx |1 
 sw/source/core/access/accnotextframe.hxx |2 
 sw/source/core/access/accpara.cxx|   67 

 sw/source/core/access/accpara.hxx|2 
 vcl/unx/gtk3/a11y/gtk3atktext.cxx|   56 ++
 43 files changed, 365 insertions(+)

New commits:
commit b46a0a7f9f88a0213b0a5ca2712b6eb93b74d088
Author: Colomban Wendling 
AuthorDate: Thu Apr 30 10:49:37 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu May 7 12:11:33 2020 +0200

tdf#118418 implement scrollSubstringTo() for gtk

Define & use new accessibility scroll type compatible with IAccessible2
and extend the XAccessibleText interface to require scrollSubstringTo().

Co-authored-by: Martin Pieuchot 
Change-Id: Id3b2e8616892d7dcbfb41a14b72a8a457fd1dbf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89851
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 6823fa67eb7a..89569914c516 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace accessibility
 {
@@ -114,6 +115,7 @@ namespace accessibility
 virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( 
sal_Int32 nIndex, sal_Int16 aTextType ) override;
 virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( 
sal_Int32 nIndex, sal_Int16 aTextType ) override;
 virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 
nEndIndex ) override;
+virtual sal_Bool SAL_CALL scrollSubstringTo( sal_Int32 nStartIndex, 
sal_Int32 nEndIndex, css::accessibility::AccessibleScrollType aScrollType) 
override;
 };
 }
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx 
b/accessibility/inc/extended/AccessibleGridControlTab

Re: Colomban Wendling license statement

[Stephan Bergmann]

On 17/03/2017 10:53, Colomban Wendling wrote:

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


put on file at 
 
"added Colomban Wendling"


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

Re: Martin Pieuchot license statement

[Stephan Bergmann]

On 03/03/2020 09:03, Martin Pieuchot wrote:

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


put on file at 

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

[andreas kainz (via logerrit)]

 sw/uiconfig/swriter/ui/notebookbar.ui |2 ++
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e420b89a698f50b174422b962a24e2a21672a178
Author: andreas kainz 
AuthorDate: Thu May 7 10:13:42 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu May 7 11:48:25 2020 +0200

NB fix visible=true/false in the ui file temporary

Change-Id: I38291ad6b6d724cc951e423cd16976324dca6166
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93615
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index a932bc2b7e27..3815c8f92cfa 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -2704,6 +2704,7 @@
 
 
   
+False
 False
 .uno:ExportToPDF
 True
@@ -2740,6 +2741,7 @@
 
 
   
+False
 False
 .uno:ExportToEPUB
 True
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui 
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index fc85c2d1f6da..370fad4b1645 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -2763,6 +2763,7 @@
 
 
   
+False
 False
 .uno:ExportToPDF
   
@@ -2801,7 +2802,7 @@
 both-horiz
 
   
-True
+False
 False
 .uno:ExportDirectToEPUB
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Requiring SSE2 on Windows

[Luboš Luňák]

On Thursday 07 of May 2020, Thorsten Behrens wrote:
> Hi Rene,
>
> rene.engelh...@mailbox.org wrote:
> > So you seriously want LO dropped from Debian on all architectures?
> > (Since all release architectures have to be in sync. And i386 is
> > one.).
>
> The original proposal was asking for Windows - and it appears that is
> not controversial.

 Yeah. And I won't break the possibility of a non-SSE2 build with the patch 
(although now with ~nobody using it it'll presumably slowly rot).

 Patch pushed, BTW.

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac external/icu external/libxml2 external/libxslt external/lpsolve external/nss external/xmlsec solenv/gbuild

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

 configure.ac|   15 +++
 external/icu/ExternalProject_icu.mk |2 +-
 external/libxml2/libxml2-vc10.patch |2 +-
 external/libxslt/libxslt-msvc-sym.patch.2   |2 +-
 external/libxslt/libxslt-msvc.patch.2   |2 +-
 external/lpsolve/lp_solve_5.5-windows.patch |2 +-
 external/nss/ExternalProject_nss.mk |2 +-
 external/xmlsec/ExternalProject_xmlsec.mk   |2 +-
 solenv/gbuild/platform/com_MSC_class.mk |   10 +-
 9 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 75edcfc0569ca76fa22db451fd61138e52870a62
Author: Luboš Luňák 
AuthorDate: Wed May 6 10:43:24 2020 +0200
Commit: Luboš Luňák 
CommitDate: Thu May 7 10:58:53 2020 +0200

no longer force -arch:SSE on Windows

SSE2 has been pretty much a requirement for running Windows since
about 2018, so there should be ~nobody needing this.
https://lists.freedesktop.org/archives/libreoffice/2020-May/085029.html

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

diff --git a/configure.ac b/configure.ac
index 0297a5e4a6ca..762e43987656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3559,10 +3559,6 @@ if test "$_os" = "WINNT"; then
 CC=$MSVC_CXX
 CC_BASE=`first_arg_basename "$CC"`
 fi
-if test "$BITNESS_OVERRIDE" = ""; then
-dnl since MSVC 2012, default for x86 is -arch:SSE2:
-MSVC_CXX="$MSVC_CXX -arch:SSE"
-fi
 if test -z "$CXX"; then
 CXX=$MSVC_CXX
 CXX_BASE=`first_arg_basename "$CXX"`
@@ -3578,10 +3574,6 @@ if test "$_os" = "WINNT"; then
 COMPATH=$VC_PRODUCT_DIR
 fi
 fi
-if test "$BITNESS_OVERRIDE" = ""; then
-dnl since MSVC 2012, default for x86 is -arch:SSE2:
-CC="$CC -arch:SSE"
-fi
 
 COMPATH="$COMPATH/Tools/MSVC/$vcbuildnumber"
 
@@ -6850,8 +6842,7 @@ else
 # MSVC seems to differentiate only between SSE and SSE2, where in fact
 # SSE2 seems to be SSE2+.
 # Even if -arch:SSE2 is the default, set it explicitly, so that the 
variable
-# is not empty (and can be tested in gbuild), moreover we now default to 
SSE
-# for 32bit x86.
+# is not empty (and can be tested in gbuild).
 flag_sse2=-arch:SSE2
 flag_ssse3=-arch:SSE2
 flag_sse41=-arch:SSE2
@@ -11153,9 +11144,9 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != 
TRUE; then
 AC_MSG_CHECKING([for clang-cl])
 if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then
 CLANG_CC=`win_short_path_for_make 
"$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"`
-dnl match our MSVC default, also explicitly set -m32/-m64
+dnl explicitly set -m32/-m64
 if test "$BITNESS_OVERRIDE" = ""; then
-CLANG_CC="$CLANG_CC -m32 -arch:SSE"
+CLANG_CC="$CLANG_CC -m32"
 else
 CLANG_CC="$CLANG_CC -m64"
 fi
diff --git a/external/icu/ExternalProject_icu.mk 
b/external/icu/ExternalProject_icu.mk
index 1845ec3472a1..f62d8528cd8d 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -22,7 +22,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
$(call gb_Trace_StartRange,icu,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export LIB="$(ILIB)" \
-   && CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" 
CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) 
$(gb_DEBUGINFO_FLAGS)" \
+   && CFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" 
CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \
INSTALL=`cygpath -m /usr/bin/install` \
./runConfigureICU \
$(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug 
--disable-release) \
diff --git a/external/libxml2/libxml2-vc10.patch 
b/external/libxml2/libxml2-vc10.patch
index 3892b518d35d..15bc4d973ea7 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -6,7 +6,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012
  CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
  !endif
  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
-+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC)
++CFLAGS = $(CFLAGS) $(SOLARINC)
  
  # The linker and its options.
  LD = link.exe
diff --git a/external/libxslt/libxslt-msvc-sym.patch.2 
b/external/libxslt/libxslt-msvc-sym.patch.2
index e4d4e673f339..636c22a82e45 100644
--- a/external/libxslt/libxslt-msvc-sym.patch.2
+++ b/external/libxslt/libxslt-msvc-sym.patch.2
@@ -4,7 +4,7 @@
  CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /W3 /wd4244 /wd4267 $(CRUNTIME) /D 
"_REENTRANT"
  CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(

[Libreoffice-commits] online.git: loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.Notebookbar.js   |1 
 loleaflet/src/control/Control.NotebookbarWriter.js | 3382 -
 2 files changed, 3374 insertions(+), 9 deletions(-)

New commits:
commit 229b4f8121900556e2fb8aefa851acce72038107
Author: Szymon Kłos 
AuthorDate: Mon May 4 09:08:42 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu May 7 10:55:03 2020 +0200

notebookbar: add tabs data for writer

Change-Id: I62b0dbab881f8f77bb5fa3ce40bd93f8c8f79ffb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93399
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.Notebookbar.js 
b/loleaflet/src/control/Control.Notebookbar.js
index 0fca7d1ca..f19d124f9 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -23,7 +23,6 @@ L.Control.Notebookbar = L.Control.extend({
 
loadTab: function(tabJSON) {
this.clearNotebookbar();
-   tabJSON = JSON.parse(tabJSON);
var builder = new L.control.notebookbarBuilder({mobileWizard: 
this, map: this.map, cssClass: 'notebookbar'});
 
var parent = $('#toolbar-up').get(0);
diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js 
b/loleaflet/src/control/Control.NotebookbarWriter.js
index 17a443fee..5351b1d08 100644
--- a/loleaflet/src/control/Control.NotebookbarWriter.js
+++ b/loleaflet/src/control/Control.NotebookbarWriter.js
@@ -19,7 +19,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
case 'LayoutLabel':
this.loadTab(this.getLayoutTab());
break;
-   
+
case 'ReferencesLabel':
this.loadTab(this.getReferencesTab());
break;
@@ -33,7 +33,7 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({
break;
}
},
-   
+
getTabs: function() {
return [
{
@@ -70,27 +70,3393 @@ L.Control.NotebookbarWriter = 
L.Control.Notebookbar.extend({
},
 
getHomeTab: function() {
-   return '';
+   return {
+   'id': 'NotebookBar',
+   'type': 'notebookbar',
+   'children': [
+   {
+   'id': 'box',
+   'type': 'container',
+   'children': [
+   {
+   'id': 
'ContextContainer',
+   'type': 'tabcontrol',
+   'children': [
+   {
+   'id': 
'',
+   'type': 
'tabpage',
+   
'children': [
+   
{
+   
'id': 'HomeBox',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'Home-PasteBox',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'FileSection7',
+   
'type': 'container',
+   
'children': [
+   
{
+   
'id': 'SectionBottom87',
+  

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-3' - 2 commits - include/toolkit toolkit/CppunitTest_toolkit.mk toolkit/qa toolkit/source

[Samuel Mehrbrodt (via logerrit)]

 include/toolkit/controls/eventcontainer.hxx |   18 +-
 toolkit/CppunitTest_toolkit.mk  |1 
 toolkit/qa/cppunit/EventContainer.cxx   |   82 
 toolkit/source/controls/eventcontainer.cxx  |   56 ---
 4 files changed, 136 insertions(+), 21 deletions(-)

New commits:
commit ed0474097cebb7de8ce0bfee8f758f54bc74791b
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 6 16:32:12 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 10:35:52 2020 +0200

Test keeping element order in EventContainer

Change-Id: Ic33d8a83305f70bb3eb60f44da0d9ac0d2b47e16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93570
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93610
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/CppunitTest_toolkit.mk b/toolkit/CppunitTest_toolkit.mk
index 5afa7a616188..496ed0d7bac0 100644
--- a/toolkit/CppunitTest_toolkit.mk
+++ b/toolkit/CppunitTest_toolkit.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,toolkit))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,toolkit, \
toolkit/qa/cppunit/Dialog \
+   toolkit/qa/cppunit/EventContainer \
toolkit/qa/cppunit/UnitConversion \
 ))
 
diff --git a/toolkit/qa/cppunit/EventContainer.cxx 
b/toolkit/qa/cppunit/EventContainer.cxx
new file mode 100644
index ..300c8e5adb74
--- /dev/null
+++ b/toolkit/qa/cppunit/EventContainer.cxx
@@ -0,0 +1,82 @@
+/* -*- 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+using namespace css;
+using namespace css::awt;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::script;
+using namespace css::uno;
+
+namespace
+{
+/// Test EventContainer class
+class EventContainerTest : public test::BootstrapFixture
+{
+protected:
+Reference mxContext;
+
+public:
+virtual void setUp() override;
+};
+
+void EventContainerTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+}
+
+// Make sure that EventContainer keeps insertion order, and does not reorder 
its elements.
+// Otherwise this would break macro signatures.
+CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder)
+{
+Reference xFactory(mxContext->getServiceManager(), 
UNO_SET_THROW);
+Reference xControlModel(
+
xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", 
mxContext),
+UNO_QUERY_THROW);
+
+Reference xPropSet(xControlModel, UNO_QUERY_THROW);
+
+Reference xEventsSupplier(xPropSet, 
UNO_QUERY_THROW);
+Reference xEvents(xEventsSupplier->getEvents(), 
UNO_SET_THROW);
+script::ScriptEventDescriptor descr1;
+script::ScriptEventDescriptor descr2;
+script::ScriptEventDescriptor descr3;
+script::ScriptEventDescriptor descr4;
+xEvents->insertByName("b", makeAny(descr1));
+xEvents->insertByName("a", makeAny(descr2));
+xEvents->insertByName("1", makeAny(descr3));
+xEvents->insertByName("A", makeAny(descr4));
+
+Sequence aEventNames(xEvents->getElementNames());
+sal_Int32 nEventCount = aEventNames.getLength();
+CPPUNIT_ASSERT_EQUAL(4, nEventCount);
+
+CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), aEventNames[2]);
+CPPUNIT_ASSERT_EQUAL(OUString("A"), aEventNames[3]);
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a85c89cfd5fd008a05081937b9b524f674ffed0f
Author: Samuel Mehrbrodt 
AuthorDate: Thu Apr 30 14:24:06 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 10:35:39 2020 +0200

Revert "remove some "optimisation" insanity in ScriptEventContainer"

This broke the event order in basic dialog xml,
which in turn broke macro signatures.

This reverts commit 85f08e3e34bea01456eaf8989ac4f77d3900d5c5.

Change-Id: I49ef2eb200571a0fd862770abc4331b6ea053e2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93209
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93609

diff --git a/include/toolkit/controls/eventcontainer.hxx 
b/include/toolkit/controls/eventcontainer.hxx
index 29ce0beecf80..3cb7406f58cd 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -31,13 +31,25 @@
 namespace toolkit
 {
 
+// Hashtab

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-3' - .gitreview

[Samuel Mehrbrodt (via logerrit)]

 .gitreview |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 788c4250c7f81460f84fdd8c5c2aeddbf6a091df
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 7 09:10:42 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 10:36:24 2020 +0200

.gitreview: Update default branch

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

diff --git a/.gitreview b/.gitreview
index 1e6ce73905e8..b0ef5b7b10d5 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@ host=gerrit.libreoffice.org
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-6-3
-
+defaultbranch=distro/cib/libreoffice-6-3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - include/toolkit toolkit/CppunitTest_toolkit.mk toolkit/qa toolkit/source

[Samuel Mehrbrodt (via logerrit)]

 include/toolkit/controls/eventcontainer.hxx |   20 +-
 toolkit/CppunitTest_toolkit.mk  |1 
 toolkit/qa/cppunit/EventContainer.cxx   |   82 
 toolkit/source/controls/eventcontainer.cxx  |   56 ---
 4 files changed, 137 insertions(+), 22 deletions(-)

New commits:
commit 3cf7ffb23f3024ba4c477399dde26f224b0fb554
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 6 16:32:12 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 10:34:48 2020 +0200

Test keeping element order in EventContainer

Change-Id: Ic33d8a83305f70bb3eb60f44da0d9ac0d2b47e16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93570
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 4021fedf758b8c4c439387c61223acd78630cedc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93608
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/CppunitTest_toolkit.mk b/toolkit/CppunitTest_toolkit.mk
index 5afa7a616188..496ed0d7bac0 100644
--- a/toolkit/CppunitTest_toolkit.mk
+++ b/toolkit/CppunitTest_toolkit.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,toolkit))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,toolkit, \
toolkit/qa/cppunit/Dialog \
+   toolkit/qa/cppunit/EventContainer \
toolkit/qa/cppunit/UnitConversion \
 ))
 
diff --git a/toolkit/qa/cppunit/EventContainer.cxx 
b/toolkit/qa/cppunit/EventContainer.cxx
new file mode 100644
index ..300c8e5adb74
--- /dev/null
+++ b/toolkit/qa/cppunit/EventContainer.cxx
@@ -0,0 +1,82 @@
+/* -*- 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+using namespace css;
+using namespace css::awt;
+using namespace css::container;
+using namespace css::lang;
+using namespace css::script;
+using namespace css::uno;
+
+namespace
+{
+/// Test EventContainer class
+class EventContainerTest : public test::BootstrapFixture
+{
+protected:
+Reference mxContext;
+
+public:
+virtual void setUp() override;
+};
+
+void EventContainerTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+}
+
+// Make sure that EventContainer keeps insertion order, and does not reorder 
its elements.
+// Otherwise this would break macro signatures.
+CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder)
+{
+Reference xFactory(mxContext->getServiceManager(), 
UNO_SET_THROW);
+Reference xControlModel(
+
xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", 
mxContext),
+UNO_QUERY_THROW);
+
+Reference xPropSet(xControlModel, UNO_QUERY_THROW);
+
+Reference xEventsSupplier(xPropSet, 
UNO_QUERY_THROW);
+Reference xEvents(xEventsSupplier->getEvents(), 
UNO_SET_THROW);
+script::ScriptEventDescriptor descr1;
+script::ScriptEventDescriptor descr2;
+script::ScriptEventDescriptor descr3;
+script::ScriptEventDescriptor descr4;
+xEvents->insertByName("b", makeAny(descr1));
+xEvents->insertByName("a", makeAny(descr2));
+xEvents->insertByName("1", makeAny(descr3));
+xEvents->insertByName("A", makeAny(descr4));
+
+Sequence aEventNames(xEvents->getElementNames());
+sal_Int32 nEventCount = aEventNames.getLength();
+CPPUNIT_ASSERT_EQUAL(4, nEventCount);
+
+CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), aEventNames[2]);
+CPPUNIT_ASSERT_EQUAL(OUString("A"), aEventNames[3]);
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 82836b836d552b0e9043222d4a8a2c06dbe0d7da
Author: Samuel Mehrbrodt 
AuthorDate: Thu Apr 30 14:24:06 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 7 10:34:35 2020 +0200

Revert "remove some "optimisation" insanity in ScriptEventContainer"

This broke the event order in basic dialog xml,
which in turn broke macro signatures.

This reverts commit 85f08e3e34bea01456eaf8989ac4f77d3900d5c5.

Change-Id: I49ef2eb200571a0fd862770abc4331b6ea053e2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93209
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93607
Tested-by: Jenkins

diff --git a/include/toolkit/controls/eventcontainer.hxx 
b/include/toolkit/controls/eventcontainer.hxx
index 4804a2f2588b..3cb7406f58cd 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontai

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen (via logerrit)]

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

New commits:
commit a638c73fcfc4480d652ba86754a3f96c693f8e12
Author: Gabor Kelemen 
AuthorDate: Thu May 7 10:29:26 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Thu May 7 10:29:26 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 46cb9465cb3503ea0595c1b8537598c31dba3d28
  - No more SWF export support

Change-Id: Iefd264272c76c1576ac7b9baaf0feeedf0295bfd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93579
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 6522d1a26130..46cb9465cb35 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6522d1a261301211b35885ee9709f64f9a587edb
+Subproject commit 46cb9465cb3503ea0595c1b8537598c31dba3d28
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 source/text/shared/guide/convertfilters.xhp |   22 --
 source/text/simpress/01/0117.xhp|5 ++---
 2 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit 46cb9465cb3503ea0595c1b8537598c31dba3d28
Author: Gabor Kelemen 
AuthorDate: Sat May 2 21:10:16 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu May 7 10:29:26 2020 +0200

No more SWF export support

Change-Id: Iefd264272c76c1576ac7b9baaf0feeedf0295bfd
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/93579
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/convertfilters.xhp 
b/source/text/shared/guide/convertfilters.xhp
index 19c543c67..32e34091f 100644
--- a/source/text/shared/guide/convertfilters.xhp
+++ b/source/text/shared/guide/convertfilters.xhp
@@ -1995,28 +1995,6 @@
 mov MOV
 
 
-
-
-Macromedia Flash (SWF)
-
-
-None
-
-
-swf
-
-
-
-
-Macromedia Flash (SWF)
-
-
-None
-
-
-swf
-
-
 
 
 PBM - 
Portable Bitmap
diff --git a/source/text/simpress/01/0117.xhp 
b/source/text/simpress/01/0117.xhp
index f4b08068d..2d39e594a 100644
--- a/source/text/simpress/01/0117.xhp
+++ b/source/text/simpress/01/0117.xhp
@@ -31,8 +31,8 @@
 
 
 
-Macromedia Flash export
-exporting;to Macromedia Flash format
+Presentation HTML export 
Drawing HTML export
+exporting;to HTML format
 
 Export
 Exports your presentation or drawing and sets the 
export options.
@@ -43,7 +43,6 @@
 
 The following 
file formats present you with additional export options after you click 
Save: 
 HTML 
Document, JPEG, SVM/WMF/PICT/MET, BMP, GIF, EPS, PNG, PBM, PPM, 
PGM.
-If you select 
"Macromedia Flash (SWF)" as file format, the current Impress or Draw document 
will be exported to the Macromedia Flash format.
 If you choose 
"HTML Document" as your file format, the HTML Export Wizard appears. 
This wizard guides you through the export process and includes the option to 
save the pictures in your presentation in GIF or JPG format.
 
 Export 
dialog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 4 commits - include/svx svx/source sw/CppunitTest_sw_core_layout.mk sw/Module_sw.mk sw/qa sw/source writerfilter/qa writerfilter/sour

[Miklos Vajna (via logerrit)]

 include/svx/framelink.hxx 
|7 
 svx/source/dialog/framelink.cxx   
|  117 ++
 sw/CppunitTest_sw_core_layout.mk  
|   72 ++
 sw/Module_sw.mk   
|1 
 sw/qa/core/layout/data/border-collapse-compat.docx
|binary
 sw/qa/core/layout/data/table-fly-overlap.docx 
|binary
 sw/qa/core/layout/layout.cxx  
|   68 +
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
|4 
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
|4 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
|4 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
|2 
 sw/source/core/layout/paintfrm.cxx
|   12 +
 sw/source/core/layout/tabfrm.cxx  
|   30 ++
 writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
|   34 ++
 writerfilter/qa/cppunittests/dmapper/data/inline-anchored-zorder.docx 
|binary
 writerfilter/qa/cppunittests/dmapper/data/inline-inshape-anchored-zorder.docx 
|binary
 writerfilter/source/dmapper/DomainMapper.cxx  
|2 
 writerfilter/source/dmapper/DomainMapper.hxx  
|1 
 writerfilter/source/dmapper/GraphicImport.cxx 
|   12 -
 19 files changed, 357 insertions(+), 13 deletions(-)

New commits:
commit fa77419c66544e050a612baf027a9f927c4fe0a4
Author: Miklos Vajna 
AuthorDate: Wed Feb 19 18:03:59 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu May 7 10:14:24 2020 +0200

sw table cell borders: add optional Word-compatible border collapsing

We always compared border width and other aspects only after that, Word
works with border weight according to their implementer notes.

So extend svx::frame::Style to be able to collapse borders using weights
and opt in for that from sw/ in case a compat mode (which is related to
tables, off by default and is set by the DOC/DOCX import) is set.

(cherry picked from commit e6fa52c2c371c7adc9c2c2cb18c3a8cf782cfa4b)

Change-Id: I1f682789302c88a0d326c6c0263ad3007441cb24

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index 4c662700bec6..ee84176ce9fc 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -116,6 +116,7 @@ private:
 double  mfSecn; /// Width of secondary (right or 
bottom) line.
 double  mfPatternScale; /// Scale used for line pattern 
spacing.
 SvxBorderLineStyle  mnType;
+bool mbWordTableCell;
 
 public:
 /** Constructs an invisible frame style. */
@@ -129,7 +130,8 @@ private:
 mfDist(0.0),
 mfSecn(0.0),
 mfPatternScale(1.0),
-mnType(SvxBorderLineStyle::SOLID)
+mnType(SvxBorderLineStyle::SOLID),
+mbWordTableCell(false)
 {}
 };
 
@@ -187,6 +189,9 @@ public:
 /** Mirrors this style (exchanges primary and secondary), if it is a 
double frame style. */
 Style& MirrorSelf();
 
+/** Enables the Word-compatible Style comparison code. */
+void SetWordTableCell(bool bWordTableCell);
+
 bool operator==( const Style& rOther) const;
 bool operator<( const Style& rOther) const;
 };
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index b4548c6ebed9..c8696b063e0b 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -267,6 +267,16 @@ Style& Style::MirrorSelf()
 return *this;
 }
 
+void Style::SetWordTableCell(bool bWordTableCell)
+{
+if (!maImplStyle)
+{
+implEnsureImplStyle();
+}
+
+maImplStyle->mbWordTableCell = bWordTableCell;
+}
+
 bool Style::operator==( const Style& rOther) const
 {
 if(!maImplStyle && !rOther.maImplStyle)
@@ -290,6 +300,101 @@ bool Style::operator==( const Style& rOther) const
 && Type() == rOther.Type());
 }
 
+namespace
+{
+/**
+ * Gets the weight of rStyle, according to [MS-OI29500] v20171130, 2.1.168 
Part 1 Section 17.4.66,
+ * tcBorders (Table Cell Borders).
+ */
+double GetWordTableCellBorderWeight(const Style& rStyle)
+{
+double fWidth = rStyle.GetWidth();
+int nBorderNumber = 0;
+
+// See lcl_convertBorderStyleFromToken() in writerfilter/ and 
ConvertBorderStyleFromWord() in
+// editeng/, this is the opposite of the combination of those functions.
+switch (rStyle.Type())
+{
+case SvxBorderLineStyle::NONE:
+return 0.0;
+case SvxBorderLineStyle::DOTTED:
+case SvxBorderLine

Re: Requiring SSE2 on Windows

[Michael Stahl]

On 07.05.20 01:06, Thorsten Behrens wrote:


The original proposal was asking for Windows - and it appears that is
not controversial.

Most of the benefits for the project (dropping custom patches for
externals) might then not materialise for the moment, but hey.


actually i'm not aware of a patch being required for non-MSVC builds 
because only MSVC builds tend to use weird build systems that don't 
respect CFLAGS.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/uiconfig

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui |2 +-
 sc/uiconfig/scalc/ui/notebookbar_compact.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 481b58b5f87abaee3fa556093c30b9fa5bc07c9e
Author: andreas kainz 
AuthorDate: Wed May 6 22:18:46 2020 +0200
Commit: Xisco Faulí 
CommitDate: Thu May 7 10:23:05 2020 +0200

tdf#127889 NB use .uno:ToggleMergeCells instead MergeCells

Change-Id: I495619c0b4f7dfd65b8105c657ea2156ca10550c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93593
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 07c871457f095816b266adaa101e1c6c37b635d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93535

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 05b05ced70a8..c6c08c077de4 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -4183,7 +4183,7 @@
   
 True
 False
-.uno:MergeCells
+.uno:ToggleMergeCells
   
   
 False
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index eb388327a93b..c0f79c40e384 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -4154,7 +4154,7 @@
   
 True
 False
-.uno:MergeCells
+.uno:ToggleMergeCells
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/qa drawinglayer/source emfio/qa filter/qa include/drawinglayer include/test sc/qa sd/qa sfx2/qa starmath/qa svgio/qa svx/qa sw/qa test/qa test/source vcl/qa writ

[Noel Grandin (via logerrit)]

 chart2/qa/extras/chart2export.cxx  |  228 ++---
 chart2/qa/extras/xshape/chart2xshape.cxx   |   10 
 drawinglayer/source/tools/primitive2dxmldump.cxx   |5 
 emfio/qa/cppunit/emf/EmfImportTest.cxx |   10 
 emfio/qa/cppunit/wmf/wmfimporttest.cxx |   16 -
 filter/qa/cppunit/filters-pict-test.cxx|2 
 filter/qa/unit/svg.cxx |4 
 include/drawinglayer/tools/primitive2dxmldump.hxx  |3 
 include/test/htmltesttools.hxx |7 
 include/test/xmldocptr.hxx |   19 +
 include/test/xmltesttools.hxx  |   31 +-
 sc/qa/extras/htmlexporttest.cxx|2 
 sc/qa/unit/helper/xpath.cxx|4 
 sc/qa/unit/helper/xpath.hxx|5 
 sc/qa/unit/pivottable_filters_test.cxx |   40 +--
 sc/qa/unit/subsequent_export-test.cxx  |  162 +++---
 sd/qa/unit/HtmlExportTest.cxx  |4 
 sd/qa/unit/SVGExportTests.cxx  |4 
 sd/qa/unit/export-tests-ooxml1.cxx |   16 -
 sd/qa/unit/export-tests-ooxml2.cxx |  170 +++
 sd/qa/unit/export-tests.cxx|   20 -
 sd/qa/unit/misc-tests.cxx  |   20 -
 sd/qa/unit/sdmodeltestbase.hxx |4 
 sd/qa/unit/tiledrendering/tiledrendering.cxx   |   18 -
 sfx2/qa/cppunit/test_misc.cxx  |2 
 starmath/qa/extras/mmlexport-test.cxx  |   12 -
 svgio/qa/cppunit/SvgImportTest.cxx |   58 ++---
 svx/qa/unit/svdraw.cxx |2 
 sw/qa/core/frmedt/frmedt.cxx   |2 
 sw/qa/core/layout/layout.cxx   |6 
 sw/qa/core/objectpositioning/objectpositioning.cxx |2 
 sw/qa/core/text/text.cxx   |2 
 sw/qa/core/txtnode/txtnode.cxx |2 
 sw/qa/extras/docbookexport/docbookexport.cxx   |4 
 sw/qa/extras/fodfexport/fodfexport.cxx |4 
 sw/qa/extras/htmlexport/htmlexport.cxx |   56 ++---
 sw/qa/extras/htmlexport/xhtmlexport.cxx|2 
 sw/qa/extras/layout/layout.cxx |  172 +++
 sw/qa/extras/mailmerge/mailmerge.cxx   |4 
 sw/qa/extras/odfexport/odfexport.cxx   |   32 +-
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   64 ++---
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   16 -
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |   68 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |   12 -
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |   54 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |   54 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx  |   20 -
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |   78 +++
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |  144 ++---
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx  |  192 -
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx  |   68 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx  |   94 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx  |   42 +--
 sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx  |2 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx  |  110 +-
 sw/qa/extras/ooxmlexport/ooxmllinks.cxx|   16 -
 sw/qa/extras/ooxmlexport/ooxmlw14export.cxx|   22 +-
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |4 
 sw/qa/extras/uiwriter/uiwriter.cxx |   74 +++---
 sw/qa/extras/uiwriter/uiwriter2.cxx|8 
 sw/qa/extras/ww8export/ww8export2.cxx  |4 
 sw/qa/inc/swmodeltestbase.hxx  |   17 -
 test/qa/cppunit/test_xpath.cxx |2 
 test/source/htmltesttools.cxx  |8 
 test/source/xmltesttools.cxx   |   34 +--
 vcl/qa/cppunit/svm/svmtest.cxx |   82 +++
 writerperfect/qa/unit/EPUBExportTest.cxx   |   17 -
 xmlsecurity/qa/unit/signing/signing.cxx|4 
 68 files changed, 1242 insertions(+), 1234 deletions(-)

New commits:
commit ec6eaa58addf0d8823f8c56d4ec168ff389da8c5
Author: Noel Grandin 
AuthorDate: Tue May 5 19:10:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu May 7 09:52:27 2020 +0200

fix memory leak of xmlDoc objects

in unit tests

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 91fad970586e..571a0da80132 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -305,7 +305,7 @@ pr

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

[andreas kainz (via logerrit)]

 sw/uiconfig/swriter/ui/notebookbar.ui |   26 +--
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |   45 +++---
 2 files changed, 44 insertions(+), 27 deletions(-)

New commits:
commit c437948f6c0d602bb200fc92e80cb73ae8ae5109
Author: andreas kainz 
AuthorDate: Wed May 6 23:57:08 2020 +0200
Commit: andreas_kainz 
CommitDate: Thu May 7 09:34:47 2020 +0200

tdf#127421 Export and Export Direct are now available in NB customize

Change-Id: I85f54f0c8808421bbe7d3c0098add207d36f2b20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93602
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index ab391766f0c4..a932bc2b7e27 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -2691,7 +2691,7 @@
 both-horiz
 False
 
-  
+  
 True
 False
 .uno:ExportDirectToPDF
@@ -2702,6 +2702,17 @@
 True
   
 
+
+  
+False
+.uno:ExportToPDF
+True
+  
+  
+False
+True
+  
+
   
   
 False
@@ -2716,7 +2727,7 @@
 both-horiz
 False
 
-  
+  
 True
 False
 .uno:ExportDirectToEPUB
@@ -2727,6 +2738,17 @@
 True
   
 
+
+  
+False
+.uno:ExportToEPUB
+True
+  
+  
+False
+True
+  
+
   
   
 False
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui 
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 06d9500ee72f..fc85c2d1f6da 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -105,14 +105,12 @@
 
 
   
-False
 False
 .uno:OpenFromWriter
   
 
 
   
-False
 False
 .uno:OpenRemote
   
@@ -139,28 +137,24 @@
 
 
   
-False
 False
 .uno:AutoPilotMenu
   
 
 
   
-False
 False
 .uno:OpenTemplate
   
 
 
   
-False
 False
 .uno:SaveAsTemplate
   
 
 
   
-False
 False
 .uno:NewDoc
   
@@ -173,14 +167,12 @@
 
 
   
-False
 False
 .uno:Reload
   
 
 
   
-False
 False
 .uno:VersionDialog
   
@@ -214,14 +206,12 @@
 
 
   
-False
 False
 .uno:SaveACopy
   
 
 
   
-False
 False
 .uno:SaveAll
   
@@ -241,21 +231,18 @@
 
 
   
-False
 False
 .uno:CheckOut
   
 
 
   
-False
 False
 .uno:CancelCheckOut
   
 
 
   
-False
 False
 .uno:CheckIn
   
@@ -282,7 +269,6 @@
 
 
   
-False
 False
 .uno:ExportDirectToPDF
   
@@ -296,7 +282,6 @@
 
 
   
-False
 False
 .uno:ExportDirectToEPUB
   
@@ -316,14 +301,12 @@
 
 
   
-False
 False
 .uno:SendMailDocAsOOo
   
 
 
   
-False
 False
 .uno:SendMailDocAsMS
   
@@ -344,42 +327,36 @@
 
 
   
-False
 False
 .uno:NewGlobalDoc
   
 
 
   
-False
 False
 .uno:NewHtmlDoc
   

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentContentOperationsManager.cxx |   36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

New commits:
commit f29c24a8c23f232d4f59eb35984f6502043f44e5
Author: Michael Stahl 
AuthorDate: Mon May 4 14:22:09 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 09:30:15 2020 +0200

tdf#132187 sw: fix creation of frames on end node in CopyWithFlyInFly()

The problem is that the rInsPos node is included in the range passed to
MakeFrames(), but it already has a frame, so now it has 2 and that
means the next call to MakeFrames() in this position will create all the
frames twice.

This is tricky because while in practice there is currently only one
layout in theory there could be multiple, and then it could happen that
RecreateStartTextFrames() will destroy the node's frame in one layout
but not the other, while MakeFrames() always works on all layouts.

Fix this by checking if all the existing frames survive
RecreateStartTextFrames() and if it's not the case (like in tdf#130685)
explicitly delete all the frames and including the node in MakeFrames().

(regression from 166b5010b402a41b192b1659093a25acf9065fd9)

Change-Id: I1bba11da053fe1c6359b2f76f3a352e44c6a2a1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93416
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 49f26e7dae550aff6ca90b3cda7f89e11ac8cfd4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93375
Reviewed-by: Thorsten Behrens 
(cherry picked from commit d8bea028093fe3d4c0c0af0afad20c2c03bb9855)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93379
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index dd25731710cb..49920f65d503 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3434,6 +3434,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 if (rRg.aStart != rRg.aEnd)
 {
 bool bEndIsEqualEndPos = rInsPos == rRg.aEnd;
+bool isRecreateEndNode(false);
 --aSavePos;
 SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 );
 
@@ -3444,7 +3445,40 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 {   // recreate from previous node (could be merged now)
 if (SwTextNode *const pNode = aSavePos.GetNode().GetTextNode())
 {
+std::unordered_set frames;
+SwTextNode *const pEndNode = rInsPos.GetNode().GetTextNode();
+if (pEndNode)
+{
+SwIterator aIter(*pEndNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.insert(pFrame);
+}
+}
+}
 sw::RecreateStartTextFrames(*pNode);
+if (!frames.empty())
+{   // tdf#132187 check if the end node needs new frames
+SwIterator aIter(*pEndNode);
+for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = 
aIter.Next())
+{
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+auto const it = frames.find(pFrame);
+if (it != frames.end())
+{
+frames.erase(it);
+}
+}
+}
+if (!frames.empty()) // existing frame was deleted
+{   // all layouts because MakeFrames recreates all layouts
+pEndNode->DelFrames(nullptr);
+isRecreateEndNode = true;
+}
+}
 }
 }
 bool const isAtStartOfSection(aSavePos.GetNode().IsStartNode());
@@ -3456,7 +3490,7 @@ void DocumentContentOperationsManager::CopyWithFlyInFly(
 // if it was the first node in the document so that MakeFrames()
 // will find the existing (wasn't deleted) frame on it
 SwNodeIndex const end(rInsPos,
-(rInsPos.GetNode().IsEndNode() || isAtStartOfSection)
+(!isRecreateEndNode || isAtStartOfSection)
 ? 0 : +1);
 ::MakeFrames(pDest, aSavePos, end);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-c

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

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/DocumentSettingManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bef8fa40e192547457563e2296af531d63031a6f
Author: Miklos Vajna 
AuthorDate: Wed May 6 21:13:53 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 09:26:49 2020 +0200

sw: handle UnbreakableNumberings when replacing compat options

This was added in commit 74b6759ee81c95ae75046dd411d2bd0bd2324a8b
(n#707157: Word doesn't break the numberings and prefers hiding them,
2011-11-10), it's off by default and on for MSO documents.

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

diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index bbc2f0781387..a4776f91d7e1 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -619,7 +619,7 @@ void 
sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
 mbTabAtLeftIndentForParagraphsInList = 
rSource.mbTabAtLeftIndentForParagraphsInList;
 // No mbSmallCapsPercentage66
 // No mbTabOverflow
-// No mbUnbreakableNumberings
+mbUnbreakableNumberings = rSource.mbUnbreakableNumberings;
 // No mbClippedPictures
 // No mbBackgroundParaOverDrawings
 mbTabOverMargin = rSource.mbTabOverMargin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 4 commits - include/oox oox/source sd/qa sfx2/uiconfig vcl/source

[Samuel Mehrbrodt (via logerrit)]

 include/oox/drawingml/drawingmltypes.hxx |3 +
 include/oox/export/drawingml.hxx |1 
 oox/source/drawingml/drawingmltypes.cxx  |6 +++
 oox/source/export/drawingml.cxx  |   35 +++
 sd/qa/unit/data/pptx/tdf79082.pptx   |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   57 +++
 sfx2/uiconfig/ui/custominfopage.ui   |4 ++
 vcl/source/control/button.cxx|3 -
 vcl/source/edit/textview.cxx |5 ++
 9 files changed, 111 insertions(+), 3 deletions(-)

New commits:
commit c44d85b32fdee8fedb40e30b61bcd7732600e4f5
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 5 12:02:47 2020 +0200
Commit: Andras Timar 
CommitDate: Thu May 7 09:24:41 2020 +0200

tdf#79082 Export paragraph tab stops to ooxml

Change-Id: I7d25dc1ab3c960aafc07a3be69b54f5aceef23fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93462
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 2c14bbd5820f854be3a4b1c0f49b9d9afa05b08c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93526
Reviewed-by: Thorsten Behrens 

diff --git a/include/oox/drawingml/drawingmltypes.hxx 
b/include/oox/drawingml/drawingmltypes.hxx
index 5e3517b58524..8b513d8c3f61 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -106,6 +106,9 @@ sal_Int32 GetCoordinate( sal_Int32 nValue );
 /** converts an emu string into 1/100th mmm */
 sal_Int32 GetCoordinate( const OUString& sValue );
 
+/** converts 1/100mm to EMU */
+sal_Int32 GetPointFromCoordinate( sal_Int32 nValue );
+
 /** converts a ST_Percentage % string into 1/1000th of % */
 sal_Int32 GetPercent( const OUString& sValue );
 
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index a3da6a3cb442..fb7b7877138c 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -247,6 +247,7 @@ public:
 void WriteParagraphProperties(const css::uno::Reference< 
css::text::XTextContent >& rParagraph, float fFirstCharHeight);
 void WriteParagraphNumbering(const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet, float fFirstCharHeight,
   sal_Int16 nLevel );
+void WriteParagraphTabStops(const 
css::uno::Reference& rXPropSet);
 void WriteRun( const css::uno::Reference< css::text::XTextRange >& rRun,
bool& rbOverridingCharHeight, sal_Int32& rnCharHeight );
 void WriteRunProperties( const css::uno::Reference< 
css::beans::XPropertySet >& rRun, bool bIsField, sal_Int32 nElement, bool 
bCheckDirect,
diff --git a/oox/source/drawingml/drawingmltypes.cxx 
b/oox/source/drawingml/drawingmltypes.cxx
index f341ff3f9587..9a5ddf3cc4b9 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -54,6 +54,12 @@ sal_Int32 GetCoordinate( const OUString& sValue )
 return GetCoordinate( nRet );
 }
 
+/** converts 1/100mm to EMU */
+sal_Int32 GetPointFromCoordinate( sal_Int32 nValue )
+{
+return nValue * 360;
+}
+
 /** converts a ST_Percentage % string into 1/1000th of % */
 sal_Int32 GetPercent( const OUString& sValue )
 {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 468c89ad7b7e..4259feb2ae81 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2393,6 +2393,40 @@ void DrawingML::WriteParagraphNumbering(const Reference< 
XPropertySet >& rXPropS
 }
 }
 
+void DrawingML::WriteParagraphTabStops(const Reference& 
rXPropSet)
+{
+css::uno::Sequence aTabStops;
+if (GetProperty(rXPropSet, "ParaTabStops"))
+aTabStops = 
*o3tl::doAccess>(mAny);
+
+if (aTabStops.getLength() > 0)
+mpFS->startElementNS(XML_a, XML_tabLst);
+
+for (const css::style::TabStop& rTabStop : std::as_const(aTabStops))
+{
+OString sPosition = 
OString::number(GetPointFromCoordinate(rTabStop.Position));
+OString sAlignment;
+switch (rTabStop.Alignment)
+{
+case css::style::TabAlign_DECIMAL:
+sAlignment = "dec";
+break;
+case css::style::TabAlign_RIGHT:
+sAlignment = "r";
+break;
+case css::style::TabAlign_CENTER:
+sAlignment = "ctr";
+break;
+case css::style::TabAlign_LEFT:
+default:
+sAlignment = "l";
+}
+mpFS->singleElementNS(XML_a, XML_tab, XML_algn, sAlignment, XML_pos, 
sPosition);
+}
+if (aTabStops.getLength() > 0)
+mpFS->endElementNS(XML_a, XML_tabLst);
+}
+
 bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape )
 {
 bool bRet = false;
@@ -2593,6 +2627,7 @@ void DrawingML::WriteParagraphProperties( const 
Reference< XTextContent >& rPara
 }
 
 WriteParagraphNumbering( rXPropSet, fFirstCharHeight, nLe

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

[Samuel Mehrbrodt (via logerrit)]

 toolkit/inc/controls/eventcontainer.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6e31ddbe83115dd5283c5b0f31d92396290895ae
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 7 08:12:45 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu May 7 09:24:28 2020 +0200

Add comment about insertion order

Change-Id: I650316c0c4bc31a861b3d96586a6a0aae57bd054
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93537
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/toolkit/inc/controls/eventcontainer.hxx 
b/toolkit/inc/controls/eventcontainer.hxx
index 396578432fd1..beca65e3e38f 100644
--- a/toolkit/inc/controls/eventcontainer.hxx
+++ b/toolkit/inc/controls/eventcontainer.hxx
@@ -43,6 +43,9 @@ class ScriptEventContainer final : public 
::cppu::WeakImplHelper<
 css::container::XNameContainer,
 css::container::XContainer >
 {
+// The map needs to keep the insertion order, otherwise Macro signatures 
would get broken
+// if the order changes here (Dialog xml files are digitally signed too).
+// Thus a std::map or std::unordered_map can't be used.
 NameContainerNameMap mHashMap;
 css::uno::Sequence< OUString > mNames;
 std::vector< css::uno::Any > mValues;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits