date:20200408

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

2020-04-08 Thread Michael Weghorn (via logerrit)

 svx/source/unodraw/unopage.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 79ce9d030b934c375e4f9d12b577ff3f29770a46
Author: Michael Weghorn 
AuthorDate: Wed Apr 8 15:06:04 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Apr 9 07:26:10 2020 +0200

tdf#96760 Don't assert on presentation with video for non-desktop

Since the OBJ_MEDIA case was only handled '#if HAVE_FEATURE_DESKTOP',
a non-desktop debug build would run into the assert in the
default case and complain about a "Not implemented Starone-Shape".

The corresponding HAVE_FEATURE_DESKTOP switch had been added with
commit c0b3d5be8fcec28190b1f25c9c0fd99916299249
("Try harder to bypass avmedia on non-desktop for now", 2014-04-17).
However, at a quick glance, SvxMediaShape now properly handles
the case where avmedia is not available itself (presumably since
commit 54982d5fea21d9e81e1561a74fd341ddb0570c91, "svx, check
HAVE_FEATURE_AVMEDIA", 2018-01-07).

For an Android Viewer debug build, a placeholder is now shown instead
of the video (just as was the case for a non-debug build already
without this patch), rather than aborting.

Change-Id: I49864a3742d0435cd5346f561dea9f2f804ace70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91921
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index f80f92e77f56..bba5929f5b2f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -611,9 +611,6 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, 
SdrInventor& rInventor,
 
 SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, 
SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *mpPage, OUString const & 
referer )
 {
-#if !HAVE_FEATURE_DESKTOP
-(void) referer;
-#endif
 SvxShape* pRet = nullptr;
 
 switch( nInventor )
@@ -779,11 +776,9 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( 
sal_uInt16 nType, SdrInvent
 case OBJ_CUSTOMSHAPE:
 pRet = new SvxCustomShape( pObj );
 break;
-#if HAVE_FEATURE_DESKTOP
 case OBJ_MEDIA:
 pRet = new SvxMediaShape( pObj, referer );
 break;
-#endif
 case OBJ_TABLE:
 pRet = new SvxTableShape( pObj );
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

2020-04-08 Thread Rizal Muttaqin (via logerrit)

 dev/null   |binary
 icon-themes/colibre/links.txt  |   82 +++--
 icon-themes/colibre_svg/cmd/ar/lc_redo.svg |1 
 icon-themes/colibre_svg/cmd/ar/lc_undo.svg |1 
 icon-themes/colibre_svg/cmd/ar/sc_redo.svg |1 
 icon-themes/colibre_svg/cmd/ar/sc_undo.svg |1 
 icon-themes/colibre_svg/cmd/fa/lc_redo.svg |1 
 icon-themes/colibre_svg/cmd/fa/lc_undo.svg |1 
 icon-themes/colibre_svg/cmd/fa/sc_redo.svg |1 
 icon-themes/colibre_svg/cmd/fa/sc_undo.svg |1 
 icon-themes/colibre_svg/cmd/he/lc_redo.svg |1 
 icon-themes/colibre_svg/cmd/he/lc_undo.svg |1 
 icon-themes/colibre_svg/cmd/he/sc_redo.svg |1 
 icon-themes/colibre_svg/cmd/he/sc_undo.svg |1 
 14 files changed, 43 insertions(+), 51 deletions(-)

New commits:
commit 5b56db7dcf471dc837fc05e92636579ef80a205c
Author: Rizal Muttaqin 
AuthorDate: Thu Apr 9 10:08:17 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu Apr 9 07:13:49 2020 +0200

Colibre: Fix for tdf#131974 & tdf#131975

- tdf#131974: Flipped Undo & Redo button in RTL UI
- tdf#131975: Wrong icons for "Undo: Data Input" (.uno:RecUndo)

Change-Id: I7c6e667df20cbe125da020f246d264626c48528c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91944
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/cmd/ar/lc_redo.png 
b/icon-themes/colibre/cmd/ar/lc_redo.png
deleted file mode 100644
index efd7d9cd907d..
Binary files a/icon-themes/colibre/cmd/ar/lc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/ar/lc_undo.png 
b/icon-themes/colibre/cmd/ar/lc_undo.png
deleted file mode 100644
index 80f6c14d42a9..
Binary files a/icon-themes/colibre/cmd/ar/lc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/ar/sc_redo.png 
b/icon-themes/colibre/cmd/ar/sc_redo.png
deleted file mode 100644
index 244fe3d40710..
Binary files a/icon-themes/colibre/cmd/ar/sc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/ar/sc_undo.png 
b/icon-themes/colibre/cmd/ar/sc_undo.png
deleted file mode 100644
index 15926bb005a3..
Binary files a/icon-themes/colibre/cmd/ar/sc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/fa/lc_redo.png 
b/icon-themes/colibre/cmd/fa/lc_redo.png
deleted file mode 100644
index efd7d9cd907d..
Binary files a/icon-themes/colibre/cmd/fa/lc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/fa/lc_undo.png 
b/icon-themes/colibre/cmd/fa/lc_undo.png
deleted file mode 100644
index 80f6c14d42a9..
Binary files a/icon-themes/colibre/cmd/fa/lc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/fa/sc_redo.png 
b/icon-themes/colibre/cmd/fa/sc_redo.png
deleted file mode 100644
index 244fe3d40710..
Binary files a/icon-themes/colibre/cmd/fa/sc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/fa/sc_undo.png 
b/icon-themes/colibre/cmd/fa/sc_undo.png
deleted file mode 100644
index 15926bb005a3..
Binary files a/icon-themes/colibre/cmd/fa/sc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/he/lc_redo.png 
b/icon-themes/colibre/cmd/he/lc_redo.png
deleted file mode 100644
index efd7d9cd907d..
Binary files a/icon-themes/colibre/cmd/he/lc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/he/lc_undo.png 
b/icon-themes/colibre/cmd/he/lc_undo.png
deleted file mode 100644
index 80f6c14d42a9..
Binary files a/icon-themes/colibre/cmd/he/lc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/he/sc_redo.png 
b/icon-themes/colibre/cmd/he/sc_redo.png
deleted file mode 100644
index 244fe3d40710..
Binary files a/icon-themes/colibre/cmd/he/sc_redo.png and /dev/null differ
diff --git a/icon-themes/colibre/cmd/he/sc_undo.png 
b/icon-themes/colibre/cmd/he/sc_undo.png
deleted file mode 100644
index 15926bb005a3..
Binary files a/icon-themes/colibre/cmd/he/sc_undo.png and /dev/null differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 79b1d22a5c46..0c676fa681d1 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -402,19 +402,52 @@ cmd/sc_showallnotes.png cmd/sc_showannotations.png
 cmd/sc_showchanges.png cmd/sc_addwatch.png
 
 # Locale language support
+cmd/32/ar/bulletliststyle.png cmd/32/ar/defaultbullet.png
+cmd/32/ar/defaultparastyle.png cmd/32/ar/controlcodes.png
+cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png
+cmd/32/ar/recundo.png cmd/32/redo.png
+cmd/32/ar/redo.png cmd/32/undo.png
+cmd/32/ar/undo.png cmd/32/redo.png
 cmd/32/es/italic.png cmd/32/de/italic.png
-cmd/32/fa/recundo.png cmd/32/ar/recundo.png
-cmd/32/he/recundo.png cmd/32/ar/recundo.png
-cmd/32/ur/recundo.png cmd/32/ar/recundo.png
+cmd/32/fa/recundo.png cmd/32/redo.png
+cmd/32/fa/redo.png cmd/32/undo.png 
+cmd/32/fa/undo.png cmd/3

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2020-04-08 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/cmd/32/dsbformletter.png |binary
 icon-themes/breeze/cmd/32/dsbinsertcontent.png  |binary
 icon-themes/breeze/cmd/lc_insertexternaldatasource.png  |binary
 icon-themes/breeze/res/sx03187.png  |binary
 icon-themes/breeze/res/sx03201.png  |binary
 icon-themes/breeze_dark/cmd/32/dsbformletter.png|binary
 icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png |binary
 icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png |binary
 icon-themes/breeze_dark/res/sx03187.png |binary
 icon-themes/breeze_dark/res/sx03201.png |binary
 icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg|1 +
 icon-themes/breeze_dark_svg/cmd/32/dsbinsertcontent.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertexternaldatasource.svg |2 +-
 icon-themes/breeze_dark_svg/res/sx03187.svg |1 +
 icon-themes/breeze_dark_svg/res/sx03201.svg |1 +
 icon-themes/breeze_svg/cmd/32/dsbformletter.svg |1 +
 icon-themes/breeze_svg/cmd/32/dsbinsertcontent.svg  |1 +
 icon-themes/breeze_svg/cmd/lc_insertexternaldatasource.svg  |2 +-
 icon-themes/breeze_svg/res/sx03187.svg  |1 +
 icon-themes/breeze_svg/res/sx03201.svg  |1 +
 20 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 52eeb41d0574f32b63c717167bbe26be1f35385c
Author: Rizal Muttaqin 
AuthorDate: Wed Apr 8 20:44:30 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu Apr 9 07:15:19 2020 +0200

Breeze: Fix for tdf#131984: missing icons for Writer's Data Source

Change-Id: I3516d55f08c3bdd857994db7704c2af0a20cc260
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91924
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 6209ac8094e3578bb2dfcbf5f7e2f302bd760926)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91895

diff --git a/icon-themes/breeze/cmd/32/dsbformletter.png 
b/icon-themes/breeze/cmd/32/dsbformletter.png
new file mode 100644
index ..7dd541185e1c
Binary files /dev/null and b/icon-themes/breeze/cmd/32/dsbformletter.png differ
diff --git a/icon-themes/breeze/cmd/32/dsbinsertcontent.png 
b/icon-themes/breeze/cmd/32/dsbinsertcontent.png
new file mode 100644
index ..ac36d3d56a75
Binary files /dev/null and b/icon-themes/breeze/cmd/32/dsbinsertcontent.png 
differ
diff --git a/icon-themes/breeze/cmd/lc_insertexternaldatasource.png 
b/icon-themes/breeze/cmd/lc_insertexternaldatasource.png
index 807216a02887..a1d38275ef61 100644
Binary files a/icon-themes/breeze/cmd/lc_insertexternaldatasource.png and 
b/icon-themes/breeze/cmd/lc_insertexternaldatasource.png differ
diff --git a/icon-themes/breeze/res/sx03187.png 
b/icon-themes/breeze/res/sx03187.png
new file mode 100644
index ..0b50e265cfd2
Binary files /dev/null and b/icon-themes/breeze/res/sx03187.png differ
diff --git a/icon-themes/breeze/res/sx03201.png 
b/icon-themes/breeze/res/sx03201.png
new file mode 100644
index ..42e51cb622f4
Binary files /dev/null and b/icon-themes/breeze/res/sx03201.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/dsbformletter.png 
b/icon-themes/breeze_dark/cmd/32/dsbformletter.png
new file mode 100644
index ..3dea8928e89f
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/dsbformletter.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png 
b/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png
new file mode 100644
index ..e77e02393e07
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png differ
diff --git a/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png 
b/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png
index bdae6b126167..15559e5b698c 100644
Binary files a/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png and 
b/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png differ
diff --git a/icon-themes/breeze_dark/res/sx03187.png 
b/icon-themes/breeze_dark/res/sx03187.png
new file mode 100644
index ..c54857aa49e5
Binary files /dev/null and b/icon-themes/breeze_dark/res/sx03187.png differ
diff --git a/icon-themes/breeze_dark/res/sx03201.png 
b/icon-themes/breeze_dark/res/sx03201.png
new file mode 100644
index ..07ae2c7b5f98
Binary files /dev/null and b/icon-themes/breeze_dark/res/sx03201.png differ
diff --git a/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg 
b/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg
new file mode 100644
index ..68a827e0d0c5
--- /dev/null
+++ b/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/breeze_dark_svg/cmd/32/dsbins

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg

2020-04-08 Thread Rizal Muttaqin (via logerrit)

 icon-themes/breeze/cmd/32/dsbformletter.png |binary
 icon-themes/breeze/cmd/32/dsbinsertcontent.png  |binary
 icon-themes/breeze/cmd/lc_insertexternaldatasource.png  |binary
 icon-themes/breeze/res/sx03187.png  |binary
 icon-themes/breeze/res/sx03201.png  |binary
 icon-themes/breeze_dark/cmd/32/dsbformletter.png|binary
 icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png |binary
 icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png |binary
 icon-themes/breeze_dark/res/sx03187.png |binary
 icon-themes/breeze_dark/res/sx03201.png |binary
 icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg|1 +
 icon-themes/breeze_dark_svg/cmd/32/dsbinsertcontent.svg |1 +
 icon-themes/breeze_dark_svg/cmd/lc_insertexternaldatasource.svg |2 +-
 icon-themes/breeze_dark_svg/res/sx03187.svg |1 +
 icon-themes/breeze_dark_svg/res/sx03201.svg |1 +
 icon-themes/breeze_svg/cmd/32/dsbformletter.svg |1 +
 icon-themes/breeze_svg/cmd/32/dsbinsertcontent.svg  |1 +
 icon-themes/breeze_svg/cmd/lc_insertexternaldatasource.svg  |2 +-
 icon-themes/breeze_svg/res/sx03187.svg  |1 +
 icon-themes/breeze_svg/res/sx03201.svg  |1 +
 20 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 6209ac8094e3578bb2dfcbf5f7e2f302bd760926
Author: Rizal Muttaqin 
AuthorDate: Wed Apr 8 20:44:30 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Thu Apr 9 02:40:52 2020 +0200

Breeze: Fix for tdf#131984: missing icons for Writer's Data Source

Change-Id: I3516d55f08c3bdd857994db7704c2af0a20cc260
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91924
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/breeze/cmd/32/dsbformletter.png 
b/icon-themes/breeze/cmd/32/dsbformletter.png
new file mode 100644
index ..7dd541185e1c
Binary files /dev/null and b/icon-themes/breeze/cmd/32/dsbformletter.png differ
diff --git a/icon-themes/breeze/cmd/32/dsbinsertcontent.png 
b/icon-themes/breeze/cmd/32/dsbinsertcontent.png
new file mode 100644
index ..ac36d3d56a75
Binary files /dev/null and b/icon-themes/breeze/cmd/32/dsbinsertcontent.png 
differ
diff --git a/icon-themes/breeze/cmd/lc_insertexternaldatasource.png 
b/icon-themes/breeze/cmd/lc_insertexternaldatasource.png
index 807216a02887..a1d38275ef61 100644
Binary files a/icon-themes/breeze/cmd/lc_insertexternaldatasource.png and 
b/icon-themes/breeze/cmd/lc_insertexternaldatasource.png differ
diff --git a/icon-themes/breeze/res/sx03187.png 
b/icon-themes/breeze/res/sx03187.png
new file mode 100644
index ..0b50e265cfd2
Binary files /dev/null and b/icon-themes/breeze/res/sx03187.png differ
diff --git a/icon-themes/breeze/res/sx03201.png 
b/icon-themes/breeze/res/sx03201.png
new file mode 100644
index ..42e51cb622f4
Binary files /dev/null and b/icon-themes/breeze/res/sx03201.png differ
diff --git a/icon-themes/breeze_dark/cmd/32/dsbformletter.png 
b/icon-themes/breeze_dark/cmd/32/dsbformletter.png
new file mode 100644
index ..3dea8928e89f
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/32/dsbformletter.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png 
b/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png
new file mode 100644
index ..e77e02393e07
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/32/dsbinsertcontent.png differ
diff --git a/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png 
b/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png
index bdae6b126167..15559e5b698c 100644
Binary files a/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png and 
b/icon-themes/breeze_dark/cmd/lc_insertexternaldatasource.png differ
diff --git a/icon-themes/breeze_dark/res/sx03187.png 
b/icon-themes/breeze_dark/res/sx03187.png
new file mode 100644
index ..c54857aa49e5
Binary files /dev/null and b/icon-themes/breeze_dark/res/sx03187.png differ
diff --git a/icon-themes/breeze_dark/res/sx03201.png 
b/icon-themes/breeze_dark/res/sx03201.png
new file mode 100644
index ..07ae2c7b5f98
Binary files /dev/null and b/icon-themes/breeze_dark/res/sx03201.png differ
diff --git a/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg 
b/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg
new file mode 100644
index ..68a827e0d0c5
--- /dev/null
+++ b/icon-themes/breeze_dark_svg/cmd/32/dsbformletter.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/breeze_dark_svg/cmd/32/dsbinsertcontent.svg 
b/icon-themes/breeze_dark_svg/cmd/32/dsbinsertcontent.svg
new file mode 100644
index ..b74b5749cb70
--- /dev

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

2020-04-08 Thread LibreOﬃciant (via logerrit)

 source/auxiliary/sbasic.tree   |1 
 source/text/sbasic/shared/0305.xhp |   35 ++
 source/text/sbasic/shared/03100080.xhp |   50 
 source/text/sbasic/shared/03102450.xhp |   51 -
 4 files changed, 67 insertions(+), 70 deletions(-)

New commits:
commit 7bcd164e06f21da45a34804bb3c96823bf4c6989
Author: LibreOﬃciant 
AuthorDate: Fri Mar 27 15:50:54 2020 +0100
Commit: Olivier Hallot 
CommitDate: Thu Apr 9 00:51:22 2020 +0200

Variable insertions for future page embeds

"Relatedtopics" with x-refs to come after

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

diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 74996c65a..d2924a7c7 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -186,6 +186,7 @@
 IsArray 
Function
 IsDate 
Function
 IsEmpty 
Function
+IsError 
Function
 IsMissing function
 IsNull 
Function
 IsNumeric Function
diff --git a/source/text/sbasic/shared/0305.xhp 
b/source/text/sbasic/shared/0305.xhp
index 870a734f6..2d23d147d 100644
--- a/source/text/sbasic/shared/0305.xhp
+++ b/source/text/sbasic/shared/0305.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
 
-
-
-Error-Handling Functions
-/text/sbasic/shared/0305.xhp
-
-
-Sun Microsystems, Inc.
-
-
+  
+
+  Error-Handling Functions
+  /text/sbasic/shared/0305.xhp
+
+
+  Sun Microsystems, Inc.
+
+  
 
-  
-  
   
-  Error-Handling Functions
-  Use the 
following statements and functions to define the way $[officename] Basic reacts 
to run-time errors.
+  Error-Handling Functions
+  Use the 
following statements and functions to define the way %PRODUCTNAME Basic reacts 
to run-time errors.
   
-  $[officename] Basic offers several methods to prevent the 
termination of a program when a run-time error occurs.
+  %PRODUCTNAME 
Basic offers several methods to prevent the termination of a program when a 
run-time error occurs.
+  
   
   
+  
   
   
- 
-
+
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03100080.xhp 
b/source/text/sbasic/shared/03100080.xhp
index 77c2dd21a..6b4652116 100644
--- a/source/text/sbasic/shared/03100080.xhp
+++ b/source/text/sbasic/shared/03100080.xhp
@@ -19,30 +19,30 @@
  -->
 
 
-
-
-CVErr Function
-/text/sbasic/shared/03100080.xhp
-
-
-CVErr
-
-
-
-
-CVErr function
-
-CVErr Function
-Converts a 
string expression or numeric expression to a variant expression of the sub type 
"Error".
-
-Syntax:
-
-CVErr(Expression)
-
-Return 
value:
-Variant.
-Parameter:
-Expression: Any 
string or numeric expression that you want to convert.
-
+  
+
+CVErr Function
+/text/sbasic/shared/03100080.xhp
+
+  
+  CVErr
+
+  
+  
+
+  CVErr function
+  
+  CVErr Function
+  Converts a string 
expression or numeric expression to a variant expression of the sub type 
"Error".
+
+Syntax:
+
+  CVErr(Expression)
+
+Return value:
+Variant.
+Parameter:
+Expression: Any string or 
numeric expression that you want to convert.
+  
 
 
diff --git a/source/text/sbasic/shared/03102450.xhp 
b/source/text/sbasic/shared/03102450.xhp
index 7080a1f22..ffcf01ca6 100644
--- a/source/text/sbasic/shared/03102450.xhp
+++ b/source/text/sbasic/shared/03102450.xhp
@@ -19,30 +19,29 @@
  -->
 
 
-
-
-IsError Function
-/text/sbasic/shared/03102450.xhp
-
-
-IsError
-
-
-
-
-IsError function
-
-IsError Function
-Tests if a 
variable contains an error value.
-
-Syntax:
-
-IsError (Var)
-
-Return 
value:
-Bool
-Parameters:
-
-Var: Any variable that you want to test. If the variable contains 
an error value, the function returns True, otherwise the function returns 
False.
-
+  
+
+  IsError Function
+  /text/sbasic/shared/03102450.xhp
+
+
+  IsError
+
+  
+  
+  
+IsError function
+
+IsError Function
+Tests if a variable contains 
an error value.
+  
+  Syntax:
+  
+IsError (Var)
+  
+  Return value:
+  Bool
+  Parameters:
+  Var: Any variable that you want to test. If the 
variable contains an error value, the function returns True, otherwise the 
function returns False.
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-04-08 Thread LibreOﬃciant (via logerrit)

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

New commits:
commit 35feeefef569572f1443446912124247378c3a0e
Author: LibreOﬃciant 
AuthorDate: Wed Apr 8 23:51:22 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Apr 9 00:51:22 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7bcd164e06f21da45a34804bb3c96823bf4c6989
  - Variable insertions for future page embeds

"Relatedtopics" with x-refs to come after

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

diff --git a/helpcontent2 b/helpcontent2
index ef21ad9a4c0d..7bcd164e06f2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ef21ad9a4c0d9fb787392c5a6d24ebe9bb77309e
+Subproject commit 7bcd164e06f21da45a34804bb3c96823bf4c6989
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-04-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 7e848a1e5b37282231bd30e117fc959c65ee969c
Author: Steve Fanning 
AuthorDate: Wed Apr 8 19:33:31 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 9 00:33:31 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ef21ad9a4c0d9fb787392c5a6d24ebe9bb77309e
  - tdf#131960 Clarification of FLOOR functions

+ refactor, grouping all FLOOR variants into one file

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

diff --git a/helpcontent2 b/helpcontent2
index 2d238deabf58..ef21ad9a4c0d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2d238deabf589c10ab89b495d3f9e2c57a8efda0
+Subproject commit ef21ad9a4c0d9fb787392c5a6d24ebe9bb77309e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Steve Fanning (via logerrit)

 AllLangHelp_scalc.mk|1 
 source/text/scalc/01/04060106.xhp   |   50 ---
 source/text/scalc/01/func_floor.xhp |  113 
 3 files changed, 114 insertions(+), 50 deletions(-)

New commits:
commit ef21ad9a4c0d9fb787392c5a6d24ebe9bb77309e
Author: Steve Fanning 
AuthorDate: Tue Apr 7 18:15:02 2020 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 9 00:33:31 2020 +0200

tdf#131960 Clarification of FLOOR functions

+ refactor, grouping all FLOOR variants into one file

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index aeee43364..d8660002b 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -204,6 +204,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_eomonth \
 helpcontent2/source/text/scalc/01/func_error_type \
 helpcontent2/source/text/scalc/01/func_findb \
+helpcontent2/source/text/scalc/01/func_floor \
 helpcontent2/source/text/scalc/01/func_forecastetsadd \
 helpcontent2/source/text/scalc/01/func_forecastetsmult \
 helpcontent2/source/text/scalc/01/func_forecastetsstatadd \
diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 0bd8172ee..36bde5f4d 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -1420,56 +1420,6 @@
 =ODD(-3.1) returns -5.see also 
CEILING, FLOOR, EVEN, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
 
 
-
-
-  FLOOR.PRECISE function
-  FLOOR.XCL function
-  rounding;down to nearest multiple of 
significance
-
-mw added one entry
-
-
-
-FLOOR.PRECISE
-Rounds a number down to the nearest multiple of 
Significance, regardless of sign of Significance
-
-
-FLOOR.PRECISE(Number; Significance)
-Number is the number that is to be rounded 
down.
-Significance is the value to whose multiple the 
number is to be rounded down.
-
-
-=FLOOR.PRECISE( -11;-2) returns -12see 
also CEILING, EVEN, ODD, MROUND,INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
-
-
-
-
-  FLOOR function
-  FLOOR.MATH function
-  rounding;down to nearest multiple of 
significance
-
-mw added one entry
-
-
-
-FLOOR
-Rounds a number down to the nearest multiple of 
Significance.
-
-
-FLOOR(Number; 
Significance; Mode)
-Number is the number that is to be rounded 
down.
-Significance is the value to whose multiple the 
number is to be rounded down.
-Mode is an optional value. If the Mode value is 
given and not equal to zero, and if Number and Significance are negative, then 
rounding is done based on the absolute value of Number, i.e. negative numbers 
are rounded towards zero. If the Mode value is equal to zero or is not given, 
negative numbers are rounded away from zero.
-
-If the spreadsheet is exported to Microsoft 
Excel, the FLOOR function is exported as the equivalent FLOOR.MATH function 
that exists since Excel 2013. If you plan to use the spreadsheet with earlier 
Excel versions, use either FLOOR.PRECISE that exists since Excel 2010, or 
FLOOR.XCL that is exported as the FLOOR function compatible with all Excel 
versions. Note that FLOOR.XCL always rounds towards zero.
-
-
-
-=FLOOR( -11;-2) returns -12
-=FLOOR( -11;-2;0) returns -12
-=FLOOR( -11;-2;1) returns -10see also 
CEILING, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
-
-
 
 
   SIGN function
diff --git a/source/text/scalc/01/func_floor.xhp 
b/source/text/scalc/01/func_floor.xhp
new file mode 100644
index 0..e56c0598b
--- /dev/null
+++ b/source/text/scalc/01/func_floor.xhp
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+FLOOR Functions
+/text/scalc/01/func_floor.xhp
+
+
+
+FLOOR Functions
+
+
+
+FLOOR function
+rounding;down to nearest multiple of 
significance
+
+mw added one entry
+
+FLOOR
+Rounds a number to the nearest multiple of a 
significance value.
+For a positive 
number and a positive significance value, the function rounds down (towards 
zero). For a negative number and a negative significance value, the direction 
of rounding is determined by the value of a mode parameter. The function 
returns an error if the number and significance values have opposite 
signs.
+
+FLOOR(Number[; Significance[; Mode]])
+
+Number is the number that is to be rounded, or a 
reference to a cell containing the number.
+
+Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to +1 or -1 depending on the sign of 
Number.
+Mode (optional) is a number, or a reference to a 
cell containing a number. The function only uses Mode if both 
Number and Significance are negative. Then if 
Mode is given and not e

[Libreoffice-commits] core.git: helpcontent2

2020-04-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 979928c2cc5a2d14a003d59bcbf39d846ade91f7
Author: Steve Fanning 
AuthorDate: Wed Apr 8 19:32:33 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 9 00:32:33 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2d238deabf589c10ab89b495d3f9e2c57a8efda0
  - tdf#131960 Clarification of CEILING function

+ refactor, grouping all CEILING variants into one file

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

diff --git a/helpcontent2 b/helpcontent2
index 2748a458c312..2d238deabf58 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2748a458c312743c81f295e170aa26f626d2bff7
+Subproject commit 2d238deabf589c10ab89b495d3f9e2c57a8efda0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Steve Fanning (via logerrit)

 AllLangHelp_scalc.mk  |1 
 source/text/scalc/01/04060106.xhp |   99 -
 source/text/scalc/01/func_ceiling.xhp |  132 ++
 3 files changed, 133 insertions(+), 99 deletions(-)

New commits:
commit 2d238deabf589c10ab89b495d3f9e2c57a8efda0
Author: Steve Fanning 
AuthorDate: Tue Apr 7 15:34:09 2020 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 9 00:32:33 2020 +0200

tdf#131960 Clarification of CEILING function

+ refactor, grouping all CEILING variants into one file

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 32fe1d62e..aeee43364 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -189,6 +189,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_aggregate \
 helpcontent2/source/text/scalc/01/func_averageif \
 helpcontent2/source/text/scalc/01/func_averageifs \
+helpcontent2/source/text/scalc/01/func_ceiling \
 helpcontent2/source/text/scalc/01/func_countifs \
 helpcontent2/source/text/scalc/01/func_color \
 helpcontent2/source/text/scalc/01/func_concat \
diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index a34aba2f3..0bd8172ee 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -688,105 +688,6 @@
 =LOG10(5) returns the base-10 logarithm of 5 (approximately 
0.69897).see also LOG, LN, POWER
 
 
-
-
-  CEILING function
-  rounding;up to multiples of significance
-
-mw added one entry
-
-
-CEILING
-Rounds a number up to the nearest multiple of 
Significance.
-
-
-CEILING(Number; 
Significance; Mode)
-Number is the number that is to be rounded 
up.
-Significance is the number to whose multiple the 
value is to be rounded up.
-Mode is an optional value. If the Mode value is 
given and not equal to zero, and if Number and Significance are negative, then 
rounding is done based on the absolute value of Number, i.e. negative numbers 
are rounded away from zero. If the Mode value is equal to zero or is not given, 
negative numbers are rounded towards zero.
-If the spreadsheet is exported to Microsoft Excel, 
the CEILING function is exported as the equivalent CEILING.MATH function that 
exists since Excel 2013. If you plan to use the spreadsheet with earlier Excel 
versions, use either CEILING.PRECISE that exists since Excel 2010, or 
CEILING.XCL that is exported as the CEILING function compatible with all Excel 
versions. Note that CEILING.XCL always rounds away from zero.
-
-
-=CEILING(-11;-2) returns -10
-=CEILING(-11;-2;0) returns -10
-=CEILING(-11;-2;1) returns -12see also 
FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
-
-
-
-
-  CEILING.PRECISE function
-  rounding;up to multiples of significance
-
-mw added one entry
-
-
-CEILING.PRECISE
-Rounds a number up to the nearest multiple of 
Significance, regardless of sign of Significance
-
-
-CEILING.PRECISE(Number; Significance)
-Number (required) is the number that is to be 
rounded up.
-Significance (optional) is the number to whose 
multiple the value is to be rounded up.
-
-
-=CEILING.PRECISE(-11;-2) returns 
-10see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, 
ROUNDDOWN, ROUNDUP
-
-
-
-
-CEILING.MATH function
-
-
-CEILING.MATH
-Rounds a number up to the 
nearest multiple of Significance.
-
-CEILING.MATH(Number; Significance; Mode)
-Number is the number that is to be rounded 
up.
-Significance is the number to whose multiple the 
value is to be rounded up.
-Mode is an optional value. If the Mode value is 
given and not equal to zero, and if Number and Significance are negative, then 
rounding is done based on the absolute value of Number, i.e. negative numbers 
are rounded away from zero. If the Mode value is equal to zero or is not given, 
negative numbers are rounded towards zero.
-This function exists for 
interoperability with Microsoft Excel 2013 or newer.
-
-=CEILING.MATH(-10;-3) returns 
-9
-=CEILING.MATH(-10;-3;0) returns 
-9
-=CEILING.MATH(-10;-3;1) returns 
-12
-
-
-
-CEILING.XCL function
-
-
-CEILING.XCL
-Rounds a number away from zero 
to the nearest multiple of Significance.
-
-
-CEILING.XCL(Number; Significance)
-Number is the number that is to be 
rounded.
-Significance is the number to whose multiple the 
value is to be rounded.
-This function exists for 
interoperability with Microsoft Excel 2007 or older versions.
-
-=CEILING.XCL(1;3) returns 
3
-=CEILING.XCL(7;4) returns 
8
-=CEILING.XCL(-10;-3) returns 
-12
-
-
-
-  ISO.CEILING function
-  rounding;up to multiples of significance
-
-mw added one entry
-
-
-ISO.CEILING
-Rounds a number u

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

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/databasedocument.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 984a240975b87eff10ccda394de9e7ea0078ed30
Author: Samuel Mehrbrodt 
AuthorDate: Tue Apr 7 09:05:05 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 8 23:52:20 2020 +0200

Related tdf#97694 Fix macro preservation on Windows

Change-Id: Ief183c75e0c3ce6c42868b7c60c5f66f9684d743
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91795
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 792c730f3cda4f5c312921a62ecae3d322ad9b72)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91920
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index cc571a0a6457..f76104e93aa9 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1093,18 +1093,21 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 }
 
 // store to current storage
-Reference< XStorage > xCurrentStorage( 
m_pImpl->getOrCreateRootStorage(), UNO_QUERY_THROW );
+Reference< XStorage > xCurrentStorage( 
m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW );
+OUString 
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
 Sequence< PropertyValue > aMediaDescriptor( 
lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
 impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard 
);
 
 // Preserve script signature if the script has not changed
 if (bTryToPreserveScriptSignature)
 {
+// Need to close this storage, otherwise we can't open it for 
signing below
+// (Windows needs exclusive file access)
+uno::Reference < lang::XComponent > xComp = xCurrentStorage;
+xComp->dispose();
 uno::Reference xDDSigns;
 try
 {
-OUString aODFVersion(
-
comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
 xDDSigns = 
security::DocumentDigitalSignatures::createWithVersion(
 comphelper::getProcessComponentContext(), aODFVersion);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/ModelImpl.cxx |   14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 903c3f6bac1814adb39246bacb117fffd796d03e
Author: Samuel Mehrbrodt 
AuthorDate: Tue Mar 31 08:18:48 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 8 23:50:54 2020 +0200

Fix reading ODF version

Change-Id: I5787737d3f689fba93bf4be56c018967b5e37ab1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91407
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 1ec7b4ae86a9fe666fc1510636c483d8980d04f6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91918
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 0e1934f364c6..ef4525cc3877 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1310,19 +1310,11 @@ bool 
ODatabaseModelImpl::hasTrustedScriptingSignature(bool bAllowUIToAddAuthor)
 // which leads to signatures not being found
 Reference xStorage = 
comphelper::OStorageHelper::GetStorageOfFormatFromURL(
 ZIP_STORAGE_FORMAT_STRING, m_sDocFileLocation, ElementModes::READ);
-OUString aVersion;
-try
-{
-uno::Reference xPropSet(xStorage, 
uno::UNO_QUERY_THROW);
-xPropSet->getPropertyValue("Version") >>= aVersion;
-}
-catch (uno::Exception&)
-{
-}
 
+OUString 
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(getOrCreateRootStorage()));
 uno::Reference xSigner(
 security::DocumentDigitalSignatures::createWithVersion(
-comphelper::getProcessComponentContext(), aVersion));
+comphelper::getProcessComponentContext(), aODFVersion));
 uno::Sequence aInfo
 = xSigner->verifyScriptingContentSignatures(xStorage,
 
uno::Reference());
@@ -1350,7 +1342,7 @@ bool 
ODatabaseModelImpl::hasTrustedScriptingSignature(bool bAllowUIToAddAuthor)
 aRequest.DocumentURL = m_sDocFileLocation;
 aRequest.DocumentStorage = xStorage;
 aRequest.DocumentSignatureInformation = aInfo;
-aRequest.DocumentVersion = aVersion;
+aRequest.DocumentVersion = aODFVersion;
 aRequest.Classification = 
task::InteractionClassification_QUERY;
 bResult = SfxMedium::CallApproveHandler(xInteraction, 
uno::makeAny(aRequest), true);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/databasedocument.cxx |   91 ++-
 1 file changed, 90 insertions(+), 1 deletion(-)

New commits:
commit 8a7d8eeeb0ea75881913b7c672cb4bc5d8893114
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 1 09:58:09 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 8 23:51:42 2020 +0200

Related tdf#97694 Preserve macro signatures in Base

Change-Id: I139ac003d1c95144e6cb1beec774f3cf142625b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91466
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8d27d495a733cfc29753e2e78000b199632695f7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91919
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index eb20c56ed849..cc571a0a6457 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -46,6 +46,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -70,7 +72,7 @@
 #include 
 #include 
 #include 
-
+#include 
 #include 
 
 #include 
@@ -78,7 +80,9 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 #include 
 
@@ -1025,6 +1029,22 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 _rGuard.reset();
 }
 
+bool bTryToPreserveScriptSignature = false;
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+OUString aTmpFileURL = aTempFile.GetURL();
+if (m_pImpl->getScriptingSignatureState() == SignatureState::OK
+|| m_pImpl->getScriptingSignatureState() == 
SignatureState::NOTVALIDATED
+|| m_pImpl->getScriptingSignatureState() == SignatureState::INVALID)
+{
+bTryToPreserveScriptSignature = true;
+// We need to first save the file (which removes the macro signature), 
then add the macro signature again.
+// For that, we need a temporary copy of the original file.
+osl::File::RC rc = osl::File::copy(m_pImpl->getDocFileLocation(), 
aTmpFileURL);
+if (rc != osl::FileBase::E_None)
+throw uno::RuntimeException("Could not create temp file");
+}
+
 Reference< XStorage > xNewRootStorage;
 // will be non-NULL if our storage changed
 
@@ -1077,6 +1097,75 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 Sequence< PropertyValue > aMediaDescriptor( 
lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
 impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard 
);
 
+// Preserve script signature if the script has not changed
+if (bTryToPreserveScriptSignature)
+{
+uno::Reference xDDSigns;
+try
+{
+OUString aODFVersion(
+
comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
+xDDSigns = 
security::DocumentDigitalSignatures::createWithVersion(
+comphelper::getProcessComponentContext(), aODFVersion);
+
+const OUString aScriptSignName
+= 
xDDSigns->getScriptingContentSignatureDefaultStreamName();
+
+if (!aScriptSignName.isEmpty())
+{
+Reference xReadOrig
+= 
comphelper::OStorageHelper::GetStorageOfFormatFromURL(
+ZIP_STORAGE_FORMAT_STRING, aTmpFileURL, 
ElementModes::READ);
+if (!xReadOrig.is())
+throw uno::RuntimeException("Could not read " + 
aTmpFileURL);
+uno::Reference xMetaInf
+= xReadOrig->openStorageElement("META-INF", 
embed::ElementModes::READ);
+
+Reference xTarget
+= 
comphelper::OStorageHelper::GetStorageOfFormatFromURL(
+ZIP_STORAGE_FORMAT_STRING, _rURL, 
ElementModes::READWRITE);
+if (!xTarget.is())
+throw uno::RuntimeException("Could not read " + _rURL);
+uno::Reference xTargetMetaInf
+= xTarget->openStorageElement("META-INF", 
embed::ElementModes::READWRITE);
+
+if (xMetaInf.is() && xTargetMetaInf.is())
+{
+xMetaInf->copyElementTo(aScriptSignName, 
xTargetMetaInf, aScriptSignName);
+
+uno::Reference 
xTransact(xTargetMetaInf,
+   
uno::UNO_QUERY);
+if (xTransact.is())
+xTransact->commit();
+
+xTargetMetaInf->dispose();
+
+// now check the copied signature
+

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

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/ModelImpl.cxx |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 1d09fd89b27cc037d6a89bfdeea76a3a1e83030a
Author: Samuel Mehrbrodt 
AuthorDate: Tue Mar 31 07:52:30 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 8 23:50:07 2020 +0200

Related tdf#97694 Show dialog when signed macros are blocked

Change-Id: I7b9dd4872a58eff93ab8818f0286781c6ff4c9bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91385
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 6c89715b7d1e78a17b6c53cdb89f2f734500fd44)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91917
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index a0cfd46f3c18..0e1934f364c6 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -55,6 +56,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1298,7 +1300,7 @@ SignatureState 
ODatabaseModelImpl::getScriptingSignatureState()
 return m_nScriptingSignatureState;
 }
 
-bool ODatabaseModelImpl::hasTrustedScriptingSignature(bool 
/*bAllowUIToAddAuthor*/)
+bool ODatabaseModelImpl::hasTrustedScriptingSignature(bool bAllowUIToAddAuthor)
 {
 bool bResult = false;
 
@@ -1337,6 +1339,22 @@ bool 
ODatabaseModelImpl::hasTrustedScriptingSignature(bool /*bAllowUIToAddAuthor
   return 
xSigner->isAuthorTrusted(rInfo.Signer);
   });
 }
+
+if (!bResult && bAllowUIToAddAuthor)
+{
+Reference xInteraction;
+xInteraction = 
m_aMediaDescriptor.getOrDefault("InteractionHandler", xInteraction);
+if (xInteraction.is())
+{
+task::DocumentMacroConfirmationRequest aRequest;
+aRequest.DocumentURL = m_sDocFileLocation;
+aRequest.DocumentStorage = xStorage;
+aRequest.DocumentSignatureInformation = aInfo;
+aRequest.DocumentVersion = aVersion;
+aRequest.Classification = 
task::InteractionClassification_QUERY;
+bResult = SfxMedium::CallApproveHandler(xInteraction, 
uno::makeAny(aRequest), true);
+}
+}
 }
 catch (uno::Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - dbaccess/source include/sfx2 sfx2/Library_sfx.mk sfx2/source

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/ModelImpl.cxx |   57 ++---
 dbaccess/source/core/inc/ModelImpl.hxx|2 
 include/sfx2/objsh.hxx|2 
 include/sfx2/signaturestate.hxx   |   11 
 sfx2/Library_sfx.mk   |1 
 sfx2/source/doc/objmisc.cxx   |2 
 sfx2/source/doc/objserv.cxx   |   42 --
 sfx2/source/doc/objstor.cxx   |2 
 sfx2/source/doc/signaturestate.cxx|   59 ++
 9 files changed, 128 insertions(+), 50 deletions(-)

New commits:
commit f87d2d7c3ba0f566fc129865543924ef5401916c
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 23 12:11:24 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Apr 8 23:49:26 2020 +0200

Related tdf#97694 Check Base macro signatures on load

Change-Id: I45c6eae633c41585c6c7e4c5fff0b187a6dc1f60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90908
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit f2f93434f4795646255e5d8edd31fa08b8b2ffab)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91916
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 3281d0dd2b7e..a0cfd46f3c18 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -40,6 +40,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -49,7 +51,9 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -60,6 +64,7 @@
 
 #include 
 
+using namespace css;
 using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
@@ -369,6 +374,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< 
XComponentContext >& _r
 ,m_aEmbeddedMacros()
 ,m_bModificationLock( false )
 ,m_bDocumentInitialized( false )
+,m_nScriptingSignatureState(SignatureState::UNKNOWN)
 ,m_aContext( _rxContext )
 ,m_nLoginTimeout(0)
 ,m_bReadOnly(false)
@@ -1289,13 +1295,54 @@ Reference< XEmbeddedScripts > 
ODatabaseModelImpl::getEmbeddedDocumentScripts() c
 SignatureState ODatabaseModelImpl::getScriptingSignatureState()
 {
 // no support for signatures at the moment
-return SignatureState::NOSIGNATURES;
+return m_nScriptingSignatureState;
 }
 
-bool ODatabaseModelImpl::hasTrustedScriptingSignature( bool 
/*bAllowUIToAddAuthor*/ )
+bool ODatabaseModelImpl::hasTrustedScriptingSignature(bool 
/*bAllowUIToAddAuthor*/)
 {
-// no support for signatures at the moment
-return false;
+bool bResult = false;
+
+try
+{
+// Don't use m_xDocumentStorage, that somehow has an incomplete 
storage representation
+// which leads to signatures not being found
+Reference xStorage = 
comphelper::OStorageHelper::GetStorageOfFormatFromURL(
+ZIP_STORAGE_FORMAT_STRING, m_sDocFileLocation, ElementModes::READ);
+OUString aVersion;
+try
+{
+uno::Reference xPropSet(xStorage, 
uno::UNO_QUERY_THROW);
+xPropSet->getPropertyValue("Version") >>= aVersion;
+}
+catch (uno::Exception&)
+{
+}
+
+uno::Reference xSigner(
+security::DocumentDigitalSignatures::createWithVersion(
+comphelper::getProcessComponentContext(), aVersion));
+uno::Sequence aInfo
+= xSigner->verifyScriptingContentSignatures(xStorage,
+
uno::Reference());
+
+if (!aInfo.hasElements())
+return false;
+
+m_nScriptingSignatureState = 
DocumentSignatures::getSignatureState(aInfo);
+if (m_nScriptingSignatureState == SignatureState::OK
+|| m_nScriptingSignatureState == SignatureState::NOTVALIDATED)
+{
+bResult = std::any_of(aInfo.begin(), aInfo.end(),
+  [&xSigner](const 
security::DocumentSignatureInformation& rInfo) {
+  return 
xSigner->isAuthorTrusted(rInfo.Signer);
+  });
+}
+}
+catch (uno::Exception&)
+{
+}
+
+return bResult;
 }
 
 void ODatabaseModelImpl::storageIsModified()
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx 
b/dbaccess/source/core/inc/ModelImpl.hxx
index d7a642a02397..1a375b0b1e19 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -185,6 +185,8 @@ private:
 */
 OUString m_sDocumentURL;
 
+SignatureState m_nScriptingSignatureState;
+
 public:
 OWeakConnectionArray

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

2020-04-08 Thread andreas kainz (via logerrit)

 extras/source/gallery/gallery_mytheme/arrows.sdv |binary
 extras/source/gallery/gallery_mytheme/arrows.thm |binary
 2 files changed

New commits:
commit dc19a76efd8334b0fca9ef0537daf5bd25014b70
Author: andreas kainz 
AuthorDate: Wed Apr 8 22:16:56 2020 +0200
Commit: andreas_kainz 
CommitDate: Wed Apr 8 23:25:08 2020 +0200

Arrow Gallery update

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

diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv 
b/extras/source/gallery/gallery_mytheme/arrows.sdv
index 288e64303c4c..22150a07a7a7 100644
Binary files a/extras/source/gallery/gallery_mytheme/arrows.sdv and 
b/extras/source/gallery/gallery_mytheme/arrows.sdv differ
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm 
b/extras/source/gallery/gallery_mytheme/arrows.thm
index 76fe10695679..7a33a0751fae 100644
Binary files a/extras/source/gallery/gallery_mytheme/arrows.thm and 
b/extras/source/gallery/gallery_mytheme/arrows.thm differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/WopiProofTests.cpp wsd/ProofKey.hpp

2020-04-08 Thread Michael Meeks (via logerrit)

 test/WopiProofTests.cpp |   48 ++--
 wsd/ProofKey.hpp|2 +-
 2 files changed, 43 insertions(+), 7 deletions(-)

New commits:
commit d7f55b4bda7452321401e76e838dfea3765cbd40
Author: Michael Meeks 
AuthorDate: Wed Apr 8 21:15:04 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:20:35 2020 +0200

Proof: verify existing RSA proof.

Change-Id: I26163d0cad3437300bb255b0d7760af6393ceffa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91939
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/test/WopiProofTests.cpp b/test/WopiProofTests.cpp
index 74a9c1df3..6ad0b4268 100644
--- a/test/WopiProofTests.cpp
+++ b/test/WopiProofTests.cpp
@@ -5,6 +5,9 @@
  * 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/.
+ *
+ * Uses known-good sample data from:
+ *   https://github.com/microsoft/Office-Online-Test-Tools-and-Documentation
  */
 
 #include 
@@ -12,27 +15,37 @@
 #include 
 
 #include 
+#include 
+#include 
 #include 
 
+#include 
+#include 
+#include 
+
+
 /// Delta unit-tests.
 class WopiProofTests : public CPPUNIT_NS::TestFixture
 {
 CPPUNIT_TEST_SUITE(WopiProofTests);
 
 CPPUNIT_TEST(testCapiBlob);
-CPPUNIT_TEST(testProof);
+CPPUNIT_TEST(testExistingProof);
 
 CPPUNIT_TEST_SUITE_END();
 
 void testCapiBlob();
+void testExistingProof();
 
-void testProof();
+BIGNUM *Base64ToNum(const std::string &str)
+{
+std::vector vec = Proof::Base64ToBytes(str);
+return BN_bin2bn(&vec[0], vec.size(), nullptr);
+}
 };
 
-
 void WopiProofTests::testCapiBlob()
 {
-// Known-good sample strings from 
https://github.com/microsoft/Office-Online-Test-Tools-and-Documentation
 std::vector modulus = 
Proof::Base64ToBytes("0HOWUPFFgmSYHbLZZzdWO/HUOr8YNfx5NAl7GUytooHZ7B9QxQKTJpj0NIJ4XEskQW8e4dLzRrPbNOOJ+KpWHttXz8HoQXkkZV/gYNxaNHJ8/pRXGMZzfVM5vchhx/2C7ULPTrpBsSpmfWQ6ShaVoQzfThFUd0MsBvIN7HVtqzPx9jbSV04wAqyNjcro7F3iu9w7AEsMejHbFlWoN+J05dP5ixryF7+2U5RVmjMt7/dYUdCoiXvCMt2CaVr0XEG6udHU4iDKVKZjmUBc7cTWRzhqEL7lZ1yQfylp38Nd2xxVJ0sSU7OkC1bBDlePcYGaF3JjJgsmp/H5BNnlW9gSxQ==");
 std::vector exponent = Proof::Base64ToBytes("AQAB");
 
@@ -42,9 +55,32 @@ void WopiProofTests::testCapiBlob()
 LOK_ASSERT_EQUAL(capiEncoded, 
std::string("BgIAAACkAABSU0ExAAgAAAEAAQDFEthb5dkE+fGnJgsmY3IXmoFxj1cOwVYLpLNTEksnVRzbXcPfaSl/kFxn5b4QajhH1sTtXECZY6ZUyiDi1NG5ukFc9Fppgt0ywnuJqNBRWPfvLTOaVZRTtr8X8hqL+dPldOI3qFUW2zF6DEsAO9y74l3s6MqNjawCME5X0jb28TOrbXXsDfIGLEN3VBFO3wyhlRZKOmR9ZiqxQbpOz0Ltgv3HYci9OVN9c8YYV5T+fHI0Wtxg4F9lJHlB6MHPV9seVqr4ieM027NG89LhHm9BJEtceII09JgmkwLFUB/s2YGirUwZewk0efw1GL861PE7Vjdn2bIdmGSCRfFQlnPQ"));
 }
 
-void WopiProofTests::testProof()
+void WopiProofTests::testExistingProof()
 {
-LOK_ASSERT(1 > 0);
+std::vector proof = Proof::GetProof(
+
"yZhdN1qgywcOQWhyEMVpB6NE3pvBksvcLXsrFKXNtBeDTPW%2fu62g2t%2fOCWSlb3jUGaz1zc%2fzOzbNgAredLdhQI1Q7sPPqUv2owO78olmN74DV%2fv52OZIkBG%2b8jqjwmUobcjXVIC1BG9g%2fynMN0itZklL2x27Z2imCF6xELcQUuGdkoXBj%2bI%2bTlKM",
 // access token
+
"https://contoso.com/wopi/files/vHxYyRGM8VfmSGwGYDBMIQPzuE+sSC6kw+zWZw2Nyg?access_token=yZhdN1qgywcOQWhyEMVpB6NE3pvBksvcLXsrFKXNtBeDTPW%2fu62g2t%2fOCWSlb3jUGaz1zc%2fzOzbNgAredLdhQI1Q7sPPqUv2owO78olmN74DV%2fv52OZIkBG%2b8jqjwmUobcjXVIC1BG9g%2fynMN0itZklL2x27Z2imCF6xELcQUuGdkoXBj%2bI%2bTlKM";,
 // uri
+UINT64_C(635655897610773532)); // ticks
+
+BIGNUM *modulus = 
Base64ToNum("0HOWUPFFgmSYHbLZZzdWO/HUOr8YNfx5NAl7GUytooHZ7B9QxQKTJpj0NIJ4XEskQW8e4dLzRrPbNOOJ+KpWHttXz8HoQXkkZV/gYNxaNHJ8/pRXGMZzfVM5vchhx/2C7ULPTrpBsSpmfWQ6ShaVoQzfThFUd0MsBvIN7HVtqzPx9jbSV04wAqyNjcro7F3iu9w7AEsMejHbFlWoN+J05dP5ixryF7+2U5RVmjMt7/dYUdCoiXvCMt2CaVr0XEG6udHU4iDKVKZjmUBc7cTWRzhqEL7lZ1yQfylp38Nd2xxVJ0sSU7OkC1bBDlePcYGaF3JjJgsmp/H5BNnlW9gSxQ==");
+BIGNUM *exponent = Base64ToNum("AQAB");
+
+RSA *rsa = RSA_new();
+LOK_ASSERT(rsa != nullptr);
+LOK_ASSERT_EQUAL(1, RSA_set0_key(rsa, modulus, exponent, nullptr));
+
+std::vector msgProof = 
Proof::Base64ToBytes("IflL8OWCOCmws5qnDD5kYMraMGI3o+T+hojoDREbjZSkxbbx7XIS1Av85lohPKjyksocpeVwqEYm9nVWfnq05uhDNGp2MsNyhPO9unZ6w25Rjs1hDFM0dmvYx8wlQBNZ/CFPaz3inCMaaP4PtU85YepaDccAjNc1gikdy3kSMeG1XZuaDixHvMKzF/60DMfLMBIu5xP4Nt8i8Gi2oZs4REuxi6yxOv2vQJQ5+8Wu2Olm8qZvT4FEIQT9oZAXebn/CxyvyQv+RVpoU2gb4BreXAdfKthWF67GpJyhr+ibEVDoIIolUvviycyEtjsaEBpOf6Ne/OLRNu98un7WNDzMTQ==");
+
+Poco::Crypto::DigestEngine digestEngine("SHA256");
+digestEngine.update(proof.data(), proof.size());
+std::vector digest = digestEngine.digest();
+
+   LOK_ASSERT_EQUAL(1, RSA_verify(digestEngine.nid(),
+   &digest[0], digest.size(),
+   &msgProof[0], msgProof.size(),
+   rsa));
+
+RSA_free(rsa);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATI

[Libreoffice-commits] online.git: test/WopiProofTests.cpp wsd/ProofKey.cpp wsd/ProofKey.hpp

2020-04-08 Thread Michael Meeks (via logerrit)

 test/WopiProofTests.cpp |   74 ++--
 wsd/ProofKey.cpp|   34 +++---
 wsd/ProofKey.hpp|3 +
 3 files changed, 92 insertions(+), 19 deletions(-)

New commits:
commit 668007544b89d9cb29aa8a62405de95cb7a7c02f
Author: Michael Meeks 
AuthorDate: Wed Apr 8 21:39:54 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:20:55 2020 +0200

Proof: generate our own key, and verify our own signatures.

Change-Id: If805c89a3b6618d6e34e7421b20077c4f0a48cb3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91940
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/test/WopiProofTests.cpp b/test/WopiProofTests.cpp
index 6ad0b4268..446ec07b6 100644
--- a/test/WopiProofTests.cpp
+++ b/test/WopiProofTests.cpp
@@ -22,7 +22,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 /// Delta unit-tests.
 class WopiProofTests : public CPPUNIT_NS::TestFixture
@@ -31,17 +31,26 @@ class WopiProofTests : public CPPUNIT_NS::TestFixture
 
 CPPUNIT_TEST(testCapiBlob);
 CPPUNIT_TEST(testExistingProof);
+CPPUNIT_TEST(testOurProof);
 
 CPPUNIT_TEST_SUITE_END();
 
 void testCapiBlob();
 void testExistingProof();
+void testOurProof();
 
 BIGNUM *Base64ToNum(const std::string &str)
 {
 std::vector vec = Proof::Base64ToBytes(str);
 return BN_bin2bn(&vec[0], vec.size(), nullptr);
 }
+
+void verifySignature(const std::string &access,
+ const std::string &uri,
+ uint64_t ticks,
+ const std::string &discoveryModulus,
+ const std::string &discoveryExponent,
+ const std::string &msgProof);
 };
 
 void WopiProofTests::testCapiBlob()
@@ -55,21 +64,24 @@ void WopiProofTests::testCapiBlob()
 LOK_ASSERT_EQUAL(capiEncoded, 
std::string("BgIAAACkAABSU0ExAAgAAAEAAQDFEthb5dkE+fGnJgsmY3IXmoFxj1cOwVYLpLNTEksnVRzbXcPfaSl/kFxn5b4QajhH1sTtXECZY6ZUyiDi1NG5ukFc9Fppgt0ywnuJqNBRWPfvLTOaVZRTtr8X8hqL+dPldOI3qFUW2zF6DEsAO9y74l3s6MqNjawCME5X0jb28TOrbXXsDfIGLEN3VBFO3wyhlRZKOmR9ZiqxQbpOz0Ltgv3HYci9OVN9c8YYV5T+fHI0Wtxg4F9lJHlB6MHPV9seVqr4ieM027NG89LhHm9BJEtceII09JgmkwLFUB/s2YGirUwZewk0efw1GL861PE7Vjdn2bIdmGSCRfFQlnPQ"));
 }
 
-void WopiProofTests::testExistingProof()
+void WopiProofTests::verifySignature(const std::string &access,
+ const std::string &uri,
+ uint64_t ticks,
+ const std::string &discoveryModulus,
+ const std::string &discoveryExponent,
+ const std::string &msgProofStr)
 {
-std::vector proof = Proof::GetProof(
-
"yZhdN1qgywcOQWhyEMVpB6NE3pvBksvcLXsrFKXNtBeDTPW%2fu62g2t%2fOCWSlb3jUGaz1zc%2fzOzbNgAredLdhQI1Q7sPPqUv2owO78olmN74DV%2fv52OZIkBG%2b8jqjwmUobcjXVIC1BG9g%2fynMN0itZklL2x27Z2imCF6xELcQUuGdkoXBj%2bI%2bTlKM",
 // access token
-
"https://contoso.com/wopi/files/vHxYyRGM8VfmSGwGYDBMIQPzuE+sSC6kw+zWZw2Nyg?access_token=yZhdN1qgywcOQWhyEMVpB6NE3pvBksvcLXsrFKXNtBeDTPW%2fu62g2t%2fOCWSlb3jUGaz1zc%2fzOzbNgAredLdhQI1Q7sPPqUv2owO78olmN74DV%2fv52OZIkBG%2b8jqjwmUobcjXVIC1BG9g%2fynMN0itZklL2x27Z2imCF6xELcQUuGdkoXBj%2bI%2bTlKM";,
 // uri
-UINT64_C(635655897610773532)); // ticks
+#if OPENSSL_VERSION_NUMBER > 0x1010L
+std::vector proof = Proof::GetProof(access, uri, ticks);
 
-BIGNUM *modulus = 
Base64ToNum("0HOWUPFFgmSYHbLZZzdWO/HUOr8YNfx5NAl7GUytooHZ7B9QxQKTJpj0NIJ4XEskQW8e4dLzRrPbNOOJ+KpWHttXz8HoQXkkZV/gYNxaNHJ8/pRXGMZzfVM5vchhx/2C7ULPTrpBsSpmfWQ6ShaVoQzfThFUd0MsBvIN7HVtqzPx9jbSV04wAqyNjcro7F3iu9w7AEsMejHbFlWoN+J05dP5ixryF7+2U5RVmjMt7/dYUdCoiXvCMt2CaVr0XEG6udHU4iDKVKZjmUBc7cTWRzhqEL7lZ1yQfylp38Nd2xxVJ0sSU7OkC1bBDlePcYGaF3JjJgsmp/H5BNnlW9gSxQ==");
-BIGNUM *exponent = Base64ToNum("AQAB");
+BIGNUM *modulus = Base64ToNum(discoveryModulus);
+BIGNUM *exponent = Base64ToNum(discoveryExponent);
 
 RSA *rsa = RSA_new();
 LOK_ASSERT(rsa != nullptr);
 LOK_ASSERT_EQUAL(1, RSA_set0_key(rsa, modulus, exponent, nullptr));
 
-std::vector msgProof = 
Proof::Base64ToBytes("IflL8OWCOCmws5qnDD5kYMraMGI3o+T+hojoDREbjZSkxbbx7XIS1Av85lohPKjyksocpeVwqEYm9nVWfnq05uhDNGp2MsNyhPO9unZ6w25Rjs1hDFM0dmvYx8wlQBNZ/CFPaz3inCMaaP4PtU85YepaDccAjNc1gikdy3kSMeG1XZuaDixHvMKzF/60DMfLMBIu5xP4Nt8i8Gi2oZs4REuxi6yxOv2vQJQ5+8Wu2Olm8qZvT4FEIQT9oZAXebn/CxyvyQv+RVpoU2gb4BreXAdfKthWF67GpJyhr+ibEVDoIIolUvviycyEtjsaEBpOf6Ne/OLRNu98un7WNDzMTQ==");
+std::vector msgProof = Proof::Base64ToBytes(msgProofStr);
 
 Poco::Crypto::DigestEngine digestEngine("SHA256");
 digestEngine.update(proof.data(), proof.size());
@@ -81,6 +93,50 @@ void WopiProofTests::testExistingProof()
rsa));
 
 RSA_free(rsa);
+#else
+(void)access; (void)uri; (void)ticks;
+(void)discoveryModulus; (void)discoveryExponent;
+(void)msgProofStr;
+

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

2020-04-08 Thread Michael Meeks (via logerrit)

 vcl/headless/svpinst.cxx |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 5186dd92779d1fc2032415f59979cd6afd6b426c
Author: Michael Meeks 
AuthorDate: Wed Apr 8 14:52:30 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:11:06 2020 +0200

headless: re-work microsecond calculation to preserve accuracy.

Should be an almost pure re-factor, that may save a few ms
in some cases.

Change-Id: Ie9c9e1a3610e1bcc8c12941f230109dd8eb77404
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91892
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 70ba9b153168..9501bd6af053 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -447,23 +447,18 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 {
 if (bWait && ! bEvent)
 {
-int nTimeoutMS = 0;
+sal_Int64 nTimeoutMicroS = 0;
 if (m_aTimeout.tv_sec) // Timer is started.
 {
 timeval Timeout;
 // determine remaining timeout.
 gettimeofday (&Timeout, nullptr);
 if (m_aTimeout > Timeout)
-{
-int nTimeoutMicroS = m_aTimeout.tv_usec - Timeout.tv_usec;
-nTimeoutMS = (m_aTimeout.tv_sec - Timeout.tv_sec) * 1000
-   + nTimeoutMicroS / 1000;
-if ( nTimeoutMicroS % 1000 )
-nTimeoutMS += 1;
-}
+nTimeoutMicroS = ((m_aTimeout.tv_sec - Timeout.tv_sec) * 
1000 * 1000 +
+  (m_aTimeout.tv_usec - Timeout.tv_usec));
 }
 else
-nTimeoutMS = -1; // wait until something happens
+nTimeoutMicroS = -1; // wait until something happens
 
 ImplSVData* pSVData = ImplGetSVData();
 sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
@@ -471,25 +466,28 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 if (pSVData->mpPollCallback)
 {
 // Poll for events from the LOK client.
-if (nTimeoutMS < 0)
-nTimeoutMS = 5000;
+if (nTimeoutMicroS < 0)
+nTimeoutMicroS = 5000 * 1000;
 
 // External poll.
 if (pSVData->mpPollClosure != nullptr &&
-pSVData->mpPollCallback(pSVData->mpPollClosure, nTimeoutMS 
* 1000 /* us */) < 0)
+pSVData->mpPollCallback(pSVData->mpPollClosure, 
nTimeoutMicroS) < 0)
 pSVData->maAppData.mbAppQuit = true;
 }
 else
 {
 std::unique_lock g(pMutex->m_WakeUpMainMutex);
 // wait for doRelease() or Wakeup() to set the condition
-if (nTimeoutMS == -1)
+if (nTimeoutMicroS == -1)
 {
 pMutex->m_WakeUpMainCond.wait(g,
 [pMutex]() { return pMutex->m_wakeUpMain; });
 }
 else
 {
+int nTimeoutMS = nTimeoutMicroS / 1000;
+if ( nTimeoutMicroS % 1000 )
+nTimeoutMS += 1;
 pMutex->m_WakeUpMainCond.wait_for(g,
 std::chrono::milliseconds(nTimeoutMS),
 [pMutex]() { return pMutex->m_wakeUpMain; });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Michael Meeks (via logerrit)

 vcl/headless/svpinst.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 486d32f1e83002e6ff43db32463fb49393cc3664
Author: Michael Meeks 
AuthorDate: Wed Apr 8 15:10:45 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:11:45 2020 +0200

tdf#131985 - ensure the Kit poll callback gets into fast idle loops.

Comparing with the windows impl. it seems that it is possible to get
timeout / idle starvation, and we need to poll and be responsive on
our sockets even in this this case.

As such, ensure we end up in the Kit poll callback, even when we have
very short timeouts / busy-idle loops.

Change-Id: I4bcac46af931de52a675f66fd189cd0ee14a0859
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91893
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 9501bd6af053..daaa4d170b3e 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -439,13 +439,20 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 if (!bHandleAllCurrentEvents && bEvent)
 return true;
 
-bEvent = CheckTimeout() || bEvent;
+ImplSVData* pSVData = ImplGetSVData();
+
+bool bTimeout = CheckTimeout();
+bool bSkipPoll = bEvent;
+if (pSVData->mpPollCallback == nullptr)
+bSkipPoll = bEvent || bTimeout;
+// else - give the poll-callback visibility into waiting timeouts too.
 
 SvpSalYieldMutex *const 
pMutex(static_cast(GetYieldMutex()));
 
 if (IsMainThread())
 {
-if (bWait && ! bEvent)
+// in kit case
+if (bWait && !bSkipPoll)
 {
 sal_Int64 nTimeoutMicroS = 0;
 if (m_aTimeout.tv_sec) // Timer is started.
@@ -460,7 +467,6 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 else
 nTimeoutMicroS = -1; // wait until something happens
 
-ImplSVData* pSVData = ImplGetSVData();
 sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
 
 if (pSVData->mpPollCallback)
@@ -496,7 +502,7 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 }
 AcquireYieldMutex( nAcquireCount );
 }
-else if (bEvent)
+else if (bSkipPoll)
 {
 pMutex->m_NonMainWaitingYieldCond.set(); // wake up other threads
 }
@@ -521,7 +527,7 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 }
 }
 
-return bEvent;
+return bSkipPoll;
 }
 
 bool SvpSalInstance::AnyInput( VclInputFlags nType )
___
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.2' - vcl/headless

2020-04-08 Thread Michael Meeks (via logerrit)

 vcl/headless/svpinst.cxx |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 1eaae412c596585a2ff37fb618341930ea091f05
Author: Michael Meeks 
AuthorDate: Wed Apr 8 14:52:30 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:10:19 2020 +0200

headless: re-work microsecond calculation to preserve accuracy.

Should be an almost pure re-factor, that may save a few ms
in some cases.

Change-Id: Ie9c9e1a3610e1bcc8c12941f230109dd8eb77404
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91925
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 80223ac58904..0247474c60a4 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -430,23 +430,18 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 {
 if (bWait && ! bEvent)
 {
-int nTimeoutMS = 0;
+sal_Int64 nTimeoutMicroS = 0;
 if (m_aTimeout.tv_sec) // Timer is started.
 {
 timeval Timeout;
 // determine remaining timeout.
 gettimeofday (&Timeout, nullptr);
 if (m_aTimeout > Timeout)
-{
-int nTimeoutMicroS = m_aTimeout.tv_usec - Timeout.tv_usec;
-nTimeoutMS = (m_aTimeout.tv_sec - Timeout.tv_sec) * 1000
-   + nTimeoutMicroS / 1000;
-if ( nTimeoutMicroS % 1000 )
-nTimeoutMS += 1;
-}
+nTimeoutMicroS = ((m_aTimeout.tv_sec - Timeout.tv_sec) * 
1000 * 1000 +
+  (m_aTimeout.tv_usec - Timeout.tv_usec));
 }
 else
-nTimeoutMS = -1; // wait until something happens
+nTimeoutMicroS = -1; // wait until something happens
 
 ImplSVData* pSVData = ImplGetSVData();
 sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
@@ -454,25 +449,28 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 if (pSVData->mpPollCallback)
 {
 // Poll for events from the LOK client.
-if (nTimeoutMS < 0)
-nTimeoutMS = 5000;
+if (nTimeoutMicroS < 0)
+nTimeoutMicroS = 5000 * 1000;
 
 // External poll.
 if (pSVData->mpPollClosure != nullptr &&
-pSVData->mpPollCallback(pSVData->mpPollClosure, nTimeoutMS 
* 1000 /* us */) < 0)
+pSVData->mpPollCallback(pSVData->mpPollClosure, 
nTimeoutMicroS) < 0)
 pSVData->maAppData.mbAppQuit = true;
 }
 else
 {
 std::unique_lock g(pMutex->m_WakeUpMainMutex);
 // wait for doRelease() or Wakeup() to set the condition
-if (nTimeoutMS == -1)
+if (nTimeoutMicroS == -1)
 {
 pMutex->m_WakeUpMainCond.wait(g,
 [pMutex]() { return pMutex->m_wakeUpMain; });
 }
 else
 {
+int nTimeoutMS = nTimeoutMicroS / 1000;
+if ( nTimeoutMicroS % 1000 )
+nTimeoutMS += 1;
 pMutex->m_WakeUpMainCond.wait_for(g,
 std::chrono::milliseconds(nTimeoutMS),
 [pMutex]() { return pMutex->m_wakeUpMain; });
___
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.2' - vcl/headless

2020-04-08 Thread Michael Meeks (via logerrit)

 vcl/headless/svpinst.cxx |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 366bd3599cc64ea8474cb72df51540774a6021eb
Author: Michael Meeks 
AuthorDate: Wed Apr 8 15:10:45 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 23:10:40 2020 +0200

tdf#131985 - ensure the Kit poll callback gets into fast idle loops.

Comparing with the windows impl. it seems that it is possible to get
timeout / idle starvation, and we need to poll and be responsive on
our sockets even in this this case.

As such, ensure we end up in the Kit poll callback, even when we have
very short timeouts / busy-idle loops.

Change-Id: I4bcac46af931de52a675f66fd189cd0ee14a0859
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91927
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
Reviewed-by: Michael Meeks 

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 0247474c60a4..9aa0e134dcc8 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -422,13 +422,20 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 if (!bHandleAllCurrentEvents && bEvent)
 return true;
 
-bEvent = CheckTimeout() || bEvent;
+ImplSVData* pSVData = ImplGetSVData();
+
+bool bTimeout = CheckTimeout();
+bool bSkipPoll = bEvent;
+if (pSVData->mpPollCallback == nullptr)
+bSkipPoll = bEvent || bTimeout;
+// else - give the poll-callback visibility into waiting timeouts too.
 
 SvpSalYieldMutex *const 
pMutex(static_cast(GetYieldMutex()));
 
 if (IsMainThread())
 {
-if (bWait && ! bEvent)
+// in kit case
+if (bWait && !bSkipPoll)
 {
 sal_Int64 nTimeoutMicroS = 0;
 if (m_aTimeout.tv_sec) // Timer is started.
@@ -443,7 +450,6 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 else
 nTimeoutMicroS = -1; // wait until something happens
 
-ImplSVData* pSVData = ImplGetSVData();
 sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
 
 if (pSVData->mpPollCallback)
@@ -479,7 +485,7 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 }
 AcquireYieldMutex( nAcquireCount );
 }
-else if (bEvent)
+else if (bSkipPoll)
 {
 pMutex->m_NonMainWaitingYieldCond.set(); // wake up other threads
 }
@@ -504,7 +510,7 @@ bool SvpSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
 }
 }
 
-return bEvent;
+return bSkipPoll;
 }
 
 bool SvpSalInstance::AnyInput( VclInputFlags nType )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/Makefile.am test/WopiProofTests.cpp wsd/ProofKey.cpp wsd/ProofKey.hpp

2020-04-08 Thread Michael Meeks (via logerrit)

 test/Makefile.am|3 ++-
 test/WopiProofTests.cpp |   16 
 wsd/ProofKey.cpp|   15 ++-
 wsd/ProofKey.hpp|6 ++
 4 files changed, 38 insertions(+), 2 deletions(-)

New commits:
commit f4f7b08d44aa8af50b18061f7c4ac84855aa1399
Author: Michael Meeks 
AuthorDate: Wed Apr 8 18:25:44 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 22:19:51 2020 +0200

Proof: implement CAPI blob test.

Change-Id: Ifa4ddc3c5fa375606eedd932af029e4b30a740de
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91936
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/test/Makefile.am b/test/Makefile.am
index 629b52c19..0e63ab5ab 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -65,7 +65,8 @@ wsd_sources = \
 ../common/Authorization.cpp \
 ../kit/Kit.cpp \
 ../kit/TestStubs.cpp \
-../wsd/TileCache.cpp
+../wsd/TileCache.cpp \
+../wsd/ProofKey.cpp
 
 test_base_source = \
TileQueueTests.cpp \
diff --git a/test/WopiProofTests.cpp b/test/WopiProofTests.cpp
index 1d2b1d5cb..74a9c1df3 100644
--- a/test/WopiProofTests.cpp
+++ b/test/WopiProofTests.cpp
@@ -19,13 +19,29 @@ class WopiProofTests : public CPPUNIT_NS::TestFixture
 {
 CPPUNIT_TEST_SUITE(WopiProofTests);
 
+CPPUNIT_TEST(testCapiBlob);
 CPPUNIT_TEST(testProof);
 
 CPPUNIT_TEST_SUITE_END();
 
+void testCapiBlob();
+
 void testProof();
 };
 
+
+void WopiProofTests::testCapiBlob()
+{
+// Known-good sample strings from 
https://github.com/microsoft/Office-Online-Test-Tools-and-Documentation
+std::vector modulus = 
Proof::Base64ToBytes("0HOWUPFFgmSYHbLZZzdWO/HUOr8YNfx5NAl7GUytooHZ7B9QxQKTJpj0NIJ4XEskQW8e4dLzRrPbNOOJ+KpWHttXz8HoQXkkZV/gYNxaNHJ8/pRXGMZzfVM5vchhx/2C7ULPTrpBsSpmfWQ6ShaVoQzfThFUd0MsBvIN7HVtqzPx9jbSV04wAqyNjcro7F3iu9w7AEsMejHbFlWoN+J05dP5ixryF7+2U5RVmjMt7/dYUdCoiXvCMt2CaVr0XEG6udHU4iDKVKZjmUBc7cTWRzhqEL7lZ1yQfylp38Nd2xxVJ0sSU7OkC1bBDlePcYGaF3JjJgsmp/H5BNnlW9gSxQ==");
+std::vector exponent = Proof::Base64ToBytes("AQAB");
+
+std::vector capiBlob = Proof::RSA2CapiBlob(modulus, 
exponent);
+
+std::string capiEncoded = Proof::BytesToBase64(capiBlob);
+LOK_ASSERT_EQUAL(capiEncoded, 
std::string("BgIAAACkAABSU0ExAAgAAAEAAQDFEthb5dkE+fGnJgsmY3IXmoFxj1cOwVYLpLNTEksnVRzbXcPfaSl/kFxn5b4QajhH1sTtXECZY6ZUyiDi1NG5ukFc9Fppgt0ywnuJqNBRWPfvLTOaVZRTtr8X8hqL+dPldOI3qFUW2zF6DEsAO9y74l3s6MqNjawCME5X0jb28TOrbXXsDfIGLEN3VBFO3wyhlRZKOmR9ZiqxQbpOz0Ltgv3HYci9OVN9c8YYV5T+fHI0Wtxg4F9lJHlB6MHPV9seVqr4ieM027NG89LhHm9BJEtceII09JgmkwLFUB/s2YGirUwZewk0efw1GL861PE7Vjdn2bIdmGSCRfFQlnPQ"));
+}
+
 void WopiProofTests::testProof()
 {
 LOK_ASSERT(1 > 0);
diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index 489ad89b1..b78499da0 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -81,7 +81,9 @@ std::vector ToNetworkOrderBytes(const T& x)
 return getBytesBE(reinterpret_cast(&x), sizeof(x));
 }
 
-std::string BytesToBase64(const std::vector& bytes)
+} // namespace
+
+std::string Proof::BytesToBase64(const std::vector& bytes)
 {
 std::ostringstream oss;
 // The signature generated contains CRLF line endings.
@@ -93,6 +95,17 @@ std::string BytesToBase64(const std::vector& 
bytes)
 return oss.str();
 }
 
+std::vector Proof::Base64ToBytes(const std::string &str)
+{
+std::istringstream oss(str);
+Poco::Base64Decoder decoder(oss);
+
+char c = 0;
+std::vector vec;
+while (decoder.get(c))
+vec.push_back(c);
+
+return vec;
 }
 
 Proof::Proof()
diff --git a/wsd/ProofKey.hpp b/wsd/ProofKey.hpp
index e74942e70..8e9f5c885 100644
--- a/wsd/ProofKey.hpp
+++ b/wsd/ProofKey.hpp
@@ -25,7 +25,10 @@ namespace Poco {
 }
 }
 
+class WopiProofTests;
+
 class Proof {
+friend class WopiProofTests;
 public:
 Proof();
 VecOfStringPairs GetProofHeaders(const std::string& access_token, const 
std::string& uri) const;
@@ -33,6 +36,9 @@ public:
 private:
 static std::string ProofKeyPath();
 
+static std::string BytesToBase64(const std::vector& bytes);
+static std::vector Base64ToBytes(const std::string &str);
+
 // modulus and exponent are big-endian vectors
 static std::vector RSA2CapiBlob(const std::vector& modulus,
const std::vector& exponent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-9'

2020-04-08 Thread Pedro Silva (via logerrit)

Tag 'cp-6.2-9' created by Andras Timar  at 
2020-04-08 20:11 +

cp-6.2-9

Changes since co-6.2-2:
Pedro Silva (1):
  [cp] Update CSS for Search button

---
 help3xsl/default.css |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-9'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-9' created by Andras Timar  at 
2020-04-08 20:11 +

cp-6.2-9

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-9'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-9' created by Andras Timar  at 
2020-04-08 20:11 +

cp-6.2-9

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-9'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-9' created by Andras Timar  at 
2020-04-08 20:11 +

cp-6.2-9

Changes since CODE-4.2.1-2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/CODE-4.2.2-1'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CODE-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:10 +

CODE-4.2.2-1

Changes since CODE-4.2.1-2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/CODE-4.2.2-1'

2020-04-08 Thread Pedro Silva (via logerrit)

Tag 'CODE-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:10 +

CODE-4.2.2-1

Changes since co-6.2-2:
Pedro Silva (1):
  [cp] Update CSS for Search button

---
 help3xsl/default.css |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/CODE-4.2.2-1'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CODE-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:10 +

CODE-4.2.2-1

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/CODE-4.2.2-1'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CODE-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:10 +

CODE-4.2.2-1

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/CP-Android-iOS-4.2.2'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CP-Android-iOS-4.2.2' created by Andras Timar  
at 2020-04-08 20:09 +

CP-Android-iOS-4.2.2

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/CP-Android-iOS-4.2.2'

2020-04-08 Thread Pedro Silva (via logerrit)

Tag 'CP-Android-iOS-4.2.2' created by Andras Timar  
at 2020-04-08 20:09 +

CP-Android-iOS-4.2.2

Changes since co-6.2-2:
Pedro Silva (1):
  [cp] Update CSS for Search button

---
 help3xsl/default.css |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/CP-Android-iOS-4.2.2'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CP-Android-iOS-4.2.2' created by Andras Timar  
at 2020-04-08 20:09 +

CP-Android-iOS-4.2.2

Changes since CODE-4.2.1-2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/CP-Android-iOS-4.2.2'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'CP-Android-iOS-4.2.2' created by Andras Timar  
at 2020-04-08 20:09 +

CP-Android-iOS-4.2.2

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/CP-Android-iOS-4.2.2'

2020-04-08 Thread Tor Lillqvist (via logerrit)

Tag 'CP-Android-iOS-4.2.2' created by Andras Timar  
at 2020-04-08 20:07 +

CP-Android-iOS-4.2.2

Changes since co-4-2-0-branch-point-1117:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.2-1'

2020-04-08 Thread Tor Lillqvist (via logerrit)

Tag 'CODE-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:07 +

CODE-4.2.2-1

Changes since co-4-2-0-branch-point-1117:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.2-1'

2020-04-08 Thread Tor Lillqvist (via logerrit)

Tag 'cp-4.2.2-1' created by Andras Timar  at 
2020-04-08 20:06 +

cp-4.2.2-1

Changes since co-4-2-0-branch-point-1117:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Xisco Fauli (via logerrit)

 chart2/qa/extras/chart2export.cxx |   14 ++
 chart2/qa/extras/data/xlsx/tdf114139.xlsx |binary
 2 files changed, 14 insertions(+)

New commits:
commit f7e23260d22416667fb707e06282c2aeb538d816
Author: Xisco Fauli 
AuthorDate: Wed Apr 8 18:21:48 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 8 21:56:50 2020 +0200

tdf#114139: Add unittest

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 0570ca4697c6..589225e8cd2e 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -88,6 +88,7 @@ public:
 void testDataLabelDefaultLineChartDOCX();
 void testIndividualDataLabelProps();
 void testTdf108107();
+void testTdf114139();
 void testChartTitlePropertiesColorFillDOCX();
 void testChartTitlePropertiesGradientFillDOCX();
 void testChartTitlePropertiesBitmapFillDOCX();
@@ -211,6 +212,7 @@ public:
 CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX);
 CPPUNIT_TEST(testIndividualDataLabelProps);
 CPPUNIT_TEST(testTdf108107);
+CPPUNIT_TEST(testTdf114139);
 CPPUNIT_TEST(testChartTitlePropertiesColorFillDOCX);
 CPPUNIT_TEST(testChartTitlePropertiesGradientFillDOCX);
 CPPUNIT_TEST(testChartTitlePropertiesBitmapFillDOCX);
@@ -1248,6 +1250,18 @@ void Chart2ExportTest::testTdf108107()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr",
 "sz", "2000");
 }
 
+void Chart2ExportTest::testTdf114139()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart", 1);
+//no fill
+assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr", 0);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0);
+}
+
 void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
 {
 load("/chart2/qa/extras/data/docx/", 
"testChartTitlePropertiesColorFill.docx");
diff --git a/chart2/qa/extras/data/xlsx/tdf114139.xlsx 
b/chart2/qa/extras/data/xlsx/tdf114139.xlsx
new file mode 100644
index ..ef09575c1fa5
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf114139.xlsx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 2226997d38cc8fb838ae2fcbe3a87114acf29b38
Author: Xisco Fauli 
AuthorDate: Wed Apr 8 19:11:02 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 8 21:00:28 2020 +0200

sw: re-enable unittest

Disabled in 7e66b3214a13e3ab94041874d4495e1dfb2c2dd
The document still has 1 page after RT so it should be
fine to re-enable it.
OpenSuse 12.2 reached EOF in 2014

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index ffedbd31c42f..ef9ae951edeb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -18,13 +18,11 @@
 #include 
 #include 
 #include 
-// #include  // keep for 
test1Table1Page
 #include 
 #include 
 #include 
 #include 
 #include 
-//#include  // keep for test1Table1Page
 //#include  // keep for testTableStylerPrSz
 #include 
 #include 
@@ -434,20 +432,13 @@ DECLARE_OOXMLEXPORT_TEST(testFdo51550, "fdo51550.odt")
 "Excel.Sheet.12");
 }
 
-/*
- * doesn't work on openSUSE12.2 at least
 DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx")
 {
 // 2 problem for this document after export:
 //   - invalid sectPr inserted at the beginning of the page
 //   - font of empty cell is not preserved, leading to change in rows 
height
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
-*/
 
 DECLARE_OOXMLEXPORT_TEST(testTextFrames, "textframes.odt")
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Package_gallmytheme.mk extras/source

2020-04-08 Thread andreas kainz (via logerrit)

 extras/Package_gallmytheme.mk|3 +++
 extras/source/gallery/gallery_mytheme/shapes.sdg |binary
 extras/source/gallery/gallery_mytheme/shapes.sdv |binary
 extras/source/gallery/gallery_mytheme/shapes.thm |binary
 4 files changed, 3 insertions(+)

New commits:
commit 20ca75db653378dfa6251d737112ccec810292ac
Author: andreas kainz 
AuthorDate: Wed Apr 8 15:59:48 2020 +0200
Commit: andreas_kainz 
CommitDate: Wed Apr 8 20:16:47 2020 +0200

tdf#131795 Add new Shapes/Symbols Gallery

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

diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index f964bc61d110..6edf2d1f6cca 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -24,4 +24,7 @@ $(eval $(call 
gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDE
symbol.sdg \
symbol.sdv \
symbol.thm \
+   shapes.sdg \
+   shapes.sdv \
+   shapes.thm \
 ))
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdg 
b/extras/source/gallery/gallery_mytheme/shapes.sdg
new file mode 100644
index ..6ac7113be618
Binary files /dev/null and b/extras/source/gallery/gallery_mytheme/shapes.sdg 
differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.sdv 
b/extras/source/gallery/gallery_mytheme/shapes.sdv
new file mode 100644
index ..d19fbf155db4
Binary files /dev/null and b/extras/source/gallery/gallery_mytheme/shapes.sdv 
differ
diff --git a/extras/source/gallery/gallery_mytheme/shapes.thm 
b/extras/source/gallery/gallery_mytheme/shapes.thm
new file mode 100644
index ..57ff7f085cbf
Binary files /dev/null and b/extras/source/gallery/gallery_mytheme/shapes.thm 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2020-04-08 Thread Noel Grandin

The "right" answer is probably rewrite the SVG import to use drawinglayer.

A more useful answer is:
Assuming that the SVG format announces it's number range somewhere,
we could check if the number range is stupid big and scale all the numbers
down into a sensible range.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-04-08 Thread Miklos Vajna (via logerrit)

 filter/qa/unit/data/semi-transparent-line.odg |binary
 filter/qa/unit/svg.cxx|   34 +++---
 filter/source/svg/svgwriter.cxx   |   47 --
 test/source/xmltesttools.cxx  |5 ++
 4 files changed, 61 insertions(+), 25 deletions(-)

New commits:
commit ea52d24b5a19bb54f91cd679a977332ec330880d
Author: Miklos Vajna 
AuthorDate: Wed Apr 8 17:47:24 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 8 18:25:18 2020 +0200

SVG export: fix lost semi-transparent line shapes

The line shape itself didn't really have a height, rather it had a
stroke. For some reason, the SVG mask then decides that nothing has to
be painted there, so unless the line is entirely opaque, the line shape
gets lost on export.

Fix the problem by handling transparency similar to the PDF export,
which detects if the whole purpose of the transparency gradient is to
pass around a transparency percentage. We don't need a mask in that
case, we can just use opacity as described at e.g.
.

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

diff --git a/filter/qa/unit/data/semi-transparent-line.odg 
b/filter/qa/unit/data/semi-transparent-line.odg
new file mode 100644
index ..2d28a694cea5
Binary files /dev/null and b/filter/qa/unit/data/semi-transparent-line.odg 
differ
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx
index d6bb68283b74..8e6524c688ba 100644
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@@ -20,9 +20,7 @@
 
 using namespace ::com::sun::star;
 
-#if !defined MACOSX
 char const DATA_DIRECTORY[] = "/filter/qa/unit/data/";
-#endif
 
 /// SVG filter tests.
 class SvgFilterTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
@@ -34,10 +32,8 @@ public:
 void setUp() override;
 void tearDown() override;
 void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
-#if !defined MACOSX
 uno::Reference& getComponent() { return mxComponent; }
 void load(const OUString& rURL);
-#endif
 };
 
 void SvgFilterTest::setUp()
@@ -55,13 +51,11 @@ void SvgFilterTest::tearDown()
 test::BootstrapFixture::tearDown();
 }
 
-#if !defined MACOSX
 void SvgFilterTest::load(const OUString& rFileName)
 {
 OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + rFileName;
 mxComponent = loadFromDesktop(aURL);
 }
-#endif
 
 void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
 {
@@ -100,6 +94,34 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentLine)
+{
+// Load a document with a semi-transparent line shape.
+load("semi-transparent-line.odg");
+
+// Export it to SVG.
+uno::Reference xStorable(getComponent(), 
uno::UNO_QUERY_THROW);
+SvMemoryStream aStream;
+uno::Reference xOut = new 
utl::OOutputStreamWrapper(aStream);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("draw_svg_Export");
+aMediaDescriptor["OutputStream"] <<= xOut;
+xStorable->storeToURL("private:stream", 
aMediaDescriptor.getAsConstPropertyValueList());
+aStream.Seek(STREAM_SEEK_TO_BEGIN);
+
+// Get the style of the group around the actual  element.
+xmlDocPtr pXmlDoc = parseXmlStream(&aStream);
+OUString aStyle = getXPath(
+pXmlDoc, 
"//svg:g[@class='com.sun.star.drawing.LineShape']/svg:g/svg:g", "style");
+OUString aPrefix("opacity: ");
+// Without the accompanying fix in place, this test would have failed, as 
the style was
+// "mask:url(#mask1)", not "opacity: ".
+CPPUNIT_ASSERT(aStyle.startsWith(aPrefix));
+int nPercent = std::round(aStyle.copy(aPrefix.getLength()).toDouble() * 
100);
+// Make sure that the line is still 30% opaque, rather than completely 
invisible.
+CPPUNIT_ASSERT_EQUAL(30, nPercent);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 8d491d122d0b..c276fd903048 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2382,32 +2382,43 @@ void SVGActionWriter::ImplWriteMask( GDIMetaFile& rMtf,
 if( nMoveX || nMoveY )
 rMtf.Move( nMoveX, nMoveY );
 
-OUString aMaskId = "mask" + OUString::number( mnCurMaskId++ );
-
+OUString aStyle;
+if (rGradient.GetStartColor() == rGradient.GetEndColor())
 {
-SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, 
aXMLElemDefs, true, true );
+// Special case: constant alpha value.
+const Color& rColor = rGradient.GetStartColor();
+const double fOpacity = 1.0 - 
stati

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - loleaflet/html

2020-04-08 Thread Tor Lillqvist (via logerrit)

 loleaflet/html/loleaflet.html.m4 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 406d2b725216959bd6c9bcf2b8236f49809c0e49
Author: Tor Lillqvist 
AuthorDate: Wed Apr 8 18:36:28 2020 +0300
Commit: Jan Holesovsky 
CommitDate: Wed Apr 8 18:25:14 2020 +0200

No %OS_INFO% needed in the mobile apps

Besides, the loleaflet.html isn't passed through any file server that
would replace it anyway.

Change-Id: Ie8c4a58d83e697d441b9a34236092fe3240a7e25
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91931
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit a161902406051df93259dffd14455b4feaa3b154)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91894
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 9c83d213c..12407c34b 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -222,7 +222,7 @@ m4_ifelse(MOBILEAPP,[true],
   
   LOKit
   
-  %OS_INFO%
+  m4_ifelse(MOBILEAPP,[],[%OS_INFO%])
   Copyright © _YEAR_, VENDOR.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Tor Lillqvist (via logerrit)

 loleaflet/html/loleaflet.html.m4 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a161902406051df93259dffd14455b4feaa3b154
Author: Tor Lillqvist 
AuthorDate: Wed Apr 8 18:36:28 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 8 17:56:21 2020 +0200

No %OS_INFO% needed in the mobile apps

Besides, the loleaflet.html isn't passed through any file server that
would replace it anyway.

Change-Id: Ie8c4a58d83e697d441b9a34236092fe3240a7e25
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91931
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 9c83d213c..12407c34b 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -222,7 +222,7 @@ m4_ifelse(MOBILEAPP,[true],
   
   LOKit
   
-  %OS_INFO%
+  m4_ifelse(MOBILEAPP,[],[%OS_INFO%])
   Copyright © _YEAR_, VENDOR.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - loleaflet/js

2020-04-08 Thread Jan Holesovsky (via logerrit)

 loleaflet/js/global.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53dd77bfa137cf934dc6ad8f7386e81730fef5c2
Author: Jan Holesovsky 
AuthorDate: Wed Apr 8 14:15:22 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 8 17:41:48 2020 +0200

mobile, tablet: Even the small tablets or large phones should get the phone 
UI.

There is clearly not enough space for the normal sidebar when one of the
dimensions is below 768.

Change-Id: Iac27f12f837b9e6a64d1cce7b8376009bbe2c15f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91914
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index a4fd77bab..3022d94a3 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -149,7 +149,7 @@
return true;
}
 
-   return L.Browser.mobile && screen.width < 768;
+   return L.Browser.mobile && (screen.width < 768 || 
screen.height < 768);
},
// Mobile device with big screen size.
isTablet: function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - loleaflet/src

2020-04-08 Thread Jan Holesovsky (via logerrit)

 loleaflet/src/control/Control.Menubar.js  |   12 ++--
 loleaflet/src/control/Control.PartsPreview.js |6 +++---
 loleaflet/src/control/Control.Toolbar.js  |4 ++--
 loleaflet/src/control/Permission.js   |6 +++---
 loleaflet/src/layer/AnnotationManager.js  |2 +-
 loleaflet/src/layer/marker/Annotation.js  |2 +-
 loleaflet/src/layer/tile/CalcTileLayer.js |2 +-
 loleaflet/src/layer/tile/GridLayer.js |2 +-
 loleaflet/src/layer/tile/ImpressTileLayer.js  |2 +-
 loleaflet/src/layer/tile/WriterTileLayer.js   |2 +-
 loleaflet/src/map/Clipboard.js|2 +-
 loleaflet/src/map/Map.js  |   20 ++--
 12 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 35f5e5f1ad255b5b8ae8130d261d1b030dbdb202
Author: Jan Holesovsky 
AuthorDate: Wed Apr 8 13:32:59 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 8 17:41:12 2020 +0200

mobile: Never use L.Browser.mobile, instead use window.mode.isXYZ().

The L.Browser detects the browser capabilities, but the
window.mode.isMobile()/isTablet()/isDesktop() is what decides what form
factor are we targeting in the particular instance of the Online.

This commit tries to kill convert the L.Browser.mobile checks into the
appropriate window.mode.isXYZ(), hope I got the intention right on most
of the places - it wouldn't be correct to blindly convert everything to
(isMobile() || isTablet()).

Change-Id: I57430058ec15deb5f67f9c645d234f998fbf539d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91911
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index f7aa69111..dac5d07d2 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -841,7 +841,7 @@ L.Control.Menubar = L.Control.extend({
var pageStyles = e.commandValues['HeaderFooter'];
for (var iterator in pageStyles) {
style = pageStyles[iterator];
-   if (!L.Browser.mobile) {
+   if (!window.mode.isMobile()) {

$menuHeader.append(this._createUnoMenuItem(_(style), constHeader + 
encodeURIComponent(style) + constArg, style));

$menuFooter.append(this._createUnoMenuItem(_(style), constFooter + 
encodeURIComponent(style) + constArg, style));
} else {
@@ -897,12 +897,12 @@ L.Control.Menubar = L.Control.extend({
var $nav = $menu.parent();
if (this.checked) {
self._map.fire('closesidebar');
-   if (!L.Browser.mobile) {
+   if (!window.mode.isMobile()) {
// Surely this code, if 
it really is related only to the hamburger menu,
// will never be 
invoked on non-mobile browsers? I might be wrong though.
// If you notice this 
logging, please modify this comment to indicate what is
// going on.
-   console.log('==> 
Assertion failed!? Not L.Browser.mobile? Control.Menubar.js #1');
+   console.log('==> 
Assertion failed!? Not window.mode.isMobile()? Control.Menubar.js #1');
$nav.css({height: 
'initial', bottom: '38px'});

$menu.hide().slideDown(250, function() { $menu.css('display', ''); });

$('#mobile-wizard-header').show();
@@ -913,9 +913,9 @@ L.Control.Menubar = L.Control.extend({

$('#toolbar-hamburger').removeClass('menuwizard-closed').addClass('menuwizard-opened');

$('#mobile-wizard-header').hide();
}
-   } else if (!L.Browser.mobile) {
+   } else if (!window.mode.isMobile()) {
// Ditto.
-   console.log('==> Assertion 
failed!? Not L.Browser.mobile? Control.Menubar.js #2');
+   console.log('==> Assertion 
failed!? Not window.mode.isMobile()? Control.M

[Libreoffice-commits] online.git: tools/Connect.cpp tools/Stress.cpp tools/Tool.cpp

2020-04-08 Thread Pranam Lashkari (via logerrit)

 tools/Connect.cpp |6 +-
 tools/Stress.cpp  |   15 ++-
 tools/Tool.cpp|   13 ++---
 3 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit fba0be787f389d412691196da63488dc0f3369c5
Author: Pranam Lashkari 
AuthorDate: Tue Nov 19 23:59:54 2019 +0530
Commit: Jan Holesovsky 
CommitDate: Wed Apr 8 17:22:10 2020 +0200

killpoco: removed Poco::Thread from tools directory

Change-Id: I3fc4a04c62a064eaefd5c31452abc4a7fe100fb4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/83224
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/tools/Connect.cpp b/tools/Connect.cpp
index 8593b0a35..a150bdf99 100644
--- a/tools/Connect.cpp
+++ b/tools/Connect.cpp
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -56,7 +55,6 @@ using Poco::Net::WebSocketException;
 using Poco::Runnable;
 using Poco::SharedPtr;
 using Poco::TemporaryFile;
-using Poco::Thread;
 using Poco::URI;
 using Poco::Util::Application;
 
@@ -171,9 +169,7 @@ protected:
 
 ws.setReceiveTimeout(0);
 
-Thread thread;
-Output output(ws);
-thread.start(output);
+std::thread thread([&ws]{Output(ws).run();});
 
 while (true)
 {
diff --git a/tools/Stress.cpp b/tools/Stress.cpp
index b298951db..dc846771f 100644
--- a/tools/Stress.cpp
+++ b/tools/Stress.cpp
@@ -23,7 +23,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -55,7 +54,6 @@ protected:
 int  main(const std::vector& args) override;
 };
 
-using Poco::Thread;
 using Poco::Util::Application;
 using Poco::Util::HelpFormatter;
 using Poco::Util::Option;
@@ -282,7 +280,8 @@ void Stress::handleOption(const std::string& optionName,
 
 int Stress::main(const std::vector& args)
 {
-std::vector> clients(_numClients * args.size());
+std::vector clients;
+clients.reserve(_numClients * args.size());
 
 if (args.size() == 0)
 {
@@ -294,21 +293,19 @@ int Stress::main(const std::vector& args)
 
 std::vector> workers;
 
-unsigned index = 0;
 for (size_t i = 0; i < args.size(); ++i)
 {
 std::cout << "Arg: " << args[i] << std::endl;
-for (unsigned j = 0; j < _numClients; ++j, ++index)
+for (unsigned j = 0; j < _numClients; ++j)
 {
 workers.emplace_back(new Worker(_serverURI, args[i]));
-clients[index].reset(new Thread());
-clients[index]->start(*workers[workers.size() - 1]);
+clients.emplace_back([&workers]{workers.back()->run();});
 }
 }
 
-for (const auto& client : clients)
+for (auto& client : clients)
 {
-client->join();
+client.join();
 }
 
 if (Stress::Benchmark)
diff --git a/tools/Tool.cpp b/tools/Tool.cpp
index 91fe4600a..91c9164b6 100644
--- a/tools/Tool.cpp
+++ b/tools/Tool.cpp
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -28,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -69,7 +69,6 @@ using Poco::Net::HTTPClientSession;
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;
 using Poco::Runnable;
-using Poco::Thread;
 using Poco::URI;
 using Poco::Util::Application;
 using Poco::Util::OptionSet;
@@ -250,26 +249,26 @@ int Tool::main(const std::vector& origArgs)
 return EX_NOINPUT;
 }
 
-std::vector> clients(_numWorkers);
+std::vector clients;
+clients.reserve(_numWorkers);
 
 size_t chunk = (args.size() + _numWorkers - 1) / _numWorkers;
 size_t offset = 0;
 for (unsigned i = 0; i < _numWorkers; i++)
 {
-clients[i].reset(new Thread());
 size_t toCopy = std::min(args.size() - offset, chunk);
 if (toCopy > 0)
 {
 std::vector< std::string > files( toCopy );
 std::copy( args.begin() + offset, args.begin() + offset + toCopy, 
files.begin() );
 offset += toCopy;
-clients[i]->start(*(new Worker(*this, files)));
+clients.emplace_back([this, &files]{Worker(*this, files).run();});
 }
 }
 
-for (unsigned i = 0; i < _numWorkers; i++)
+for (auto& client: clients)
 {
-clients[i]->join();
+client.join();
 }
 
 return EX_OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2020-04-08 Thread Caolán McNamara

On Wed, 2020-04-08 at 04:30 +, crashtest wrote:
> New crashtest update available at 
> https://dev-builds.libreoffice.org/crashtest/27d04f6dbf38aa28fb7215590d578c4567db57

There's a bunch of the same assert listed there:

vcl/source/outdev/map.cxx:366: long int ImplLogicToPixel(long int, long
int, long int, long int, long int): Assertion `nMapNum == 0 ||
std::abs(n) < std::numeric_limits::max() / nMapNum / nDPI'
failed.

using ./soffice --headless --convert-to pdf on e.g.
the svg attachment 
https://bugzilla.mozilla.org/attachment.cgi?id=9058902 (of mozilla bug
https://bugzilla.mozilla.org/show_bug.cgi?id=1545040) reproduces this

The assert seems to have become noticeable since

commit 62ac8333999c661432adb0a18245a399daa89dcb (HEAD)
Date:   Fri Feb 14 16:47:14 2020 +0100

tdf#130655 callback interface for 3D and secure dash

But that looks blameless in the sense that it probably just timed out
before that change. The original svg contains massive numbers in the
input source path. Anyone got any thoughts about what we should do with
cases like this ?

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

Re: ESC meeting minutes: 2020-04-02

2020-04-08 Thread Christian Lohmaier

On Thu, Apr 2, 2020 at 8:52 PM Ilmari Lauhakangas
 wrote:
> […]
> Note that all this Firefox stuff only applies when having video calls,
> possibly only with screen sharing.

"Um, actually…"
Seems that at least for Xisco even a single Firefox user in a meeting
can cause audio-issues even without video or screen sharing.
Admittedly this was only a single test in our last team call, but at
least we could test in small scale and once everyone was on
chrome-based browser call was fine for him.

So while using Firefox esp. for video causes a whole bunch of issues
(most notably increased bandwidth utilization and higher CPU usage
than necessary) and doesn't have working bandwidth estimation in jitsi
usecase that causes additional problems, it can still be problematic
even for smaller audio-only meetings (but much fewer people are
affected then)

But as you and Jan-Marek have pointed out: things started moving and
hopefully will be improved soon…

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

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

2020-04-08 Thread Xisco Fauli (via logerrit)

 sc/qa/unit/data/ods/tdf122331.ods |binary
 sc/qa/unit/subsequent_export-test.cxx |   19 +++
 2 files changed, 19 insertions(+)

New commits:
commit 95dbfd517240666e5b9a9fd7ac1d47d799235a62
Author: Xisco Fauli 
AuthorDate: Wed Apr 8 12:55:23 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 8 15:51:25 2020 +0200

tdf#122331: Add unittest

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

diff --git a/sc/qa/unit/data/ods/tdf122331.ods 
b/sc/qa/unit/data/ods/tdf122331.ods
new file mode 100644
index ..f32b4124d0ae
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf122331.ods differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 7ab066dbeb11..28c7d4645ac4 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -234,6 +234,7 @@ public:
 void testTdf128976();
 void testTdf120502();
 void testTdf131372();
+void testTdf122331();
 void testTdf83779();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
@@ -369,6 +370,7 @@ public:
 CPPUNIT_TEST(testTdf128976);
 CPPUNIT_TEST(testTdf120502);
 CPPUNIT_TEST(testTdf131372);
+CPPUNIT_TEST(testTdf122331);
 CPPUNIT_TEST(testTdf83779);
 
 CPPUNIT_TEST_SUITE_END();
@@ -4741,6 +4743,23 @@ void ScExportTest::testTdf131372()
 xShell->DoClose();
 }
 
+void ScExportTest::testTdf122331()
+{
+ScDocShellRef xShell = loadDoc("tdf122331.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell);
+
+auto pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet);
+
+assertXPath(pSheet, "/x:worksheet/x:sheetPr", "filterMode", "true");
+assertXPath(pSheet, "/x:worksheet/x:autoFilter", "ref", "A1:B761");
+assertXPath(pSheet, "/x:worksheet/x:autoFilter/x:filterColumn", "colId", 
"1");
+
+xShell->DoClose();
+}
+
 void ScExportTest::testTdf83779()
 {
 // Roundtripping TRUE/FALSE constants (not functions) must convert them to 
functions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Julien Nabet (via logerrit)

 connectivity/source/drivers/firebird/User.cxx  |   11 +--
 connectivity/source/drivers/firebird/User.hxx  |7 +--
 connectivity/source/drivers/firebird/Users.cxx |4 ++--
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 877b67f5d69306beb6ceca5b3d75349c2716c77e
Author: Julien Nabet 
AuthorDate: Sat Mar 7 23:15:13 2020 +0100
Commit: Michael Weghorn 
CommitDate: Wed Apr 8 15:43:01 2020 +0200

tdf#131212: Implement change user password in Firebird

Command retrieved from 
https://firebirdsql.org/refdocs/langrefupd25-security-sql-user-mgmt.html

Change-Id: Idd16c74cd3b00f8a5c9cc135e11ac032811557f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90177
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90182
(cherry picked from commit 358d34e12d8f88543ddca8c0e852712e6ef1b10c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90283
Reviewed-by: Michael Weghorn 

diff --git a/connectivity/source/drivers/firebird/User.cxx 
b/connectivity/source/drivers/firebird/User.cxx
index 024d7eb4958a..a2e6f71e3bed 100644
--- a/connectivity/source/drivers/firebird/User.cxx
+++ b/connectivity/source/drivers/firebird/User.cxx
@@ -16,15 +16,22 @@ using namespace ::connectivity::sdbcx;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::sdbc;
 
-User::User():
+User::User(const css::uno::Reference< css::sdbc::XConnection >& rConnection):
 OUser(true) // Case Sensitive
+, m_xConnection(rConnection)
 {}
 
-User::User(const OUString& rName):
+User::User(const css::uno::Reference< css::sdbc::XConnection >& rConnection, 
const OUString& rName):
 OUser(rName,
   true) // Case Sensitive
+, m_xConnection(rConnection)
 {}
 
+void User::changePassword(const OUString&, const OUString& newPassword)
+{
+m_xConnection->createStatement()->execute("ALTER USER " + m_Name + " 
PASSWORD '" + newPassword + "'");
+}
+
 //- IRefreshableGroups 
 void User::refreshGroups()
 {
diff --git a/connectivity/source/drivers/firebird/User.hxx 
b/connectivity/source/drivers/firebird/User.hxx
index d2cc091000b9..ff1de34ea5fb 100644
--- a/connectivity/source/drivers/firebird/User.hxx
+++ b/connectivity/source/drivers/firebird/User.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX
 
 #include 
+#include 
 
 namespace connectivity
 {
@@ -22,17 +23,19 @@ namespace connectivity
  */
 class User: public ::connectivity::sdbcx::OUser
 {
+css::uno::Reference< css::sdbc::XConnection > m_xConnection;
 
 public:
 /**
  * Create a "new" descriptor, which isn't yet in the database.
  */
-User();
+User(const css::uno::Reference< css::sdbc::XConnection >& 
rConnection);
 /**
  * For a user that already exists in the db.
  */
-User(const OUString& rName);
+User(const css::uno::Reference< css::sdbc::XConnection >& 
rConnection, const OUString& rName);
 
+virtual void SAL_CALL changePassword(const OUString&, const 
OUString& newPassword) override;
 // IRefreshableGroups::
 virtual void refreshGroups() override;
 };
diff --git a/connectivity/source/drivers/firebird/Users.cxx 
b/connectivity/source/drivers/firebird/Users.cxx
index 0423d9c33181..061200fde5d3 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -47,7 +47,7 @@ void Users::impl_refresh()
 
 ObjectType Users::createObject(const OUString& rName)
 {
-return new User(rName);
+return new User(m_xMetaData->getConnection(), rName);
 }
 
 uno::Reference< XPropertySet > Users::createDescriptor()
@@ -55,7 +55,7 @@ uno::Reference< XPropertySet > Users::createDescriptor()
 // There is some internal magic so that the same class can be used as 
either
 // a descriptor or as a normal user. See VUser.cxx for the details. In our
 // case we just need to ensure we use the correct constructor.
-return new User;
+return new User(m_xMetaData->getConnection());
 }
 
 //- XAppend ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source

2020-04-08 Thread Caolán McNamara (via logerrit)

 sd/source/ui/view/DocumentRenderer.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a834a0251f53a561e450fd3c58059bdcfaad8584
Author: Caolán McNamara 
AuthorDate: Tue Mar 24 14:51:09 2020 +
Commit: Michael Weghorn 
CommitDate: Wed Apr 8 15:40:40 2020 +0200

selecting multiple slides and using "print..." doesn't set selection as 
range

start impress, copy the default slide a few times, select more than
one slide and use "print..."

"slides" is selected, but just the first selected slide is shown in the 
range

since...

commit 76e22667625ce8d16dfaa8617a199b774e987a70
Date:   Thu Jun 14 23:29:34 2018 -0300

Configures page range in print dialog

where

aPageRange = aBuf.getStr()

was removed, but if that line is removed then the surrounding loop
of "for (auto pPage: *pPageSelection)" just accumulates text
in the OUStringBuffer to then discard it and no longer makes sense

perhaps this was an oversight rather than a planned change.

Change-Id: I39e76c70714ee39d189016179fb1d13a71ec74ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91169
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit f8e2fe46fa7cd2df90853b0aca31cfda49a06d3d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91395
Reviewed-by: Michael Weghorn 

diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index c8a1456d1c7b..cf0f50e03a3c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -617,6 +617,7 @@ namespace {
 else
 aBuf.append(',');
 aBuf.append(OUString::number(pPage->GetPageNum() / 2 + 
1));
+aPageRange = aBuf.getStr();
 }
 nPrintRange = 1;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/common/mobile_helper.js 
 |   27 +++
 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js   
 |   18 -
 cypress_test/integration_tests/mobile/calc/apply_font_spec.js  
 |   19 -
 cypress_test/integration_tests/mobile/calc/calc_helper.js  
 |   18 -
 cypress_test/integration_tests/mobile/calc/number_format_spec.js   
 |   31 
 cypress_test/integration_tests/mobile/impress/impress_helper.js
 |   18 -
 cypress_test/integration_tests/mobile/writer/apply_font_spec.js
 |   26 ---
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|   34 -
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js  
 |   30 
 cypress_test/integration_tests/mobile/writer/writer_helper.js  
 |   36 --
 10 files changed, 31 insertions(+), 226 deletions(-)

New commits:
commit 803e9ee336e869e7b8d82fcc985c81470cacac41
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 15:21:31 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 15:26:27 2020 +0200

cypress: mobile: remove copy-pasted comment.

Change-Id: I459c0a7f068c1eabea9f5630bea3a718e31e044e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91922
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git 
a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js 
b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 39119ee15..74a088c74 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -54,7 +54,6 @@ describe('Change alignment settings.', function() {
});
 
it('Align to center horizontally.', function() {
-   // Set right aligment first
cy.get('#AlignHorizontalCenter')
.click();
 
@@ -76,7 +75,6 @@ describe('Change alignment settings.', function() {
});
 
it('Right-to-left and left-to-right writing mode.', function() {
-   // Set right aligment first
cy.get('#ParaRightToLeft')
.click();
 
@@ -92,7 +90,6 @@ describe('Change alignment settings.', function() {
});
 
it('Align to the top and to bottom.', function() {
-   // Set right aligment first
cy.get('#AlignTop')
.click();
 
@@ -119,7 +116,6 @@ describe('Change alignment settings.', function() {
});
 
it('Align to center vertically.', function() {
-   // Set right aligment first
cy.get('#AlignVCenter')
.click();
 
commit a795117f60969e054c1a3b7131f33ee23036f010
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 14:03:58 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 15:26:18 2020 +0200

cypress: mobile: improve copying via context menu.

So we don't need to close the mobile wizard before copying.
The main issue was with contains() method, which first
selects the HTML items and waits until these items gets
the content 'Copy'. What we actually need is to wait until
an item appears with the content 'Copy'. Not the existing
items's content is updated with the 'Copy' text, but new
items are created.

Change-Id: I235d2756ce41a099267fa335c215d3eca6f468c2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91913
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/common/mobile_helper.js 
b/cypress_test/integration_tests/common/mobile_helper.js
index 53eac5d6d..f9e0b78f8 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -165,6 +165,32 @@ function closeMobileWizard() {
cy.log('Closing mobile wizard - end.');
 }
 
+function executeCopyFromContextMenu(XPos, YPos) {
+   cy.log('Executing copy from context menu - start.');
+   cy.log('Param - XPos: ' + XPos);
+   cy.log('Param - YPos: ' + YPos);
+
+   longPressOnDocument(XPos, YPos);
+
+   cy.get('.menu-entry-with-icon')
+   .should('contain.text', 'Copy');
+
+   // Execute copy
+   cy.get('.menu-entry-with-icon')
+   .contains('Copy')
+   .click();
+
+   // Close warning about clipboard operations
+   cy.get('.vex-dialog-button-primary.vex-dialog-button.vex-first')
+   .click();
+
+   // Wait until it's closed
+   cy.get('.vex-overlay')
+   .should('not.exist');
+
+   cy.log('Executing copy from context menu - end.');
+}
+
 module.exports.enableEditingMobile = enableEditingMobile;
 module.exports.beforeAllMobile = beforeAllMobile;
 module.exports.lon

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-2' - net/Socket.cpp net/Socket.hpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp

2020-04-08 Thread Jan Holesovsky (via logerrit)

 net/Socket.cpp |5 -
 net/Socket.hpp |   31 +--
 wsd/DocumentBroker.cpp |   16 ++--
 wsd/DocumentBroker.hpp |3 ---
 4 files changed, 3 insertions(+), 52 deletions(-)

New commits:
commit fd91687f8f62c8779faf82b8296857d32e900972
Author: Jan Holesovsky 
AuthorDate: Wed Apr 8 14:33:24 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 8 15:15:29 2020 +0200

Revert "wsd: minimize wait when DocBroker terminates"

With this, the editing session on Android returns without proper cleanup
which leads to occassional hangs when the user tries to open a new
editing session quickly.

This reverts commit a73590d81f4cf910568aa49f73e78abfb412eab7.

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

diff --git a/net/Socket.cpp b/net/Socket.cpp
index cb19c99cd..5bb1fa250 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -200,11 +200,6 @@ void SocketPoll::wakeupWorld()
 wakeup(fd);
 }
 
-bool ProtocolHandlerInterface::hasPendingWork() const
-{
-return _msgHandler && _msgHandler->hasQueuedMessages();
-}
-
 #if !MOBILEAPP
 
 void SocketPoll::insertNewWebSocketSync(
diff --git a/net/Socket.hpp b/net/Socket.hpp
index fd0a5278d..ab56e5d10 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -162,9 +162,6 @@ public:
 std::chrono::steady_clock::time_point now,
 int events) = 0;
 
-/// Is all data sent, so tha we can shutdown ?
-virtual bool hasPendingWork() const { return false; }
-
 /// manage latency issues around packet aggregation
 void setNoDelay()
 {
@@ -293,7 +290,7 @@ public:
 }
 
 /// Asserts in the debug builds, otherwise just logs.
-void assertCorrectThread() const
+void assertCorrectThread()
 {
 if (InhibitThreadChecks)
 return;
@@ -395,9 +392,6 @@ public:
 _msgHandler = msgHandler;
 }
 
-/// Do we have something to send ?
-virtual bool hasPendingWork() const;
-
 /// Clear all external references
 virtual void dispose() { _msgHandler.reset(); }
 
@@ -779,21 +773,6 @@ public:
 return _pollSockets.size();
 }
 
-bool hasPendingWork() const
-{
-assertCorrectThread();
-
-if (_newCallbacks.size() > 0 ||
-_newSockets.size() > 0)
-return true;
-
-for (auto &i : _pollSockets)
-if (i->hasPendingWork())
-return true;
-
-return false;
-}
-
 const std::string& name() const { return _name; }
 
 /// Start the polling thread (if desired)
@@ -952,14 +931,6 @@ public:
 return events;
 }
 
-bool hasPendingWork() const override
-{
-assertCorrectThread();
-if (!_outBuffer.empty() || !_inBuffer.empty())
-return true;
-return _socketHandler && _socketHandler->hasPendingWork();
-}
-
 /// Send data to the socket peer.
 void send(const char* data, const int len, const bool flush = true)
 {
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 0d5ce909d..ca5cc28d9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -452,14 +452,14 @@ void DocumentBroker::pollThread()
 << ", TerminationFlag: " << SigUtil::getTerminationFlag()
 << ". Terminating child with reason: [" << _closeReason << "].");
 const auto flushStartTime = std::chrono::steady_clock::now();
-while (_poll->hasPendingWork() || hasDisconnectingSessions())
+while (_poll->getSocketCount())
 {
 const auto now = std::chrono::steady_clock::now();
 const int elapsedMs = 
std::chrono::duration_cast(now - 
flushStartTime).count();
 if (elapsedMs > flushTimeoutMs)
 break;
 
-_poll->poll(std::min(flushTimeoutMs - elapsedMs, POLL_TIMEOUT_MS / 
10));
+_poll->poll(std::min(flushTimeoutMs - elapsedMs, POLL_TIMEOUT_MS / 5));
 }
 
 LOG_INF("Finished flushing socket for doc [" << _docKey << "]. stop: " << 
_stop << ", continuePolling: " <<
@@ -484,18 +484,6 @@ void DocumentBroker::pollThread()
 LOG_INF("Finished docBroker polling thread for docKey [" << _docKey << 
"].");
 }
 
-bool DocumentBroker::hasDisconnectingSessions() const
-{
-for (const auto& pair : _sessions)
-{
-const std::shared_ptr &session = pair.second;
-// need to wait around to fetch clipboards from disconnecting sessions.
-if (session->inWaitDisconnected())
-return true;
-}
-return false;
-}
-
 bool DocumentBroker::isAlive() const
 {
 if (!_stop || _poll->isAlive())
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 251e97bba..136167f15 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -328,9 +328,6 @@ private:
 /// Starts t

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/elementary icon-themes/elementary_svg icon

2020-04-08 Thread Rizal Muttaqin (via logerrit)

 dev/null  |binary
 icon-themes/breeze/cmd/32/absoluterecord.png  |binary
 icon-themes/breeze/cmd/32/ar/recundo.png  |binary
 icon-themes/breeze/cmd/32/recundo.png |binary
 icon-themes/breeze/cmd/ar/lc_recundo.png  |binary
 icon-themes/breeze/cmd/ar/sc_recundo.png  |binary
 icon-themes/breeze/cmd/lc_absoluterecord.png  |binary
 icon-themes/breeze/cmd/lc_recundo.png |binary
 icon-themes/breeze/cmd/sc_absoluterecord.png  |binary
 icon-themes/breeze/cmd/sc_recundo.png |binary
 icon-themes/breeze/links.txt  |   86 ++
 icon-themes/breeze_dark/cmd/32/absoluterecord.png |binary
 icon-themes/breeze_dark/cmd/32/ar/recundo.png |binary
 icon-themes/breeze_dark/cmd/32/recundo.png|binary
 icon-themes/breeze_dark/cmd/ar/lc_recundo.png |binary
 icon-themes/breeze_dark/cmd/ar/sc_recundo.png |binary
 icon-themes/breeze_dark/cmd/lc_absoluterecord.png |binary
 icon-themes/breeze_dark/cmd/lc_recundo.png|binary
 icon-themes/breeze_dark/cmd/sc_absoluterecord.png |binary
 icon-themes/breeze_dark/cmd/sc_recundo.png|binary
 icon-themes/breeze_dark/links.txt |   86 ++
 icon-themes/breeze_dark_svg/cmd/32/absoluterecord.svg |2 
 icon-themes/breeze_dark_svg/cmd/32/ar/recundo.svg |1 
 icon-themes/breeze_dark_svg/cmd/32/recundo.svg|1 
 icon-themes/breeze_dark_svg/cmd/ar/lc_recundo.svg |1 
 icon-themes/breeze_dark_svg/cmd/ar/lc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/ar/lc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/ar/sc_recundo.svg |1 
 icon-themes/breeze_dark_svg/cmd/ar/sc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/ar/sc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/fa/lc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/fa/lc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/fa/sc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/fa/sc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/he/lc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/he/lc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/he/sc_redo.svg|1 
 icon-themes/breeze_dark_svg/cmd/he/sc_undo.svg|1 
 icon-themes/breeze_dark_svg/cmd/lc_absoluterecord.svg |2 
 icon-themes/breeze_dark_svg/cmd/lc_recundo.svg|1 
 icon-themes/breeze_dark_svg/cmd/sc_absoluterecord.svg |2 
 icon-themes/breeze_dark_svg/cmd/sc_recundo.svg|1 
 icon-themes/breeze_svg/cmd/32/absoluterecord.svg  |2 
 icon-themes/breeze_svg/cmd/32/ar/recundo.svg  |1 
 icon-themes/breeze_svg/cmd/32/recundo.svg |1 
 icon-themes/breeze_svg/cmd/ar/lc_recundo.svg  |1 
 icon-themes/breeze_svg/cmd/ar/lc_redo.svg |1 
 icon-themes/breeze_svg/cmd/ar/lc_undo.svg |1 
 icon-themes/breeze_svg/cmd/ar/sc_recundo.svg  |1 
 icon-themes/breeze_svg/cmd/ar/sc_redo.svg |1 
 icon-themes/breeze_svg/cmd/ar/sc_undo.svg |1 
 icon-themes/breeze_svg/cmd/fa/lc_redo.svg |1 
 icon-themes/breeze_svg/cmd/fa/lc_undo.svg |1 
 icon-themes/breeze_svg/cmd/fa/sc_redo.svg |1 
 icon-themes/breeze_svg/cmd/fa/sc_undo.svg |1 
 icon-themes/breeze_svg/cmd/he/lc_redo.svg |1 
 icon-themes/breeze_svg/cmd/he/lc_undo.svg |1 
 icon-themes/breeze_svg/cmd/he/sc_redo.svg |1 
 icon-themes/breeze_svg/cmd/he/sc_undo.svg |1 
 icon-themes/breeze_svg/cmd/lc_absoluterecord.svg  |2 
 icon-themes/breeze_svg/cmd/lc_recundo.svg |1 
 icon-themes/breeze_svg/cmd/sc_absoluterecord.svg  |2 
 icon-themes/breeze_svg/cmd/sc_recundo.svg |1 
 icon-themes/colibre/links.txt |   10 ++
 icon-themes/elementary/cmd/32/ar/recundo.png  |binary
 icon-themes/elementary/cmd/ar/lc_recundo.png  |binary
 icon-themes/elementary/cmd/ar/sc_recundo.png  |binary
 icon-themes/elementary/links.txt  |9 +
 icon-themes/elementary_svg/cmd/32/ar/recundo.svg  |1 
 icon-themes/elementary_svg/cmd/ar/lc_recundo.svg  |1 
 icon-themes/elementary_svg/cmd/ar/sc_recundo.svg  |1 
 icon-themes/karasa_jaga/cmd/32/ar/recundo.png |binary
 icon-themes/karasa_jaga/cmd/32/recundo.png|binary
 icon-themes/karasa_jaga/cmd/ar/lc_recundo.png |binary
 icon-themes/karasa_jaga/cmd/ar/sc_recundo.png |binary
 icon-themes/karasa_jaga/cmd/lc_recundo.png|binary
 icon-themes/karasa_jaga/cmd/sc_recundo.png|binary
 icon-themes/karasa_jaga/links.txt |   28 +++--
 icon-themes/karasa_jaga_svg/cmd/32/ar/re

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

2020-04-08 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/odfimport/odfimport.cxx   |   18 ++---
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   13 +---
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |6 -
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |   24 +++
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx  |   30 -
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx  |6 -
 6 files changed, 16 insertions(+), 81 deletions(-)

New commits:
commit 2e84b06460e4f4f1d25b1973fcc0e0493c6d9815
Author: Xisco Fauli 
AuthorDate: Wed Apr 8 13:33:26 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 8 15:09:51 2020 +0200

CppunitTest: remove duplicated code

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

diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 55a477ba0aa5..30737c3454dd 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -480,11 +480,7 @@ DECLARE_ODFIMPORT_TEST(testFdo60842, "fdo60842.odt")
 
 DECLARE_ODFIMPORT_TEST(testFdo79269, "fdo79269.odt")
 {
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(2, getPages());
 
 // The problem was that the first-footer was shared.
 uno::Reference 
xPropSet(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
@@ -498,11 +494,7 @@ DECLARE_ODFIMPORT_TEST(testFdo79269, "fdo79269.odt")
 
 DECLARE_ODFIMPORT_TEST(testFdo79269_header, "fdo79269_header.odt")
 {
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(2, getPages());
 
 uno::Reference 
xPropSet(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(false, getProperty(xPropSet, "FirstIsShared"));
@@ -849,11 +841,7 @@ DECLARE_ODFIMPORT_TEST(testTdf76322_columnBreakInHeader, 
"tdf76322_columnBreakIn
 DECLARE_ODFIMPORT_TEST(testTdf76349_1columnBreak, "tdf76349_1columnBreak.odt")
 {
 //single-column breaks should only be treated as page breaks for MS 
formats - should be only one page here.
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
 DECLARE_ODFIMPORT_TEST(testTdf96113, "tdf96113.odt")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 1a59b2f8f920..09a232ae5773 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -649,25 +649,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78883, "fdo78883.docx")
 {
 // fdo#78883 : LO was getting hang while opening document
 // Checking there is a single page after loading a doc in LO.
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-
 // Check to make sure the document loaded.  Note that the page number may
 // be 1 or 2 depending on the environment.
-CPPUNIT_ASSERT(xCursor->getPage() > sal_Int16(0));
+CPPUNIT_ASSERT(getPages() > 0);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo79535, "fdo79535.docx")
 {
 // fdo#79535 : LO was crashing while opening document
 // Checking there is a single page after loading a doc successfully in LO.
-uno::Reference xModel(mxComponent, uno::UNO_QUERY);
-uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-xCursor->jumpToLastPage();
-CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
+CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testBnc875718, "bnc875718.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 99aa70e27cd5..fbd0552b479d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@

[Libreoffice-commits] online.git: common/SigUtil.cpp kit/ForKit.cpp wsd/Admin.cpp wsd/Admin.hpp wsd/AdminModel.cpp wsd/AdminModel.hpp wsd/LOOLWSD.cpp

2020-04-08 Thread Gabriel Masei (via logerrit)

 common/SigUtil.cpp |2 +-
 kit/ForKit.cpp |   36 ++--
 wsd/Admin.cpp  |5 +
 wsd/Admin.hpp  |1 +
 wsd/AdminModel.cpp |6 ++
 wsd/AdminModel.hpp |4 
 wsd/LOOLWSD.cpp|   22 +++---
 7 files changed, 70 insertions(+), 6 deletions(-)

New commits:
commit 0ac330f599b8daaeae5ba057fddb6994fd078e73
Author: Gabriel Masei 
AuthorDate: Wed Apr 8 00:21:17 2020 +0300
Commit: Michael Meeks 
CommitDate: Wed Apr 8 15:06:39 2020 +0200

Add segmentation fault metric for Kit processes

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

diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index 944a8d376..cd4c779dc 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -260,7 +260,7 @@ namespace SigUtil
 dumpBacktrace();
 
 // let default handler process the signal
-kill(getpid(), signal);
+::raise(signal);
 }
 
 void dumpBacktrace()
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 8b18ef34e..bea72f4d5 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -36,6 +36,9 @@
 #include 
 #include 
 #include 
+#if !MOBILEAPP
+#include 
+#endif
 
 #include 
 #include 
@@ -226,7 +229,7 @@ static void cleanupChildren()
 {
 std::vector jails;
 Process::PID exitedChildPid;
-int status;
+int status, segFaultCount = 0;
 
 // Reap quickly without doing slow cleanup so WSD can spawn more rapidly.
 while ((exitedChildPid = waitpid(-1, &status, WUNTRACED | WNOHANG)) > 0)
@@ -242,13 +245,42 @@ static void cleanupChildren()
 // We ran out of kits and we aren't terminating.
 LOG_WRN("No live Kits exist, and we are not terminating yet.");
 }
+
+if (WIFSIGNALED(status) && (WTERMSIG(status) == SIGSEGV || 
WTERMSIG(status) == SIGBUS))
+{
+segFaultCount ++;
+}
 }
 else
 {
 LOG_ERR("Unknown child " << exitedChildPid << " has exited");
 }
 }
-
+
+if (segFaultCount)
+{
+#ifdef KIT_IN_PROCESS
+#if !MOBILEAPP
+Admin::instance().addSegFaultCount(segFaultCount);
+#endif
+#else
+if (WSHandler)
+{
+std::stringstream stream;
+stream << "segfaultcount " << segFaultCount << "\n";
+int ret = WSHandler->sendMessage(stream.str());
+if (ret == -1)
+{
+LOG_WRN("Could not send 'segfaultcount' message through 
websocket");
+}
+else
+{
+LOG_WRN("Successfully sent 'segfaultcount' message " << 
stream.str());
+}
+}
+#endif
+}
+
 // Now delete the jails.
 for (const auto& path : jails)
 {
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 88b9268df..3fc0b6955 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -593,6 +593,11 @@ void Admin::setDocWopiUploadDuration(const std::string& 
docKey, const std::chron
 addCallback([=]{ _model.setDocWopiUploadDuration(docKey, uploadDuration); 
});
 }
 
+void Admin::addSegFaultCount(unsigned segFaultCount)
+{
+addCallback([=]{ _model.addSegFaultCount(segFaultCount); });
+}
+
 void Admin::notifyForkit()
 {
 std::ostringstream oss;
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index e39d89fe7..6287d38bc 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -129,6 +129,7 @@ public:
 void setViewLoadDuration(const std::string& docKey, const std::string& 
sessionId, std::chrono::milliseconds viewLoadDuration);
 void setDocWopiDownloadDuration(const std::string& docKey, 
std::chrono::milliseconds wopiDownloadDuration);
 void setDocWopiUploadDuration(const std::string& docKey, const 
std::chrono::milliseconds uploadDuration);
+void addSegFaultCount(unsigned segFaultCount);
 
 void getMetrics(std::ostringstream &metrics);
 
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index 22e402a83..f19d6e367 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -771,6 +771,11 @@ void AdminModel::setDocWopiUploadDuration(const 
std::string& docKey, const std::
 it->second.setWopiUploadDuration(wopiUploadDuration);
 }
 
+void AdminModel::addSegFaultCount(unsigned segFaultCount)
+{
+_segFaultCount += segFaultCount;
+}
+
 int filterNumberName(const struct dirent *dir)
 {
 return !fnmatch("[0-9]*", dir->d_name, 0);
@@ -993,6 +998,7 @@ void AdminModel::getMetrics(std::ostringstream &oss)
 oss << "kit_count " << kitStats.unassignedCount + kitStats.assignedCount 
<< std::endl;
 oss << "kit_unassigned_count " << kitStats.unassignedCount << std::endl;
 oss << "kit_assigned_count " << kitStats.assignedCount << std::endl;
+oss << "kit_segfault_count " << _segFaultCount << std::endl;
 PrintKitAggregateMetrics(oss, "thread_count", "", kitStats.

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

2020-04-08 Thread Michael Stahl (via logerrit)

 sw/qa/core/data/odt/pass/ooo95711-1.odt |binary
 sw/source/core/doc/docedt.cxx   |3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6b2e925aa0dd389a613e182545de6550057374d4
Author: Michael Stahl 
AuthorDate: Wed Apr 8 13:40:02 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 8 14:52:03 2020 +0200

sw: crashtesting: fix assert on ooo95711-1.odt

Document is special and contains deletion that contains only a table, no
paragraphs before or after it.  The assertion is wrong in this case.
It doesn't matter if the atParaEndNode is incremented because it's going
to be on an end node either way.

(regression from 91b2325808a75174f284c48c8b8afc118fad74e4)

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

diff --git a/sw/qa/core/data/odt/pass/ooo95711-1.odt 
b/sw/qa/core/data/odt/pass/ooo95711-1.odt
new file mode 100644
index ..4bcb3b44675b
Binary files /dev/null and b/sw/qa/core/data/odt/pass/ooo95711-1.odt differ
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 016a3849e470..b4f52ede746e 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -144,7 +144,8 @@ void SaveFlyInRange( const SwPaM& rPam, const SwPosition& 
rInsPos,
 SwPosition atParaEnd(*rPam.End());
 if (bMoveAllFlys)
 {
-assert(rPam.End()->nContent.GetIndex() == 
rPam.End()->nNode.GetNode().GetTextNode()->Len());
+assert(!rPam.End()->nNode.GetNode().IsTextNode() // can be table 
end-node
+|| rPam.End()->nContent.GetIndex() == 
rPam.End()->nNode.GetNode().GetTextNode()->Len());
 ++atParaEnd.nNode;
 atParaEnd.nContent.Assign(atParaEnd.nNode.GetNode().GetContentNode(), 
0);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/data cypress_test/integration_tests cypress_test/Makefile.am

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/Makefile.am |1 
 cypress_test/data/mobile/calc/alignment_options.ods  |binary
 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js |  145 
++
 3 files changed, 146 insertions(+)

New commits:
commit 56c6f5cc48981962f9c1fe0a574c5c88485318b9
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 13:26:00 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 14:30:13 2020 +0200

cypress: mobile: add some tests for alignment properties in Calc.

Change-Id: I6a0209a484041a3df44e5472a4b0679193dd38c1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91912
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 6925f2721..8e137be2c 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -35,6 +35,7 @@ WSD_VERSION_HASH := ""
 
 if HAVE_LO_PATH
 MOBILE_TEST_FILES= \
+   calc/alignment_options_spec.js \
calc/apply_font_spec.js \
calc/focus_spec.js \
calc/insertion_wizard_spec.js \
diff --git a/cypress_test/data/mobile/calc/alignment_options.ods 
b/cypress_test/data/mobile/calc/alignment_options.ods
new file mode 100644
index 0..ade730114
Binary files /dev/null and 
b/cypress_test/data/mobile/calc/alignment_options.ods differ
diff --git 
a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js 
b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
new file mode 100644
index 0..f89e7843c
--- /dev/null
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -0,0 +1,145 @@
+/* global describe it cy beforeEach require afterEach*/
+
+var helper = require('../../common/helper');
+var mobileHelper = require('../../common/mobile_helper');
+var calcHelper = require('./calc_helper');
+
+describe('Change alignment settings.', function() {
+   beforeEach(function() {
+   mobileHelper.beforeAllMobile('alignment_options.ods', 'calc');
+
+   // Click on edit button
+   mobileHelper.enableEditingMobile();
+
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openMobileWizard();
+
+   cy.get('#ScAlignmentPropertyPanel')
+   .click();
+
+   cy.get('#AlignLeft')
+   .should('be.visible');
+   });
+
+   afterEach(function() {
+   helper.afterAll('alignment_options.ods');
+   });
+
+   it('Apply left/right alignment', function() {
+   // Set right aligment first
+   cy.get('#AlignRight')
+   .click();
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'align', 'right');
+
+   // Change alignment back
+   calcHelper.clickOnFirstCell();
+
+   mobileHelper.openMobileWizard();
+
+   cy.get('#ScAlignmentPropertyPanel')
+   .click();
+
+   cy.get('#AlignLeft')
+   .click();
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'align', 'left');
+   });
+
+   it('Align to center horizontally.', function() {
+   // Set right aligment first
+   cy.get('#AlignHorizontalCenter')
+   .click();
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'align', 'center');
+   });
+
+   it('Change to block alignment.', function() {
+   // Set right aligment first
+   cy.get('#AlignBlock')
+   .click();
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'align', 'justify');
+   });
+
+   it('Right-to-left and left-to-right writing mode.', function() {
+   // Set right aligment first
+   cy.get('#ParaRightToLeft')
+   .click();
+
+   // TODO: we don't have a way of testing this
+   // copy container doesn't have info about this
+   cy.wait(500);
+
+   // Set right aligment first
+   cy.get('#ParaLeftToRight')
+   .click();
+
+   cy.wait(500);
+   });
+
+   it('Align to the top and to bottom.', function() {
+   // Set right aligment first
+   c

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

2020-04-08 Thread László Németh (via logerrit)

 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|9 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |8 
 writerfilter/source/dmapper/TblStylePrHandler.cxx|   15 +++
 3 files changed, 32 insertions(+)

New commits:
commit 1b582b53596928be9e01e40ea287fbd4ed62996c
Author: László Németh 
AuthorDate: Wed Apr 8 11:49:46 2020 +0200
Commit: László Németh 
CommitDate: Wed Apr 8 14:14:48 2020 +0200

tdf#131959 DOCX: import tblInd from table style

to fix left table indent when direct formatting
doesn't overwrite the table style.

Note: The imported values are adjusted
correctly according to the differences in
calculation of table indent positions. See
commit d2db4bc9507653a46fdea282d41b9683910a072f
(tdf#119760 docx: table starts at left, not mid-border).

Change-Id: Ieb6f078b3bd3605d538f2eedb7a5030784a738b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91765
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 3eac4838f146..c6ae77a1a512 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -235,6 +235,15 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131819, 
"NumberedList.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblGrid/w:gridCol[2]", "w", 
"4049");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131959, "NumberedList.docx")
+{
+// import tblInd from table style
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// These were 0.
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblInd", "w", 
"360");
+assertXPath(pXmlDoc, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tblPr/w:tblInd", "w", "360");
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFDO76597, "fdo76597.docx")
 {
 // check XML
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b7151f26cb9f..0c73bb60f23a 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -514,6 +514,14 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 }
 
 m_aTableProperties->getValue( TablePropertyMap::GAP_HALF, nGapHalf );
+
+std::optional oLeftMarginFromStyle = 
m_aTableProperties->getProperty(PROP_LEFT_MARGIN);
+if (oLeftMarginFromStyle)
+{
+oLeftMarginFromStyle->second >>= nLeftMargin;
+// don't need to erase, we will push back the adjusted value
+// of this (or the direct formatting, if that exists) later
+}
 m_aTableProperties->getValue( TablePropertyMap::LEFT_MARGIN, 
nLeftMargin );
 
 m_aTableProperties->getValue( TablePropertyMap::CELL_MAR_LEFT,
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx 
b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 22a790644ebe..21dd6f619894 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -21,6 +21,7 @@
 #include "TagLogger.hxx"
 #include "CellMarginHandler.hxx"
 #include "PropertyMap.hxx"
+#include "MeasureHandler.hxx"
 #include 
 #include 
 
@@ -169,6 +170,20 @@ void TblStylePrHandler::lcl_sprm(Sprm & rSprm)
 m_aInteropGrabBag.push_back(aValue);
 }
 break;
+case NS_ooxml::LN_CT_TblPrBase_tblInd:
+{
+//contains unit and value
+writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
+if( pProperties.get())
+{
+MeasureHandlerPtr pMeasureHandler( new MeasureHandler );
+pProperties->resolve(*pMeasureHandler);
+TablePropertyMapPtr pPropMap( new TablePropertyMap );
+pPropMap->setValue( TablePropertyMap::LEFT_MARGIN, 
pMeasureHandler->getMeasureValue() );
+m_pProperties->Insert( PROP_LEFT_MARGIN, 
uno::makeAny(pMeasureHandler->getMeasureValue()) );
+}
+}
+break;
 case NS_ooxml::LN_CT_TblPrBase_tblCellMar:
 {
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Michael Weghorn (via logerrit)

 svx/source/unodraw/unopage.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 5f03eb4e6dd11f65e16a1bb8aa46a7ae18379160
Author: Michael Weghorn 
AuthorDate: Wed Apr 8 12:51:41 2020 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 8 14:02:29 2020 +0200

svx: Drop duplicate fix for unused parameter

It looks like the two commits
c468b6910bf77e332647725da70e3cb248a9de0e
("-Werror,-Wunused-parameter (Android)") and
bfaae016b225e775264008935cddef1564b07e66
("svx, compile error with !HAVE_FEATURE_DESKTOP")
were submitted independently on 2019-03-09 with just
a few hours in between, and thus this has been
added twice...

Change-Id: Ic930eaba65adda9c210a1d3e376136095ee062db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91885
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index e59afceef7cf..f80f92e77f56 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -615,9 +615,6 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( 
sal_uInt16 nType, SdrInvent
 (void) referer;
 #endif
 SvxShape* pRet = nullptr;
-#if !HAVE_FEATURE_DESKTOP
-(void)referer;
-#endif
 
 switch( nInventor )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Miklos Vajna (via logerrit)

 wsd/LOOLWSD.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e087a0079c15061c348c5f8c4a24bbdbe36e507a
Author: Miklos Vajna 
AuthorDate: Wed Apr 8 11:49:39 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 8 13:52:35 2020 +0200

ForKitProcWSHandler: remove std::enable_shared_from_this inheritance

This was added in commit 70af76e28cbca4a45869fcecfe221d21eb7a3790
(Replaced pipe with websocket based on Unix socket in communication with
ForKit, 2020-04-02), but it seems to me that the shared_from_this()
member function (which is now available, due to ineritance) is not
actually called anywhere, so this is not necessary.

Additionally, Debian 8 / gcc-4.9 has problems compiling this:

In file included from /usr/include/c++/4.9/bits/shared_ptr.h:52:0,
 from /usr/include/c++/4.9/memory:82,
 from wsd/AdminModel.hpp:13,
 from wsd/AdminModel.cpp:12:
/usr/include/c++/4.9/bits/shared_ptr_base.h: In instantiation of 
‘std::__shared_ptr<_Tp, _Lp>::__shared_ptr(std::_Sp_make_shared_tag, const 
_Alloc&, _Args&& ...) [with _Alloc = std::allocator; _Args 
= {std::shared_ptr&, const Poco::Net::HTTPRequest&}; _Tp = 
ForKitProcWSHandler; __gnu_cxx::_Lock_policy _Lp = 
(__gnu_cxx::_Lock_policy)2u]’:
/usr/include/c++/4.9/bits/shared_ptr.h:316:64:   required from 
‘std::shared_ptr<_Tp>::shared_ptr(std::_Sp_make_shared_tag, const _Alloc&, 
_Args&& ...) [with _Alloc = std::allocator; _Args = 
{std::shared_ptr&, const Poco::Net::HTTPRequest&}; _Tp = 
ForKitProcWSHandler]’
/usr/include/c++/4.9/bits/shared_ptr.h:588:39:   required from 
‘std::shared_ptr<_Tp1> std::allocate_shared(const _Alloc&, _Args&& ...) [with 
_Tp = ForKitProcWSHandler; _Alloc = std::allocator; _Args 
= {std::shared_ptr&, const Poco::Net::HTTPRequest&}]’
/usr/include/c++/4.9/bits/shared_ptr.h:604:42:   required from 
‘std::shared_ptr<_Tp1> std::make_shared(_Args&& ...) [with _Tp = 
ForKitProcWSHandler; _Args = {std::shared_ptr&, const 
Poco::Net::HTTPRequest&}]’
./wsd/LOOLWSD.hpp:201:97:   required from here
/usr/include/c++/4.9/bits/shared_ptr_base.h:1096:64: error: call of 
overloaded ‘__enable_shared_from_this_helper(std::__shared_count<>&, 
ForKitProcWSHandler*&, ForKitProcWSHandler*&)’ is ambiguous

So just remove it till that inheritance is needed.

Change-Id: I74d38b90bcf06d4490feed31783c098ed831f1ee
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91879
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-by: Gabriel Masei 

diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 33056538f..034dbfbe0 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -182,7 +182,7 @@ public:
 std::shared_ptr _socket;
 };
 
-class ForKitProcWSHandler: public WebSocketHandler, public 
std::enable_shared_from_this
+class ForKitProcWSHandler: public WebSocketHandler
 {
 public:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Michael Weghorn (via logerrit)

 solenv/bin/native-code.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a8f802e74ea768fd489eb43742ae9ac6adf2d918
Author: Michael Weghorn 
AuthorDate: Wed Apr 8 10:56:04 2020 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 8 13:35:08 2020 +0200

Related tdf#111408 liblo-native-code: Add stardiv_Toolkit_UnoGroupBoxControl

Opening the bug doc from tdf#111408 with Android Viewer
previously resulted in a crash; corresponding log entries:

 W cppuhelper: 1:cppuhelper/source/shlib.cxx:288: unknown constructor name 
"stardiv_Toolkit_UnoGroupBoxControl_get_implementation"
 W svx : 
1:svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx:1129: 
DBG_UNHANDLED_EXCEPTION in static bool 
sdr::contact::ViewObjectContactOfUnoControl_Impl::createControlForDevice(const 
sdr::contact::(anonymous namespace)::IPageViewAccess &, const OutputDevice &, 
const SdrUnoObj &, const basegfx::B2DHomMatrix &, const basegfx::B2DHomMatrix 
&, sdr::contact::(anonymous namespace)::ControlHolder &) exception: 
com.sun.star.loader.CannotActivateFactoryException message: unknown constructor 
name "stardiv_Toolkit_UnoGroupBoxControl_get_implementation"

Change-Id: I4682d9982ff51bc1c1cc931657747fa9cb90a2fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91877
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 3a3e898c48f6..00a98c5b8148 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -277,6 +277,7 @@ core_constructor_list = [
 "stardiv_Toolkit_UnoControlRadioButtonModel_get_implementation",
 "stardiv_Toolkit_UnoControlScrollBarModel_get_implementation",
 "stardiv_Toolkit_UnoDateFieldControl_get_implementation",
+"stardiv_Toolkit_UnoGroupBoxControl_get_implementation",
 "stardiv_Toolkit_UnoListBoxControl_get_implementation",
 "stardiv_Toolkit_UnoRadioButtonControl_get_implementation",
 "stardiv_Toolkit_UnoSpinButtonModel_get_implementation",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Stephan Bergmann (via logerrit)

 vcl/source/filter/jpeg/Exif.cxx |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

New commits:
commit fd5961cb0e2ebc2f5797f76a2b1f9fd52ca4b3ab
Author: Stephan Bergmann 
AuthorDate: Wed Apr 8 11:56:34 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 8 13:32:57 2020 +0200

tdf#131969: Fix reading SHORT Orientation value

 "CIPA DC- 
008-Translation-
2012: Exchangeable image file format for digital still cameras: Exif 
Version 2.3"
documents that the Orientation tag 0x0112 expects a count of 1 values of 
type SHORT
(16 bit), and details that values <= 4 bytes are stored in the Value Offset 
field
always using bytes starting from the left of the field.

This is a regression introduced with 
42c0e433aca68c669bc0f55af404b6bae1655fba "Avoid
-fsanitize=misaligned-pointer-use".  That commit had wondered why the 
original code
had used OSL_SWAPWORD instead of OSL_SWAPDWORD when reading and writing such
orientation values.  It turns out that that original code had happened to 
work
correctly when processing either little or big endian data on a little 
endian
machine.  (Though it would have worked incorrectly when processing either 
little or
big endian data on a big endian machine.)  And with
42c0e433aca68c669bc0f55af404b6bae1655fba, the code worked when processing 
little
endian data on a little endian machine, but failed when processing big 
endian data
on a little endian machine, as is the case for tdf#131669 on e.g. x86_64.

(read32 has become unused and is thus removed.)

Change-Id: I7992629048ac44c00ee703c75164f3d094773244
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91881
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 62e51e807063..8f282583fe8e 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -171,16 +171,6 @@ void write16(sal_uInt16 value, sal_uInt8 (& data)[2], bool 
littleEndian) {
 }
 }
 
-sal_uInt32 read32(sal_uInt8 const (& data)[4], bool littleEndian) {
-if (littleEndian) {
-return data[0] | (sal_uInt32(data[1]) << 8)
-| (sal_uInt32(data[2]) << 16) | (sal_uInt32(data[3]) << 24);
-} else {
-return data[3] | (sal_uInt32(data[2]) << 8)
-| (sal_uInt32(data[1]) << 16) | (sal_uInt32(data[0]) << 24);
-}
-}
-
 void write32(sal_uInt32 value, sal_uInt8 (& data)[4], bool littleEndian) {
 if (littleEndian) {
 data[0] = value & 0xFF;
@@ -212,11 +202,13 @@ void Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 
aLength, sal_uInt16 aOffs
 {
 write16(3, ifd->type, littleEndian);
 write32(1, ifd->count, littleEndian);
-write32(maOrientation, ifd->offset, littleEndian);
+write16(
+maOrientation, reinterpret_cast(ifd->offset), littleEndian);
 }
 else
 {
-sal_uInt32 nIfdOffset = read32(ifd->offset, littleEndian);
+sal_uInt16 nIfdOffset = read16(
+reinterpret_cast(ifd->offset), 
littleEndian);
 maOrientation = convertToOrientation(nIfdOffset);
 }
 }
___
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' - vcl/uiconfig

2020-04-08 Thread Heiko Tietze (via logerrit)

 vcl/uiconfig/ui/printdialog.ui |  911 +
 1 file changed, 486 insertions(+), 425 deletions(-)

New commits:
commit ecc95d33e1a0e5f13fbbe655576828ee7dd35b6d
Author: Heiko Tietze 
AuthorDate: Thu Jan 9 11:17:25 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Apr 8 13:09:26 2020 +0200

Resolves tdf#127782 - New Print dialog is too high

Expander added

Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 96b4bf352b1dc43637080719c91eef61fef74bf8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91725

diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 215e7d82f686..fc98a18a89a9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -502,7 +502,7 @@
   
 0
 0
-3
+2
   
 
 
@@ -534,7 +534,6 @@
   
 1
 1
-2
   
 
 
@@ -553,7 +552,7 @@
   
 0
 2
-3
+2
   
 
 
@@ -572,191 +571,207 @@
   
 0
 3
-3
-  
-
-
-  
-False
-start
-_From which print:
-True
-printextrabox
-  
-  
-0
-6
-  
-
-
-  
-False
-True
-  
-  
-1
-6
 2
   
 
 
-  
-True
-False
-start
-Paper 
_sides:
-True
-sidesbox
-  
-  
-0
-7
-  
-
-
-  
-True
-False
-True
-
-  Print on one side (simplex)
-  Print on both sides (duplex long edge)
-  Print on both sides (duplex short edge)
-
-  
-  
-1
-7
-2
-  
-
-
-  
-True
-False
-start
-_Number of 
copies:
-True
-

[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/mobile/calc/number_format_spec.js |   94 
++
 cypress_test/integration_tests/mobile/calc/spellchecking_spec.js |5 
 2 files changed, 96 insertions(+), 3 deletions(-)

New commits:
commit 4d270dffac8417079c992c993a280954e03620e6
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 12:41:33 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 13:06:25 2020 +0200

cypress: mobile: calc: add more tests for number formatting.

Change-Id: I6720040a296ce9cb1185b428a4a062a7f61c27fa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91884
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js 
b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index 4f1356e50..ab1b69734 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -369,4 +369,98 @@ describe('Apply number formatting.', function() {
cy.get('#copy-paste-container table td')
.should('have.text', '1000');
});
+
+   it('Change decimal places.', function() {
+   // Check default value
+   cy.get('#decimalplaces input')
+   .should('have.attr', 'value', '0');
+
+   // Type in a new value
+   cy.get('#decimalplaces input')
+   .clear()
+   .type('2{enter}');
+
+   cy.get('#decimalplaces input')
+   .should('have.attr', 'value', '2');
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'sdnum', '1033;0;0.00');
+
+   cy.get('#copy-paste-container table td')
+   .should('have.text', '1000.00');
+   });
+
+   it('Change leading zeros.', function() {
+   // Check default value
+   cy.get('#leadingzeroes input')
+   .should('have.attr', 'value', '1');
+
+   // Type in a new value
+   cy.get('#leadingzeroes input')
+   .clear()
+   .type('6{enter}');
+
+   cy.get('#leadingzeroes input')
+   .should('have.attr', 'value', '6');
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'sdnum', '1033;0;00');
+
+   cy.get('#copy-paste-container table td')
+   .should('have.text', '001000');
+   });
+
+   it('Apply red color for negative numbers.', function() {
+   // Check default value
+   cy.get('#negativenumbersred input')
+   .should('not.have.attr', 'checked', 'checked');
+
+   // Change the option
+   cy.get('#negativenumbersred input')
+   .click();
+
+   cy.get('#negativenumbersred input')
+   .should('have.attr', 'checked', 'checked');
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'sdnum', '1033;0;0;[RED]-0');
+
+   cy.get('#copy-paste-container table td')
+   .should('have.text', '1000');
+   });
+
+   it('Add thousands separator.', function() {
+   // Check default value
+   cy.get('#thousandseparator input')
+   .should('not.have.attr', 'checked', 'checked');
+
+   // Change the option
+   cy.get('#thousandseparator input')
+   .click();
+
+   cy.get('#thousandseparator input')
+   .should('have.attr', 'checked', 'checked');
+
+   mobileHelper.closeMobileWizard();
+
+   calcHelper.copyContentToClipboard();
+
+   cy.get('#copy-paste-container table td')
+   .should('have.attr', 'sdnum', '1033;0;#,##0');
+
+   cy.get('#copy-paste-container table td')
+   .should('have.text', '1,000');
+   });
 });
commit 8986e8068faa556979ccbdd5633412312bc9c80d
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 12:07:53 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 13:06:14 2020 +0200

cypress: mobile: try to fix random failure in calc spellchecking test.

Change-Id: I0c4bda087a651e668ea0bbff285d11996768fc05
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91883
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --gi

[Libreoffice-commits] core.git: solenv/clang-format writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source

2020-04-08 Thread Noel Grandin (via logerrit)

 solenv/clang-format/blacklist   |1 
 writerfilter/Library_writerfilter.mk|1 
 writerfilter/inc/ooxml/QNameToString.hxx|   25 +-
 writerfilter/source/dmapper/LoggedResources.cxx |8 +--
 writerfilter/source/ooxml/OOXMLPropertySet.cxx  |2 
 writerfilter/source/ooxml/qnametostr.py |   21 ++---
 writerfilter/source/ooxml/qnametostrcore.cxx|   55 
 writerfilter/source/rtftok/rtfsprm.cxx  |2 
 8 files changed, 25 insertions(+), 90 deletions(-)

New commits:
commit 18e5d441ca3c3f0b59db8beaa87e3565489db6f1
Author: Noel Grandin 
AuthorDate: Wed Apr 8 11:49:28 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 8 13:03:58 2020 +0200

simplify QNameToString

no need for it to be a class, and no need for the data to be allocated
at runtime

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

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 01f1129e7ee0..95d4390ce95d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17804,7 +17804,6 @@ writerfilter/source/ooxml/OOXMLPropertySet.cxx
 writerfilter/source/ooxml/OOXMLPropertySet.hxx
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx
-writerfilter/source/ooxml/qnametostrcore.cxx
 xmlhelp/source/cxxhelp/inc/tvfactory.hxx
 xmlhelp/source/cxxhelp/inc/tvread.hxx
 xmlhelp/source/cxxhelp/provider/content.cxx
diff --git a/writerfilter/Library_writerfilter.mk 
b/writerfilter/Library_writerfilter.mk
index c18e95f1b248..61e62d66e10d 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -123,7 +123,6 @@ $(eval $(call 
gb_Library_add_exception_objects,writerfilter,\
 writerfilter/source/ooxml/OOXMLParserState \
 writerfilter/source/ooxml/OOXMLPropertySet \
 writerfilter/source/ooxml/OOXMLStreamImpl \
-writerfilter/source/ooxml/qnametostrcore \
 ))
 
 $(eval $(call gb_Library_add_generated_exception_objects,writerfilter,\
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx 
b/writerfilter/inc/ooxml/QNameToString.hxx
index 2f3376edbd93..9cdf13de143b 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -19,34 +19,15 @@
 #ifndef INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
 #define INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
 
-#include 
 #include 
 #include 
 
 namespace writerfilter
 {
 
-class QNameToString final : public virtual SvRefBase
-{
-typedef tools::SvRef Pointer_t;
-typedef std::map < Id, std::string > Map;
-
-static Pointer_t pInstance;
-
-void init();
-
-Map mMap;
-
-/**
-   Generated.
- */
-QNameToString();
-
-public:
-static Pointer_t const & Instance();
-
-std::string operator()(Id qName);
-};
+#ifdef DBG_UTIL
+std::string QNameToString(Id);
+#endif
 
 }
 
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx 
b/writerfilter/source/dmapper/LoggedResources.cxx
index 9fedb159efa8..d8857911ea1d 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -258,7 +258,7 @@ void LoggedStream::table(Id name, 
writerfilter::Reference::Pointer_t ref)
 {
 #ifdef DBG_UTIL
 mHelper.startElement("table");
-LoggedResourcesHelper::attribute("name", 
(*QNameToString::Instance())(name));
+LoggedResourcesHelper::attribute("name", QNameToString(name));
 #endif
 
 lcl_table(name, ref);
@@ -272,7 +272,7 @@ void LoggedStream::substream(Id name, 
writerfilter::Reference::Pointer_t
 {
 #ifdef DBG_UTIL
 mHelper.startElement("substream");
-LoggedResourcesHelper::attribute("name", 
(*QNameToString::Instance())(name));
+LoggedResourcesHelper::attribute("name", QNameToString(name));
 #endif
 
 lcl_substream(name, ref);
@@ -341,7 +341,7 @@ void LoggedProperties::attribute(Id name, Value & val)
 {
 #ifdef DBG_UTIL
 mHelper.startElement("attribute");
-LoggedResourcesHelper::attribute("name", 
(*QNameToString::Instance())(name));
+LoggedResourcesHelper::attribute("name", QNameToString(name));
 LoggedResourcesHelper::attribute("value", val.toString());
 LoggedResourcesHelper::endElement();
 #endif
@@ -353,7 +353,7 @@ void LoggedProperties::sprm(Sprm & rSprm)
 {
 #ifdef DBG_UTIL
 mHelper.startElement("sprm");
-LoggedResourcesHelper::attribute("name", 
(*QNameToString::Instance())(rSprm.getId()));
+LoggedResourcesHelper::attribute("name", QNameToString(rSprm.getId()));
 LoggedResourcesHelper::chars(rSprm.toString());
 #endif
 
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx 
b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 23a6e7861231..b8071011422b 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/s

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

2020-04-08 Thread Szabolcs (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf104565_ArrowPosition.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |   12 
 sw/source/filter/ww8/docxsdrexport.cxx |8 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 08a11f8fe19560b000c62da00d7425b4f500d605
Author: Szabolcs 
AuthorDate: Tue Mar 24 15:38:14 2020 +0100
Commit: László Németh 
CommitDate: Wed Apr 8 12:54:45 2020 +0200

tdf#104565 DOCX drawing object export: fix arrow positions

Saving some arrows from ODT to DOCX scattered them around
their correct position. This happened because of a function that
recalculates the position of drawing objects when they are rotated,
according to the rotation. It turns out we don't have to do this
with lines and such.

Co-Author: Balázs Regényi

Change-Id: Iea6a34d15003cacc27a8030cb73511aba39225f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90989
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf104565_ArrowPosition.docx 
b/sw/qa/extras/ooxmlexport/data/tdf104565_ArrowPosition.docx
new file mode 100644
index ..514eeddbafb8
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf104565_ArrowPosition.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 498cf8a95772..99aa70e27cd5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1115,6 +1115,18 @@ DECLARE_OOXMLEXPORT_TEST(testArrowFlipXY, 
"tdf100751_arrowBothFlip.docx")
 CPPUNIT_ASSERT(arrowStyle.indexOf(u"flip:xy") != sal_Int32(-1));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testArrowPosition, "tdf104565_ArrowPosition.docx")
+{
+// tdf#104565: Test correct position.
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+// This is the correct Y coordinate, the incorrect was 817880.
+assertXPathContent(pXmlDocument, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor"
+"/wp:positionV/wp:posOffset", "516255");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index fbdee23ebd70..66ab33a15ac9 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -441,8 +441,12 @@ void DocxSdrExport::startDMLAnchorInline(const 
SwFrameFormat* pFrameFormat, cons
 ->getIDocumentDrawModelAccess()
 .GetInvisibleHellId();
 
-nRotation = pObj->GetRotateAngle();
-lclMovePositionWithRotation(aPos, rSize, nRotation);
+// Do not do this with lines.
+if (pObj->GetObjIdentifier() != OBJ_LINE)
+{
+nRotation = pObj->GetRotateAngle();
+lclMovePositionWithRotation(aPos, rSize, nRotation);
+}
 }
 attrList->add(XML_behindDoc, bOpaque ? "0" : "1");
 // Extend distance with the effect extent if the shape is not rotated, 
which is the opposite
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Tor Lillqvist (via logerrit)

 kit/ChildSession.cpp   |   29 +
 wsd/DocumentBroker.cpp |   15 ---
 2 files changed, 29 insertions(+), 15 deletions(-)

New commits:
commit 5270284701136b6603f52a79adc2483c5da8a753
Author: Tor Lillqvist 
AuthorDate: Wed Apr 8 12:37:46 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 8 12:19:38 2020 +0200

Further re-work of document saving in the iOS app

Now, finally, I think it works as it should, knock on wood. After an
auto-save (or explicit save by tapping the button), the edited
document does show up with its auto-saved contents if you open it from
iCloud Drive or Nextcloud while it is still open in the iOS app.

What I was missing was that the document hadn't actually been saved by
the core (to the temporary copy) until we get the
LOK_CALLBACK_UNO_COMMAND_RESULT for the .uno:Save. We must call the
-[UIDocumentsaveToURL:forSaveOperation:completionHandler:] only upon
receiving that callback.

Change-Id: I10486f3bc587c871ee2644a0c097493f33baf420
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91880
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 54d5350b5..534d6c2fb 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -32,6 +32,10 @@
 #include 
 #endif
 
+#ifdef IOS
+#import "DocumentViewController.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -2475,6 +2479,31 @@ void ChildSession::loKitCallback(const int type, const 
std::string& payload)
 break;
 case LOK_CALLBACK_UNO_COMMAND_RESULT:
 sendTextFrame("unocommandresult: " + payload);
+#ifdef IOS
+{
+// After the document has been saved (into the temporary copy that 
we set up in
+// -[CODocument loadFromContents:ofType:error:]), save it also 
using the system API so
+// that file provider extensions notice.
+
+Parser parser;
+Poco::Dynamic::Var var = parser.parse(payload);
+Object::Ptr object = var.extract();
+
+auto commandName = object->get("commandName");
+auto success = object->get("success");
+
+if (!commandName.isEmpty() && commandName.toString() == 
".uno:Save" && !success.isEmpty() && success.toString() == "true")
+{
+CODocument *document = [[DocumentViewController singleton] 
document];
+
+[document saveToURL:[document fileURL]
+ forSaveOperation:UIDocumentSaveForOverwriting
+ completionHandler:^(BOOL success) {
+LOG_TRC("ChildSession::loKitCallback() save completion 
handler gets " << (success?"YES":"NO"));
+}];
+}
+}
+#endif
 break;
 case LOK_CALLBACK_ERROR:
 {
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 4287624e9..0c28b94bd 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -39,10 +39,6 @@
 #include 
 #include 
 
-#ifdef IOS
-#import "DocumentViewController.h"
-#endif
-
 #include 
 #include 
 
@@ -1288,17 +1284,6 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
 const auto command = "uno .uno:Save " + saveArgs;
 forwardToChild(sessionId, command);
 _lastSaveRequestTime = std::chrono::steady_clock::now();
-#ifdef IOS
-// We need to do this here, also for auto-save, so that file provider 
extensions notice.
-
-CODocument *document = [[DocumentViewController singleton] document];
-
-[document saveToURL:[[[DocumentViewController singleton] document] 
fileURL]
-   forSaveOperation:UIDocumentSaveForOverwriting
-  completionHandler:^(BOOL success) {
-LOG_TRC("DocumentBroker::sendUnoSave() save completion handler 
gets " << (success?"YES":"NO"));
-}];
-#endif
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Samuel Mehrbrodt (via logerrit)

 dbaccess/source/core/dataaccess/databasedocument.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 792c730f3cda4f5c312921a62ecae3d322ad9b72
Author: Samuel Mehrbrodt 
AuthorDate: Tue Apr 7 09:05:05 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 8 12:11:20 2020 +0200

Related tdf#97694 Fix macro preservation on Windows

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

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index fd93febbe8f1..415d4a5d3c4c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1084,17 +1084,20 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 
 // store to current storage
 Reference< XStorage > xCurrentStorage( 
m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW );
+OUString 
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
 Sequence< PropertyValue > aMediaDescriptor( 
lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
 impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard 
);
 
 // Preserve script signature if the script has not changed
 if (bTryToPreserveScriptSignature)
 {
+// Need to close this storage, otherwise we can't open it for 
signing below
+// (Windows needs exclusive file access)
+uno::Reference < lang::XComponent > xComp = xCurrentStorage;
+xComp->dispose();
 uno::Reference xDDSigns;
 try
 {
-OUString aODFVersion(
-
comphelper::OStorageHelper::GetODFVersionFromStorage(xCurrentStorage));
 xDDSigns = 
security::DocumentDigitalSignatures::createWithVersion(
 comphelper::getProcessComponentContext(), aODFVersion);
 
@@ -1152,7 +1155,7 @@ void ODatabaseDocument::impl_storeAs_throw( const 
OUString& _rURL, const ::comph
 }
 catch (uno::Exception&)
 {
-SAL_WARN("dbaccess", "Preserving macro signature failed!");
+TOOLS_WARN_EXCEPTION("dbaccess", "");
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Luboš Luňák (via logerrit)

 vcl/inc/skia/gdiimpl.hxx |2 +-
 vcl/skia/gdiimpl.cxx |   33 ++---
 2 files changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 738a563a0512bf7f28f15160f0be271bcef4f59e
Author: Luboš Luňák 
AuthorDate: Tue Apr 7 16:48:07 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 8 11:56:03 2020 +0200

fix/improve Skia debug messages

CopyBits() wasn't reporting 'src' if it was different from 'this'.
Put the 'O' for offscreen after 'G' or 'R', so that it doesn't look
like 0 being part of the size.
Add pointer value to the Idle instances debug name.

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

diff --git a/vcl/inc/skia/gdiimpl.hxx b/vcl/inc/skia/gdiimpl.hxx
index a145e001850d..a99bb9ae4ce1 100644
--- a/vcl/inc/skia/gdiimpl.hxx
+++ b/vcl/inc/skia/gdiimpl.hxx
@@ -269,7 +269,7 @@ protected:
 { // O - offscreen, G - GPU-based, R - raster
 return stream << static_cast(graphics) << " "
   << Size(graphics->GetWidth(), graphics->GetHeight())
-  << (graphics->isOffscreen() ? "O" : "") << 
(graphics->isGPU() ? "G" : "R");
+  << (graphics->isGPU() ? "G" : "R") << 
(graphics->isOffscreen() ? "O" : "");
 }
 
 SalGraphics& mParent;
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 8b484ea124c7..b9d6d3575c85 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -156,15 +156,31 @@ bool checkInvalidSourceOrDestination(SalTwoRect const& 
rPosAry)
 class SkiaFlushIdle : public Idle
 {
 SkiaSalGraphicsImpl* mpGraphics;
+#ifndef NDEBUG
+char* debugname;
+#endif
 
 public:
 explicit SkiaFlushIdle(SkiaSalGraphicsImpl* pGraphics)
-: Idle("skia idle swap")
+: Idle(get_debug_name(pGraphics))
 , mpGraphics(pGraphics)
 {
 // We don't want to be swapping before we've painted.
 SetPriority(TaskPriority::POST_PAINT);
 }
+#ifndef NDEBUG
+virtual ~SkiaFlushIdle() { free(debugname); }
+const char* get_debug_name(SkiaSalGraphicsImpl* pGraphics)
+{
+// Idle keeps just a pointer, so we need to store the string
+debugname = strdup(
+OString("skia idle 0x" + 
OString::number(reinterpret_cast(pGraphics), 16))
+.getStr());
+return debugname;
+}
+#else
+const char* get_debug_name(SkiaSalGraphicsImpl*) { return "skia idle"; }
+#endif
 
 virtual void Invoke() override
 {
@@ -895,13 +911,24 @@ void SkiaSalGraphicsImpl::copyBits(const SalTwoRect& 
rPosAry, SalGraphics* pSrcG
 src = this;
 if (rPosAry.mnSrcWidth == rPosAry.mnDestWidth && rPosAry.mnSrcHeight == 
rPosAry.mnDestHeight)
 {
-SAL_INFO("vcl.skia.trace", "copybits(" << this << "): copy area:" << 
rPosAry);
+auto srcDebug = [&]() -> std::string {
+if (src == this)
+return "(self)";
+else
+{
+std::ostringstream stream;
+stream << "(" << src << ")";
+return stream.str();
+}
+};
+SAL_INFO("vcl.skia.trace",
+ "copybits(" << this << "): " << srcDebug() << " copy area: " 
<< rPosAry);
 ::copyArea(getDrawCanvas(), src->mSurface, rPosAry.mnDestX, 
rPosAry.mnDestY, rPosAry.mnSrcX,
rPosAry.mnSrcY, rPosAry.mnDestWidth, rPosAry.mnDestHeight);
 }
 else
 {
-SAL_INFO("vcl.skia.trace", "copybits(" << this << "): (" << src << 
"):" << rPosAry);
+SAL_INFO("vcl.skia.trace", "copybits(" << this << "): (" << src << "): 
" << rPosAry);
 // Do not use makeImageSnapshot(rect), as that one may make a needless 
data copy.
 sk_sp image = src->mSurface->makeImageSnapshot();
 SkPaint paint;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Luboš Luňák (via logerrit)

 svx/source/sdr/animation/scheduler.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8aaac402dfe551fb63eabb06386a4631e28300a
Author: Luboš Luňák 
AuthorDate: Tue Apr 7 16:59:26 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 8 11:54:16 2020 +0200

run svx animations at POST_PAINT priority (tdf#131753)

Skia VCL drawing (and GL too) set first drawing to POST_PAINT,
so that the contents aren't drawn prematurely the first time,
but only after the first paint has been finished. But animations
constantly running at a normal priority will starve that.
It doesn't make sense to run animations at REPAINT or higher
priorities anyway, if LO is busy painting then animating more
will just make it even busier.

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

diff --git a/svx/source/sdr/animation/scheduler.cxx 
b/svx/source/sdr/animation/scheduler.cxx
index 1994dcc0b1eb..21a28fe72f9f 100644
--- a/svx/source/sdr/animation/scheduler.cxx
+++ b/svx/source/sdr/animation/scheduler.cxx
@@ -49,6 +49,7 @@ namespace sdr::animation
 mnDeltaTime(0),
 mbIsPaused(false)
 {
+SetPriority(TaskPriority::POST_PAINT);
 }
 
 Scheduler::~Scheduler()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Stephan Bergmann (via logerrit)

 sc/qa/uitest/calc_tests2/tdf118189.py |2 +-
 vcl/inc/salinst.hxx   |1 +
 vcl/source/components/dtranscomp.cxx  |   27 ---
 3 files changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 68c3d3e46bf731c93fe5eca2e35042484f77d650
Author: Stephan Bergmann 
AuthorDate: Wed Apr 8 09:26:38 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 8 11:33:46 2020 +0200

Make SalInstance::CreateClipboard return a single instance in the non-LOK 
case

I came across this when seeing UITest_calc_tests2's
tdf118189.tdf118189.test_tdf118189 fail on Linux with SAL_USE_VCLPLUGIN=gen 
and
also on Windows, see the mailing list thread starting at

"Linux SAL_USE_VCLPLUGIN=svp and the clipboard".  That email thread 
clarified
that the codified behavior of that non-LOK test was wrong.  (While the LOK 
test
ScTiledRenderingTest::testMultiViewCopyPaste in
sc/qa/unit/tiledrendering/tiledrendering.cxx keeps working as intended.)

I did not find documentation for what arguments CreateClipboard shall 
support,
but things seem to work if anything but empty arguments is rejected with an
IllegalArgumentException.

Change-Id: I1918254cc15878ad43b8aa22aff7eb1c4bea73fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91869
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/qa/uitest/calc_tests2/tdf118189.py 
b/sc/qa/uitest/calc_tests2/tdf118189.py
index ed33b20bcbee..e49a471fd40a 100644
--- a/sc/qa/uitest/calc_tests2/tdf118189.py
+++ b/sc/qa/uitest/calc_tests2/tdf118189.py
@@ -46,7 +46,7 @@ class tdf118189(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 
 #-> CRASH
-self.assertEqual(get_cell_by_position(document2, 0, 0, 0).getString(), 
"")
+self.assertEqual(get_cell_by_position(document2, 0, 0, 0).getString(), 
"On Back Order")
 
 self.ui_test.close_doc()
 
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 621343677078..36c51d990d5c 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -82,6 +82,7 @@ class VCL_DLLPUBLIC SalInstance
 private:
 rtl::Reference< vcl::DisplayConnectionDispatch > m_pEventInst;
 const std::unique_ptr m_pYieldMutex;
+css::uno::Reference m_clipboard;
 
 public:
 SalInstance(std::unique_ptr pMutex);
diff --git a/vcl/source/components/dtranscomp.cxx 
b/vcl/source/components/dtranscomp.cxx
index e76e7691ded8..c7bda5361fdb 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -17,14 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 
+#include 
+#include 
+#include 
 #include 
 
 #include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -452,9 +456,26 @@ Reference< XInterface > DropTarget_createInstance( const 
Reference< XMultiServic
 /*
 *   SalInstance generic
 */
-Reference< XInterface > SalInstance::CreateClipboard( const Sequence< Any >& )
+Reference< XInterface > SalInstance::CreateClipboard( const Sequence< Any >& 
arguments )
 {
-return Reference< XInterface >( static_cast(new 
vcl::GenericClipboard()) );
+if (arguments.hasElements()) {
+throw css::lang::IllegalArgumentException(
+"non-empty SalInstance::CreateClipboard arguments", {}, -1);
+}
+if (comphelper::LibreOfficeKit::isActive()) {
+// In LOK, each document view shall have its own clipboard instance, 
and the way that
+// (happens to?) work is that apparently this function is called at 
most once for each such
+// document view, so it is OK if we hand out a fresh instance on each 
call in LOK (whereas
+// in non-LOK below we keep handing out one single instance; see also
+// 
 
"Re: Linux
+// SAL_USE_VCLPLUGIN=svp and the clipboard"):
+return Reference< XInterface >( static_cast(new 
vcl::GenericClipboard()) );
+}
+DBG_TESTSOLARMUTEX();
+if (!m_clipboard.is()) {
+m_clipboard = static_cast(new 
vcl::GenericClipboard());
+}
+return m_clipboard;
 }
 
 Reference< XInterface > SalInstance::CreateDragSource()
___
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 writerfilter/source

2020-04-08 Thread Xisco Fauli (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf131594.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |7 +++
 writerfilter/source/dmapper/DomainMapper.cxx |   25 +++--
 3 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit de5a0023695584a4c2c5a2729284186d43fc7d82
Author: Xisco Fauli 
AuthorDate: Thu Mar 26 15:50:59 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Apr 8 11:32:37 2020 +0200

tdf#131594: switch line numbering off if w:countBy="0"

See https://bugs.documentfoundation.org/show_bug.cgi?id=131594#c0
for more info

Change-Id: Ic57826eb5a440e83cea1d9bde5e9144727e3b6df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91141
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 910197b8cf9b653c1b39b35b73424a36b7c1d1ae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91512
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf131594.docx 
b/sw/qa/extras/ooxmlexport/data/tdf131594.docx
new file mode 100644
index ..009c6d56bd85
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf131594.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 91817f2f2220..47db568932bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -682,6 +682,13 @@ DECLARE_OOXMLEXPORT_TEST(testImageCommentAtChar, 
"image-comment-at-char.docx")
  getProperty(getRun(xPara, 5), 
"TextPortionType"));
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131594, "tdf131594.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// lnNumType should not be exported if w:countBy="0"
+assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:lnNumType", 0);
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121663, "tdf121663.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 70cd838d59b5..938cc59be726 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1996,19 +1996,24 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 {
 uno::Reference< text::XLineNumberingProperties > 
xLineNumberingProperties( m_pImpl->GetTextDocument(), uno::UNO_QUERY_THROW );
 uno::Reference< beans::XPropertySet > xLineNumberingPropSet = 
xLineNumberingProperties->getLineNumberingProperties();
-xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_IS_ON ), uno::makeAny(true) );
-if( aSettings.nInterval )
-xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_INTERVAL ), uno::makeAny(static_cast(aSettings.nInterval)) );
-if( aSettings.nDistance != -1 )
-xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
+if( aSettings.nInterval == 0 )
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_IS_ON ), uno::makeAny(false) );
 else
 {
-// set Auto value (0.5 cm)
-xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_DISTANCE ), uno::makeAny(static_cast(500)) );
-if( pSectionContext )
-pSectionContext->SetdxaLnn( static_cast(283) );
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_IS_ON ), uno::makeAny(true) );
+if( aSettings.nInterval )
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_INTERVAL ), uno::makeAny(static_cast(aSettings.nInterval)) );
+if( aSettings.nDistance != -1 )
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
+else
+{
+// set Auto value (0.5 cm)
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_DISTANCE ), uno::makeAny(static_cast(500)) );
+if( pSectionContext )
+pSectionContext->SetdxaLnn( 
static_cast(283) );
+}
+xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
 }
-xLineNumberingPropSet->setPropertyValue(getPropertyName( 
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
 }
 catch( const uno::Exception& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Caolán McNamara (via logerrit)

 sc/inc/textuno.hxx  |2 +-
 sc/source/ui/unoobj/textuno.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 92f1626160b823f8136c03ab067136f866279da9
Author: Caolán McNamara 
AuthorDate: Wed Apr 8 09:08:55 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 8 11:27:07 2020 +0200

cid#1461387 Uncaught exception

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

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index f7023ff36835..401387b8dcca 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -362,7 +362,7 @@ class ScCellTextObj final : public ScCellTextData, public 
SvxUnoText
 {
 public:
  ScCellTextObj(ScDocShell* pDocSh, const ScAddress& rP);
-virtual  ~ScCellTextObj() throw() override;
+virtual  ~ScCellTextObj() COVERITY_NOEXCEPT_FALSE override;
 };
 
 #endif
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 61882737b8b6..bba27416dac5 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -897,7 +897,7 @@ ScCellTextObj::ScCellTextObj(ScDocShell* pDocSh, const 
ScAddress& rP) :
 {
 }
 
-ScCellTextObj::~ScCellTextObj() throw()
+ScCellTextObj::~ScCellTextObj() COVERITY_NOEXCEPT_FALSE
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Caolán McNamara (via logerrit)

 vcl/source/app/salvtables.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7eb78233b46652f4317aef34a1bac4d084b00e2d
Author: Caolán McNamara 
AuthorDate: Tue Apr 7 11:22:52 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Apr 8 11:25:05 2020 +0200

Resolves: tdf#131715 don't keep trying the same page if we're already on it

return of false means we didn't change page for some reason, the idea is
that it might be blocked to go to another page, in which case sync with
what page we ended up on, but don't bother with that if the dest page
would be the same as the current page

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 72db47b4e4f7..9bfeb9997041 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1933,8 +1933,9 @@ IMPL_LINK_NOARG(SalInstanceAssistant, 
OnRoadmapItemSelected, LinkParamNone*, voi
 {
 if (notify_events_disabled())
 return;
-int nPageIndex(find_id(m_xWizard->GetCurrentRoadmapItemID()));
-if (!signal_jump_page(get_page_ident(nPageIndex)))
+auto nCurItemId = m_xWizard->GetCurrentRoadmapItemID();
+int nPageIndex(find_id(nCurItemId));
+if (!signal_jump_page(get_page_ident(nPageIndex)) && nCurItemId != 
m_xWizard->GetCurLevel())
 m_xWizard->SelectRoadmapItemByID(m_xWizard->GetCurLevel());
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdef8193b8b0a500091efc47ab6986459e83d0db
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 10:44:16 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 11:24:38 2020 +0200

cypress: simplify output error matcher.

Change-Id: I18392d8aabd9f3f4ba43139f9e951faead8b9667
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91876
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index b9129753c..6925f2721 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -206,7 +206,7 @@ endef
 define execute_run_parallel
@mkdir -p $(dir $(2)) && touch $(2) && \
echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-   if [ -z `grep -o -m 1 "CypressError\|AssertionError\|Uncaught 
TypeError\|Error: " $(2)` ];\
+   if [ -z `grep -o -m 1 "Error:" $(2)` ];\
then cat $(2);\
else cat $(2) >> $(ERROR_LOG);\
fi;
___
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/CppunitTest_sw_core_txtnode.mk sw/Module_sw.mk sw/qa sw/source vcl/source

2020-04-08 Thread Miklos Vajna (via logerrit)

 sw/CppunitTest_sw_core_txtnode.mk |   73 ++
 sw/Module_sw.mk   |1 
 sw/qa/core/txtnode/data/btlr-cell-chinese.doc |binary
 sw/qa/core/txtnode/txtnode.cxx|   54 +++
 sw/source/core/txtnode/swfont.cxx |7 +-
 vcl/source/gdi/mtfxmldump.cxx |1 
 6 files changed, 133 insertions(+), 3 deletions(-)

New commits:
commit f570e6618611c2ba239ff686e120d8a4508580c3
Author: Miklos Vajna 
AuthorDate: Mon Apr 6 21:02:30 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 8 11:22:37 2020 +0200

tdf#131490 sw btlr: fix handling of vertical text

Latin text goes from l->r, then t->b. If we rotate to the right, then we
get t->b, then r->l. Vertical text in vcl's Font means the individual
glyphs are painted in a way that looks "non-rotated" in the tbrl case.

btlr is not symmetric to this: if you rotate to the left, then Latin and
vertical text is handled the same way, i.e. there is no compensation at
a glyph level.

This means that as far as vcl is concerned, the Font's vertical flag has
to be true in the tbrl case, but no in the btlr one. Fix
SwFont::SetVertical() to do this, which means that rotating at a
character level or using the btlr text direction will result in the same
rendering for a one-liner text.

Regression from commit 89e5b431d468745da3a1eff14d48296107b9101b (sw btlr
writing mode: implement DOC filter, 2019-03-28).

(cherry picked from commit a8d26a0bb40c101394ded8061d1b58048153631b)

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

diff --git a/sw/CppunitTest_sw_core_txtnode.mk 
b/sw/CppunitTest_sw_core_txtnode.mk
new file mode 100644
index ..2f09165d86cb
--- /dev/null
+++ b/sw/CppunitTest_sw_core_txtnode.mk
@@ -0,0 +1,73 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_txtnode))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_txtnode))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_txtnode, \
+sw/qa/core/txtnode/txtnode \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_txtnode, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+svxcore \
+sw \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_txtnode,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_txtnode,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_txtnode,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_txtnode))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_txtnode))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_txtnode,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_txtnode,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_txtnode))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_txtnode, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_txtnode))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 470e7b545971..4784dcc64f8b 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -108,6 +108,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_doc \
 CppunitTest_sw_uibase_shells \
 CppunitTest_sw_core_frmedt \
+CppunitTest_sw_core_txtnode \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/core/txtnode/data/btlr-cell-chinese.doc 
b/sw/qa/core/txtnode/data/btlr-cell-chinese.doc
new file mode 100644
index ..a4a70f6779dd
Binary files /dev/null and b/sw/qa/core/txtnode/data/btlr-cell-chinese.doc 
differ
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
new file mode 100644
index ..b6af5230faf8
--- /dev/null
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -0,0 +1,54 @@
+/* -*- 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
+ *

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

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/Makefile.am |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit efdc8b25b40caf25cc755ef55a6630592ee35b29
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 10:43:07 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 11:22:20 2020 +0200

cypress: run JS error check also for make run commands.

Change-Id: I0a00d64ecbad5fc7e89711a89bb3620f793f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91875
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 73ce55751..b9129753c 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -113,6 +113,7 @@ check-mobile: @JAILS_PATH@ $(NODE_BINS)
@$(KILL_COMMAND) || true
 
 run-desktop: @JAILS_PATH@ $(NODE_BINS)
+   $(call run_JS_error_check)
$(call start_loolwsd)
@echo
@echo "Open cypress with desktop tests..."
@@ -123,6 +124,7 @@ run-desktop: @JAILS_PATH@ $(NODE_BINS)
@$(KILL_COMMAND) || true
 
 run-mobile: @JAILS_PATH@ $(NODE_BINS)
+   $(call run_JS_error_check)
$(call start_loolwsd)
@echo
@echo "Open cypress with mobile tests..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: cypress_test/.gitignore cypress_test/integration_tests cypress_test/support

2020-04-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/.gitignore|1 +
 cypress_test/integration_tests/mobile/writer/insert_object_spec.js |2 ++
 cypress_test/support/commands.js   |1 -
 cypress_test/support/index.js  |1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 82f022d8b9d3cfda2465ca46c854af1f64d17dd9
Author: Tamás Zolnai 
AuthorDate: Wed Apr 8 10:34:31 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Apr 8 11:11:31 2020 +0200

cypress: try to fix TypeError: cy.waitUntil is not a function.

Import cypress-wait-until directly in the test file. This module
is not intended to use everywhere, so it's not a big issue
if we need to import it before use.

Change-Id: I33ff8ae1eae2ec124b286cd7760d5571e5c67531
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91874
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/.gitignore b/cypress_test/.gitignore
index 3e5e8dbd2..0b6b5b539 100644
--- a/cypress_test/.gitignore
+++ b/cypress_test/.gitignore
@@ -2,3 +2,4 @@ node_modules
 cypress
 package-lock.json
 workdir
+support/commands.js
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index ab938168f..338230b44 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -1,5 +1,7 @@
 /* global describe it cy beforeEach require expect afterEach Cypress*/
 
+import 'cypress-wait-until';
+
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
 var writerHelper = require('./writer_helper');
diff --git a/cypress_test/support/commands.js b/cypress_test/support/commands.js
deleted file mode 100644
index 5c6c3cd80..0
--- a/cypress_test/support/commands.js
+++ /dev/null
@@ -1 +0,0 @@
-import 'cypress-wait-until';
diff --git a/cypress_test/support/index.js b/cypress_test/support/index.js
index 1c6833720..8f683db34 100644
--- a/cypress_test/support/index.js
+++ b/cypress_test/support/index.js
@@ -1,4 +1,3 @@
 /* global require */
 
 require('cypress-failed-log');
-import './commands';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_gallhtmlexpo.mk extras/source

2020-04-08 Thread andreas kainz (via logerrit)

 dev/null   |binary
 extras/Module_extras.mk|1 
 extras/Package_gallhtmlexpo.mk |   63 -
 3 files changed, 64 deletions(-)

New commits:
commit 586d0f7458a0e23bbd35d8ff797fd86878e41138
Author: andreas kainz 
AuthorDate: Wed Apr 8 08:28:56 2020 +0200
Commit: andreas_kainz 
CommitDate: Wed Apr 8 11:04:55 2020 +0200

tdf#131949 Remove /extras/source/gallery/htmlexpo

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

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index c0986d8ca40e..e41e542da24f 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_fonts \
Package_resource_fonts \
Package_gallbullets \
-   Package_gallhtmlexpo \
Package_gallmytheme \
Package_gallroot \
Package_gallsystem \
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
deleted file mode 100644
index 43587fa1c66d..
--- a/extras/Package_gallhtmlexpo.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call 
gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
-
-$(eval $(call 
gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\
-   bludown.gif \
-   blufirs_.gif \
-   blufirs.gif \
-   blulast_.gif \
-   blulast.gif \
-   blunav.gif \
-   blunext_.gif \
-   blunext.gif \
-   bluprev_.gif \
-   bluprev.gif \
-   blutext.gif \
-   bluup.gif \
-   cubdown.gif \
-   cubfirs_.gif \
-   cubfirs.gif \
-   cublast_.gif \
-   cublast.gif \
-   cubnav.gif \
-   cubnext_.gif \
-   cubnext.gif \
-   cubprev_.gif \
-   cubprev.gif \
-   cubtext.gif \
-   cubup.gif \
-   gredown.gif \
-   grefirs_.gif \
-   grefirs.gif \
-   grelast_.gif \
-   grelast.gif \
-   grenav.gif \
-   grenext_.gif \
-   grenext.gif \
-   greprev_.gif \
-   greprev.gif \
-   gretext.gif \
-   greup.gif \
-   simdown.gif \
-   simfirs_.gif \
-   simfirs.gif \
-   simlast_.gif \
-   simlast.gif \
-   simnav.gif \
-   simnext_.gif \
-   simnext.gif \
-   simprev_.gif \
-   simprev.gif \
-   simtext.gif \
-   simup.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/htmlexpo/bludown.gif 
b/extras/source/gallery/htmlexpo/bludown.gif
deleted file mode 100644
index 8db5e143b4f7..
Binary files a/extras/source/gallery/htmlexpo/bludown.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blufirs.gif 
b/extras/source/gallery/htmlexpo/blufirs.gif
deleted file mode 100644
index 34c390f9bf97..
Binary files a/extras/source/gallery/htmlexpo/blufirs.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blufirs_.gif 
b/extras/source/gallery/htmlexpo/blufirs_.gif
deleted file mode 100644
index 617be4f8349e..
Binary files a/extras/source/gallery/htmlexpo/blufirs_.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blulast.gif 
b/extras/source/gallery/htmlexpo/blulast.gif
deleted file mode 100644
index 9356074310c4..
Binary files a/extras/source/gallery/htmlexpo/blulast.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blulast_.gif 
b/extras/source/gallery/htmlexpo/blulast_.gif
deleted file mode 100644
index 5d22bd51d821..
Binary files a/extras/source/gallery/htmlexpo/blulast_.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blunav.gif 
b/extras/source/gallery/htmlexpo/blunav.gif
deleted file mode 100644
index 2a863c68fcf2..
Binary files a/extras/source/gallery/htmlexpo/blunav.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blunext.gif 
b/extras/source/gallery/htmlexpo/blunext.gif
deleted file mode 100644
index c4e28a48b6ec..
Binary files a/extras/source/gallery/htmlexpo/blunext.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/blunext_.gif 
b/extras/source/gallery/htmlexpo/blunext_.gif
deleted file mode 100644
index bc2b1d64e511..
Binary files a/extras/source/gallery/htmlexpo/blunext_.gif and /dev/null differ
diff --git a/extras/source/gallery/htmlexpo/bluprev.gif 
b/extras/source/gallery/htmlexpo/bluprev.gif
deleted file mode 100644
index ffd6416c0b23..
Bi

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

2020-04-08 Thread Noel Grandin (via logerrit)

 framework/source/dispatch/popupmenudispatcher.cxx |   76 
 framework/source/fwe/classes/addonmenu.cxx|  138 -
 framework/source/fwe/helper/actiontriggerhelper.cxx   |  214 +-
 framework/source/fwe/xml/menudocumenthandler.cxx  |   98 -
 framework/source/fwe/xml/statusbardocumenthandler.cxx |  357 +--
 framework/source/fwe/xml/toolboxdocumenthandler.cxx   |  513 ++---
 framework/source/fwi/helper/mischelper.cxx|   22 
 framework/source/fwi/jobs/configaccess.cxx|   71 
 framework/source/fwi/uielement/constitemcontainer.cxx |   62 
 framework/source/fwi/uielement/itemcontainer.cxx  |   44 
 framework/source/fwi/uielement/rootitemcontainer.cxx  |   44 
 framework/source/helper/dockingareadefaultacceptor.cxx|   46 
 framework/source/helper/ocomponentaccess.cxx  |   28 
 framework/source/helper/statusindicatorfactory.cxx|   68 
 framework/source/helper/uiconfigelementwrapperbase.cxx|   90 
 framework/source/helper/uielementwrapperbase.cxx  |   28 
 framework/source/jobs/job.cxx |   50 
 framework/source/jobs/jobdata.cxx |   52 
 framework/source/jobs/jobexecutor.cxx |   34 
 framework/source/jobs/joburl.cxx  |   82 
 framework/source/layoutmanager/helpers.cxx|   58 
 framework/source/layoutmanager/layoutmanager.cxx  |  546 +++---
 framework/source/layoutmanager/toolbarlayoutmanager.cxx   |  907 
+-
 framework/source/loadenv/loadenv.cxx  |   26 
 framework/source/services/ContextChangeEventMultiplexer.cxx   |   59 
 framework/source/services/autorecovery.cxx|   48 
 framework/source/services/frame.cxx   |  380 ++--
 framework/source/uiconfiguration/imagemanagerimpl.cxx |  514 ++---
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |  392 ++--
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |  276 +--
 framework/source/uiconfiguration/windowstateconfiguration.cxx |  104 -
 framework/source/uielement/FixedImageToolbarController.cxx|   42 
 framework/source/uielement/FixedTextToolbarController.cxx |   24 
 framework/source/uielement/addonstoolbarwrapper.cxx   |   90 
 framework/source/uielement/buttontoolbarcontroller.cxx|   56 
 framework/source/uielement/complextoolbarcontroller.cxx   |  162 -
 framework/source/uielement/controlmenucontroller.cxx  |  114 -
 framework/source/uielement/edittoolbarcontroller.cxx  |   24 
 framework/source/uielement/fontmenucontroller.cxx |   91 -
 framework/source/uielement/fontsizemenucontroller.cxx |  152 -
 framework/source/uielement/generictoolbarcontroller.cxx   |  212 +-
 framework/source/uielement/headermenucontroller.cxx   |  156 -
 framework/source/uielement/imagebuttontoolbarcontroller.cxx   |   46 
 framework/source/uielement/langselectionstatusbarcontroller.cxx   |  182 +-
 framework/source/uielement/menubarmanager.cxx |  214 +-
 framework/source/uielement/menubarwrapper.cxx |  176 -
 framework/source/uielement/newmenucontroller.cxx  |  396 ++--
 framework/source/uielement/objectmenucontroller.cxx   |   24 
 framework/source/uielement/popuptoolbarcontroller.cxx |   40 
 framework/source/uielement/progressbarwrapper.cxx |   70 
 framework/source/uielement/recentfilesmenucontroller.cxx  |  282 +--
 framework/source/uielement/statusbarmanager.cxx   |   82 
 framework/source/uielement/statusbarwrapper.cxx   |   90 
 framework/source/uielement/subtoolbarcontroller.cxx   |  136 -
 framework/source/uielement/thesaurusmenucontroller.cxx|   82 
 framework/source/uielement/toolbarmanager.cxx |  148 -
 framework/source/uielement/toolbarmodemenucontroller.cxx  |  150 -
 framework/source/uielement/toolbarsmenucontroller.cxx |  580 +++---
 framework/source/uielement/toolbarwrapper.cxx |  198 +-
 framework/source/uielement/uicommanddescription.cxx   |  128 -
 framework/source/uifactory/factoryconfiguration.cxx   |   72 
 framework/source/uifactory/uielementfactorymanager.cxx|   44 
 framework/source/xml/imagesdocumenthandler.cxx|  146 -
 63 files changed, 4915 insertions(+), 4921 deletions(-)

New commits:
commit ff25a4a6f4b9763b09abbbd6a711fa4d18f40ade
Author: Noel Grandin 
AuthorDate: Tue Apr 7 20:32:26 2020 +0200
Commit:

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

2020-04-08 Thread Noel Grandin (via logerrit)

 compilerplugins/clang/flatten.cxx   |5 ++
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   24 +-
 i18npool/source/calendar/calendar_gregorian.cxx |   35 
 i18npool/source/calendar/calendar_hijri.cxx |   31 +++---
 i18npool/source/calendar/calendar_jewish.cxx|   27 ++--
 i18npool/source/nativenumber/nativenumbersupplier.cxx   |   29 ++---
 6 files changed, 80 insertions(+), 71 deletions(-)

New commits:
commit 32343bcbb786168df62f85a57e30c620c3d3bdb4
Author: Noel Grandin 
AuthorDate: Tue Apr 7 19:59:47 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 8 11:01:14 2020 +0200

loplugin:flatten in i18npool

and workaround a clang crash

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

diff --git a/compilerplugins/clang/flatten.cxx 
b/compilerplugins/clang/flatten.cxx
index 68baa742dcca..a084fabb9204 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -650,6 +650,11 @@ std::string Flatten::getSourceAsString(SourceRange range)
 char const *p1 = SM.getCharacterData( startLoc );
 char const *p2 = SM.getCharacterData( endLoc );
 p2 += Lexer::MeasureTokenLength( endLoc, SM, compiler.getLangOpts());
+if (p2 < p1) {
+// workaround clang weirdness, but don't return empty string
+// in case it happens during code replacement
+return "clang returned bad pointers";
+}
 return std::string( p1, p2 - p1);
 }
 
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 22d8a8b50568..b756fbbdbee2 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -307,23 +307,23 @@ void BreakIterator_Unicode::loadICUBreakIterator(const 
css::lang::Locale& rLocal
 bNewBreak=true;
 }
 
-if (bNewBreak || icuBI->mpValue->maICUText.pData != rText.pData)
-{
-const UChar *pText = reinterpret_cast(rText.getStr());
+if (!(bNewBreak || icuBI->mpValue->maICUText.pData != rText.pData))
+return;
 
-status = U_ZERO_ERROR;
-icuBI->mpValue->mpUt = utext_openUChars(icuBI->mpValue->mpUt, pText, 
rText.getLength(), &status);
+const UChar *pText = reinterpret_cast(rText.getStr());
 
-if (!U_SUCCESS(status))
-throw uno::RuntimeException();
+status = U_ZERO_ERROR;
+icuBI->mpValue->mpUt = utext_openUChars(icuBI->mpValue->mpUt, pText, 
rText.getLength(), &status);
 
-icuBI->mpValue->mpBreakIterator->setText(icuBI->mpValue->mpUt, status);
+if (!U_SUCCESS(status))
+throw uno::RuntimeException();
 
-if (!U_SUCCESS(status))
-throw uno::RuntimeException();
+icuBI->mpValue->mpBreakIterator->setText(icuBI->mpValue->mpUt, status);
 
-icuBI->mpValue->maICUText = rText;
-}
+if (!U_SUCCESS(status))
+throw uno::RuntimeException();
+
+icuBI->mpValue->maICUText = rText;
 }
 
 sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index a4eaf3dcde9f..b7ae49fbd96e 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -394,27 +394,28 @@ bool Calendar_gregorian::setTimeZone( const OUString& 
rTimeZone )
 // By using eraArray, it can take care Japanese and Taiwan ROC calendar.
 void Calendar_gregorian::mapFromGregorian()
 {
-if (eraArray) {
-sal_Int16 e, y, m, d;
+if (!eraArray)
+return;
 
-e = fieldValue[CalendarFieldIndex::ERA];
-y = fieldValue[CalendarFieldIndex::YEAR];
-m = fieldValue[CalendarFieldIndex::MONTH] + 1;
-d = fieldValue[CalendarFieldIndex::DAY_OF_MONTH];
+sal_Int16 e, y, m, d;
 
-// since the year is reversed for first era, it is reversed again here 
for Era compare.
-if (e == 0)
-y = 1 - y;
+e = fieldValue[CalendarFieldIndex::ERA];
+y = fieldValue[CalendarFieldIndex::YEAR];
+m = fieldValue[CalendarFieldIndex::MONTH] + 1;
+d = fieldValue[CalendarFieldIndex::DAY_OF_MONTH];
 
-for (e = 0; eraArray[e].year; e++)
-if ((y != eraArray[e].year) ? y < eraArray[e].year :
-(m != eraArray[e].month) ? m < eraArray[e].month : d < 
eraArray[e].day)
-break;
+// since the year is reversed for first era, it is reversed again here for 
Era compare.
+if (e == 0)
+y = 1 - y;
 
-fieldValue[CalendarFieldIndex::ERA] = e;
-fieldValue[CalendarFieldIndex::YEAR] =
-sal::static_int_cast( (e == 0) ? (eraArray[0].year - y) 
: (y - eraArray[e-

[Libreoffice-commits] online.git: test/Makefile.am test/WopiProofTests.cpp wsd/ProofKey.cpp wsd/ProofKey.hpp

2020-04-08 Thread Michael Meeks (via logerrit)

 test/Makefile.am|1 +
 test/WopiProofTests.cpp |   36 
 wsd/ProofKey.cpp|   30 +-
 wsd/ProofKey.hpp|   35 +++
 4 files changed, 73 insertions(+), 29 deletions(-)

New commits:
commit a2b9fc474a1b250fdaf8510a35089d4513de9585
Author: Michael Meeks 
AuthorDate: Tue Apr 7 21:42:30 2020 +0100
Commit: Michael Meeks 
CommitDate: Wed Apr 8 10:58:49 2020 +0200

Proof: re-factor - publicise some internals to make testing easier.

Also add dummy, run-every-build test to validate wopi like proofs.

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

diff --git a/test/Makefile.am b/test/Makefile.am
index db5c6fb95..629b52c19 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -71,6 +71,7 @@ test_base_source = \
TileQueueTests.cpp \
WhiteBoxTests.cpp \
DeltaTests.cpp \
+   WopiProofTests.cpp \
$(wsd_sources)
 
 unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS -DSTANDALONE_CPPUNIT
diff --git a/test/WopiProofTests.cpp b/test/WopiProofTests.cpp
new file mode 100644
index 0..1d2b1d5cb
--- /dev/null
+++ b/test/WopiProofTests.cpp
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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 
+
+/// Delta unit-tests.
+class WopiProofTests : public CPPUNIT_NS::TestFixture
+{
+CPPUNIT_TEST_SUITE(WopiProofTests);
+
+CPPUNIT_TEST(testProof);
+
+CPPUNIT_TEST_SUITE_END();
+
+void testProof();
+};
+
+void WopiProofTests::testProof()
+{
+LOK_ASSERT(1 > 0);
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(WopiProofTests);
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index e0dba1b46..489ad89b1 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -14,9 +14,7 @@
 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -95,31 +93,7 @@ std::string BytesToBase64(const std::vector& 
bytes)
 return oss.str();
 }
 
-class Proof {
-public:
-Proof();
-VecOfStringPairs GetProofHeaders(const std::string& access_token, const 
std::string& uri) const;
-const VecOfStringPairs& GetProofKeyAttributes() const { return m_aAttribs; 
}
-private:
-static std::string ProofKeyPath();
-
-// modulus and exponent are big-endian vectors
-static std::vector RSA2CapiBlob(const std::vector& modulus,
-   const std::vector& exponent);
-
-// Returns .Net tick (=100ns) count since 0001-01-01 00:00:00 Z
-// See https://docs.microsoft.com/en-us/dotnet/api/system.datetime.ticks
-static int64_t DotNetTicks(const std::chrono::system_clock::time_point& 
utc);
-// Returns bytes to sign and base64-encode
-// See 
http://www.wictorwilen.se/sharepoint-2013-building-your-own-wopi-client-part-2
-static std::vector GetProof(const std::string& access_token,
-   const std::string& uri, int64_t 
ticks);
-// Signs bytes and returns base64-encoded string
-std::string SignProof(const std::vector& proof) const;
-
-const std::unique_ptr m_pKey;
-VecOfStringPairs m_aAttribs;
-};
+}
 
 Proof::Proof()
 : m_pKey([]() -> Poco::Crypto::RSAKey* {
@@ -262,8 +236,6 @@ const Proof& GetProof()
 return proof;
 }
 
-}
-
 VecOfStringPairs GetProofHeaders(const std::string& access_token, const 
std::string& uri)
 {
 return GetProof().GetProofHeaders(access_token, uri);
diff --git a/wsd/ProofKey.hpp b/wsd/ProofKey.hpp
index f02403db1..e74942e70 100644
--- a/wsd/ProofKey.hpp
+++ b/wsd/ProofKey.hpp
@@ -14,9 +14,44 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 typedef std::vector> VecOfStringPairs;
 
+namespace Poco {
+namespace Crypto {
+class RSAKey;
+}
+}
+
+class Proof {
+public:
+Proof();
+VecOfStringPairs GetProofHeaders(const std::string& access_token, const 
std::string& uri) const;
+const VecOfStringPairs& GetProofKeyAttributes() const { return m_aAttribs; 
}
+private:
+static std::string ProofKeyPath();
+
+// modulus and exponent are big-endian vectors
+static std::vector RSA2CapiBlob(const std::vector& modulus,
+   const std::vector& exponent);
+
+// Returns .Net tick (=100ns) count since 0001-01-01 00:00:00 Z
+// See https://docs.microsoft.com/en-us/dotnet/api/system.datetime.ticks
+static int64_t DotNetTicks(const std:

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

2020-04-08 Thread Caolán McNamara (via logerrit)

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

New commits:
commit f2053a6accc2e68aa2920d4d3f46f82909415666
Author: Caolán McNamara 
AuthorDate: Wed Apr 8 08:55:48 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 8 10:58:32 2020 +0200

cid#1461385 silence Unchecked return value

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

diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index af559769836c..dacb0df3d3c4 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -326,7 +326,7 @@ void Bitmap::ImplMakeUnique()
 {
 std::shared_ptr xOldImpBmp = mxSalBmp;
 mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
-mxSalBmp->Create(*xOldImpBmp);
+(void)mxSalBmp->Create(*xOldImpBmp);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Michael Stahl (via logerrit)

 sw/source/core/undo/undel.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6c7245e789f973cf6dad03f7008ab3f9d12d350c
Author: Michael Stahl 
AuthorDate: Tue Apr 7 18:33:34 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 8 10:57:52 2020 +0200

tdf#131684 sw_redlinehide: fix SwUndoDelete for entire doc in section

The problem is that in SwUndoDelete::UndoImpl(), at the start there is
only one content node with a frame in the layout, and there is a special
case with m_nReplaceDummy being set so this SwTextFrame gets deleted by
the MoveNodes() call in line 969 that moves it into the newly inserted
section.

As a result of that, MakeFrames() won't do anything because it can't
find an existing frame in the same section.

In this case, MoveNodes() should leave the frame alone, as it is beyond
the end of the deletion and excluded from MakeFrames() - if it wasn't
merged before then it doesn't need action, if it was merged before (in a
different document maybe) the RecreateStartTextFrames() ought to fix it.

(regression from 723728cd358693b8f4bc9d913541aa4479f2bd48
 which disabled immediate creation of frames in Copy_())

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

diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index ba1d9210359d..6b4b4b3786de 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -965,7 +965,8 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext & 
rContext)
 SwNodeIndex aMvIdx(rDoc.GetNodes(), nMoveIndex);
 SwNodeRange aRg( aPos.nNode, 0, aPos.nNode, 1 );
 pMovedNode = &aPos.nNode.GetNode();
-rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx);
+// tdf#131684 without deleting frames
+rDoc.GetNodes().MoveNodes(aRg, rDoc.GetNodes(), aMvIdx, false);
 rDoc.GetNodes().Delete( aMvIdx);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.2-9'

2020-04-08 Thread Andras Timar (via logerrit)

Tag 'co-6.2-9' created by Andras Timar  at 
2020-04-08 08:52 +

co-6.2-9

Changes since CODE-4.2.1-2-53:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Caolán McNamara (via logerrit)

 sd/source/ui/animations/CustomAnimationList.cxx |   17 +
 sd/source/ui/animations/CustomAnimationList.hxx |1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 969ebe1c5801fa194ee29ffc7abfad7363ebd08f
Author: Caolán McNamara 
AuthorDate: Wed Apr 8 08:48:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 8 10:47:45 2020 +0200

cid#1461386 Unchecked return value

and

cid#1461388 Unchecked return value

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

diff --git a/sd/source/ui/animations/CustomAnimationList.cxx 
b/sd/source/ui/animations/CustomAnimationList.cxx
index 559ac92a6b5c..68ecf1362ce9 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -479,8 +479,8 @@ IMPL_LINK(CustomAnimationList, DragBeginHdl, bool&, 
rUnsetDragIcon, bool)
 
 // Note: pEntry is the effect with focus (if multiple effects are selected)
 mxDndEffectDragging = mxTreeView->make_iterator();
-mxTreeView->get_cursor(mxDndEffectDragging.get());
-mxDndEffectInsertBefore = 
mxTreeView->make_iterator(mxDndEffectDragging.get());
+if (!mxTreeView->get_cursor(mxDndEffectDragging.get()))
+mxDndEffectDragging.reset();
 
 // Allow normal processing.
 return false;
@@ -500,17 +500,18 @@ sal_Int8 CustomAnimationList::AcceptDrop( const 
AcceptDropEvent& rEvt )
 // D'n'D #5: Tell model to update effect order.
 sal_Int8 CustomAnimationList::ExecuteDrop(const ExecuteDropEvent& rEvt)
 {
-if (!mxTreeView->get_dest_row_at_pos(rEvt.maPosPixel, 
mxDndEffectInsertBefore.get()))
-mxDndEffectInsertBefore.reset();
+std::unique_ptr 
xDndEffectInsertBefore(mxTreeView->make_iterator());
+if (!mxTreeView->get_dest_row_at_pos(rEvt.maPosPixel, 
xDndEffectInsertBefore.get()))
+xDndEffectInsertBefore.reset();
 
 const bool bMovingEffect = ( mxDndEffectDragging != nullptr );
-const bool bMoveNotSelf  = !mxDndEffectInsertBefore || 
(mxDndEffectDragging && mxTreeView->iter_compare(*mxDndEffectInsertBefore, 
*mxDndEffectDragging) != 0);
+const bool bMoveNotSelf  = !xDndEffectInsertBefore || (mxDndEffectDragging 
&& mxTreeView->iter_compare(*xDndEffectInsertBefore, *mxDndEffectDragging) != 
0);
 const bool bHaveSequence = ( mpMainSequence.get() != nullptr );
 
 if( bMovingEffect && bMoveNotSelf && bHaveSequence )
 {
-CustomAnimationListEntryItem* pTarget = mxDndEffectInsertBefore ?
-
reinterpret_cast(mxTreeView->get_id(*mxDndEffectInsertBefore).toInt64())
 :
+CustomAnimationListEntryItem* pTarget = xDndEffectInsertBefore ?
+
reinterpret_cast(mxTreeView->get_id(*xDndEffectInsertBefore).toInt64())
 :
 nullptr;
 
 // Build list of effects
@@ -1100,7 +1101,7 @@ EffectSequence CustomAnimationList::getSelection() const
 if (!mxTreeView->get_row_expanded(rEntry) && 
mxTreeView->iter_has_child(rEntry))
 {
 std::unique_ptr xChild = 
mxTreeView->make_iterator(&rEntry);
-mxTreeView->iter_children(*xChild);
+(void)mxTreeView->iter_children(*xChild);
 
 do
 {
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx 
b/sd/source/ui/animations/CustomAnimationList.hxx
index 398793840187..3da6b350dce6 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -154,7 +154,6 @@ private:
 
 // drag & drop
 std::unique_ptr mxDndEffectDragging;
-std::unique_ptr mxDndEffectInsertBefore;
 std::vector> mDndEffectsSelected;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/tags/co-6.2-9' - 0 commits -

2020-04-08 Thread (via logerrit)

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/Admin.cpp wsd/AdminModel.cpp wsd/AdminModel.hpp

2020-04-08 Thread Miklos Vajna (via logerrit)

 wsd/Admin.cpp  |   11 ++-
 wsd/AdminModel.cpp |   13 +
 wsd/AdminModel.hpp |2 ++
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 60908ed88cf970b0457a8feba5239a3420d6850d
Author: Miklos Vajna 
AuthorDate: Wed Apr 8 09:03:07 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 8 10:23:59 2020 +0200

admin: only kill document pids

unit-admin is currently disabled, so... how to reproduce:

Edit loleaflet/admin/src/AdminSocketOverview.js to try to kill e.g. pid
0.

Expected result:

[ admin ] WRN  Invalid PID to kill (not a document pid)| wsd/Admin.cpp:168

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

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index ca72ecd61..88b9268df 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -157,7 +157,16 @@ void AdminSocketHandler::handleMessage(const 
std::vector &payload)
 {
 const int pid = std::stoi(tokens[1]);
 LOG_INF("Admin request to kill PID: " << pid);
-SigUtil::killChild(pid);
+
+std::set pids = model.getDocumentPids();
+if (pids.find(pid) != pids.end())
+{
+SigUtil::killChild(pid);
+}
+else
+{
+LOG_WRN("Invalid PID to kill (not a document pid)");
+}
 }
 catch (std::invalid_argument& exc)
 {
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index f8302f842..22e402a83 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -1016,4 +1016,17 @@ void AdminModel::getMetrics(std::ostringstream &oss)
 PrintDocActExpMetrics(oss, "view_load_duration", "milliseconds", 
docStats._viewLoadDuration);
 }
 
+std::set AdminModel::getDocumentPids() const
+{
+std::set pids;
+
+for (const auto& it : _documents)
+{
+const Document& document = it.second;
+pids.insert(document.getPid());
+}
+
+return pids;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/AdminModel.hpp b/wsd/AdminModel.hpp
index f683cd45c..be5d9dd0f 100644
--- a/wsd/AdminModel.hpp
+++ b/wsd/AdminModel.hpp
@@ -320,6 +320,8 @@ public:
 
 void getMetrics(std::ostringstream &oss);
 
+std::set getDocumentPids() const;
+
 static int getPidsFromProcName(const std::regex& procNameRegEx, 
std::vector *pids);
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Noel Grandin (via logerrit)

 hwpfilter/source/hstyle.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e9c327be8f0b4848e9f65687833ed89021907a6a
Author: Noel Grandin 
AuthorDate: Tue Apr 7 20:02:36 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 8 10:17:00 2020 +0200

loplugin:flatten in hwpfilter

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

diff --git a/hwpfilter/source/hstyle.cxx b/hwpfilter/source/hstyle.cxx
index e80a9c1a8b0d..e6f1e3999e07 100644
--- a/hwpfilter/source/hstyle.cxx
+++ b/hwpfilter/source/hstyle.cxx
@@ -67,24 +67,24 @@ char *HWPStyle::GetName(int n) const
 
 void HWPStyle::SetName(int n, char const *name)
 {
-if (n >= 0 && n < nstyles)
+if (!(n >= 0 && n < nstyles))
+return;
+
+if (name)
 {
-if (name)
-{
 #if defined __GNUC__ && (__GNUC__ == 8 || __GNUC__ == 9) && !defined __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
 #endif
-auto const p = DATA[n].name;
-strncpy(p, name, MAXSTYLENAME);
-p[MAXSTYLENAME] = '\0'; // just in case, even though the array is 
zero-initialized
+auto const p = DATA[n].name;
+strncpy(p, name, MAXSTYLENAME);
+p[MAXSTYLENAME] = '\0'; // just in case, even though the array is 
zero-initialized
 #if defined __GNUC__ && (__GNUC__ == 8 || __GNUC__ == 9) && !defined __clang__
 #pragma GCC diagnostic pop
 #endif
-}
-else
-DATA[n].name[0] = 0;
 }
+else
+DATA[n].name[0] = 0;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Caolán McNamara (via logerrit)

 include/vcl/weld.hxx  |1 +
 vcl/source/app/salvtables.cxx |   15 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   28 
 3 files changed, 44 insertions(+)

New commits:
commit 8a84493d1fe92faefecbd3352f911632cbb0e324
Author: Caolán McNamara 
AuthorDate: Tue Apr 7 20:52:50 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 8 09:46:41 2020 +0200

add get_entry_font to match set_entry_font

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7dbe6643491e..18eeb67f38a1 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -679,6 +679,7 @@ public:
 
 // font size is in points, not pixels, e.g. see Window::[G]etPointFont
 virtual void set_entry_font(const vcl::Font& rFont) = 0;
+virtual vcl::Font get_entry_font() = 0;
 
 virtual bool get_popup_shown() const = 0;
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index febffea547fc..13f596d5bc36 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5948,6 +5948,8 @@ public:
 
 virtual void set_entry_font(const vcl::Font&) override { assert(false); }
 
+virtual vcl::Font get_entry_font() override { assert(false); return 
vcl::Font(); }
+
 virtual ~SalInstanceComboBoxWithoutEdit() override
 {
 m_xComboBox->SetSelectHdl(Link());
@@ -6071,6 +6073,13 @@ public:
 pEdit->Invalidate();
 }
 
+virtual vcl::Font get_entry_font() override
+{
+Edit* pEdit = m_xComboBox->GetSubEdit();
+assert(pEdit);
+return pEdit->GetPointFont(*pEdit);
+}
+
 virtual ~SalInstanceComboBoxWithEdit() override
 {
 m_xComboBox->SetTextFilter(nullptr);
@@ -6149,6 +6158,12 @@ public:
 rEntry.Invalidate();
 }
 
+virtual vcl::Font get_entry_font() override
+{
+Edit& rEntry = m_pEntry->getEntry();
+return rEntry.GetPointFont(rEntry);
+}
+
 virtual void set_entry_placeholder_text(const OUString& rText) override
 {
 Edit& rEntry = m_pEntry->getEntry();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 29d1ad3b0b9f..69904fe34b17 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -8444,6 +8444,7 @@ class GtkInstanceEntry : public GtkInstanceWidget, public 
virtual weld::Entry
 {
 private:
 GtkEntry* m_pEntry;
+std::unique_ptr m_xFont;
 gulong m_nChangedSignalId;
 gulong m_nInsertTextSignalId;
 gulong m_nCursorPosSignalId;
@@ -8621,11 +8622,19 @@ public:
 
 virtual void set_font(const vcl::Font& rFont) override
 {
+m_xFont.reset(new vcl::Font(rFont));
 PangoAttrList* pAttrList = create_attr_list(rFont);
 gtk_entry_set_attributes(m_pEntry, pAttrList);
 pango_attr_list_unref(pAttrList);
 }
 
+virtual vcl::Font get_font() override
+{
+if (m_xFont)
+return *m_xFont;
+return GtkInstanceWidget::get_font();
+}
+
 void fire_signal_changed()
 {
 signal_changed();
@@ -12577,6 +12586,7 @@ private:
 GtkCellRenderer* m_pTextRenderer;
 GtkMenu* m_pMenu;
 GtkWidget* m_pToggleButton;
+std::unique_ptr m_xFont;
 std::unique_ptr m_xSorter;
 vcl::QuickSelectionEngine m_aQuickSelectionEngine;
 std::vector m_aSeparatorRows;
@@ -13405,6 +13415,7 @@ public:
 
 virtual void set_entry_font(const vcl::Font& rFont) override
 {
+m_xFont.reset(new vcl::Font(rFont));
 PangoAttrList* pAttrList = create_attr_list(rFont);
 GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox));
 assert(pChild && GTK_IS_ENTRY(pChild));
@@ -13413,6 +13424,18 @@ public:
 pango_attr_list_unref(pAttrList);
 }
 
+virtual vcl::Font get_entry_font() override
+{
+if (m_xFont)
+return *m_xFont;
+GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pComboBox));
+assert(pChild && GTK_IS_ENTRY(pChild));
+GtkEntry* pEntry = GTK_ENTRY(pChild);
+PangoContext* pContext = 
gtk_widget_get_pango_context(GTK_WIDGET(pEntry));
+return pango_to_vcl(pango_context_get_font_description(pContext),
+
Application::GetSettings().GetUILanguageTag().getLocale());
+}
+
 virtual void disable_notify_events() override
 {
 if (GtkEntry* pEntry = get_entry())
@@ -13716,6 +13739,11 @@ public:
 m_xEntry->set_font(rFont);
 }
 
+virtual vcl::Font get_entry_font() override
+{
+return m_xEntry->get_font();
+}
+
 virtual void grab_focus() override { m_xEntry->grab_focus(); }
 
 virtual void connect_focus_in(const Link& rLink) override
___
Libreoffice-commits mailing list
libreoffice-comm

Re: Linux SAL_USE_VCLPLUGIN=svp and the clipboard

2020-04-08 Thread Stephan Bergmann


On 03/04/2020 18:00, Miklos Vajna wrote:

My understanding is that in when svp is active and
comphelper::LibreOfficeKit::isActive() returns true, then the
expectation is that each view has its own clipboard. A "view" is the
Window -> New Window menu item. The LOK case wants this, as such a view
actually ends up in the web browser of different users. This is the same
as the "tiled rendering" case, these tests always set the LOK mode to
true.

When comphelper::LibreOfficeKit::isActive() return false, then then
expectation is that this is a desktop session where both views belong to
the same user, so a shared clipboard makes sense. The UITests probably
want to mimic the desktop case, so they would be in this category.
(Actually, any kind of test which is not a tiled rendering test.)

Does that help?


Thanks, that helped indeed.  I've created 
 "Make 
SalInstance::CreateClipboard return a single instance in the non-LOK 
case" now.


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

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

2020-04-08 Thread Michael Weghorn (via logerrit)

 android/source/build.gradle |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b7056b800f50eaa861177891ef0ee9d103f65069
Author: Michael Weghorn 
AuthorDate: Wed Apr 8 08:29:01 2020 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 8 09:17:22 2020 +0200

tdf#116243 android: Include headerfootermenu.ui

Otherwise, Android Viewer crashes when clicking inside
a header or footer, failing to access the file:

E libo:sal/osl/unx/file: failed to open 
/assets//config/soffice.cfg/modules/swriter/ui/headerfootermenu.ui
W vcl.builder: 2:vcl/source/window/builder.cxx:481: 
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window *, const 
rtl::OUString &, const rtl::OUString &, const rtl::OString &, const 
css::uno::Reference &, bool, const NotebookBarAddonsItem *)
W vcl.builder: when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
file:///assets//config/soffice.cfg/modules/swriter/ui/headerfootermenu.ui
I stderr  : terminating with uncaught exception of type 
com::sun::star::container::NoSuchElementException

Change-Id: Iaf95e3dd2dbd9c471c8e1b3facabe21c93c47622
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91865
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 3383df0679d6..a672d0945c73 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -190,10 +190,11 @@ task copyAssets(type: Copy) {
 // documents with manual page break trigger attempt to read the ui file 
'pagebreakmenu.ui'
 // would trigger a css::container::NoSuchElementException with 
osl_File_E_NOENT
 // if not present and since it is not caught would crash the app;
-// 'annotationmenu.ui' required to handle documents containing comments
+// 'annotationmenu.ui' required to handle documents containing comments,
+// 'headerfootermenu.ui' when clicking inside header/footer of document
 into('config') {
 from "${liboInstdir}/share/config"
-include '**/pagebreakmenu.ui', '**/annotationmenu.ui'
+include '**/pagebreakmenu.ui', '**/annotationmenu.ui', 
'**/headerfootermenu.ui'
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-08 Thread Miklos Vajna (via logerrit)

 vcl/source/filter/ipdf/pdfread.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9b69b624bf7a35e99b15da1709b4050cfbe46829
Author: Miklos Vajna 
AuthorDate: Tue Apr 7 21:08:20 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 8 09:02:35 2020 +0200

vcl pdf import: use convertTwipToMm100()

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

diff --git a/vcl/source/filter/ipdf/pdfread.cxx 
b/vcl/source/filter/ipdf/pdfread.cxx
index 386ede2d0f42..022fa502f986 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -278,13 +278,12 @@ size_t ImportPDFUnloaded(const OUString& rURL, 
std::vector(
 aPdfDataArray, OUString(), VectorGraphicDataType::Pdf, nPageIndex);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

96 matches

Mail list logo