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

[Stephan Bergmann (via logerrit)]

 pyuno/source/module/pyuno.cxx  |4 ++--
 pyuno/source/module/pyuno_callable.cxx |4 ++--
 pyuno/source/module/pyuno_iterator.cxx |8 
 pyuno/source/module/pyuno_runtime.cxx  |4 ++--
 pyuno/source/module/pyuno_struct.cxx   |4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 23d9966751566028c50ca95ca203d20f36c64f30
Author: Stephan Bergmann 
AuthorDate: Mon May 11 22:46:12 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 12 08:24:16 2020 +0200

Fix initialization of Python-3.8--only at-end tp_print member

Until Python 3.7, PyTypeObject had a member tp_print following tp_dealloc, 
which
had then been repurposed as

>  /* Methods to implement standard operations */
>
>  destructor tp_dealloc;
> -printfunc tp_print;
> +Py_ssize_t tp_vectorcall_offset;
>  getattrfunc tp_getattr;
>  setattrfunc tp_setattr;
>  PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 
2)

in  "bpo-36974: implement PEP 590
(GH-13185)" towards Python 3.8.  Then only on the 3.8 branch (and prior to 
tag
v3.8.0),  "[3.8] bpo-37250: put back 
tp_print
for backwards compatibility (GH-14193)" added

>  destructor tp_finalize;
>  vectorcallfunc tp_vectorcall;
>
> +/* bpo-37250: kept for backwards compatibility in CPython 3.8 only */
> +Py_DEPRECATED(3.8) int (*tp_print)(PyObject *, FILE *, int);
> +
>  #ifdef COUNT_ALLOCS
>  /* these must be last and never explicitly initialized */
>  Py_ssize_t tp_allocs;

at the end of PyTypeObject.  This was apparently done so that third-party 
code
containing initialization code like

  X.tp_print = 0;

would continue to compile (by just adding back a member with that name, 
even if
at a "random" new---and otherwise unused---location).  However, for our way 
of
list-initializing PyTypeObject instances in pyuno that new member caused
"missing field 'tp_print' initializer" -Wmissing-field-initializers 
warnings, so
50ccb7e82b7053306721cbe220323be072306a29 "python 3.8.2 compile: add 
tp_print to
PyTypeObject" added initializers for this new at-end member.  But it did so 
in a
way that raises three concerns:

1  The new member was already added in Python 3.8.0 (prior to tag v3.8.0), 
not
   only in 3.8.2.

2  The new member was only added to Python 3.8.  It has not been added to
   current master towards 3.9.

3  It is unclear why the comments mention "Py_ssize_t" as the type of that 
new
   member, when actually it is of a function pointer type (see above).  
Probably
   best to just drop that from the comments, to avoid confusion.

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

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index ba60f04bbcaa..25aea6436032 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1660,12 +1660,12 @@ static PyTypeObject PyUNOType =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
-#if PY_VERSION_HEX >= 0x03080200
+#if PY_VERSION_HEX < 0x0309
 #if defined __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
-, nullptr //Py_ssize_t tp_print
+, nullptr // tp_print
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/pyuno/source/module/pyuno_callable.cxx 
b/pyuno/source/module/pyuno_callable.cxx
index 867a7f917aa0..1c138f71b419 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -235,12 +235,12 @@ static PyTypeObject PyUNO_callable_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
-#if PY_VERSION_HEX >= 0x03080200
+#if PY_VERSION_HEX < 0x0309
 #if defined __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
-, nullptr //Py_ssize_t tp_print
+, nullptr // tp_print
 #if defined __clang__
 #pragma clang diagnostic pop
 #endif
diff --git a/pyuno/source/module/pyuno_iterator.cxx 
b/pyuno/source/module/pyuno_iterator.cxx
index 8337feba9a9d..840fc977014a 100644
--- a/pyuno/source/module/pyuno_iterator.cxx
+++ b/pyuno/source/module/pyuno_iterator.cxx
@@ -167,12 +167,12 @@ static PyTypeObject PyUNO_iterator_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
-#if PY_VERSION_HEX >= 0x03080200
+#if PY_VERSION_HEX < 0x0309
 #if defi

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit 18614ea5c899f8c01691562e5cad5be9b884
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon May 11 23:44:32 2020 -0500
Commit: Gerrit Code Review 
CommitDate: Tue May 12 06:44:32 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a5f1ad79fc3c7a7bf358f1ab9afe79269f5b8cf5
  - Remove HTML attribute values from the translatable strings

Change-Id: I9d1d0223b2eec3eb0e1181bda2f8aa6c7d90763f

diff --git a/helpcontent2 b/helpcontent2
index 11458f34eb3e..a5f1ad79fc3c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 11458f34eb3e0e965a58ad9a0667e7259ad52d50
+Subproject commit a5f1ad79fc3c7a7bf358f1ab9afe79269f5b8cf5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos (via logerrit)]

 source/text/shared/01/05020400.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a5f1ad79fc3c7a7bf358f1ab9afe79269f5b8cf5
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon May 11 23:44:18 2020 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 11 23:44:18 2020 -0500

Remove HTML attribute values from the translatable strings

Change-Id: I9d1d0223b2eec3eb0e1181bda2f8aa6c7d90763f

diff --git a/source/text/shared/01/05020400.xhp 
b/source/text/shared/01/05020400.xhp
index 990ecd64f..f1887d0e5 100644
--- a/source/text/shared/01/05020400.xhp
+++ b/source/text/shared/01/05020400.xhp
@@ -95,7 +95,7 @@
 
 
 
-_self
+_self
 
 
 File opens 
in the current frame.
@@ -103,7 +103,7 @@
 
 
 
-_blank
+_blank
 
 
 File opens 
in a new page.
@@ -111,7 +111,7 @@
 
 
 
-_parent
+_parent
 
 
 File opens 
in the parent frame of the current frame. If there is no parent frame, the 
current frame is used.
@@ -119,7 +119,7 @@
 
 
 
-_top
+_top
 
 
 File opens 
in the topmost frame in the hierarchy.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - include/basegfx

[Tomaž Vajngerl (via logerrit)]

 include/basegfx/color/bcolor.hxx   |5 -
 include/basegfx/color/bcolormodifier.hxx   |6 -
 include/basegfx/color/bcolortools.hxx  |   33 +++-
 include/basegfx/curve/b2dbeziertools.hxx   |5 -
 include/basegfx/curve/b2dcubicbezier.hxx   |5 -
 include/basegfx/matrix/b2dhommatrix.hxx|5 -
 include/basegfx/matrix/b2dhommatrixtools.hxx   |   28 --
 include/basegfx/matrix/b3dhommatrix.hxx|5 -
 include/basegfx/matrix/b3dhommatrixtools.hxx   |   23 -
 include/basegfx/pixel/bpixel.hxx   |5 -
 include/basegfx/point/b2dpoint.hxx |5 -
 include/basegfx/point/b2ipoint.hxx |5 -
 include/basegfx/point/b3dpoint.hxx |5 -
 include/basegfx/polygon/WaveLine.hxx   |5 -
 include/basegfx/polygon/b2dlinegeometry.hxx|   12 --
 include/basegfx/polygon/b2dpolygon.hxx |5 -
 include/basegfx/polygon/b2dpolygonclipper.hxx  |   65 +++-
 include/basegfx/polygon/b2dpolygoncutandtouch.hxx  |   45 ---
 include/basegfx/polygon/b2dpolygontools.hxx|   14 +--
 include/basegfx/polygon/b2dpolygontriangulator.hxx |   12 --
 include/basegfx/polygon/b2dpolypolygon.hxx |5 -
 include/basegfx/polygon/b2dpolypolygoncutter.hxx   |   13 ---
 include/basegfx/polygon/b2dpolypolygontools.hxx|   14 +--
 include/basegfx/polygon/b2dtrapezoid.hxx   |   66 +++-
 include/basegfx/polygon/b3dpolygon.hxx |6 -
 include/basegfx/polygon/b3dpolygontools.hxx|   18 +---
 include/basegfx/polygon/b3dpolypolygon.hxx |5 -
 include/basegfx/polygon/b3dpolypolygontools.hxx|   15 +--
 include/basegfx/range/b2dconnectedranges.hxx   |5 -
 include/basegfx/range/b2drangeclipper.hxx  |5 -
 include/basegfx/range/b2drectangle.hxx |5 -
 include/basegfx/range/b2irectangle.hxx |5 -
 include/basegfx/range/b3drange.hxx |6 -
 include/basegfx/range/basicbox.hxx |5 -
 include/basegfx/range/basicrange.hxx   |5 -
 include/basegfx/raster/bzpixelraster.hxx   |5 -
 include/basegfx/raster/rasterconvert3d.hxx |   33 +---
 include/basegfx/tuple/b2dtuple.hxx |5 -
 include/basegfx/tuple/b2i64tuple.hxx   |5 -
 include/basegfx/tuple/b2ituple.hxx |5 -
 include/basegfx/tuple/b3dtuple.hxx |5 -
 include/basegfx/tuple/b3ituple.hxx |5 -
 include/basegfx/utils/b2dclipstate.hxx |   11 --
 include/basegfx/utils/canvastools.hxx  |   12 --
 include/basegfx/utils/gradienttools.hxx|5 -
 include/basegfx/utils/keystoplerp.hxx  |   10 --
 include/basegfx/utils/lerp.hxx |   38 +++--
 include/basegfx/utils/rectcliptools.hxx|   85 +
 include/basegfx/utils/systemdependentdata.hxx  |   17 
 include/basegfx/utils/tools.hxx|   11 --
 include/basegfx/utils/unopolypolygon.hxx   |   10 --
 include/basegfx/utils/zoomtools.hxx|   21 +
 include/basegfx/vector/b2dsize.hxx |5 -
 include/basegfx/vector/b2dvector.hxx   |5 -
 include/basegfx/vector/b2enums.hxx |5 -
 include/basegfx/vector/b2isize.hxx |5 -
 include/basegfx/vector/b2ivector.hxx   |5 -
 include/basegfx/vector/b3dvector.hxx   |5 -
 58 files changed, 250 insertions(+), 534 deletions(-)

New commits:
commit 0072c12507c5e34824f62a46b9b116240b156f4f
Author: Tomaž Vajngerl 
AuthorDate: Mon May 11 22:44:38 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Mon May 11 22:44:38 2020 +0200

basegfx: simplify namespaces in ALL basegfx headers

Change-Id: Iaf9426507e3822363e69dff2cae2b22f34b1b26c

diff --git a/include/basegfx/color/bcolortools.hxx 
b/include/basegfx/color/bcolortools.hxx
index 4a1574da4cdf..5c16802cff4a 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -21,22 +21,21 @@
 
 #include 
 
-namespace basegfx
+namespace basegfx { class BColor; }
+
+namespace basegfx::utils
 {
-class BColor;
-
-namespace utils
-{
-/// Transform from RGB to HSL
-BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
-/// Transform from HSL to RGB
-BASEGFX_DLLPUBLIC BColor hsl2rgb(const BColor& rHSLColor);
-
-/// Transform from RGB to HSV
-BASEGFX_DLLPUBLIC BColor rgb2hsv(const BColor& rRGBColor);
-/// Transform from HSV to RGB
-BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor);
-}
+
+/// Transform from RGB to HSL
+BASEGFX_DLLPUBLIC BColor rgb2hsl(const BColor& rRGBColor);
+/// Transform from HSL to RGB
+BASEGFX_DLLPU

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

[Pranam Lashkari (via logerrit)]

 svx/source/sidebar/text/TextPropertyPanel.cxx |6 ++
 svx/source/sidebar/text/TextPropertyPanel.hxx |2 ++
 svx/uiconfig/ui/sidebartextpanel.ui   |   25 +
 3 files changed, 33 insertions(+)

New commits:
commit a0e45956ce90401be01918f4712ae187beccf248
Author: Pranam Lashkari 
AuthorDate: Thu May 7 19:21:04 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 11 23:00:28 2020 +0200

fixed clear Direct Formatting button to sidebar in impress

Change-Id: I81cd30b3ce7087122c260dca99e86a3c857447b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93813
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 6c3b20cedef6..642f41800718 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -57,6 +57,8 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, 
const css::uno::Ref
 , mxToolBoxBackgroundColorDispatch(new 
ToolbarUnoDispatcher(*mxToolBoxBackgroundColor, *m_xBuilder, rxFrame))
 , mxResetBar(m_xBuilder->weld_toolbar("resetattr"))
 , mxResetBarDispatch(new ToolbarUnoDispatcher(*mxResetBar, *m_xBuilder, 
rxFrame))
+, mxDefaultBar(m_xBuilder->weld_toolbar("defaultattr"))
+, mxDefaultBarDispatch(new ToolbarUnoDispatcher(*mxDefaultBar, 
*m_xBuilder, rxFrame))
 , mxPositionBar(m_xBuilder->weld_toolbar("position"))
 , mxPositionBarDispatch(new ToolbarUnoDispatcher(*mxPositionBar, 
*m_xBuilder, rxFrame))
 , mxSpacingBar(m_xBuilder->weld_toolbar("spacingbar"))
@@ -78,6 +80,7 @@ TextPropertyPanel::~TextPropertyPanel()
 void TextPropertyPanel::dispose()
 {
 mxResetBarDispatch.reset();
+mxDefaultBarDispatch.reset();
 mxPositionBarDispatch.reset();
 mxSpacingBarDispatch.reset();
 mxToolBoxFontColorSwDispatch.reset();
@@ -89,6 +92,7 @@ void TextPropertyPanel::dispose()
 mxFontDispatch.reset();
 
 mxResetBar.reset();
+mxDefaultBar.reset();
 mxPositionBar.reset();
 mxSpacingBar.reset();
 mxToolBoxFontColorSw.reset();
@@ -140,6 +144,8 @@ void TextPropertyPanel::HandleContextChange (
 mxToolBoxFontColor->set_visible(!bWriterText);
 mxToolBoxFontColorSw->set_visible(bWriterText);
 mxToolBoxBackgroundColor->set_visible(bDrawText);
+mxResetBar->set_visible(bWriterText);
+mxDefaultBar->set_visible(bDrawText);
 }
 
 } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx 
b/svx/source/sidebar/text/TextPropertyPanel.hxx
index baea3468f9de..437596145584 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -62,6 +62,8 @@ private:
 std::unique_ptr mxToolBoxBackgroundColorDispatch;
 std::unique_ptr mxResetBar;
 std::unique_ptr mxResetBarDispatch;
+std::unique_ptr mxDefaultBar;
+std::unique_ptr mxDefaultBarDispatch;
 std::unique_ptr mxPositionBar;
 std::unique_ptr mxPositionBarDispatch;
 std::unique_ptr mxSpacingBar;
diff --git a/svx/uiconfig/ui/sidebartextpanel.ui 
b/svx/uiconfig/ui/sidebartextpanel.ui
index 14584cdc63d1..943cf41b1165 100644
--- a/svx/uiconfig/ui/sidebartextpanel.ui
+++ b/svx/uiconfig/ui/sidebartextpanel.ui
@@ -337,6 +337,31 @@
 3
   
 
+
+  
+True
+True
+icons
+False
+2
+
+  
+True
+False
+True
+  
+  
+False
+False
+  
+
+  
+  
+False
+True
+3
+  
+
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 svx/source/sidebar/text/TextPropertyPanel.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 4118610df8a78b00e5369bad1d9ce21cf1fbafeb
Author: Pranam Lashkari 
AuthorDate: Mon May 11 19:43:37 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 11 23:00:49 2020 +0200

added clear Direct Formatting button in calc sidebar

Change-Id: I7f18c696eb32332d9c65145e7788370304d91ea6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93969
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx 
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 642f41800718..89292ea03bc1 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -116,6 +116,7 @@ void TextPropertyPanel::HandleContextChange (
 
 bool bWriterText = false;
 bool bDrawText = false;
+bool bCalcText = false;
 
 switch (maContext.GetCombinedContext_DI())
 {
@@ -137,6 +138,14 @@ void TextPropertyPanel::HandleContextChange (
 bWriterText = true;
 break;
 
+case CombinedEnumContext(Application::Calc, Context::Text):
+case CombinedEnumContext(Application::Calc, Context::Table):
+case CombinedEnumContext(Application::Calc, Context::Cell):
+case CombinedEnumContext(Application::Calc, Context::EditCell):
+case CombinedEnumContext(Application::Calc, Context::Grid):
+bCalcText = true;
+break;
+
 default:
 break;
 }
@@ -144,7 +153,7 @@ void TextPropertyPanel::HandleContextChange (
 mxToolBoxFontColor->set_visible(!bWriterText);
 mxToolBoxFontColorSw->set_visible(bWriterText);
 mxToolBoxBackgroundColor->set_visible(bDrawText);
-mxResetBar->set_visible(bWriterText);
+mxResetBar->set_visible(bWriterText || bCalcText);
 mxDefaultBar->set_visible(bDrawText);
 }
 
___
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-3' - 2 commits - cypress_test/integration_tests loleaflet/css loleaflet/src

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |   15 +++
 loleaflet/css/loleaflet.css  |4 -
 loleaflet/src/layer/FormFieldButtonLayer.js  |   38 
++
 3 files changed, 44 insertions(+), 13 deletions(-)

New commits:
commit 0f5271149a9c71ecb125b0174dcc6031f736f645
Author: Tamás Zolnai 
AuthorDate: Mon May 11 17:18:50 2020 +0200
Commit: Andras Timar 
CommitDate: Mon May 11 22:59:00 2020 +0200

MSForms: add a small padding to the list items.

Change-Id: I4ba449a1c82ab046454a87d09f351879b5ac9f26
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93981
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 166c6d87f790d0f0a4d5731431914278ad47ccd8)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94012
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index b2f788141..3ec71f0f1 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -562,7 +562,9 @@ body {
 }
 
 .drop-down-field-list-item {
-   width: 100%;
+   width: calc(100% - 10px);
+   padding-left: 5px;
+   padding-right: 5px;
 }
 
 .drop-down-field-list-item.selected {
commit 4875539b15452fa722403728f330d4bd01b3fc44
Author: Tamás Zolnai 
AuthorDate: Mon May 11 13:40:05 2020 +0200
Commit: Andras Timar 
CommitDate: Mon May 11 22:58:48 2020 +0200

MSForms: display placeholder text, when there is no items.

Change-Id: I8acd29d734820f6ddc36871cfefd2956c213
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93962
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit f7bf4d5cdd5e97a7a11745ce9839db676ea9bbc4)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94011
Reviewed-by: Andras Timar 

diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js 
b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
index 8fbc268fb..def301989 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -227,6 +227,21 @@ describe('Form field button tests.', function() {
buttonShouldExist();
 
cy.get('.drop-down-field-list-item')
+   .should('have.text', 'No Item specified');
+
+   cy.get('.drop-down-field-list-item.selected')
+   .should('not.exist');
+
+   cy.get('.form-field-button')
+   .click();
+
+   cy.get('.drop-down-field-list')
+   .should('be.visible');
+
+   cy.contains('.drop-down-field-list-item', 'No Item specified')
+   .click();
+
+   cy.get('.drop-down-field-list-item.selected')
.should('not.exist');
});
 });
diff --git a/loleaflet/src/layer/FormFieldButtonLayer.js 
b/loleaflet/src/layer/FormFieldButtonLayer.js
index 0acaabce5..fcd826c28 100644
--- a/loleaflet/src/layer/FormFieldButtonLayer.js
+++ b/loleaflet/src/layer/FormFieldButtonLayer.js
@@ -104,20 +104,30 @@ L.FormFieldButton = L.Layer.extend({
 
var itemList = this._buttonData.params.items;
var selected = parseInt(this._buttonData.params.selected);
+
for (var i = 0; i < itemList.length; ++i) {
-   var option = L.DomUtil.create('div', 
'drop-down-field-list-item', dropDownList);
-   option.innerHTML = itemList[i];
+   this._buildListItem(dropDownList, itemList[i], i === 
selected);
+   }
+
+   if (this._buttonData.params.items.length === 0) {
+   this._buildListItem(dropDownList, 
this._buttonData.params.placeholderText, false);
+   }
+   },
 
-   option.addEventListener('click', 
this._onListItemSelect);
-   option.map = this.map;
+   _buildListItem: function(parent, text, selected) {
+   var option = L.DomUtil.create('div', 
'drop-down-field-list-item', parent);
+   option.innerHTML = text;
 
-   // Stop propagation to the main document
-   option.addEventListener('mouseup', function(event) 
{event.stopPropagation();});
-   option.addEventListener('mousedown', function(event) 
{event.stopPropagation();});
+   option.addEventListener('click', this._onListItemSelect);
+   option.map = this.map;
+   option._buttonData = this._buttonData;
 
-   if (i === selected)
-   option.classList.add('selected');
-   }
+   // Stop propagation to the main document
+   option.addEventListener('mouseup', function(event) 
{e

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

[Stephan Bergmann (via logerrit)]

 pyuno/source/module/pyuno.cxx  |   14 +++---
 pyuno/source/module/pyuno_callable.cxx |   14 +++---
 pyuno/source/module/pyuno_iterator.cxx |   28 ++--
 pyuno/source/module/pyuno_runtime.cxx  |   14 +++---
 pyuno/source/module/pyuno_struct.cxx   |   14 +++---
 5 files changed, 42 insertions(+), 42 deletions(-)

New commits:
commit 893a5249b934f92f072b89b9b558c9de593aa557
Author: Stephan Bergmann 
AuthorDate: Mon May 11 21:40:17 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 11 22:37:53 2020 +0200

More targeted silencing of -Wdeprecated-declarations

...compared to d1786724b8e8e474e1f7e39012c1f19611841dc0 "prevent warnings in
pyuno with latest python".  For one it is only the

  /* bpo-37250: kept for backwards compatibility in CPython 3.8 only */
  Py_DEPRECATED(3.8) int (*tp_print)(PyObject *, FILE *, int);

member (in /usr/include/python3.8/cpython/object.h) that causes a warning.  
And
for another it is only Clang that emits a warning when initializing a 
deprecated
member that way, 

"[cfe-dev] Diagnosing initialization of deprecated data member?"

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

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 1b875b6891d0..ba60f04bbcaa 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1603,10 +1603,6 @@ static PyMappingMethods PyUNOMappingMethods[] =
 PyUNO_setitem,   /* mp_ass_subscript */
 };
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 static PyTypeObject PyUNOType =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -1665,14 +1661,18 @@ static PyTypeObject PyUNOType =
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
 #if PY_VERSION_HEX >= 0x03080200
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
 , nullptr //Py_ssize_t tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
 #endif
 #endif
 #endif
-};
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
 #endif
+};
 
 int PyUNO_initType()
 {
diff --git a/pyuno/source/module/pyuno_callable.cxx 
b/pyuno/source/module/pyuno_callable.cxx
index 548c2bcef7dc..867a7f917aa0 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -178,10 +178,6 @@ static PyObject* PyUNO_callable_call(
 }
 
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 static PyTypeObject PyUNO_callable_Type =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -240,14 +236,18 @@ static PyTypeObject PyUNO_callable_Type =
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
 #if PY_VERSION_HEX >= 0x03080200
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
 , nullptr //Py_ssize_t tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
 #endif
 #endif
 #endif
-};
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
 #endif
+};
 
 PyRef PyUNO_callable_new (
 const Reference &my_inv,
diff --git a/pyuno/source/module/pyuno_iterator.cxx 
b/pyuno/source/module/pyuno_iterator.cxx
index 9258b780a304..8337feba9a9d 100644
--- a/pyuno/source/module/pyuno_iterator.cxx
+++ b/pyuno/source/module/pyuno_iterator.cxx
@@ -110,10 +110,6 @@ static PyObject* PyUNO_iterator_next( PyObject *self )
 return nullptr;
 }
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 static PyTypeObject PyUNO_iterator_Type =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -172,14 +168,18 @@ static PyTypeObject PyUNO_iterator_Type =
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
 #if PY_VERSION_HEX >= 0x03080200
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
 , nullptr //Py_ssize_t tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
 #endif
 #endif
 #endif
-};
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
 #endif
+};
 
 PyObject* PyUNO_iterator_new( const Reference< XEnumeration >& xEnumeration )
 {
@@ -256,10 +256,6 @@ static PyObject* PyUNO_list_iterator_next( PyObject *self )
 return nullptr;
 }
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 static PyTypeObject PyUNO_list_iterator_Type =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -318,14 +314,18 @@ static PyTypeObject PyUNO_list_iterator_Type =
 #if 

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/05020300.xhp |   55 ++---
 1 file changed, 34 insertions(+), 21 deletions(-)

New commits:
commit 11458f34eb3e0e965a58ad9a0667e7259ad52d50
Author: Olivier Hallot 
AuthorDate: Mon May 11 17:27:06 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon May 11 22:32:27 2020 +0200

Fix untranslatable XML'ish

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

diff --git a/source/text/shared/01/05020300.xhp 
b/source/text/shared/01/05020300.xhp
index 672ee5186..696b8e9a9 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -36,7 +36,7 @@
 
 
 
-  Numbers / Format
+  Numbers / Format
 
 Specify the formatting option for the selected 
variable.
 Specify the formatting options for the 
selected cell(s).
@@ -45,67 +45,80 @@
   
 
 
-  Category
+  Category
   Select a category from the list, 
and then select a formatting style in the Format 
box.
 
 
-  The default 
currency format for a cell is determined by the regional settings of your 
operating system.
+  The default currency format for a cell is 
determined by the regional settings of your operating system.
 
 
 
-  Format
+  Format
   Select how you want the contents of 
the selected cell(s) 
field to be 
displayed. The code for the selected option is displayed in the 
Format code box.
 
-  Currency category list boxes
+  Currency category list boxes
   Select a currency, and then scroll 
to the top of the Format list to view the formatting options for 
the currency.
   
-The format code 
for currencies uses the form [$xxx-nnn], where xxx is the currency symbol, and 
nnn the country code. Special banking symbols, such as EUR (for Euro), do not 
require the country code. The currency format is not dependent on the language 
that you select in the Language box. 
+The format code for currencies uses the form 
[$xxx-nnn], where xxx is the currency symbol, and nnn the country code. Special 
banking symbols, such as EUR (for Euro), do not require the country code. The 
currency format is not dependent on the language that you select in the 
Language box. 
   
 
-  Language
-  Specifies the language setting for 
the selected cellsfield.
 With the language set 
to Automatic, $[officename] automatically applies the number 
formats associated with the system default 
language. Select any language to fix the settings 
for the selected cells 
fields.
+  Language
+  
+  
+  
+  
+  Select any language to fix the settings for the selected fields. 
With the language set to Automatic, $[officename] automatically 
applies the number formats associated with the system default language. Select 
any language to fix the settings for the selected fields.
+  
+  
+  Specifies the language setting for the selected cells. Select any 
language to fix the settings for the selected cells.
+  
+  Specifies the language setting for the selected field. 
Select any language to fix the settings for the selected fields.
+  
+  
+  
+
   The language 
setting ensures that date and currency formats, as well as decimal and 
thousands separators, are preserved even when the document is opened in an 
operating system that uses a different default language setting.
 
 
   
-  Source format
+  Source format
   Uses the same number format as 
the cells containing the data for the chart.
 
 
-  Options
+  Options
   Specify the 
options for the selected format.
 
-  Decimal places
+  Decimal places
   Enter the number of decimal places 
that you want to display.
 
-  Denominator places
+  Denominator places
   With fraction format, enter the 
number of places for the denominator that you want to 
display.
   
-  Leading zeroes
+  Leading zeroes
   Enter the maximum number of zeroes 
to display in front of the decimal point.
 
-  Negative numbers in red
+  Negative numbers in red
   Changes the font color of negative 
numbers to red.
 
-  Use 
thousands separator
+  Use thousands separator
   Inserts a separator between 
thousands. The type of separator that is used depends on your language 
settings.
 
-  Engineering notation
+  Engineering notation
   With scientific format, 
Engineering notation ensures that exponent is a multiple of 
3.
 
-  Format code
+  Format code
   Displays the number format code for 
the selected format. You can also enter a custom format. The following 
options are only available for user-defined number formats.
 
-  Add
+  Add
   Adds the number format code that you 
entered to the user-defined category.
 
-  Edit 
Comment
+  Edit Comment
   Adds a comment to the selected number 
format.
   
-  Delete
+  Delete
   Deletes the selected number 
format. The changes are effective after you restart 
$[officename].
 
-  Name 
line
+  Name line
   Enter a comment for the selected 
number format, and then click

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 184282032856b3120e9f7cf1896c2ebee2d9815d
Author: Olivier Hallot 
AuthorDate: Mon May 11 17:32:27 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon May 11 22:32:27 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 11458f34eb3e0e965a58ad9a0667e7259ad52d50
  - Fix untranslatable XML'ish

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

diff --git a/helpcontent2 b/helpcontent2
index ee180ade07e3..11458f34eb3e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ee180ade07e36dd1fb8c7bdca6ecbab44ded9eb8
+Subproject commit 11458f34eb3e0e965a58ad9a0667e7259ad52d50
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 configure.ac  |2 
 download.lst  |8 
 external/icu/UnpackedTarball_icu.mk   |4 
 external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 |  118 
 external/icu/char8_t.patch|   19 
 external/icu/icu4c-khmerbreakengine.patch.1   |  269 --
 6 files changed, 30 insertions(+), 390 deletions(-)

New commits:
commit 8a31ac7264d7a11146d4a29034e97b564164f635
Author: Eike Rathke 
AuthorDate: Mon May 11 19:45:42 2020 +0200
Commit: Eike Rathke 
CommitDate: Mon May 11 21:19:11 2020 +0200

Upgrade to internal ICU 67

Change-Id: I9b8d5cb6d6f4610f2b20c0e0f49eb674d55ce3b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94009
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index c53f15b5e08e..06b0dd704f4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9703,7 +9703,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=65
+ICU_MAJOR=67
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index b7b3244b563e..7ad6e642c93e 100644
--- a/download.lst
+++ b/download.lst
@@ -112,10 +112,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
-export ICU_TARBALL := icu4c-65_1-src.tgz
-export ICU_DATA_SHA256SUM := 
06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6
-export ICU_DATA_TARBALL := icu4c-65_1-data.zip
+export ICU_SHA256SUM := 
94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+export ICU_TARBALL := icu4c-67_1-src.tgz
+export ICU_DATA_SHA256SUM := 
7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e
+export ICU_DATA_TARBALL := icu4c-67_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 96dcd45c30a4..72fae09b1625 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -34,13 +34,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
-   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/gcc9.patch \
-   external/icu/char8_t.patch \
external/icu/c++20-comparison.patch \
external/icu/ubsan.patch \
external/icu/Wdeprecated-copy-dtor.patch \
-   external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 \
+   external/icu/icu4c-khmerbreakengine.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 
b/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
deleted file mode 100644
index 07b3db6774be..
--- a/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
+++ /dev/null
@@ -1,118 +0,0 @@
-From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001
-From: Frank Tang 
-Date: Sat, 1 Feb 2020 02:39:04 +
-Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append
-
-See #971

- icu4c/source/common/unistr.cpp  |  6 ++-
- icu4c/source/test/intltest/ustrtest.cpp | 62 +
- icu4c/source/test/intltest/ustrtest.h   |  1 +
- 3 files changed, 68 insertions(+), 1 deletion(-)
-
-diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp
-index 901bb3358ba..077b4d6ef20 100644
 a/icu4c/source/common/unistr.cpp
-+++ b/icu4c/source/common/unistr.cpp
-@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t 
srcStart, int32_t srcLeng
-   }
- 
-   int32_t oldLength = length();
--  int32_t newLength = oldLength + srcLength;
-+  int32_t newLength;
-+  if (uprv_add32_overflow(oldLength, srcLength, &newLength)) {
-+setToBogus();
-+return *this;
-+  }
- 
-   // Check for append onto ourself
-   const UChar* oldArray = getArrayStart();
-diff --git a/icu4c/source/test/intltest/ustrtest.cpp 
b/icu4c/source/test/intltest/ustrtest.cpp
-index b6515ea813c..ad38bdf53a3 100644
 a/icu4c/source/

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/odfexport/odfexport.cxx  |   71 
 sw/qa/extras/ooxmlexport/ooxmlencryption.cxx  |4 -
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|   89 --
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|   78 --
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx|   18 -
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|   53 ---
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   34 -
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   84 
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |   42 
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx |   77 --
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   76 --
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |   59 -
 sw/qa/extras/ww8export/ww8export2.cxx |   40 ---
 sw/qa/extras/ww8export/ww8export3.cxx |   28 
 14 files changed, 753 deletions(-)

New commits:
commit 9c5ffdbdd60385a3d4618f5e36034f550d9b15c9
Author: Xisco Fauli 
AuthorDate: Mon May 11 19:25:16 2020 +0200
Commit: Xisco Faulí 
CommitDate: Mon May 11 20:33:40 2020 +0200

CppUnittest: Revert all my previous commits asserting pages

The problem is that I assumed I could automatically assert
all tests where the number of pages is the same at import
and export time but I didn't consider the number of pages might
be already wrong at import time as it happens with a few docx files.

Reverting for now until I come with a better solution

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

diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index cabf37dd3e52..6614e1642efc 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -102,7 +102,6 @@ public:
 
 DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xModifiable(mxComponent, uno::UNO_QUERY);
 CPPUNIT_ASSERT(!xModifiable->isModified());
 // see preTest(), set the OLE cache to 1 for this test
@@ -209,7 +208,6 @@ static void testTdf43569_CheckIfFieldParse()
 // instead of insertion of the pair of two field-marks: 
 + .
 DECLARE_ODFEXPORT_TEST(testTdf43569, "tdf43569_conditionalfield.doc")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 // check if our parser is valid
 testTdf43569_CheckIfFieldParse();
 
@@ -224,7 +222,6 @@ DECLARE_ODFEXPORT_TEST(testTdf43569, 
"tdf43569_conditionalfield.doc")
 
 DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference const xShape(getShape(1));
 
 // contour wrap polygon
@@ -260,7 +257,6 @@ DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
 
 DECLARE_ODFEXPORT_TEST(testUserFieldDecl, "user-field-decl.odt")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 if (xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"))
 // Without the accompanying fix in place, this test would have failed 
with 'Expected: 2;
 // Actual: 1', i.e. the in-table field had no declaration (in the 
header), while the
@@ -270,7 +266,6 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDecl, 
"user-field-decl.odt")
 
 DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly, "user-field-decl-fly.odt")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 if (xmlDocUniquePtr pXmlDoc = parseExport("styles.xml"))
 // Without the accompanying fix in place, this test would have failed 
with 'Expected: 2;
 // Actual: 1', i.e. the in-textframe field had no declaration (in the 
header), while the
@@ -280,7 +275,6 @@ DECLARE_ODFEXPORT_TEST(testUserFieldDeclFly, 
"user-field-decl-fly.odt")
 
 DECLARE_ODFEXPORT_TEST(testFramebackgrounds, "framebackgrounds.odt")
 {
-CPPUNIT_ASSERT_EQUAL(1, getPages());
//Counting the Number of Frames and checking with the expected count
 uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
@@ -407,19 +401,16 @@ DECLARE_ODFEXPORT_TEST(testFramebackgrounds, 
"framebackgrounds.odt")
 
 DECLARE_SW_ROUNDTRIP_TEST(testSHA1Correct, "sha1_correct.odt", 
"1012345678901234567890123456789012345678901234567890", Test)
 {   // tdf#114939 this has both an affected password as well as content.xml
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 getParagraph(1, "012");
 }
 
 DECLARE_SW_ROUNDTRIP_TEST(testSHA1Wrong, "sha1_wrong.odt", 
"1012345678901234567890123456789012345678901234567890", Test)
 {   // tdf#114939 this has both an affected password as well as content.xml
-CPPUNIT_ASSERT_EQUAL(1, getPages());
 getParagraph(1, "012");
 }
 
 DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded, "oooxml_embedded.sxw")
 {
-   

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

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkframe.hxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 2cede1e89aefbb8df3ae86a85e7770cfc176aab0
Author: Caolán McNamara 
AuthorDate: Sat May 9 17:58:01 2020 +0100
Commit: Justin Luth 
CommitDate: Mon May 11 20:30:29 2020 +0200

GdkDragCancelReason wasn't exposed before gtk 3.20.0

Change-Id: I63deca16ab938e340c03450e2f75054def94569f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93869
Reviewed-by: Justin Luth 
Tested-by: Jenkins

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index e8a76758a959..3d4c803ff5be 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -532,6 +532,15 @@ AtkObject* ooo_fixed_get_accessible(GtkWidget *obj);
 
 } // extern "C"
 
+#if !GTK_CHECK_VERSION(3, 20, 0)
+enum GdkDragCancelReason
+{
+  GDK_DRAG_CANCEL_NO_TARGET,
+  GDK_DRAG_CANCEL_USER_CANCELLED,
+  GDK_DRAG_CANCEL_ERROR
+};
+#endif
+
 #if !GTK_CHECK_VERSION(3, 22, 0)
 enum GdkAnchorHints
 {
___
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 loleaflet/css loleaflet/src

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |   15 +++
 loleaflet/css/loleaflet.css  |4 -
 loleaflet/src/layer/FormFieldButtonLayer.js  |   38 
++
 3 files changed, 44 insertions(+), 13 deletions(-)

New commits:
commit 166c6d87f790d0f0a4d5731431914278ad47ccd8
Author: Tamás Zolnai 
AuthorDate: Mon May 11 17:18:50 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 11 20:14:21 2020 +0200

MSForms: add a small padding to the list items.

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

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index b2f788141..3ec71f0f1 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -562,7 +562,9 @@ body {
 }
 
 .drop-down-field-list-item {
-   width: 100%;
+   width: calc(100% - 10px);
+   padding-left: 5px;
+   padding-right: 5px;
 }
 
 .drop-down-field-list-item.selected {
commit f7bf4d5cdd5e97a7a11745ce9839db676ea9bbc4
Author: Tamás Zolnai 
AuthorDate: Mon May 11 13:40:05 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 11 20:14:13 2020 +0200

MSForms: display placeholder text, when there is no items.

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

diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js 
b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
index 8fbc268fb..def301989 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -227,6 +227,21 @@ describe('Form field button tests.', function() {
buttonShouldExist();
 
cy.get('.drop-down-field-list-item')
+   .should('have.text', 'No Item specified');
+
+   cy.get('.drop-down-field-list-item.selected')
+   .should('not.exist');
+
+   cy.get('.form-field-button')
+   .click();
+
+   cy.get('.drop-down-field-list')
+   .should('be.visible');
+
+   cy.contains('.drop-down-field-list-item', 'No Item specified')
+   .click();
+
+   cy.get('.drop-down-field-list-item.selected')
.should('not.exist');
});
 });
diff --git a/loleaflet/src/layer/FormFieldButtonLayer.js 
b/loleaflet/src/layer/FormFieldButtonLayer.js
index 0acaabce5..fcd826c28 100644
--- a/loleaflet/src/layer/FormFieldButtonLayer.js
+++ b/loleaflet/src/layer/FormFieldButtonLayer.js
@@ -104,20 +104,30 @@ L.FormFieldButton = L.Layer.extend({
 
var itemList = this._buttonData.params.items;
var selected = parseInt(this._buttonData.params.selected);
+
for (var i = 0; i < itemList.length; ++i) {
-   var option = L.DomUtil.create('div', 
'drop-down-field-list-item', dropDownList);
-   option.innerHTML = itemList[i];
+   this._buildListItem(dropDownList, itemList[i], i === 
selected);
+   }
+
+   if (this._buttonData.params.items.length === 0) {
+   this._buildListItem(dropDownList, 
this._buttonData.params.placeholderText, false);
+   }
+   },
 
-   option.addEventListener('click', 
this._onListItemSelect);
-   option.map = this.map;
+   _buildListItem: function(parent, text, selected) {
+   var option = L.DomUtil.create('div', 
'drop-down-field-list-item', parent);
+   option.innerHTML = text;
 
-   // Stop propagation to the main document
-   option.addEventListener('mouseup', function(event) 
{event.stopPropagation();});
-   option.addEventListener('mousedown', function(event) 
{event.stopPropagation();});
+   option.addEventListener('click', this._onListItemSelect);
+   option.map = this.map;
+   option._buttonData = this._buttonData;
 
-   if (i === selected)
-   option.classList.add('selected');
-   }
+   // Stop propagation to the main document
+   option.addEventListener('mouseup', function(event) 
{event.stopPropagation();});
+   option.addEventListener('mousedown', function(event) 
{event.stopPropagation();});
+
+   if (selected === true)
+   option.classList.add('selected');
},
 
onRemove: function () {
@@ -131,16 +141,20 @@ L.FormFieldButton = L.Layer.extend({
 
   

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.FormulaBar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 080055b7e5d4361f6e04ee917c2a82990ef1e49d
Author: Szymon Kłos 
AuthorDate: Mon May 11 12:39:34 2020 +0200
Commit: Andras Timar 
CommitDate: Mon May 11 19:56:29 2020 +0200

Fix cell address input handler

Change-Id: Ie0a7630597f442d7f7117870cd4a52ff5b476252
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93957
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit cdf964ba861a03634fd05587bb6ee5cd9588fd94)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93802
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.FormulaBar.js 
b/loleaflet/src/control/Control.FormulaBar.js
index e62bd2c86..60fd848d9 100644
--- a/loleaflet/src/control/Control.FormulaBar.js
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -40,7 +40,7 @@ L.Control.FormulaBar = L.Control.extend({
window.hideTooltip(this, e.target);
},
onRefresh: function() {
-   $('#addressInput').off('keyup', 
this.onAddressInput, this).on('keyup', this.onAddressInput, this);
+   $('#addressInput').off('keyup', 
that.onAddressInput.bind(that)).on('keyup', that.onAddressInput.bind(that));
}
});
toolbar.bind('touchstart', function(e) {
___
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-3' - loleaflet/src

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.StatusBar.js |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 7d88dc9c7c46289d32982ff354c5c0ffe4440dbc
Author: Szymon Kłos 
AuthorDate: Mon May 11 12:31:48 2020 +0200
Commit: Andras Timar 
CommitDate: Mon May 11 19:56:51 2020 +0200

Fix language menu in statusbar

Sub items from the language submenu are executed by
uno calls - added handler.

Change-Id: Ia83cd9331de6468c7d5a7b6f5cdbe45e68595a8b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93956
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 9f55b8f46eba1410f0be0f93f01278d0d345fc60)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93803
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
index 9bd0c8d53..59f567ad7 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -109,7 +109,15 @@ L.Control.StatusBar = L.Control.extend({
 
var docLayer = this.map._docLayer;
 
-   if (id === 'zoomin' && this.map.getZoom() < 
this.map.getMaxZoom()) {
+   if (item.uno) {
+   if (item.unosheet && this.map.getDocType() === 
'spreadsheet') {
+   this.map.toggleCommandState(item.unosheet);
+   }
+   else {
+   
this.map.toggleCommandState(window.getUNOCommand(item.uno));
+   }
+   }
+   else if (id === 'zoomin' && this.map.getZoom() < 
this.map.getMaxZoom()) {
this.map.zoomIn(1);
}
else if (id === 'zoomout' && this.map.getZoom() > 
this.map.getMinZoom()) {
___
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' - sw/qa sw/source

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |3 +++
 sw/source/core/crsr/bookmrk.cxx|6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 21e5746b04067e3bc9e6b78ed5e9636f05e756e2
Author: Tamás Zolnai 
AuthorDate: Mon May 11 13:12:44 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 11 19:43:35 2020 +0200

lok: MSForms: send also the placeholder text.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93960
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit c0517c6215c78e65af8b20e8c033a75586a794bd)

Change-Id: I5cce5af22f56079e840707cfffb01785d7a15c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93978
Tested-by: Tamás Zolnai 
Reviewed-by: Tamás Zolnai 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 602791b57728..3d922d088309 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2582,6 +2582,9 @@ void SwTiledRenderingTest::testDropDownFormFieldButton()
 
 OString sSelected = 
aTree.get_child("params").get_child("selected").get_value().c_str();
 CPPUNIT_ASSERT_EQUAL(OString("1"), sSelected);
+
+OString sPlaceholder = 
aTree.get_child("params").get_child("placeholderText").get_value().c_str();
+CPPUNIT_ASSERT_EQUAL(OString("No Item specified"), sPlaceholder);
 }
 
 // Move the cursor back so the button becomes hidden.
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 484480283ce5..5f8ba1b51b9d 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
@@ -622,7 +623,10 @@ namespace sw { namespace mark
 {
 pSelectedItemIter->second >>= nSelection;
 }
-sPayload.append("\"selected\": \"" + 
OString::number(nSelection) + "\"}}");
+sPayload.append("\"selected\": \"" + 
OString::number(nSelection) + "\", ");
+
+// Placeholder text
+sPayload.append("\"placeholderText\": \"" + 
OUStringToOString(SwResId(STR_DROP_DOWN_EMPTY_LIST), RTL_TEXTENCODING_UTF8) + 
"\"}}");
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 i18nutil/source/utility/unicode.cxx |   14 ++
 include/svx/strings.hrc |8 
 svx/source/dialog/charmap.cxx   |   26 ++
 3 files changed, 48 insertions(+)

New commits:
commit b4f398db743213e80ecceab97a2dcb01b465b3b9
Author: Eike Rathke 
AuthorDate: Mon May 11 18:07:11 2020 +0200
Commit: Eike Rathke 
CommitDate: Mon May 11 19:43:35 2020 +0200

Adapt to be able to build against ICU 66

In case building against system ICU 66 is wanted.
Otherwise an interim step on the way to ICU 67.

Change-Id: I8c559ee3206afd4f61af4fd3af7dd85911198f3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93985
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 382df4db89fd..f944d69c40e2 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -766,6 +766,20 @@ OString 
unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
 case USCRIPT_WANCHO:
 sRet = "nnp-Wcho";
 break;
+#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 66)
+case USCRIPT_CHORASMIAN:
+sRet = "xco-Chrs";
+break;
+case USCRIPT_DIVES_AKURU:
+sRet = "dv-Diak";
+break;
+case USCRIPT_KHITAN_SMALL_SCRIPT:
+sRet = "zkt-Kits";
+break;
+case USCRIPT_YEZIDI:
+sRet = "kmr-Yezi";
+break;
 #endif
 }
 return sRet;
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 5fbb88d75df3..33d90b6180f1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1696,6 +1696,14 @@
 #define RID_SUBSETSTR_SYMBOLS_AND_PICTOGRAPHS_EXTENDED_A
NC_("RID_SUBSETMAP", "Symbols and Pictographs Extended-A")
 #define RID_SUBSETSTR_TAMIL_SUPPLEMENT  
NC_("RID_SUBSETMAP", "Tamil Supplement")
 #define RID_SUBSETSTR_WANCHO
NC_("RID_SUBSETMAP", "Wancho")
+#define RID_SUBSETSTR_CHORASMIAN
NC_("RID_SUBSETMAP", "Chorasmian")
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G
NC_("RID_SUBSETMAP", "CJK Unified Ideographs Extension G")
+#define RID_SUBSETSTR_DIVES_AKURU   
NC_("RID_SUBSETMAP", "Dhives Akuru")
+#define RID_SUBSETSTR_KHITAN_SMALL_SCRIPT   
NC_("RID_SUBSETMAP", "Khitan small script")
+#define RID_SUBSETSTR_LISU_SUPPLEMENT   
NC_("RID_SUBSETMAP", "Lisu Supplement")
+#define RID_SUBSETSTR_SYMBOLS_FOR_LEGACY_COMPUTING  
NC_("RID_SUBSETMAP", "Symbols for Legacy Computing")
+#define RID_SUBSETSTR_TANGUT_SUPPLEMENT 
NC_("RID_SUBSETMAP", "Tangut Supplement")
+#define RID_SUBSETSTR_YEZIDI
NC_("RID_SUBSETMAP", "Yezidi")
 
 #define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
 #define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index b2e5b4159d56..c43cafb9eb55 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1801,6 +1801,32 @@ void SubsetMap::InitList()
 aAllSubsets.emplace_back( 0x1E2C0, 0x1E2FF, 
SvxResId(RID_SUBSETSTR_WANCHO) );
 break;
 #endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 66)
+case UBLOCK_CHORASMIAN:
+aAllSubsets.emplace_back( 0x10FB0, 0x10FDF, 
SvxResId(RID_SUBSETSTR_CHORASMIAN) );
+break;
+case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G:
+aAllSubsets.emplace_back( 0x3, 0x3134F, 
SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G) );
+break;
+case UBLOCK_DIVES_AKURU:
+aAllSubsets.emplace_back( 0x11900, 0x1195F, 
SvxResId(RID_SUBSETSTR_DIVES_AKURU) );
+break;
+case UBLOCK_KHITAN_SMALL_SCRIPT:
+aAllSubsets.emplace_back( 0x18B00, 0x18CFF, 
SvxResId(RID_SUBSETSTR_KHITAN_SMALL_SCRIPT) );
+break;
+case UBLOCK_LISU_SUPPLEMENT:
+aAllSubsets.emplace_back( 0x11FB0, 0x11FBF, 
SvxResId(RID_SUBSETSTR_LISU_SUPPLEMENT) );
+break;
+case UBLOCK_SYMBOLS_FOR_LEGACY_COMPUTING:
+aAllSubsets.emplace_back( 0x1FB00, 0x1FBFF, 
SvxResId(RID_SUBSETSTR_SYMBOLS_FOR_LEGACY_COMPUTING) );
+break;
+case UBLOCK_TANGUT_SUPPLEMENT:
+aAllSubsets.emplace_back( 0x18D00, 0x18D8F, 
SvxResId(RID_SUBSETSTR_TANGUT_SUPPLEMENT) );
+break;
+case UBLOCK_YEZIDI:
+aAllSubsets.emplace_back( 0x10E80, 0x10EBF, 
SvxRes

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

[Rizal Muttaqin (via logerrit)]

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

New commits:
commit f3a4869ca3e617221020a0b8fe5fa0f41ec66aa5
Author: Rizal Muttaqin 
AuthorDate: Wed May 6 10:44:09 2020 +0700
Commit: Heiko Tietze 
CommitDate: Mon May 11 19:39:44 2020 +0200

tdf#129235 Change the color of active page border in Print Preview

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

diff --git a/sw/source/core/view/pagepreviewlayout.cxx 
b/sw/source/core/view/pagepreviewlayout.cxx
index d4d628dce507..b3b08c25a513 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1210,7 +1210,7 @@ void 
SwPagePreviewLayout::PaintSelectMarkAtPage(vcl::RenderContext& rRenderConte
 Color aLine( pOutputDev->GetLineColor() );
 
 // determine selection mark color
-Color aSelPgLineColor(COL_LIGHTBLUE);
+Color aSelPgLineColor(117, 114, 106);
 const StyleSettings& rSettings =
 mrParentViewShell.GetWin()->GetSettings().GetStyleSettings();
 if ( rSettings.GetHighContrastMode() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 drawinglayer/source/tools/primitive2dxmldump.cxx |   20 +++
 svx/CppunitTest_svx_unit.mk  |1 
 svx/qa/unit/data/shadow-scale-origin.pptx|binary
 svx/qa/unit/sdr.cxx  |   96 +++
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |   14 ++
 5 files changed, 128 insertions(+), 3 deletions(-)

New commits:
commit e21d522dddce2590ed435890ae8d5fe39658a71a
Author: Miklos Vajna 
AuthorDate: Mon May 11 16:38:12 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 11 18:47:20 2020 +0200

tdf#129916 svx: fix origin of scaled shadow

We assumed that the top left corner is the origin for scaling, but that
is not necessarily the case. The intention is that the shadow direction
can be determined from its x and y offset, and the origin is the
opposite corner of the shape.

Change-Id: I6759302767d20739b6e2be79d379740dd06f70f5
(cherry picked from commit a1dde1a85a8d1c54521a0ac6310571ffcdd4bb5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93974
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx 
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 5ba531d1b1de..7fd249697ac2 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -423,9 +423,27 @@ void Primitive2dXmlDump::decomposeAndWrite(
 break;
 }
 
+case PRIMITIVE2D_ID_SHADOWPRIMITIVE2D:
+{
+// ShadowPrimitive2D.
+rWriter.startElement("shadow");
+drawinglayer::primitive2d::Primitive2DContainer 
aPrimitiveContainer;
+pBasePrimitive->get2DDecomposition(aPrimitiveContainer,
+   
drawinglayer::geometry::ViewInformation2D());
+decomposeAndWrite(aPrimitiveContainer, rWriter);
+rWriter.endElement();
+break;
+}
+
 default:
 {
-rWriter.element(OUStringToOString(sCurrentElementTag, 
RTL_TEXTENCODING_UTF8));
+rWriter.startElement("unhandled");
+rWriter.attribute("id", OUStringToOString(sCurrentElementTag, 
RTL_TEXTENCODING_UTF8));
+drawinglayer::primitive2d::Primitive2DContainer 
aPrimitiveContainer;
+pBasePrimitive->get2DDecomposition(aPrimitiveContainer,
+   
drawinglayer::geometry::ViewInformation2D());
+decomposeAndWrite(aPrimitiveContainer, rWriter);
+rWriter.endElement();
 }
 break;
 }
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 92feb45d6578..ac9f3e4531ad 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
svx/qa/unit/svdraw/test_SdrTextObject \
svx/qa/unit/customshapes \
 svx/qa/unit/classicshapes \
+   svx/qa/unit/sdr \
svx/qa/unit/svdraw \
svx/qa/unit/unodraw \
svx/qa/unit/xoutdev \
diff --git a/svx/qa/unit/data/shadow-scale-origin.pptx 
b/svx/qa/unit/data/shadow-scale-origin.pptx
new file mode 100644
index ..a0a164a3cddf
Binary files /dev/null and b/svx/qa/unit/data/shadow-scale-origin.pptx differ
diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx
new file mode 100644
index ..a83ad564f33f
--- /dev/null
+++ b/svx/qa/unit/sdr.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for svx/source/sdr/ code.
+class SdrTest : public test::BootstrapFixture, public unotest::MacrosTest, 
public XmlTestTools
+{
+protected:
+uno::Reference mxComponent;
+
+public:
+virtual void setUp() override
+{
+test::BootstrapFixture::setUp();
+mxDesktop.set(frame::Desktop::create(m_xContext));
+}
+
+virtual void tearDown() override
+{
+if (mxComponent.is())
+{
+mxComponent->dispose();
+}
+test::BootstrapFixture::tearDown();
+}
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+CPPUNIT_TEST_FIXTURE(SdrTest, testShadowScaleOrigin)
+{
+// Load a document containing a custom shape.
+test::Directories aDirec

[Libreoffice-commits] core.git: include/svx include/xmloff oox/source schema/libreoffice sd/qa svx/source xmloff/source

[Mike Kaganski (via logerrit)]

 include/svx/strings.hrc |1 
 include/svx/svddef.hxx  |3 --
 include/svx/svxids.hrc  |3 --
 include/svx/unoshprp.hxx|1 
 include/xmloff/xmltoken.hxx |1 
 oox/source/drawingml/shape.cxx  |1 
 oox/source/export/drawingml.cxx |   16 ++--
 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |   10 ---
 sd/qa/unit/export-tests-ooxml2.cxx  |3 --
 sd/qa/unit/export-tests.cxx |   11 +---
 svx/source/svdraw/svdattr.cxx   |3 --
 xmloff/source/core/xmltoken.cxx |1 
 xmloff/source/draw/sdpropls.cxx |1 
 xmloff/source/token/tokens.txt  |1 
 14 files changed, 14 insertions(+), 42 deletions(-)

New commits:
commit d8d31f74236e87ea878f7fac5538e707df5b13ca
Author: Mike Kaganski 
AuthorDate: Mon May 11 17:26:22 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 11 18:24:23 2020 +0200

tdf#49247: no need in extra boolean property, radius is enough

When soft edge has radius 0, the effect is disabled.

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index e6ff4f7cc25b..5fbb88d75df3 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -516,7 +516,6 @@
 #define SIP_SA_GLOW_RAD 
NC_("SIP_SA_GLOW_RAD", "Radius of glow effect")
 #define SIP_SA_GLOW_COLOR   
NC_("SIP_SA_GLOW_COLOR", "Color of glow effect")
 #define SIP_SA_GLOW_TRANSPARENCY
NC_("SIP_SA_GLOW_TRANSPARENCY", "Transparency of glow effect")
-#define SIP_SA_SOFTEDGE 
NC_("SIP_SA_SOFTEDGE", "Soft edge effect")
 #define SIP_SA_SOFTEDGE_RAD 
NC_("SIP_SA_SOFTEDGE_RAD", "Radius of soft edge effect")
 #define STR_ObjNameSingulMEDIA  
NC_("STR_ObjNameSingulMEDIA", "Media object")
 #define STR_ObjNamePluralMEDIA  
NC_("STR_ObjNamePluralMEDIA", "Media objects")
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 2b8fb1e74fbb..3b9be15d315f 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -423,8 +423,7 @@ constexpr TypedWhichId 
SDRATTR_GLOW_TRANSPARENCY(SDRATTR_GLOW_FI
 constexpr sal_uInt16  SDRATTR_GLOW_LAST  
(SDRATTR_GLOW_TRANSPARENCY);
 
 constexpr sal_uInt16  SDRATTR_SOFTEDGE_FIRST(SDRATTR_GLOW_LAST 
+ 1);
-constexpr TypedWhichId  SDRATTR_SOFTEDGE(SDRATTR_SOFTEDGE_FIRST 
+ 0);
-constexpr TypedWhichId 
SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 1);
+constexpr TypedWhichId 
SDRATTR_SOFTEDGE_RAD(SDRATTR_SOFTEDGE_FIRST + 0);
 constexpr sal_uInt16  
SDRATTR_SOFTEDGE_LAST(SDRATTR_SOFTEDGE_RAD);
 
 constexpr sal_uInt16 SDRATTR_END (SDRATTR_SOFTEDGE_LAST);  /* 1357 */ /* 
1333 V4+++*/ /* 1243 V4+++*/  /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 
1065 */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index ab6fce14082c..449258d430d6 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -418,8 +418,7 @@ class SvxSetItem;
 #define SID_ATTR_GLOW_COLOR ( SID_SVX_START + 321 )
 #define SID_ATTR_GLOW_RADIUS( SID_SVX_START + 322 )
 #define SID_ATTR_GLOW_TRANSPARENCY  ( SID_SVX_START + 323 )
-#define SID_ATTR_SOFTEDGE   ( SID_SVX_START + 324 )
-#define SID_ATTR_SOFTEDGE_RADIUS( SID_SVX_START + 325 )
+#define SID_ATTR_SOFTEDGE_RADIUS( SID_SVX_START + 324 )
 #define SID_SCAN( SID_SVX_START + 330 )
 #define SID_TWAIN_SELECT( SID_SVX_START + 331 )
 #define SID_TWAIN_TRANSFER  ( SID_SVX_START + 332 )
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 12188840cfe4..fbc6b1c387b1 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -216,7 +216,6 @@
 { OUString{"GlowEffectTransparency"}, 
SDRATTR_GLOW_TRANSPARENCY,::cppu::UnoType::get(),0,  0 },
 
 #define SOFTEDGE_PROPERTIES \
-{ OUString("SoftEdge"), SDRATTR_SOFTEDGE,   
cppu::UnoType::get(),   0,  0}, \
 { OUString{"SoftEdgeRad"},  SDRATTR_SOFTEDGE_RAD,   
cppu::UnoType::get(),  0,  0, 
PropertyMoreFlags::METRIC_ITEM},
 
 #define SHADOW_PROPERTIES \
diff 

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

[Mike Kaganski (via logerrit)]

 svx/inc/sdr/primitive2d/sdrattributecreator.hxx|3 --
 svx/source/sdr/primitive2d/sdrattributecreator.cxx |   30 ++---
 2 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit 14514042f7c908d08c3284135cc6de8da387c118
Author: Mike Kaganski 
AuthorDate: Mon May 11 17:35:52 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 11 18:23:14 2020 +0200

Limit utility function's visibility

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

diff --git a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx 
b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
index 10d105fd1c45..9cff4afd6770 100644
--- a/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
+++ b/svx/inc/sdr/primitive2d/sdrattributecreator.hxx
@@ -68,9 +68,6 @@ namespace drawinglayer
 attribute::SdrFillAttribute SVXCORE_DLLPUBLIC 
createNewSdrFillAttribute(
 const SfxItemSet& rSet);
 
-attribute::SdrGlowAttribute createNewSdrGlowAttribute(
-const SfxItemSet& rSet);
-
 // #i101508# Support handing over given text-to-border distances
 attribute::SdrTextAttribute createNewSdrTextAttribute(
 const SfxItemSet& rSet,
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx 
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index bb43198bf4f6..0e8dec828bf6 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -212,6 +212,21 @@ namespace drawinglayer
 
 return aRetval;
 }
+
+attribute::SdrGlowAttribute createNewSdrGlowAttribute(const 
SfxItemSet& rSet)
+{
+const bool bGlow(rSet.Get(SDRATTR_GLOW).GetValue());
+if (!bGlow)
+return attribute::SdrGlowAttribute();
+sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue();
+Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue());
+sal_uInt16 
nTransparency(rSet.Get(SDRATTR_GLOW_TRANSPARENCY).GetValue());
+if (nTransparency)
+aColor.SetTransparency(std::round(nTransparency / 100.0 * 
255.0));
+
+attribute::SdrGlowAttribute glowAttr{ nRadius, aColor };
+return glowAttr;
+}
 } // end of anonymous namespace
 } // end of namespace drawinglayer
 
@@ -335,21 +350,6 @@ namespace drawinglayer::primitive2d
 return attribute::SdrLineStartEndAttribute();
 }
 
-attribute::SdrGlowAttribute createNewSdrGlowAttribute( const 
SfxItemSet& rSet)
-{
-const bool bGlow(rSet.Get(SDRATTR_GLOW).GetValue());
-if(!bGlow)
-return attribute::SdrGlowAttribute();
-sal_Int32 nRadius = rSet.Get(SDRATTR_GLOW_RAD).GetValue();
-Color aColor(rSet.Get(SDRATTR_GLOW_COLOR).GetColorValue());
-sal_uInt16 
nTransparency(rSet.Get(SDRATTR_GLOW_TRANSPARENCY).GetValue());
-if (nTransparency)
-aColor.SetTransparency(std::round(nTransparency / 100.0 * 
255.0));
-
-attribute::SdrGlowAttribute glowAttr{ nRadius, aColor };
-return glowAttr;
-}
-
 attribute::SdrShadowAttribute createNewSdrShadowAttribute(const 
SfxItemSet& rSet)
 {
 const bool bShadow(rSet.Get(SDRATTR_SHADOW).GetValue());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source dbaccess/source reportdesign/source sc/inc sc/source sd/inc sd/source starmath/source sw/source

[Caolán McNamara (via logerrit)]

 chart2/source/model/filter/XMLFilter.cxx |9 
 dbaccess/source/filter/xml/xmlfilter.cxx |   16 +-
 reportdesign/source/filter/xml/xmlfilter.cxx |   18 +---
 sc/inc/xmlwrap.hxx   |2 -
 sc/source/filter/xml/xmlwrap.cxx |   15 -
 sd/inc/strmname.h|1 
 sd/source/filter/xml/sdxmlwrp.cxx|   30 +--
 sd/source/ui/dlg/tpaction.cxx|3 --
 starmath/source/document.cxx |   11 -
 starmath/source/mathmlimport.cxx |   14 ++--
 starmath/source/mathmlimport.hxx |1 
 starmath/source/view.cxx |2 -
 sw/source/filter/xml/swxml.cxx   |   30 +--
 13 files changed, 28 insertions(+), 124 deletions(-)

New commits:
commit 6ed0b0230efebe6b3c705e74b8583359ebe4bbe2
Author: Caolán McNamara 
AuthorDate: Mon May 11 15:10:58 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 18:04:58 2020 +0200

remove archaic Content.xml fallback

there's no evidence that Content.xml (or Meta.xml) was written by any 
released
version to necessitate the fallback

reportdesign Settings.xml and Style.xml fallbacks appear to be cargocult
influenced by the Content.xml/Meta.xml examples

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

diff --git a/chart2/source/model/filter/XMLFilter.cxx 
b/chart2/source/model/filter/XMLFilter.cxx
index 467afe8038a2..3126eca15a1b 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -382,15 +382,6 @@ ErrCode XMLFilter::impl_Import(
 : OUString("com.sun.star.comp.Chart.XMLContentImporter"),
 xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
 nWarning = nWarning != ERRCODE_NONE ? nWarning : nContentWarning;
-
-// import of "content.xml" didn't work - try old "Content.xml" stream
-if( nContentWarning != ERRCODE_NONE )
-{
-nWarning = impl_ImportStream(
-"Content.xml", // old content stream name
-"com.sun.star.office.sax.importer.Chart",
-xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
-}
 }
 catch (const uno::Exception&)
 {
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 7de744403d03..50acc7bcf7b5 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -127,7 +127,6 @@ static ErrCode ReadThroughComponent(
 const uno::Reference< embed::XStorage >& xStorage,
 const uno::Reference& xModelComponent,
 const char* pStreamName,
-const char* pCompatibilityStreamName,
 const uno::Reference & rxContext,
 ODBFilter& _rFilter)
 {
@@ -144,17 +143,8 @@ static ErrCode ReadThroughComponent(
 OUString sStreamName = OUString::createFromAscii(pStreamName);
 if ( !xStorage->hasByName( sStreamName ) || 
!xStorage->isStreamElement( sStreamName ) )
 {
-// stream name not found! Then try the compatibility name.
-// if no stream can be opened, return immediately with OK 
signal
-
-// do we even have an alternative name?
-if ( nullptr == pCompatibilityStreamName )
-return ERRCODE_NONE;
-
-// if so, does the stream exist?
-sStreamName = 
OUString::createFromAscii(pCompatibilityStreamName);
-if ( !xStorage->hasByName( sStreamName ) || 
!xStorage->isStreamElement( sStreamName ) )
-return ERRCODE_NONE;
+// stream name not found! return immediately with OK signal
+return ERRCODE_NONE;
 }
 
 // get input stream
@@ -349,7 +339,6 @@ bool ODBFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 ErrCode nRet = ReadThroughComponent( xStorage
 ,xModel
 ,"settings.xml"
-,"Settings.xml"
 ,GetComponentContext()
 ,*this
 );
@@ -358,7 +347,6 @@ bool ODBFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 nRet = ReadThroughComponent( xStorage
 ,xModel
 ,"content.xml"
-,"Content.xml"
 ,GetComponentContext()
 ,*this
 );
diff --git a/reportdesign/source/filter/xml/xm

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 7fd79956833ed26429f1a55f1fdf0ac50325161d
Author: Olivier Hallot 
AuthorDate: Mon May 11 12:43:42 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon May 11 17:43:42 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ee180ade07e36dd1fb8c7bdca6ecbab44ded9eb8
  - tdf#128519 Automate icon repl't table for Help bld

The solution here is to create links.txt.xsl in the
helpcontent2/helpers/ folder at build time because the 
directive in XSLT of online_transform.xsl must be hardcoded
(compile time) and core/workdir/ is not.

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

diff --git a/helpcontent2 b/helpcontent2
index 5bead0438b7f..ee180ade07e3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5bead0438b7fe977d8d2288c0397b34a3623d68f
+Subproject commit ee180ade07e36dd1fb8c7bdca6ecbab44ded9eb8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/links.txt.xsl help3xsl/online_transform.xsl helpers/make_icon_link.txt.py make_icon_link.txt.py

[Olivier Hallot (via logerrit)]

 CustomTarget_html.mk  |7 
 help3xsl/links.txt.xsl| 2051 --
 help3xsl/online_transform.xsl |2 
 helpers/make_icon_link.txt.py |6 
 4 files changed, 12 insertions(+), 2054 deletions(-)

New commits:
commit ee180ade07e36dd1fb8c7bdca6ecbab44ded9eb8
Author: Olivier Hallot 
AuthorDate: Mon May 4 10:33:44 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon May 11 17:43:42 2020 +0200

tdf#128519 Automate icon repl't table for Help bld

The solution here is to create links.txt.xsl in the
helpcontent2/helpers/ folder at build time because the 
directive in XSLT of online_transform.xsl must be hardcoded
(compile time) and core/workdir/ is not.

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

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 5ee580350..b9eab167f 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -54,6 +54,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
) > $@ \
)
 
+
 # Xapian localized templates
 ifeq ($(HELP_OMINDEX_PAGE),TRUE)
 
@@ -154,8 +155,14 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
$(TREE_FILE) \
)
 
+# link txt file for icon replacement table
+$(SRCDIR)/helpcontent2/helpers/links.txt.xsl: \
+   $(SRCDIR)/icon-themes/colibre/links.txt 
+   $(SRCDIR)/helpcontent2/helpers/make_icon_link.txt.py 
$(SRCDIR)/icon-themes/colibre/links.txt $@
+
 define html_gen_html_dep
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/$(1)/html.text : \
+   $(SRCDIR)/helpcontent2/helpers/links.txt.xsl \
$(foreach module,$(html_TEXT_MODULES), \
$(if $(filter en-US,$(1)), \
$(call gb_AllLangHelp_get_helpfiles_target,$(module)), \
diff --git a/help3xsl/links.txt.xsl b/help3xsl/links.txt.xsl
deleted file mode 100644
index 80fbba68c..0
--- a/help3xsl/links.txt.xsl
+++ /dev/null
@@ -1,2051 +0,0 @@
-
-http://www.w3.org/1999/XSL/Transform";>
-
-
-
-cmd/sc_open.svg
-cmd/sc_runbasic.svg
-cmd/sc_mediapause.svg
-cmd/sc_basicstop.svg
-cmd/sc_mediarepeat.svg
-cmd/sc_ok.svg
-cmd/sc_mediamute.svg
-cmd/lc_open.svg
-cmd/lc_runbasic.svg
-cmd/lc_mediapause.svg
-cmd/lc_basicstop.svg
-cmd/lc_mediarepeat.svg
-cmd/lc_ok.svg
-cmd/lc_mediamute.svg
-cmd/sc_insertrowsafter.svg
-cmd/sc_insertcolumnsafter.svg
-cmd/sc_deleterows.svg
-cmd/sc_deletecolumns.svg
-cmd/sc_insertcellsright.svg
-cmd/sc_insertcellsdown.svg
-cmd/sc_insertcolumnsafter.svg
-cmd/sc_insertcolumns.svg
-cmd/sc_insertrowsbefore.svg
-chart2/res/net_52x60.svg
-chart2/res/netstack_52x60.svg
-formula/res/refinp1.svg
-cmd/32/toggletitle.svg
-cmd/32/diagramaxisxyz.svg
-cmd/32/diagramaxis.svg
-cmd/32/togglegridhorizontal.svg
-cmd/32/diagramaxis.svg
-cmd/32/togglegridhorizontal.svg
-cmd/32/legend.svg
-cmd/lc_toggletitle.svg
-cmd/lc_diagramaxisxyz.svg
-cmd/lc_diagramaxis.svg
-cmd/lc_togglegridhorizontal.svg
-cmd/lc_diagramaxis.svg
-cmd/lc_togglegridhorizontal.svg
-cmd/lc_legend.svg
-cmd/sc_toggletitle.svg
-cmd/sc_diagramaxisxyz.svg
-cmd/sc_diagramaxis.svg
-cmd/sc_togglegridhorizontal.svg
-cmd/sc_diagramaxis.svg
-cmd/sc_togglegridhorizontal.svg
-cmd/sc_legend.svg
-cmd/32/datefield.svg
-cmd/32/insertplugin.svg
-cmd/32/defineprintarea.svg
-cmd/32/dbnewtable.svg
-cmd/lc_datefield.svg
-cmd/lc_insertplugin.svg
-cmd/lc_defineprintarea.svg
-cmd/lc_dbnewtable.svg
-cmd/sc_datefield.svg
-cmd/sc_insertplugin.svg
-cmd/sc_defineprintarea.svg
-cmd/sc_dbnewtable.svg
-cmd/32/autocorrectdlg.svg
-cmd/32/editannotation.svg
-cmd/32/reload.svg
-cmd/lc_autocorrectdlg.svg
-cmd/lc_editannotation.svg
-cmd/lc_reload.svg
-cmd/sc_autocorrectdlg.svg
-cmd/sc_editannotation.svg
-cmd/sc_reload.svg
-cmd/32/trackchanges.svg
-cmd/32/fontdialog.svg
-cmd/32/addfield.svg
-cmd/32/avmediaplayer.svg
-cmd/32/dbviewaliases.svg
-cmd/32/avmediaplayer.svg
-cmd/32/inserttable.svg
-cmd/32/currencyfield.svg
-cmd/32/datefield.svg
-cmd/32/edit.svg
-cmd/32/addfield.svg
-cmd/32/filecontrol.svg
-cmd/32/filefield.svg
-cmd/32/formattedfield.svg
-cmd/32/checkbox.svg
-cmd/32/combobox.svg
-cmd/32/listbox.svg
-cmd/32/choosecontrols.svg
-cmd/32/radiobutton.svg
-cmd/32/spinbutton.svg
-cmd/32/dbviewfunctions.svg
-cmd/32/scrollbar.svg
-cmd/32/insertframe.svg
-cmd/32/insertframe.svg
-cmd/32/insertgraphic.svg
-cmd/32/listbox.svg
-cmd/32/numberformatstandard.svg
-cmd/32/drawchart.svg
-cmd/32/insertobject.svg
-cmd/32/insertmath.svg
-cmd/32/patternfield.svg
-cmd/32/pushbutton.svg
-cmd/32/insertpagebreak.svg
-cmd/32/insertframe.svg
-cmd/32/timefield.svg
-cmd/32/newdoc.svg
-cmd/32/outlinebullet.svg
-cmd/32/numberformatstandard.svg
-cmd/32/paragraphdialog.svg
-cmd/32/insertdraw.svg
-cmd/32/trackchanges.svg
-cmd/32/showtrackedchanges.svg
-cmd/lc_trackchanges.svg
-cmd/lc_fontdialog.svg
-cmd/

[Libreoffice-commits] core.git: helpcontent2

[Laurent BP (via logerrit)]

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

New commits:
commit 72ee7ef56aa8c1eaf2b527839303e743e6f1a99e
Author: Laurent BP 
AuthorDate: Mon May 11 17:41:50 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 11 17:41:50 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5bead0438b7fe977d8d2288c0397b34a3623d68f
  - Correct Menu path to insert animated GIF

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

diff --git a/helpcontent2 b/helpcontent2
index 8d83f7397fd0..5bead0438b7f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8d83f7397fd0ad9a5d77394b3f39825f2ee49af3
+Subproject commit 5bead0438b7fe977d8d2288c0397b34a3623d68f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent BP (via logerrit)]

 source/text/simpress/guide/animated_gif_create.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bead0438b7fe977d8d2288c0397b34a3623d68f
Author: Laurent BP 
AuthorDate: Thu May 7 13:06:12 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon May 11 17:41:50 2020 +0200

Correct Menu path to insert animated GIF

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

diff --git a/source/text/simpress/guide/animated_gif_create.xhp 
b/source/text/simpress/guide/animated_gif_create.xhp
index 209440e1a..a7a9c441e 100644
--- a/source/text/simpress/guide/animated_gif_create.xhp
+++ b/source/text/simpress/guide/animated_gif_create.xhp
@@ -41,7 +41,7 @@
 To 
create an animated GIF:
 
 
-Select an 
object or group of objects that you want to include in your animation and 
choose Insert - Animated Image.
+Select an 
object or group of objects that you want to include in your animation and 
choose Insert - Media - Animated Image.
 
 
 Do one of the 
following:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit a67ab8d9e9002df8c54e38a3569485d4493082b4
Author: Olivier Hallot 
AuthorDate: Mon May 11 12:38:46 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon May 11 17:38:46 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 8d83f7397fd0ad9a5d77394b3f39825f2ee49af3
  - Refactor Help page on Statistics

Simplify by using proper tags

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

diff --git a/helpcontent2 b/helpcontent2
index 6770da677c3a..8d83f7397fd0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6770da677c3ab2502f0a8da2fb269d1c2df979b7
+Subproject commit 8d83f7397fd0ad9a5d77394b3f39825f2ee49af3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/01100400.xhp |   60 -
 1 file changed, 33 insertions(+), 27 deletions(-)

New commits:
commit 8d83f7397fd0ad9a5d77394b3f39825f2ee49af3
Author: Olivier Hallot 
AuthorDate: Mon May 11 12:36:07 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon May 11 17:38:46 2020 +0200

Refactor Help page on Statistics

Simplify by using proper tags

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

diff --git a/source/text/shared/01/01100400.xhp 
b/source/text/shared/01/01100400.xhp
index d0742923a..1f40eadac 100644
--- a/source/text/shared/01/01100400.xhp
+++ b/source/text/shared/01/01100400.xhp
@@ -41,37 +41,43 @@
 
 
 
-Statistics
-  Displays statistics for the current file.
+Statistics
+Displays statistics for the current file.
 
 
-  
+
 
 Some statistic values can be used as 
variables in formulas.
-Pages:
-  Number of 
pages in the file.
-Tables:Sheets:
-  Number 
of tables in the file.Number of sheets 
in the file. This statistic does not 
include tables that were inserted as OLE 
objects.
-Cells:
-  Number 
of cells with content in the file.
-Formula 
groups:
-  Number 
of contiguous ranges in a column with same 
formula.
-Images:
-  Number 
of images in the file. This statistic does not include images that 
were inserted as OLE 
objects.
-OLE 
Objects:
-  Number 
of OLE objects in the file, including 
tables and graphics that were inserted as OLE 
objects.
-Paragraphs:
-  Number 
of paragraphs, including blank paragraphs, in the 
file.
-Words:
-  Number 
of words, including words consisting of a single character, in the 
file.
-Characters:
-  Number 
of characters, including spaces, in the file. Non-printable characters are not 
included.
-Characters excluding spaces:
-  Number of characters, excluding 
spaces, in the file. Non-printable characters are not 
included.
-Lines:
-  Number 
of lines in the file.
+Pages:
+Number of 
pages in the file.
+Tables:Sheets:
+Number of tables in the 
file.Number of sheets in the 
file. This statistic does not include 
tables that were inserted as OLE objects.
 
-Update
-  Updates the 
statistics.
+
+
+Cells:
+Number 
of cells with content in the file.
+Formula groups:
+Number of contiguous ranges in a column with same 
formula.
+
+
+Images:
+Number 
of images in the file. This statistic does not include images that 
were inserted as OLE objects.
+OLE Objects:
+Number 
of OLE objects in the file, including 
tables and graphics that were inserted as OLE objects.
+Paragraphs:
+Number 
of paragraphs, including blank paragraphs, in the file.
+Words:
+Number 
of words, including words consisting of a single character, in the 
file.
+Characters:
+Number 
of characters, including spaces, in the file. Non-printable characters are not 
included.
+Characters excluding spaces:
+Number of 
characters, excluding spaces, in the file. Non-printable characters are not 
included.
+Lines:
+Number 
of lines in the file.
+Update
+Updates the 
statistics.
+
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC Community Bonding Period

[Mike Kaganski]

On 11.05.2020 18:16, Shivam Kumar Singh wrote:
> Hello,
> My name is Shivam Kumar Singh a sophomore student from India, I am
> working on the project "Styles Inspector" which would allow the users to
> clearly understand the applied style formatting in a document.
> 
> I am thankful to the whole LibreOffice community and my mentors Heiko
> Tietze, Mike Kaganski and Tomaž Vajngerl for accepting me as
> their mentee and guiding me right from my first patch to this point.
> 
> Looking forward to a productive summer with LibreOffice.

Hello Shivam! Great to see your introduction.

Hope to help you to have a fruitful and pleasant summer! :-)

-- 
Best regards,
Mike Kaganski


pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

GSoC Community Bonding Period

[Shivam Kumar Singh]

Hello,
My name is Shivam Kumar Singh a sophomore student from India, I am working
on the project "Styles Inspector" which would allow the users to clearly
understand the applied style formatting in a document.

I am thankful to the whole LibreOffice community and my mentors Heiko
Tietze, Mike Kaganski and Tomaž Vajngerl for accepting me as their mentee
and guiding me right from my first patch to this point.

Looking forward to a productive summer with LibreOffice.

Regards,
Shivam
IRC- shivam_

https://summerofcode.withgoogle.com/projects/#5623614189076480
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jim Raykowski (via logerrit)]

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

New commits:
commit 3951a71777038e635e9747684806678c1c7f6612
Author: Jim Raykowski 
AuthorDate: Sat May 9 23:53:34 2020 -0800
Commit: Caolán McNamara 
CommitDate: Mon May 11 17:15:02 2020 +0200

tdf#132935 fix gtk3 submenu crash

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 1620077aa79e..934d52f8f6f5 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7632,6 +7632,16 @@ public:
 
 void remove(const OString& rIdent) override
 {
+if (!m_aExtraItems.empty())
+{
+GtkMenuItem* pMenuItem = m_aMap[rIdent];
+auto iter = std::find(m_aExtraItems.begin(), m_aExtraItems.end(), 
pMenuItem);
+if (iter != m_aExtraItems.end())
+{
+m_pTopLevelMenuHelper->remove_from_map(pMenuItem);
+m_aExtraItems.erase(iter);
+}
+}
 MenuHelper::remove_item(rIdent);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 sw/qa/extras/tiledrendering/tiledrendering.cxx |3 +++
 sw/source/core/crsr/bookmrk.cxx|6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c0517c6215c78e65af8b20e8c033a75586a794bd
Author: Tamás Zolnai 
AuthorDate: Mon May 11 13:12:44 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 11 16:58:39 2020 +0200

lok: MSForms: send also the placeholder text.

Change-Id: I5cce5af22f56079e840707cfffb01785d7a15c6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93960
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 4d3e49f5643d..487def29974b 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -2603,6 +2603,9 @@ void SwTiledRenderingTest::testDropDownFormFieldButton()
 
 OString sSelected = 
aTree.get_child("params").get_child("selected").get_value().c_str();
 CPPUNIT_ASSERT_EQUAL(OString("1"), sSelected);
+
+OString sPlaceholder = 
aTree.get_child("params").get_child("placeholderText").get_value().c_str();
+CPPUNIT_ASSERT_EQUAL(OString("No Item specified"), sPlaceholder);
 }
 
 // Move the cursor back so the button becomes hidden.
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index c1de5fb2cbaf..583ddaff4a12 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::sw::mark;
 using namespace ::com::sun::star;
@@ -766,7 +767,10 @@ namespace sw::mark
 {
 pSelectedItemIter->second >>= nSelection;
 }
-sPayload.append("\"selected\": \"" + 
OString::number(nSelection) + "\"}}");
+sPayload.append("\"selected\": \"" + 
OString::number(nSelection) + "\", ");
+
+// Placeholder text
+sPayload.append("\"placeholderText\": \"" + 
OUStringToOString(SwResId(STR_DROP_DOWN_EMPTY_LIST), RTL_TEXTENCODING_UTF8) + 
"\"}}");
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC Introduction] Community Bonding Period

[Aditya Sahu]

Hi,

I am Aditya Sahu, final year computer science engineering undergrad from
New Delhi, India. My proposal for Google Summer of Code 2020 has been
selected this year for the project "Move the gallery code to use ZIP
files".

I would sincerely like to thank the LibreOffice team for your support and
the help that you provided me at times - from my first difficulty while
building LO on my system - to helping me fix difficult bugs.

I shall be reworking gallery code to eliminate the implementation of
binaries that LO presently uses to contain the themes. You can read more
about it here: [1]. Most grateful to my mentors: Tomaž Vajngerl and Michael
Meeks for filling me in with the details of the project with whom I shall
be working this summer.

I am available on both email and IRC if anyone feels the need to contact
me. My IRC nick is . Will provide weekly status update once
the coding period starts. Hope to have an exciting summer ahead!

Cheers,
Aditya Sahu


[1] https://summerofcode.withgoogle.com/projects/#5814711242719232
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 forms/source/component/clickableimage.cxx |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit a892669ec2887f5e51c403b3a9710d9191909443
Author: Caolán McNamara 
AuthorDate: Mon May 11 14:10:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 16:57:08 2020 +0200

USE_REGISTER_TRANSFER is never defined

and each branch of the ifdef is the same anyway

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

diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index a78b1908fc65..68861e42cf30 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -752,7 +752,6 @@ namespace frm
 
 SfxObjectShell *pObjSh = GetObjectShell();
 
-#ifdef USE_REGISTER_TRANSFER
 if( pObjSh )
 {
 // Transfer target frame, so that javascript: URLs
@@ -761,16 +760,6 @@ namespace frm
 if( pShMedium )
 
m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame());
 }
-#else
-if( pObjSh )
-{
-// Transfer target frame, so that javascript: URLs
-// can also be "loaded"
-const SfxMedium *pShMedium = pObjSh->GetMedium();
-if( pShMedium )
-
m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame());
-}
-#endif
 
 m_bProdStarted = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 forms/source/component/clickableimage.cxx |   90 --
 forms/source/component/clickableimage.hxx |5 +
 2 files changed, 51 insertions(+), 44 deletions(-)

New commits:
commit 318d5bf2a3d70300268c778074919fa908a0dcee
Author: Caolán McNamara 
AuthorDate: Mon May 11 13:44:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 16:56:52 2020 +0200

factor out finding the matching SfxObjectShell

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

diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index e606ea2f549e..a78b1908fc65 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -684,6 +684,52 @@ namespace frm
 }
 }
 
+SfxObjectShell* OClickableImageBaseModel::GetObjectShell()
+{
+// Find the XModel to get to the Object shell or at least the
+// Referer.
+// There's only a Model if we load HTML documents and the URL is
+// changed in a document that is already loaded. There's no way
+// we can get to the Model during loading.
+Reference< XModel >  xModel;
+css::uno::Reference  xIfc( *this );
+while( !xModel.is() && xIfc.is() )
+{
+Reference  xChild( xIfc, UNO_QUERY );
+xIfc = xChild->getParent();
+xModel.set(xIfc, css::uno::UNO_QUERY);
+}
+
+// Search for the Object shell by iterating over all Object shells
+// and comparing their XModel to ours.
+// As an optimization, we try the current Object shell first.
+SfxObjectShell *pObjSh = nullptr;
+
+if( xModel.is() )
+{
+SfxObjectShell *pTestObjSh = SfxObjectShell::Current();
+if( pTestObjSh )
+{
+Reference< XModel >  xTestModel = pTestObjSh->GetModel();
+if( xTestModel == xModel )
+pObjSh = pTestObjSh;
+}
+if( !pObjSh )
+{
+pTestObjSh = SfxObjectShell::GetFirst();
+while( !pObjSh && pTestObjSh )
+{
+Reference< XModel > xTestModel = pTestObjSh->GetModel();
+if( xTestModel == xModel )
+pObjSh = pTestObjSh;
+else
+pTestObjSh = SfxObjectShell::GetNext( *pTestObjSh );
+}
+}
+}
+
+return pObjSh;
+}
 
 void OClickableImageBaseModel::SetURL( const OUString& rURL )
 {
@@ -701,50 +747,10 @@ namespace frm
 return;
 
 if (!rURL.isEmpty() && !::svt::GraphicAccess::isSupportedURL( rURL ) )
-   {
+{
 m_pMedium.reset(new SfxMedium(rURL, StreamMode::STD_READ));
 
-// Find the XModel to get to the Object shell or at least the
-// Referer.
-// There's only a Model if we load HTML documents and the URL is
-// changed in a document that is already loaded. There's no way
-// we can get to the Model during loading.
-Reference< XModel >  xModel;
-css::uno::Reference  xIfc( *this );
-while( !xModel.is() && xIfc.is() )
-{
-Reference  xChild( xIfc, UNO_QUERY );
-xIfc = xChild->getParent();
-xModel.set(xIfc, css::uno::UNO_QUERY);
-}
-
-// Search for the Object shell by iterating over all Object shells
-// and comparing their XModel to ours.
-// As an optimization, we try the current Object shell first.
-SfxObjectShell *pObjSh = nullptr;
-
-if( xModel.is() )
-{
-SfxObjectShell *pTestObjSh = SfxObjectShell::Current();
-if( pTestObjSh )
-{
-Reference< XModel >  xTestModel = pTestObjSh->GetModel();
-if( xTestModel == xModel )
-pObjSh = pTestObjSh;
-}
-if( !pObjSh )
-{
-pTestObjSh = SfxObjectShell::GetFirst();
-while( !pObjSh && pTestObjSh )
-{
-Reference< XModel > xTestModel = 
pTestObjSh->GetModel();
-if( xTestModel == xModel )
-pObjSh = pTestObjSh;
-else
-pTestObjSh = SfxObjectShell::GetNext( *pTestObjSh 
);
-}
-}
-}
+SfxObjectShell *pObjSh = GetObjectShell();
 
 #ifdef USE_REGISTER_TRANSFER
 if( pObjSh )
diff --git a/forms/source/component/clickableimage.hxx 
b/forms/source/component/clickableimage.hx

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 0c50447a94d092d1c19edb1bdebf9bf6dde3ae0f
Author: Caolán McNamara 
AuthorDate: Mon May 11 10:04:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 16:45:32 2020 +0200

Resolves: tdf#132902 restore original hierarchy in dtor

so a repeated weld will result in the same layout each time

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 7e05280bbc46..1620077aa79e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -14304,6 +14304,23 @@ public:
 g_signal_handler_disconnect(m_pTreeView, m_nRowActivatedSignalId);
 g_signal_handler_disconnect(m_pToggleButton, m_nPopupShownSignalId);
 
+gtk_combo_box_set_model(m_pComboBox, m_pTreeModel);
+gtk_tree_view_set_model(m_pTreeView, nullptr);
+
+// restore original hierarchy in dtor so a new GtkInstanceComboBox will
+// result in the same layout each time
+{
+g_object_ref(m_pComboBox);
+
+GtkContainer* pContainer = getContainer();
+
+gtk_container_remove(pContainer, GTK_WIDGET(m_pComboBox));
+
+replaceWidget(GTK_WIDGET(pContainer), GTK_WIDGET(m_pComboBox));
+
+g_object_unref(m_pComboBox);
+}
+
 g_object_unref(m_pComboBuilder);
 }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit a24b27986dfedd4566cf4081090bac8bd2f63e2a
Author: Caolán McNamara 
AuthorDate: Mon May 11 09:35:42 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 16:45:13 2020 +0200

split and rename to form insertAsParent

for clarity as to what each chunk does

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8cb8d0c71823..7e05280bbc46 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1710,13 +1710,13 @@ namespace
 }
 #endif
 
-void insertParent(GtkWidget* pWidget, GtkWidget* pReplacement)
+void replaceWidget(GtkWidget* pWidget, GtkWidget* pReplacement)
 {
+g_object_ref(pWidget);
+
 // remove the widget and replace it with pReplacement
 GtkWidget* pParent = gtk_widget_get_parent(pWidget);
 
-g_object_ref(pWidget);
-
 gint nTopAttach(0), nLeftAttach(0), nHeight(1), nWidth(1);
 if (GTK_IS_GRID(pParent))
 {
@@ -1794,6 +1794,15 @@ namespace
 gtk_widget_set_halign(pReplacement, gtk_widget_get_halign(pWidget));
 gtk_widget_set_valign(pReplacement, gtk_widget_get_valign(pWidget));
 
+g_object_unref(pWidget);
+}
+
+void insertAsParent(GtkWidget* pWidget, GtkWidget* pReplacement)
+{
+g_object_ref(pWidget);
+
+replaceWidget(pWidget, pReplacement);
+
 gtk_container_add(GTK_CONTAINER(pReplacement), pWidget);
 
 g_object_unref(pWidget);
@@ -1817,7 +1826,7 @@ namespace
 pMouseEventBox = gtk_event_box_new();
 gtk_event_box_set_above_child(GTK_EVENT_BOX(pMouseEventBox), 
false);
 gtk_event_box_set_visible_window(GTK_EVENT_BOX(pMouseEventBox), 
false);
-insertParent(pWidget, pMouseEventBox);
+insertAsParent(pWidget, pMouseEventBox);
 }
 
 return pMouseEventBox;
@@ -13687,7 +13696,7 @@ public:
 , m_nMRUCount(0)
 , m_nMaxMRUCount(0)
 {
-insertParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer()));
+insertAsParent(GTK_WIDGET(m_pComboBox), GTK_WIDGET(getContainer()));
 gtk_widget_set_visible(GTK_WIDGET(m_pComboBox), false);
 gtk_widget_set_no_show_all(GTK_WIDGET(m_pComboBox), true);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[LibreOfficiant (via logerrit)]

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

New commits:
commit 2adc6e0a6455bd24ee4d7304da118c52e6da1927
Author: LibreOfficiant 
AuthorDate: Mon May 11 16:17:50 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 11 16:17:50 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 99724d05c5b6e7637f7e9231942dc5bf45d14202
  - tdf#130081 Doc properties help page

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

diff --git a/helpcontent2 b/helpcontent2
index a01ce973cae9..99724d05c5b6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a01ce973cae9914d41d798ac10f84db65a7e0f3c
+Subproject commit 99724d05c5b6e7637f7e9231942dc5bf45d14202
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/sdraw/main0100.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6770da677c3ab2502f0a8da2fb269d1c2df979b7
Author: Olivier Hallot 
AuthorDate: Mon May 11 16:12:22 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon May 11 16:18:14 2020 +0200

tdf#132643 Translate German section IDs (fix)

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

diff --git a/source/text/sdraw/main0100.xhp b/source/text/sdraw/main0100.xhp
index 7e1c4f0ad..9d41f56aa 100644
--- a/source/text/sdraw/main0100.xhp
+++ b/source/text/sdraw/main0100.xhp
@@ -39,7 +39,7 @@
   
 
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[LibreOfficiant (via logerrit)]

 source/text/shared/01/01100400.xhp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 99724d05c5b6e7637f7e9231942dc5bf45d14202
Author: LibreOfficiant 
AuthorDate: Mon May 11 11:12:48 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon May 11 16:17:50 2020 +0200

tdf#130081 Doc properties help page

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

diff --git a/source/text/shared/01/01100400.xhp 
b/source/text/shared/01/01100400.xhp
index 798a03509..d0742923a 100644
--- a/source/text/shared/01/01100400.xhp
+++ b/source/text/shared/01/01100400.xhp
@@ -66,6 +66,8 @@
   Number 
of words, including words consisting of a single character, in the 
file.
 Characters:
   Number 
of characters, including spaces, in the file. Non-printable characters are not 
included.
+Characters excluding spaces:
+  Number of characters, excluding 
spaces, in the file. Non-printable characters are not 
included.
 Lines:
   Number 
of lines in the file.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 975fec33c81380cbdbd5bb7b0b76e5e14c6a173d
Author: Olivier Hallot 
AuthorDate: Mon May 11 16:18:14 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 11 16:18:14 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 6770da677c3ab2502f0a8da2fb269d1c2df979b7
  - tdf#132643 Translate German section IDs (fix)

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

diff --git a/helpcontent2 b/helpcontent2
index 99724d05c5b6..6770da677c3a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 99724d05c5b6e7637f7e9231942dc5bf45d14202
+Subproject commit 6770da677c3ab2502f0a8da2fb269d1c2df979b7
___
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/inc vcl/source

[Szymon Kłos (via logerrit)]

 vcl/inc/salvtables.hxx|   23 ++
 vcl/source/app/salvtables.cxx |   89 ++
 2 files changed, 63 insertions(+), 49 deletions(-)

New commits:
commit a2eb0fe1cffea70bb653ce93b148b4c3d48f0468
Author: Szymon Kłos 
AuthorDate: Fri Feb 28 14:40:03 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 11 16:14:13 2020 +0200

Move SalInstanceButton to header file

Change-Id: I3f6aa1975ae5859e0c340c82627d95e49313a668
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93483
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index e84143832dcf..a4a2fd9f3a45 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -632,4 +632,27 @@ public:
 virtual ~SalInstanceComboBoxWithEdit() override;
 };
 
+class SalInstanceButton : public SalInstanceContainer, public virtual 
weld::Button
+{
+private:
+VclPtr<::Button> m_xButton;
+Link<::Button*,void> const m_aOldClickHdl;
+
+DECL_LINK(ClickHdl, ::Button*, void);
+public:
+SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership);
+
+virtual void set_label(const OUString& rText) override;
+
+virtual void set_image(VirtualDevice* pDevice) override;
+
+virtual void set_from_icon_name(const OUString& rIconName) override;
+
+virtual void set_label_line_wrap(bool wrap) override;
+
+virtual OUString get_label() const override;
+
+virtual ~SalInstanceButton() override;
+};
+
 #endif
\ No newline at end of file
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 02c8a60c4b94..2eb158148349 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1172,64 +1172,55 @@ IMPL_LINK_NOARG(SalInstanceNotebook, ActivatePageHdl, 
TabControl*, void)
 m_aEnterPageHdl.Call(get_current_page_ident());
 }
 
-class SalInstanceButton : public SalInstanceContainer, public virtual 
weld::Button
+SalInstanceButton::SalInstanceButton(::Button* pButton, SalInstanceBuilder* 
pBuilder, bool bTakeOwnership)
+: SalInstanceContainer(pButton, pBuilder, bTakeOwnership)
+, m_xButton(pButton)
+, m_aOldClickHdl(pButton->GetClickHdl())
 {
-private:
-VclPtr<::Button> m_xButton;
-Link<::Button*,void> const m_aOldClickHdl;
-
-DECL_LINK(ClickHdl, ::Button*, void);
-public:
-SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool 
bTakeOwnership)
-: SalInstanceContainer(pButton, pBuilder, bTakeOwnership)
-, m_xButton(pButton)
-, m_aOldClickHdl(pButton->GetClickHdl())
-{
-m_xButton->SetClickHdl(LINK(this, SalInstanceButton, ClickHdl));
-}
+m_xButton->SetClickHdl(LINK(this, SalInstanceButton, ClickHdl));
+}
 
-virtual void set_label(const OUString& rText) override
-{
-m_xButton->SetText(rText);
-}
+void SalInstanceButton::set_label(const OUString& rText)
+{
+m_xButton->SetText(rText);
+}
 
-virtual void set_image(VirtualDevice* pDevice) override
+void SalInstanceButton::set_image(VirtualDevice* pDevice)
+{
+m_xButton->SetImageAlign(ImageAlign::Left);
+if (pDevice)
 {
-m_xButton->SetImageAlign(ImageAlign::Left);
-if (pDevice)
-{
-BitmapEx aBitmap(pDevice->GetBitmap(Point(0, 0), 
pDevice->GetOutputSize()));
-m_xButton->SetModeImage(Image(aBitmap));
-}
-else
-m_xButton->SetModeImage(Image());
+BitmapEx aBitmap(pDevice->GetBitmap(Point(0, 0), 
pDevice->GetOutputSize()));
+m_xButton->SetModeImage(Image(aBitmap));
 }
+else
+m_xButton->SetModeImage(Image());
+}
 
-virtual void set_from_icon_name(const OUString& rIconName) override
-{
-m_xButton->SetModeImage(::Image(BitmapEx(rIconName)));
-}
+void SalInstanceButton::set_from_icon_name(const OUString& rIconName)
+{
+m_xButton->SetModeImage(::Image(BitmapEx(rIconName)));
+}
 
-virtual void set_label_line_wrap(bool wrap) override
-{
-WinBits nBits = m_xButton->GetStyle();
-nBits &= ~WB_WORDBREAK;
-if (wrap)
-nBits |= WB_WORDBREAK;
-m_xButton->SetStyle(nBits);
-m_xButton->queue_resize();
-}
+void SalInstanceButton::set_label_line_wrap(bool wrap)
+{
+WinBits nBits = m_xButton->GetStyle();
+nBits &= ~WB_WORDBREAK;
+if (wrap)
+nBits |= WB_WORDBREAK;
+m_xButton->SetStyle(nBits);
+m_xButton->queue_resize();
+}
 
-virtual OUString get_label() const override
-{
-return m_xButton->GetText();
-}
+OUString SalInstanceButton::get_label() const
+{
+return m_xButton->GetText();
+}
 
-virtual ~SalInstanceButton() override
-{
-m_xButton->SetClickHdl(Link<::Button*,void>());
-}
-};
+SalInstanceButton::~SalInstanceButton()
+{
+m_xButton->SetClickHdl(Link<::Button*,void>());
+}
 
 IMPL_LINK(SalInstanceButton, ClickH

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

[Johnny_M (via logerrit)]

 source/text/sdraw/main_edit.xhp|2 +-
 source/text/shared/01/0220.xhp |2 +-
 source/text/shared/01/02200100.xhp |2 +-
 source/text/shared/02/0707.xhp |2 +-
 source/text/shared/main0201.xhp|2 +-
 source/text/smath/main0100.xhp |2 +-
 source/text/smath/main0102.xhp |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a01ce973cae9914d41d798ac10f84db65a7e0f3c
Author: Johnny_M 
AuthorDate: Thu May 7 11:01:49 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon May 11 16:08:24 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sdraw/main_edit.xhp b/source/text/sdraw/main_edit.xhp
index 1ad8f532c..ca91c6c67 100644
--- a/source/text/sdraw/main_edit.xhp
+++ b/source/text/sdraw/main_edit.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 Edit
 The commands 
in this menu are used to edit Draw documents (for example, copying and 
pasting).
 
diff --git a/source/text/shared/01/0220.xhp 
b/source/text/shared/01/0220.xhp
index 82ffb1454..4d3384ed5 100644
--- a/source/text/shared/01/0220.xhp
+++ b/source/text/shared/01/0220.xhp
@@ -35,7 +35,7 @@
 
   
 
-
+
 
 
 Insert - 
Object
diff --git a/source/text/shared/01/02200100.xhp 
b/source/text/shared/01/02200100.xhp
index 8dd51514a..1029a8674 100644
--- a/source/text/shared/01/02200100.xhp
+++ b/source/text/shared/01/02200100.xhp
@@ -28,7 +28,7 @@
   
 
 
-
+
 objects; 
editingediting; 
objects
 Edit
   Lets you edit a selected object in your file that 
you inserted with the Insert – Object command.
diff --git a/source/text/shared/02/0707.xhp 
b/source/text/shared/02/0707.xhp
index 733e37a39..b92552974 100644
--- a/source/text/shared/02/0707.xhp
+++ b/source/text/shared/02/0707.xhp
@@ -29,7 +29,7 @@
 
 
 
-
+
 write protection on/off
 protected documents
 documents; read-only
diff --git a/source/text/shared/main0201.xhp b/source/text/shared/main0201.xhp
index 164d88b8b..050df1e9b 100644
--- a/source/text/shared/main0201.xhp
+++ b/source/text/shared/main0201.xhp
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/smath/main0100.xhp b/source/text/smath/main0100.xhp
index 4b7c8ff46..e0a8d2409 100644
--- a/source/text/smath/main0100.xhp
+++ b/source/text/smath/main0100.xhp
@@ -40,7 +40,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/source/text/smath/main0102.xhp b/source/text/smath/main0102.xhp
index 123e8afcc..c3fc54bb1 100644
--- a/source/text/smath/main0102.xhp
+++ b/source/text/smath/main0102.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Edit
   The commands 
in this menu are used to edit formulas. In addition to basic commands, (for 
example, copying contents) there are functions specific to $[officename] Math 
such as searching for placeholders or errors.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 6802319819f2451e6970c3694f248b9fe31d3cfd
Author: Johnny_M 
AuthorDate: Mon May 11 16:08:24 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon May 11 16:08:24 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a01ce973cae9914d41d798ac10f84db65a7e0f3c
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index efc47bdd3b72..a01ce973cae9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit efc47bdd3b72ea1a377d2d6d497db67bdb0bdd9d
+Subproject commit a01ce973cae9914d41d798ac10f84db65a7e0f3c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 external/skia/UnpackedTarball_skia.mk  |1 
 external/skia/windows-raster-surface-no-copies.patch.1 |   39 +
 vcl/skia/gdiimpl.cxx   |   16 --
 3 files changed, 50 insertions(+), 6 deletions(-)

New commits:
commit 23d61621058221b9e15d5d49e2fbb281042d8b1d
Author: Luboš Luňák 
AuthorDate: Mon May 11 13:00:45 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 11 15:58:06 2020 +0200

avoid deep copies of pixels with Skia raster surfaces (tdf#132856)

SkCanvas::draw() leads to deep copies of the source bitmap, moreover
RasterWindowContext_win allocates the pixels in a way that
SkSurface_Raster has to do a deep copy because of not owning
the pixels.

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

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index e0841e432daa..08769b2867a5 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -34,6 +34,7 @@ skia_patches := \
 fix-without-gl.patch.0 \
 extend-rgb-to-rgba.patch.0 \
 windows-typeface-directwrite.patch.0 \
+windows-raster-surface-no-copies.patch.1 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/windows-raster-surface-no-copies.patch.1 
b/external/skia/windows-raster-surface-no-copies.patch.1
new file mode 100644
index ..0c5804d8558b
--- /dev/null
+++ b/external/skia/windows-raster-surface-no-copies.patch.1
@@ -0,0 +1,39 @@
+diff --git a/tools/sk_app/win/RasterWindowContext_win.cpp 
b/tools/sk_app/win/RasterWindowContext_win.cpp
+index 9548220ce6..49f1f9ed17 100644
+--- a/tools/sk_app/win/RasterWindowContext_win.cpp
 b/tools/sk_app/win/RasterWindowContext_win.cpp
+@@ -55,7 +55,7 @@ void RasterWindowContext_win::resize(int w, int h) {
+ fWidth = w;
+ fHeight = h;
+ fBackbufferSurface.reset();
+-const size_t bmpSize = sizeof(BITMAPINFOHEADER) + w * h * 
sizeof(uint32_t);
++const size_t bmpSize = sizeof(BITMAPINFO);
+ fSurfaceMemory.reset(bmpSize);
+ BITMAPINFO* bmpInfo = reinterpret_cast(fSurfaceMemory.get());
+ ZeroMemory(bmpInfo, sizeof(BITMAPINFO));
+@@ -65,11 +65,12 @@ void RasterWindowContext_win::resize(int w, int h) {
+ bmpInfo->bmiHeader.biPlanes = 1;
+ bmpInfo->bmiHeader.biBitCount = 32;
+ bmpInfo->bmiHeader.biCompression = BI_RGB;
+-void* pixels = bmpInfo->bmiColors;
++// Do not use a packed DIB bitmap, SkSurface_Raster::onNewImageSnapshot() 
does
++// a deep copy if it does not own the pixels.
+ 
+ SkImageInfo info = SkImageInfo::Make(w, h, fDisplayParams.fColorType, 
kPremul_SkAlphaType,
+  fDisplayParams.fColorSpace);
+-fBackbufferSurface = SkSurface::MakeRasterDirect(info, pixels, 
sizeof(uint32_t) * w);
++fBackbufferSurface = SkSurface::MakeRaster(info);
+ }
+ 
+ sk_sp RasterWindowContext_win::getBackbufferSurface() { return 
fBackbufferSurface; }
+@@ -77,7 +78,9 @@ sk_sp 
RasterWindowContext_win::getBackbufferSurface() { return fBackb
+ void RasterWindowContext_win::swapBuffers() {
+ BITMAPINFO* bmpInfo = reinterpret_cast(fSurfaceMemory.get());
+ HDC dc = GetDC(fWnd);
+-StretchDIBits(dc, 0, 0, fWidth, fHeight, 0, 0, fWidth, fHeight, 
bmpInfo->bmiColors, bmpInfo,
++SkPixmap pixmap;
++fBackbufferSurface->peekPixels(&pixmap);
++StretchDIBits(dc, 0, 0, fWidth, fHeight, 0, 0, fWidth, fHeight, 
pixmap.addr(), bmpInfo,
+   DIB_RGB_COLORS, SRCCOPY);
+ ReleaseDC(fWnd, dc);
+ }
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 94de0134b4ad..9fc3b5005980 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -902,14 +902,16 @@ bool 
SkiaSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const sal_uInt32*,
 }
 
 static void copyArea(SkCanvas* canvas, sk_sp surface, long nDestX, 
long nDestY,
- long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight)
+ long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, 
bool srcIsRaster)
 {
 // Using SkSurface::draw() should be more efficient than 
SkSurface::makeImageSnapshot(),
 // because it may detect copying to itself and avoid some needless copies.
-// It cannot do a subrectangle though, so clip.
-if (canvas == surface->getCanvas())
+// But it has problems with drawing to iself
+// (https://groups.google.com/forum/#!topic/skia-discuss/6yiuw24jv0I) and 
also
+// raster surfaces do not avoid a copy of the source
+// (https://groups.google.com/forum/#!topic/skia-discuss/S3FMpCi82k0).
+if (canvas == surface->getCanvas() || srcIsRaster)
 {
-// TODO: Currently copy-to-self is buggy with SkSurface::draw().
 SkPaint paint;
 paint.setBlendMode(SkBlendMode::kSrc)

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.NotebookbarCalc.js| 1895 ---
 loleaflet/src/control/Control.NotebookbarImpress.js | 2149 
 loleaflet/src/control/Control.NotebookbarWriter.js  | 3378 
 3 files changed, 13 insertions(+), 7409 deletions(-)

New commits:
commit 06864e7011b8a8fe350ab3d56d844e2d19f23918
Author: Szymon Kłos 
AuthorDate: Mon May 11 14:25:52 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 11 15:11:33 2020 +0200

notebookbar: remove testing JSON

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

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

'command': '.uno:Paste'
-   
}
-   
   

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

[Caolán McNamara (via logerrit)]

 include/sfx2/objsh.hxx   |2 ++
 sfx2/source/doc/objmisc.cxx  |   31 ++-
 sfx2/source/notify/eventsupplier.cxx |   25 +
 3 files changed, 17 insertions(+), 41 deletions(-)

New commits:
commit b55572c8abe2d01e5d8489b6ff32f72fa32bfea2
Author: Caolán McNamara 
AuthorDate: Mon May 11 12:28:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 15:08:34 2020 +0200

de-duplicate cut and paste function

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

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 568b0397f43b..be90b2bfa18f 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -398,6 +398,8 @@ public:
 
 static bool UnTrustedScript(const OUString& rScriptURL);
 
+static bool isScriptAccessAllowed(const 
css::uno::Reference& rScriptContext);
+
 SvKeyValueIterator* GetHeaderAttributes();
 voidClearHeaderAttributesForSourceViewHack();
 voidSetHeaderAttributesForSourceViewHack();
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3bb958246670..e3e07dd5c306 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1327,27 +1327,24 @@ ErrCode SfxObjectShell::CallBasic( const OUString& 
rMacro,
 return nRet;
 }
 
-namespace
+bool SfxObjectShell::isScriptAccessAllowed( const Reference< XInterface >& 
_rxScriptContext )
 {
-bool lcl_isScriptAccessAllowed_nothrow( const Reference< XInterface >& 
_rxScriptContext )
+try
 {
-try
-{
-Reference< XEmbeddedScripts > xScripts( _rxScriptContext, 
UNO_QUERY );
-if ( !xScripts.is() )
-{
-Reference< XScriptInvocationContext > xContext( 
_rxScriptContext, UNO_QUERY_THROW );
-xScripts.set( xContext->getScriptContainer(), UNO_SET_THROW );
-}
-
-return xScripts->getAllowMacroExecution();
-}
-catch( const Exception& )
+Reference< XEmbeddedScripts > xScripts( _rxScriptContext, UNO_QUERY );
+if ( !xScripts.is() )
 {
-DBG_UNHANDLED_EXCEPTION("sfx.doc");
+Reference< XScriptInvocationContext > xContext( _rxScriptContext, 
UNO_QUERY_THROW );
+xScripts.set( xContext->getScriptContainer(), UNO_SET_THROW );
 }
-return false;
+
+return xScripts->getAllowMacroExecution();
 }
+catch( const Exception& )
+{
+DBG_UNHANDLED_EXCEPTION("sfx.doc");
+}
+return false;
 }
 
 // don't allow LibreLogo to be used with our mouseover/etc dom-alike events
@@ -1392,7 +1389,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< 
XInterface >& _rxScriptCon
 Any aException;
 try
 {
-if ( !lcl_isScriptAccessAllowed_nothrow( _rxScriptContext ) )
+if (!isScriptAccessAllowed(_rxScriptContext))
 return ERRCODE_IO_ACCESSDENIED;
 
 if ( UnTrustedScript(_rScriptURL) )
diff --git a/sfx2/source/notify/eventsupplier.cxx 
b/sfx2/source/notify/eventsupplier.cxx
index a8a674d2f531..65a50da3ef75 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -151,29 +151,6 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasElements()
 return maEventNames.hasElements();
 }
 
-namespace
-{
-bool lcl_isScriptAccessAllowed_nothrow(const 
uno::Reference& rxScriptContext)
-{
-try
-{
-uno::Reference 
xScripts(rxScriptContext, uno::UNO_QUERY);
-if (!xScripts.is())
-{
-uno::Reference 
xContext(rxScriptContext, uno::UNO_QUERY_THROW);
-xScripts.set(xContext->getScriptContainer(), 
uno::UNO_SET_THROW);
-}
-
-return xScripts->getAllowMacroExecution();
-}
-catch( const uno::Exception& )
-{
-DBG_UNHANDLED_EXCEPTION("sfx.doc");
-}
-return false;
-}
-}
-
 void SfxEvents_Impl::Execute( uno::Any const & aEventData, const 
document::DocumentEvent& aTrigger, SfxObjectShell* pDoc )
 {
 uno::Sequence < beans::PropertyValue > aProperties;
@@ -215,7 +192,7 @@ void SfxEvents_Impl::Execute( uno::Any const & aEventData, 
const document::Docum
 if (!pDoc)
 pDoc = SfxObjectShell::Current();
 
-if (pDoc && !lcl_isScriptAccessAllowed_nothrow(pDoc->GetModel()))
+if (pDoc && !SfxObjectShell::isScriptAccessAllowed(pDoc->GetModel()))
 return;
 
 if (aType == STAR_BASIC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 7.0 alpha1 on bigendian (here: s390x)

[rene . engelhard]

Am 11. Mai 2020 14:44:22 MESZ schrieb "Luboš Luňák" :
>On Saturday 09 of May 2020, Rene Engelhard wrote:
>> In file included from
>>
>/home/rene/libreoffice-7.0.0~alpha1/workdir/UnpackedTarball/skia/include/co
>>re/SkMath.h:11:
>>
>/home/rene/libreoffice-7.0.0~alpha1/workdir/UnpackedTarball/skia/include/co
>>re/SkTypes.h:228:6: error: "The Skia team is not endian-savvy enough
>to
>> support big -endian CPUs."
>> #error "The Skia team is not endian-savvy enough to support
>big-endian
>> CPUs." ^
>...
>
>> Erm, seriously? LO is supporting s390x in the code.
>>
>> Lubos, what are you suggesting on s390x? --disable-skia? Isn't it
>needed
>> for "gen" also on Linux?
>
> (Oh, wow, people actually use LO on s390x?) You can easily 
>use --disable-skia, on Linux it's currently used only with the gen
>backend, 
>but it's not required, it's just one alternative.

Hi,

> (Oh, wow, people actually use LO on s390x?)

Don't believe so, actually, but it is available: 
http://packages.debian.org/libreoffice-core

(And I could imagine nogui - ok, skis doesn't matter here - useful for server 
usages if LO/lool)

> You can easily 
use --disable-skia, on Linux it's currently used only with the gen backend, 
but it's not required, it's just one alternative.

Ok.

Regards,

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

Re: LO 7.0 alpha1 on bigendian (here: s390x)

[Luboš Luňák]

On Saturday 09 of May 2020, Rene Engelhard wrote:
> In file included from
> /home/rene/libreoffice-7.0.0~alpha1/workdir/UnpackedTarball/skia/include/co
>re/SkMath.h:11:
> /home/rene/libreoffice-7.0.0~alpha1/workdir/UnpackedTarball/skia/include/co
>re/SkTypes.h:228:6: error: "The Skia team is not endian-savvy enough to
> support big -endian CPUs."
> #error "The Skia team is not endian-savvy enough to support big-endian
> CPUs." ^
...

> Erm, seriously? LO is supporting s390x in the code.
>
> Lubos, what are you suggesting on s390x? --disable-skia? Isn't it needed
> for "gen" also on Linux?

 (Oh, wow, people actually use LO on s390x?) You can easily 
use --disable-skia, on Linux it's currently used only with the gen backend, 
but it's not required, it's just one alternative.

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

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/effectspage.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cc08616bbe9178fdba94445a81090dad1a8cd1dc
Author: Caolán McNamara 
AuthorDate: Mon May 11 09:30:32 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 14:53:03 2020 +0200

color drop downs missing their labels

since...

commit 1eb6210d678bbb0c875f0f72bd876a9e7795dfbe
Date:   Thu Apr 23 00:39:33 2020 +0200

tdf#132373 Remove blinking character property from the UI/editor

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

diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 7bc06c9844ac..037f85c16332 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -423,6 +423,7 @@
 True
 False
 True
+
 
   
 
@@ -438,6 +439,7 @@
 True
 False
 True
+
 
   
 
@@ -551,6 +553,7 @@
 True
 False
 True
+
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ian Barkley-Yeung (via logerrit)]

 vcl/opengl/salbmp.cxx |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 4ee314959a377031a382b6ba42c6b5d5a0c0a367
Author: Ian Barkley-Yeung 
AuthorDate: Sat May 9 21:28:44 2020 -0700
Commit: Luboš Luňák 
CommitDate: Mon May 11 14:42:12 2020 +0200

tdf#38835: strip out non-trivial globals before main

Allocate the fixed texture vector on first use instead of before main. This
should make startup very, very slightly faster.

Tested by just starting up a writer document. Let me know if there are other
tests I should be doing.

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

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 4c8261858023..abb9731b6d45 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -91,10 +91,6 @@ sal_uInt32 lclBytesPerRow(sal_uInt16 nBits, int nWidth)
 }
 return 0;
 }
-
-typedef std::vector > 
TextureAtlasVector;
-static vcl::DeleteOnDeinit< TextureAtlasVector > gTextureAtlases(new 
TextureAtlasVector);
-
 }
 
 OpenGLSalBitmap::OpenGLSalBitmap()
@@ -313,16 +309,18 @@ void lclInstantiateTexture(OpenGLTexture& rTexture, const 
int nWidth, const int
 {
 if (nWidth == nHeight)
 {
-TextureAtlasVector &sTextureAtlases = *gTextureAtlases.get();
-if (sTextureAtlases.empty())
-{
-
sTextureAtlases.push_back(std::make_unique(8, 8, 16));
-
sTextureAtlases.push_back(std::make_unique(8, 8, 24));
-
sTextureAtlases.push_back(std::make_unique(8, 8, 32));
-
sTextureAtlases.push_back(std::make_unique(8, 8, 48));
-
sTextureAtlases.push_back(std::make_unique(8, 8, 64));
-}
-for (std::unique_ptr & pTextureAtlas : 
sTextureAtlases)
+typedef std::vector> 
TextureAtlasVector;
+static vcl::DeleteOnDeinit aTextureAtlases([]() {
+TextureAtlasVector* p = new TextureAtlasVector;
+p->reserve(5);
+p->push_back(std::make_unique(8, 8, 16));
+p->push_back(std::make_unique(8, 8, 24));
+p->push_back(std::make_unique(8, 8, 32));
+p->push_back(std::make_unique(8, 8, 48));
+p->push_back(std::make_unique(8, 8, 64));
+return p;
+}());
+for (std::unique_ptr& pTextureAtlas : 
*aTextureAtlases.get())
 {
 if (nWidth == pTextureAtlas->GetSubtextureSize())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rene Engelhard (via logerrit)]

 external/skia/Library_skia.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4855b5771f35ef354fbb5fb00a8cf690d5427c69
Author: Rene Engelhard 
AuthorDate: Sun May 10 00:09:14 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 11 14:40:22 2020 +0200

skia: add SkOpts_crc32

I get

/usr/bin/ld:

/home/rene/libreoffice-7.0.0~alpha1/workdir/GenCxxObject/UnpackedTarball/skia/src/core/SkOpts.o:
in function `SkOpts::Init()':
././workdir/UnpackedTarball/skia/src/core/SkOpts.cpp:135: undefined
reference to `SkOpts::Init_crc32()'
collect2: error: ld returned 1 exit status
make[2]: ***
[/home/rene/libreoffice-7.0.0~alpha1/external/skia/Library_skia.mk:10:
/home/rene/libreoffice-7.0.0~alpha1/instdir/program/libskialo.so] Error
1

on aarch64 otherwise

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

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 6047de0b864b..96566b958a7c 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -774,6 +774,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) 
$(CLANG_CXXFLAGS_INTRINSICS_SSSE3) \
 ))
+$(eval $(call gb_Library_add_generated_exception_objects,skia,\
+UnpackedTarball/skia/src/opts/SkOpts_crc32 \
+))
 
 $(eval $(call gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rene Engelhard (via logerrit)]

 sw/source/filter/ww8/WW8Sttbf.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit da1de29f8410d352884688bd76bd07ca1c8f6ecd
Author: Rene Engelhard 
AuthorDate: Sat May 9 16:15:05 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 11 14:34:48 2020 +0200

include 

since otherwise it isn't resolvable in !OSL_BIGENDIAN case (like on s390x)

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

diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx 
b/sw/source/filter/ww8/WW8Sttbf.cxx
index 54e05c42ac02..1e23c8ca89a7 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -28,6 +28,10 @@
 #include 
 #include 
 
+#ifdef OSL_BIGENDIAN
+#include 
+#endif
+
 namespace ww8
 {
 WW8Struct::WW8Struct(SvStream& rSt, sal_uInt32 nPos, sal_uInt32 nSize)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos (via logerrit)]

 svx/uiconfig/ui/findreplacedialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f1187a27681c19f1a241671f81dece34e048678
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon May 11 07:12:35 2020 -0500
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 11 07:12:35 2020 -0500

tdf#36158 Fix a lurking last instance of old “Notes” name

This completes commit 1288a1985894a5aa8819223feb4ec3da204c5352
(from 2011-05-22).

Change-Id: Ic0950c9500870a68d3e0c17b77e7fcebdc787c11

diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index d57a3e73d76e..4b27a9064a58 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -990,7 +990,7 @@
 
   Formulas
   Values
-  Notes
+  Comments
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_graphic_test.mk vcl/CppunitTest_vcl_type_serializer_test.mk vcl/qa vcl/source

[Noel Grandin (via logerrit)]

 vcl/CppunitTest_vcl_graphic_test.mk |6 ++
 vcl/CppunitTest_vcl_type_serializer_test.mk |6 ++
 vcl/qa/cppunit/FontFeatureTest.cxx  |2 ++
 vcl/qa/cppunit/GraphicTest.cxx  |   17 +
 vcl/qa/cppunit/TypeSerializerTest.cxx   |   17 +
 vcl/qa/cppunit/lifecycle.cxx|2 ++
 vcl/qa/cppunit/pdfexport/pdfexport.cxx  |7 +++
 vcl/source/font/FeatureCollector.cxx|1 +
 8 files changed, 58 insertions(+)

New commits:
commit 687f46059cc9238d74e0687fbd9422dfdb109e1e
Author: Noel Grandin 
AuthorDate: Mon May 11 11:09:50 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon May 11 13:35:07 2020 +0200

fix some leaks in vcl

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

diff --git a/vcl/CppunitTest_vcl_graphic_test.mk 
b/vcl/CppunitTest_vcl_graphic_test.mk
index 7b042f84d7da..353d054e1ba7 100644
--- a/vcl/CppunitTest_vcl_graphic_test.mk
+++ b/vcl/CppunitTest_vcl_graphic_test.mk
@@ -20,6 +20,12 @@ $(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test,\
boost_headers \
glm_headers \
 ))
+ifeq ($(TLS),NSS)
+$(eval $(call gb_CppunitTest_use_externals,vcl_graphic_test,\
+   plc4 \
+   nss3 \
+))
+endif
 
 $(eval $(call gb_CppunitTest_set_include,vcl_graphic_test,\
 $$(INCLUDE) \
diff --git a/vcl/CppunitTest_vcl_type_serializer_test.mk 
b/vcl/CppunitTest_vcl_type_serializer_test.mk
index b2d78c34a6a1..ac668da41b01 100644
--- a/vcl/CppunitTest_vcl_type_serializer_test.mk
+++ b/vcl/CppunitTest_vcl_type_serializer_test.mk
@@ -14,6 +14,12 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,vcl_type_serializer_test, \
 ))
 
 $(eval $(call 
gb_CppunitTest_use_external,vcl_type_serializer_test,boost_headers))
+ifeq ($(TLS),NSS)
+$(eval $(call gb_CppunitTest_use_externals,vcl_type_serializer_test,\
+   plc4 \
+   nss3 \
+))
+endif
 
 $(eval $(call gb_CppunitTest_set_include,vcl_type_serializer_test,\
 $$(INCLUDE) \
diff --git a/vcl/qa/cppunit/FontFeatureTest.cxx 
b/vcl/qa/cppunit/FontFeatureTest.cxx
index 79ec3c158fbe..e4040f35bf39 100644
--- a/vcl/qa/cppunit/FontFeatureTest.cxx
+++ b/vcl/qa/cppunit/FontFeatureTest.cxx
@@ -120,6 +120,8 @@ void FontFeatureTest::testGetFontFeatures()
 CPPUNIT_ASSERT_EQUAL(uint32_t(2), rParameter3.getCode());
 CPPUNIT_ASSERT(!rParameter2.getDescription().isEmpty());
 }
+
+aVDev.disposeAndClear();
 #endif // HAVE_MORE_FONTS
 }
 
diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx
index d040f8837cd0..f40b5c1b88e7 100644
--- a/vcl/qa/cppunit/GraphicTest.cxx
+++ b/vcl/qa/cppunit/GraphicTest.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -25,12 +27,20 @@
 
 #include 
 
+#if USE_TLS_NSS
+#include 
+#endif
+
 using namespace css;
 
 namespace
 {
 class GraphicTest : public CppUnit::TestFixture
 {
+public:
+~GraphicTest();
+
+private:
 void testUnloadedGraphic();
 void testUnloadedGraphicLoading();
 void testUnloadedGraphicWmf();
@@ -50,6 +60,13 @@ class GraphicTest : public CppUnit::TestFixture
 CPPUNIT_TEST_SUITE_END();
 };
 
+GraphicTest::~GraphicTest()
+{
+#if USE_TLS_NSS
+NSS_Shutdown();
+#endif
+}
+
 BitmapEx createBitmap(bool alpha = false)
 {
 Bitmap aBitmap(Size(120, 100), 24);
diff --git a/vcl/qa/cppunit/TypeSerializerTest.cxx 
b/vcl/qa/cppunit/TypeSerializerTest.cxx
index 0193ce272142..30966700a3a3 100644
--- a/vcl/qa/cppunit/TypeSerializerTest.cxx
+++ b/vcl/qa/cppunit/TypeSerializerTest.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+#include 
 #include 
 
 #include 
@@ -25,6 +27,10 @@
 
 #include 
 
+#if USE_TLS_NSS
+#include 
+#endif
+
 namespace
 {
 constexpr char DATA_DIRECTORY[] = "/vcl/qa/cppunit/data/";
@@ -52,6 +58,10 @@ std::string toHexString(const std::vector& a)
 
 class TypeSerializerTest : public CppUnit::TestFixture
 {
+public:
+~TypeSerializerTest();
+
+private:
 void testGradient();
 void testGraphic_Vector();
 void testGraphic_Bitmap_NoGfxLink();
@@ -67,6 +77,13 @@ class TypeSerializerTest : public CppUnit::TestFixture
 CPPUNIT_TEST_SUITE_END();
 };
 
+TypeSerializerTest::~TypeSerializerTest()
+{
+#if USE_TLS_NSS
+NSS_Shutdown();
+#endif
+}
+
 void TypeSerializerTest::testGradient()
 {
 Gradient aGradient(GradientStyle::Radial, Color(0xFF, 0x00, 0x00), 
Color(0x00, 0xFF, 0x00));
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index 097852770814..e55e7da8ebaf 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -76,6 +76,8 @@ void LifecycleTest::testVirtualDevice()
 VclPtrInstance pVDev3;
 VclPtrInstance pVDev4(DeviceFormat::BITMASK);
 CPPUNIT_ASSERT(!!pVDev && !!pVD

[Libreoffice-commits] core.git: Changes to 'feature/calc-coordinates'

[Dennis Francis (via logerrit)]

New branch 'feature/calc-coordinates' available with the following commits:
commit 146b18e04d5cfd0e5b6cda124e2407264ea08029
Author: Dennis Francis 
Date:   Fri May 8 13:27:50 2020 +0530

Unit tests for ITiledRenderable::getSheetGeometryData()

(Testing of groups/ouline case is not included)

Change-Id: Ia53e5489c376d2d86461a9fd3db4f5b7dc963b99

commit 517e7d1058c6676a2e1e35077b1b865c9c9cf7d7
Author: Dennis Francis 
Date:   Tue May 5 01:55:37 2020 +0530

Introduce ITiledRenderable::getSheetGeometryData()

ITiledRenderable::getSheetGeometryData(bool bColumns, bool bRows,
   bool bSizes, bool bHidden,
   bool bFiltered, bool bGroups)

and implement it for the Calc derivation (ScModelObj).

The aim is to use it actively in LOOL instead of the interface:

ITiledRenderable::getRowColumnHeaders(const tools::Rectangle& 
/*rRectangle*/)

This is used by the LOOL to fetch the sheet geometry data for just the
current view-area in the clients, so LOOL queries this everytime some
client's view-area changes.

Like the existing interface, the new one will provide all 'kinds' of
sheet geometry info [col/row sizes(twips), hidden/filtered and
grouping]. But the difference is, it generates data for the whole sheet
(not view-area specific). So the method need not be queried every time
the view area changes in the LOOL clients, and more importantly it
enables the clients to locate any cell at any zoom level without any
further help from the core. This means core needn't send various
client(zoom) specific positioning messages in pixel aligned twips. It
just can send all positioning messages in print twips uniformly to all
clients.

Change-Id: Ib6aee9a0c92746b1576ed244e98cb54b572778c0

improvements: squash to 9d11daebb

Change-Id: I55eafcde514573c3701756da6e7c888a2faaa6e7

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

Re: Compiling LO on macOS using lode - yasm and nasm not found

[julien2412]

Hello Eivind,

I'm not sure Homebrew should be used. Indeed, it's not indicated in
https://wiki.documentfoundation.org/Development/BuildingOnMac, did you
follow this link?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks (via logerrit)]

 framework/source/helper/statusindicator.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit f7fb6d11e185bf5c462457d6d977fba308cea414
Author: Michael Meeks 
AuthorDate: Fri Jan 24 20:48:21 2020 +0100
Commit: Michael Meeks 
CommitDate: Mon May 11 13:18:30 2020 +0200

lok: status update - avoid SIGFPE on zero range.

Change-Id: I75597696b529f833bbc699f66f5a4bcdc06748d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87368
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93834
Reviewed-by: Michael Weghorn 

diff --git a/framework/source/helper/statusindicator.cxx 
b/framework/source/helper/statusindicator.cxx
index e729702125d6..25d67694c5df 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -105,11 +105,14 @@ void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
 {
 if (comphelper::LibreOfficeKit::isActive())
 {
-int nPercent = (100*nValue)/m_nRange;
-if (nPercent >= m_nLastCallbackPercent)
+if (m_nRange > 0)
 {
-comphelper::LibreOfficeKit::statusIndicatorSetValue(nPercent);
-m_nLastCallbackPercent = nPercent;
+int nPercent = (100*nValue)/m_nRange;
+if (nPercent >= m_nLastCallbackPercent)
+{
+comphelper::LibreOfficeKit::statusIndicatorSetValue(nPercent);
+m_nLastCallbackPercent = nPercent;
+}
 }
 return;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.FormulaBar.js |2 +-
 loleaflet/src/control/Control.StatusBar.js  |   10 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 9f55b8f46eba1410f0be0f93f01278d0d345fc60
Author: Szymon Kłos 
AuthorDate: Mon May 11 12:31:48 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 11 13:15:26 2020 +0200

Fix language menu in statusbar

Sub items from the language submenu are executed by
uno calls - added handler.

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

diff --git a/loleaflet/src/control/Control.StatusBar.js 
b/loleaflet/src/control/Control.StatusBar.js
index 9bd0c8d53..59f567ad7 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -109,7 +109,15 @@ L.Control.StatusBar = L.Control.extend({
 
var docLayer = this.map._docLayer;
 
-   if (id === 'zoomin' && this.map.getZoom() < 
this.map.getMaxZoom()) {
+   if (item.uno) {
+   if (item.unosheet && this.map.getDocType() === 
'spreadsheet') {
+   this.map.toggleCommandState(item.unosheet);
+   }
+   else {
+   
this.map.toggleCommandState(window.getUNOCommand(item.uno));
+   }
+   }
+   else if (id === 'zoomin' && this.map.getZoom() < 
this.map.getMaxZoom()) {
this.map.zoomIn(1);
}
else if (id === 'zoomout' && this.map.getZoom() > 
this.map.getMinZoom()) {
commit cdf964ba861a03634fd05587bb6ee5cd9588fd94
Author: Szymon Kłos 
AuthorDate: Mon May 11 12:39:34 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 11 13:15:20 2020 +0200

Fix cell address input handler

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

diff --git a/loleaflet/src/control/Control.FormulaBar.js 
b/loleaflet/src/control/Control.FormulaBar.js
index e62bd2c86..60fd848d9 100644
--- a/loleaflet/src/control/Control.FormulaBar.js
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -40,7 +40,7 @@ L.Control.FormulaBar = L.Control.extend({
window.hideTooltip(this, e.target);
},
onRefresh: function() {
-   $('#addressInput').off('keyup', 
this.onAddressInput, this).on('keyup', this.onAddressInput, this);
+   $('#addressInput').off('keyup', 
that.onAddressInput.bind(that)).on('keyup', that.onAddressInput.bind(that));
}
});
toolbar.bind('touchstart', function(e) {
___
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' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx  |2 +-
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7e30a805a2451752070f6eef7149b32079bdc59
Author: Julien Nabet 
AuthorDate: Sun May 10 20:44:12 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 11 12:50:36 2020 +0200

tdf#126468: MySQL/MariaDB and Firebird don't require order field in select 
part

Change-Id: I75f050dd6f38fefe83d24a4886610d421f72826e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93937
Reviewed-by: Lionel Elie Mamane 
Tested-by: Julien Nabet 
(cherry picked from commit 572c9db0440d9aba4945fb1761ec7f83e717c2f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93801
Tested-by: Jenkins

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 3d0401678d60..88fec644527b 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -513,7 +513,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsLikeEscapeClause(  )
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
-return false;
+return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index d9c7f81f9139..2b14104ff02b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -286,7 +286,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsMultipleResultSets() { return false
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause() { return true; 
}
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated() { return 
false; }
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated() { return true; 
}
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/qa/extras/layout/layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e84d6f512fceb8b354b2d93a9fd7d834acc5
Author: Caolán McNamara 
AuthorDate: Mon May 11 10:55:54 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 11 11:58:54 2020 +0200

fix build

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

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 27ba1d0a649c..e98b7f0ebded 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2802,7 +2802,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableExtrusion2)
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf105478)
 {
 createDoc("tdf105478_rowMinHeight.odt");
-xmlDocPtr pXmlDoc = parseLayoutDump();
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 
 // Minimum row height forces the cell (with table header as row 1) to 
start on page 2, not page 1.
 assertXPathContent(pXmlDoc, "/root/page[2]/body/tab/row[2]/cell/txt[1]", 
"Cell 1");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: osx/soffice.xcodeproj

[Tor Lillqvist (via logerrit)]

 osx/soffice.xcodeproj/project.pbxproj |  236 --
 1 file changed, 224 insertions(+), 12 deletions(-)

New commits:
commit 356c636e3d3d3c1bdde3cb7e743c0811fe2e1dbf
Author: Tor Lillqvist 
AuthorDate: Fri May 8 16:39:29 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 11 11:42:28 2020 +0200

Add some more source files for breakpointing convenience

Change-Id: I21e0ebb7776f829c1ad97272be4210d7e7dfbb34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93949
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/osx/soffice.xcodeproj/project.pbxproj 
b/osx/soffice.xcodeproj/project.pbxproj
index 187d6ad4a9a4..f7d0dd16f401 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -352,8 +352,82 @@
BE82C42418C86E010050EB79 /* spinfld.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spinfld.cxx; 
path = ../vcl/source/control/spinfld.cxx; sourceTree = ""; };
BE82C42518C86E010050EB79 /* tabctrl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tabctrl.cxx; 
path = ../vcl/source/control/tabctrl.cxx; sourceTree = ""; };
BE82C42618C86E010050EB79 /* throbber.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = throbber.cxx; 
path = ../vcl/source/control/throbber.cxx; sourceTree = ""; };
+   BEBF3E2D246588AE00415E87 /* salinit.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salinit.cxx; 
path = ../sal/osl/unx/salinit.cxx; sourceTree = ""; };
+   BEBF3E2E246588AE00415E87 /* module.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = module.cxx; 
path = ../sal/osl/unx/module.cxx; sourceTree = ""; };
+   BEBF3E2F246588AE00415E87 /* unixerrnostring.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
unixerrnostring.hxx; path = ../sal/osl/unx/unixerrnostring.hxx; sourceTree = 
""; };
+   BEBF3E30246588AE00415E87 /* file_url.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = file_url.hxx; 
path = ../sal/osl/unx/file_url.hxx; sourceTree = ""; };
+   BEBF3E31246588AE00415E87 /* file_path_helper.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
file_path_helper.cxx; path = ../sal/osl/unx/file_path_helper.cxx; sourceTree = 
""; };
+   BEBF3E32246588AE00415E87 /* interlck.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = interlck.cxx; 
path = ../sal/osl/unx/interlck.cxx; sourceTree = ""; };
+   BEBF3E33246588AE00415E87 /* file_error_transl.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
file_error_transl.hxx; path = ../sal/osl/unx/file_error_transl.hxx; sourceTree 
= ""; };
+   BEBF3E34246588AE00415E87 /* process_impl.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
process_impl.cxx; path = ../sal/osl/unx/process_impl.cxx; sourceTree = 
""; };
+   BEBF3E35246588AE00415E87 /* file_impl.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = file_impl.hxx; 
path = ../sal/osl/unx/file_impl.hxx; sourceTree = ""; };
+   BEBF3E36246588AE00415E87 /* sockimpl.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = sockimpl.hxx; 
path = ../sal/osl/unx/sockimpl.hxx; sourceTree = ""; };
+   BEBF3E37246588AE00415E87 /* backtrace.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; name = backtrace.h; path 
= ../sal/osl/unx/backtrace.h; sourceTree = ""; };
+   BEBF3E38246588AE00415E87 /* file_path_helper.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
file_path_helper.hxx; path = ../sal/osl/unx/file_path_helper.hxx; sourceTree = 
""; };
+   BEBF3E39246588AE00415E87 /* process.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = process.cxx; 
path = ../sal/osl/unx/process.cxx; sourceTree = ""; };
+   BEBF3E3A246588AE00415E87 /* soffice.hxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = soffice.hxx; 
path = ../sal/osl/unx/soffice.hxx; sourceTree = ""; };
+   BEBF3E3B246588AE00415E87 /* osxlocale.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = osxlocale.cxx; 
path = ../sal/osl/unx/osxlocale.cxx; sourceTree = ""; };
+   BEBF3E3C246588AE00415E87 /* createfilehandlefromfd.hxx */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = 
createfilehandlefromfd.hxx; path = ../sal/osl/unx/createfilehandlefromfd.hxx; 
sourceTree = ""; };
+   BEBF3E3D246588AE00415E87 /* file_stat.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp;

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

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx  |2 +-
 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 572c9db0440d9aba4945fb1761ec7f83e717c2f0
Author: Julien Nabet 
AuthorDate: Sun May 10 20:44:12 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 11 11:16:34 2020 +0200

tdf#126468: MySQL/MariaDB and Firebird don't require order field in select 
part

Change-Id: I75f050dd6f38fefe83d24a4886610d421f72826e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93937
Reviewed-by: Lionel Elie Mamane 
Tested-by: Julien Nabet 

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 19c6f5755df9..661dd7dc95d0 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -514,7 +514,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsLikeEscapeClause(  )
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  )
 {
-return false;
+return true;
 }
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  )
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index db9b5c6e6b55..a1e11c9e7ccf 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -275,7 +275,7 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsMultipleResultSets() { return true;
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause() { return true; 
}
 
-sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated() { return 
false; }
+sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated() { return true; 
}
 
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion()
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx|3 +--
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx |7 +--
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |   13 +
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx|8 +---
 4 files changed, 12 insertions(+), 19 deletions(-)

New commits:
commit 4ba368a3dd793bdc703858f358e1af7112decadd
Author: Miklos Vajna 
AuthorDate: Mon May 11 10:10:34 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 11 10:54:46 2020 +0200

Related: tdf#129916 svx: clean up duplicated matrix decompose for shadow 
size

Pass the object's transform matrix to createEmbeddedShadowPrimitive(),
this allows decomposing it only at a single place. Also, this will allow
creating the shadow based on the object size.

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

diff --git a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx 
b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
index 63af09222a6d..d991eb4ed2f3 100644
--- a/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -72,8 +72,7 @@ namespace drawinglayer
 Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedShadowPrimitive(
 const Primitive2DContainer& rContent,
 const attribute::SdrShadowAttribute& rShadow,
-sal_Int32 nGraphicTranslateX = 0,
-sal_Int32 nGraphicTranslateY = 0);
+const basegfx::B2DHomMatrix& rObjectMatrix = 
basegfx::B2DHomMatrix());
 
 Primitive2DContainer SVXCORE_DLLPUBLIC createEmbeddedGlowPrimitive(
 const Primitive2DContainer& rContent,
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index eac5278ada2d..87f564e8dd6f 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -74,13 +74,8 @@ namespace drawinglayer::primitive2d
 // shadow will be correct (using ColorModifierStack), but 
expensive.
 if(!get3DShape())
 {
-basegfx::B2DTuple aScale;
-basegfx::B2DTuple aTranslate;
-double fRotate = 0;
-double fShearX = 0;
-maTransform.decompose(aScale, aTranslate, fRotate, 
fShearX);
 aRetval = createEmbeddedShadowPrimitive(aRetval, 
getSdrSTAttribute().getShadow(),
-aTranslate.getX(), 
aTranslate.getY());
+maTransform);
 }
 }
 
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx 
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index e4f67c0ed665..ca26a45f826b 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 using namespace com::sun::star;
@@ -483,8 +484,7 @@ namespace drawinglayer::primitive2d
 Primitive2DContainer createEmbeddedShadowPrimitive(
 const Primitive2DContainer& rContent,
 const attribute::SdrShadowAttribute& rShadow,
-sal_Int32 nGraphicTranslateX,
-sal_Int32 nGraphicTranslateY)
+const basegfx::B2DHomMatrix& rObjectMatrix)
 {
 if(!rContent.empty())
 {
@@ -494,10 +494,15 @@ namespace drawinglayer::primitive2d
 {
 if(rShadow.getSize().getX() != 10)
 {
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+double fRotate = 0;
+double fShearX = 0;
+rObjectMatrix.decompose(aScale, aTranslate, fRotate, 
fShearX);
 // Scale the shadow
-aShadowOffset.translate(-nGraphicTranslateX, 
-nGraphicTranslateY);
+aShadowOffset.translate(-aTranslate.getX(), 
-aTranslate.getY());
 aShadowOffset.scale(rShadow.getSize().getX() * 
0.1, rShadow.getSize().getY() * 0.1);
-aShadowOffset.translate(nGraphicTranslateX, 
nGraphicTranslateY);
+aShadowOffset.translate(aTranslate.getX(), 
aTranslate.getY());
 }
 
 aShadowOffset.translate(rShadow.getOffset().getX(), 
rShadow.getOffset().getY());
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 2a83e5b6aeed..a06d3967ae1a 100644
--- a/svx/source/sdr/primitive2d/sd

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

[Vasily Melenchuk (via logerrit)]

 sw/source/core/unocore/unodraw.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 0b0de876bad66c84a8dd0d8d19944109e59cf21a
Author: Vasily Melenchuk 
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 11 10:52:13 2020 +0200

sw: set unique name for shape format even if shape name is empty

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

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index a90358d43afb..9181ef940072 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -712,7 +712,16 @@ void SwXDrawPage::add(const uno::Reference< 
drawing::XShape > & xShape)
 if (pFormat)
 {
 if (pFormat->GetName().isEmpty())
-pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+{
+if (pSvxShape->GetSdrObject()->GetName().isEmpty())
+{
+pFormat->SetName(pDoc->GetUniqueShapeName(), false);
+}
+else
+{
+pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+}
+}
 pShape->SetFrameFormat(pFormat);
 }
 pShape->m_bDescriptor = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea414f8f255d75e3be71c0d65731ff3f42f589ed
Author: Miklos Vajna 
AuthorDate: Mon May 11 09:26:06 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 11 10:50:29 2020 +0200

sw from-bottom relative orientation: link ODF proposal

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

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng 
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 7cb6eaabafef..408754eaa742 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -2429,7 +2429,7 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
+  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf132766.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |   21 +++-
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   16 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |5 +-
 sw/source/filter/ww8/wrtw8num.cxx|   65 +++
 5 files changed, 55 insertions(+), 52 deletions(-)

New commits:
commit 598ca431de96d8bfcf18fa2945e9e30f98387474
Author: Vasily Melenchuk 
AuthorDate: Sat May 9 14:35:25 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 11 10:42:13 2020 +0200

tdf#132766: DOCX export: always try to set bullet font for list

There are some problems with bullet if we use MS Wingdigs bullets
and do not specify Symbol font for it. It shiuld be either UTF-8
or Symbol, but not mixture of both.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf132766.docx 
b/sw/qa/extras/ooxmlexport/data/tdf132766.docx
new file mode 100644
index ..aba5e82312b7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132766.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index e9fbd79422c6..7fd2ec0e5e72 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -955,19 +955,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf94628, 
"tdf94628.docx")
 uno::Sequence aProps;
 xLevels->getByIndex(0) >>= aProps; // 1st level
 
-for (int i = 0; i < aProps.getLength(); ++i)
-{
-const beans::PropertyValue& rProp = aProps[i];
-if (rProp.Name == "BulletChar")
-{
-// Check for 'BLACK UPPER RIGHT TRIANGLE' (U+25E5) as a bullet
-CPPUNIT_ASSERT_EQUAL(OUString(u"\u25E5"), 
rProp.Value.get());
-return;
-}
-}
-
-// Shouldn't reach here
-CPPUNIT_FAIL("Did not find bullet with level 0");
+OUString sBulletChar = std::find_if(aProps.begin(), aProps.end(),
+[](const beans::PropertyValue& rValue) 
{
+return rValue.Name == "BulletChar";
+})
+   ->Value.get();
+// Actually for 'BLACK UPPER RIGHT TRIANGLE' is \u25E5
+// But we use Wingdings 3 font here, so code is different
+CPPUNIT_ASSERT_EQUAL(OUString(u"\uF07B"), sBulletChar);
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf122594, "tdf122594.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3f26169dfffe..fb1519da898f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -680,6 +680,22 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserField)
 assertXPath(pXmlDoc, "//w:docVars/w:docVar", "val", "bar");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132766, "tdf132766.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/numbering.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Ensure that for list=1 and level=0 we wrote correct bullet char and 
correct font
+assertXPath(pXmlDoc, 
"//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:lvlText",
+"val", u"\uF0B7");
+assertXPath(pXmlDoc, 
"//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+"ascii", "Symbol");
+assertXPath(pXmlDoc, 
"//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+"hAnsi", "Symbol");
+assertXPath(pXmlDoc, 
"//w:numbering/w:abstractNum[@w:abstractNumId='1']/w:lvl[@w:ilvl='0']/w:rPr/w:rFonts",
+"cs", "Symbol");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 22cad9dff565..7c576e26538e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6988,7 +6988,10 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 
nLevel,
 FSNS( XML_w, XML_cs ), aFamilyName,
 FSNS( XML_w, XML_hint ), "default" );
 }
-m_rExport.OutputItemSet( *pOutSet, false, true, 
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF );
+else
+{
+m_rExport.OutputItemSet(*pOutSet, false, true, 
i18n::ScriptType::LATIN, m_rExport.m_bExportModeRTF);
+}
 
 WriteCollectedRunProperties();
 
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index cc6795aeb3b2..ca3a026f2323 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf95189.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   32 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   10 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 ++
 4 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 628cde6409eb471024a6aca5a8262b00f448c8cf
Author: Vasily Melenchuk 
AuthorDate: Sat May 9 22:31:48 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 11 10:40:36 2020 +0200

tdf#95189: docx import: apply list ovverride only once

List overrides should be applied only once on first list with
override appearance in document. Next reference to this list
should not override again and reset list numbering.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf95189.docx 
b/sw/qa/extras/ooxmlexport/data/tdf95189.docx
new file mode 100644
index ..456276b20d0c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf95189.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 26c8fc248298..3f26169dfffe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -695,6 +695,38 @@ DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
  .Position);
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf95189, "tdf95189.docx")
+{
+{
+uno::Reference xPara(getParagraph(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(2), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(4), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("3"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(6), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(7), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2"), getProperty(xPara, 
"ListLabelString"));
+}
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128820, "tdf128820.fodt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3b68ff3f582b..9ff009f0d4d1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1717,11 +1717,17 @@ void DomainMapper_Impl::finishParagraph( const 
PropertyMapPtr& pPropertyMap, con
 if (pList->GetCurrentLevel())
 {
 sal_Int16 nOverrideLevel = 
pList->GetCurrentLevel()->GetStartOverride();
-if (nOverrideLevel != -1)
+if (nOverrideLevel != -1 && 
m_aListOverrideApplied.find(nListId2) == m_aListOverrideApplied.end())
 {
-// Restart list, it is overridden
+// Apply override: we have override 
instruction for this level
+// And this was not done for this list 
before: we can do this only once on first occurrence
+// of list with override
+// TODO: Not tested variant with differen 
levels override in diffent lists.
+// Probably m_aListOverrideApplied as a 
set of overriden listids is not sufficient
+// and we need to register level overrides 
separately.
 
m_xPreviousParagraph->setPropertyValue("ParaIsNumberingRestart", 
uno::makeAny(true));
 
m_xPreviousParagraph->setPropertyValue("NumberingStartValue", 
uno::makeAny(nOverrideLevel));
+m_aListOverrideApplied.insert(nListId2);
 }
 }
 }
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 889dff41c855..8f46234a44ba 100644
--- a/writerfil

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf132754.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   16 
 writerfilter/source/dmapper/NumberingManager.cxx |4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit f8211e84a5239de25fe6dc45a4bb6b6f8673a1ee
Author: Vasily Melenchuk 
AuthorDate: Sun May 10 00:43:59 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 11 10:40:20 2020 +0200

tdf#132754: DOCX import: changed default list start nubmer

Default value for list numbering startAt is zero. If it is not
proveded numbering starts from this value.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf132754.docx 
b/sw/qa/extras/ooxmlexport/data/tdf132754.docx
new file mode 100644
index ..baec54f5e0d7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132754.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3a10ff2e0bed..26c8fc248298 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -733,6 +733,22 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128889, 
"tdf128889.fodt")
 assertXPath(pXml, "/w:document/w:body/w:p[1]/w:r[2]/w:br", "type", "page");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132754, "tdf132754.docx")
+{
+{
+uno::Reference xPara(getParagraph(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.0."), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(2), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.1."), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.2."), getProperty(xPara, 
"ListLabelString"));
+}
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf129353, "tdf129353.docx")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 252d543d67b7..cca1845d2782 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -189,8 +189,10 @@ uno::Sequence 
ListLevel::GetLevelProperties(bool bDefaults
 {
 std::vector aNumberingProperties;
 
-if( m_nIStartAt >= 0)
+if (m_nIStartAt >= 0)
 
aNumberingProperties.push_back(lcl_makePropVal(PROP_START_WITH, 
m_nIStartAt) );
+else if (bDefaults)
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_START_WITH, 0));
 
 sal_Int16 nNumberFormat = -1;
 if (m_nNFC == NS_ooxml::LN_Value_ST_NumberFormat_custom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: How do you perform a partial build on macOS?

[Michael Stahl]

On 10.05.20 20:44, Eivind Samseth wrote:

Hello,
I set up the build environment and successfully built the current master 
and .app bundle


Now I wanted to make a change to the Info.plist file to fix this bug:
https://bugs.documentfoundation.org/show_bug.cgi?id=103644

I’ve set up logerrit, created a new local branch, and edited 
sysui/desktop/macos/Info.plist.in


However, how do I build the new .app bundle with this change?

I tried to do do a partial rebuild of the sysui module:
(base) EivindsMBP2015:core eivind$ make sysui.build
cd /Users/eivind/lode/dev/core/sysui && make -j 4 -rs build
*[LOC]*top level modules: sysui
*[BIN]*top level modules: sysui
*[ALL]*top level modules: build-non-l10n-only build-l10n-only

But that doesn’t seem to do anything or recreate the .app bundle

I’m blindly following the wiki: 
https://wiki.documentfoundation.org/Development/GenericBuildingHints


"make module.build" only works if you have done a complete build first, 
and it will update the content of "instdir/".


if you want to recreate the installation set in 
workdir/installation/..., you have to build the "instsetoo_native" 
module - likely that's required for the things in sysui module which are 
a bit special.

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

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

[Michael Weghorn (via logerrit)]

 include/vcl/button.hxx |2 +-
 toolkit/source/awt/vclxwindows.cxx |   21 +
 vcl/source/control/button.cxx  |4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 2539f1d142e0077dfeec36ef349a1f5443f1c94b
Author: Michael Weghorn 
AuthorDate: Mon May 11 08:45:19 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 11 10:28:42 2020 +0200

tdf#132832 calcAdjustedSize: Take max width into account

Actually take into account the preferred width when
calculating the size of radio button, checkbox and
hyperlink controls.

This e.g. makes word wrap work properly when the
multiline property is set for a checkbox, radio or hyperlink
control and the single line text exceeds the preferred width,
rather than keeping the whole text in one line that exceeds
the preferred width.

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

diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 6f4231f7c473..39a397ead2a1 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -333,7 +333,7 @@ public:
 
 static ImageGetRadioImage( const AllSettings& rSettings, 
DrawButtonFlags nFlags );
 
-SizeCalcMinimumSize() const;
+SizeCalcMinimumSize( long nMaxWidth = 0 ) const;
 virtual SizeGetOptimalSize() const override;
 
 voidSetToggleHdl( const Link& rLink ) { 
maToggleHdl = rLink; }
diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index d22474f0e362..97b7fa6677b5 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -940,7 +940,7 @@ css::awt::Size VCLXCheckBox::calcAdjustedSize( const 
css::awt::Size& rNewSize )
 VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
 if ( pCheckBox )
 {
-Size aMinSz = pCheckBox->CalcMinimumSize();
+Size aMinSz = pCheckBox->CalcMinimumSize(rNewSize.Width);
 if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < 
aMinSz.Height() ) )
 aSz.setHeight( aMinSz.Height() );
 else
@@ -1288,7 +1288,7 @@ css::awt::Size VCLXRadioButton::calcAdjustedSize( const 
css::awt::Size& rNewSize
 VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
 if ( pRadioButton )
 {
-Size aMinSz = pRadioButton->CalcMinimumSize();
+Size aMinSz = pRadioButton->CalcMinimumSize(rNewSize.Width);
 if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < 
aMinSz.Height() ) )
 aSz.setHeight( aMinSz.Height() );
 else
@@ -3024,13 +3024,18 @@ css::awt::Size VCLXFixedHyperlink::getPreferredSize(  )
 css::awt::Size VCLXFixedHyperlink::calcAdjustedSize( const css::awt::Size& 
rNewSize )
 {
 SolarMutexGuard aGuard;
+Size aSz( VCLUnoHelper::ConvertToVCLSize( rNewSize ));
+VclPtr< FixedText > pFixedText = GetAs< FixedText >();
+if (pFixedText)
+{
+Size aMinSz = pFixedText->CalcMinimumSize(rNewSize.Width);
+if ( ( aSz.Width() > aMinSz.Width() ) && ( aSz.Height() < 
aMinSz.Height() ) )
+aSz.setHeight( aMinSz.Height() );
+else
+aSz = aMinSz;
+}
 
-css::awt::Size aSz = rNewSize;
-css::awt::Size aMinSz = getMinimumSize();
-if ( aSz.Height != aMinSz.Height )
-aSz.Height = aMinSz.Height;
-
-return aSz;
+return VCLUnoHelper::ConvertToAWTSize(aSz);
 }
 
 void VCLXFixedHyperlink::setProperty( const OUString& PropertyName, const 
css::uno::Any& Value)
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 45c922dcb362..a0b65b900208 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2780,7 +2780,7 @@ void RadioButton::ImplAdjustNWFSizes()
 Pop();
 }
 
-Size RadioButton::CalcMinimumSize() const
+Size RadioButton::CalcMinimumSize(long nMaxWidth) const
 {
 Size aSize;
 if ( !maImage )
@@ -2804,7 +2804,7 @@ Size RadioButton::CalcMinimumSize() const
 {
 bool bTopImage = (GetStyle() & WB_TOP) != 0;
 
-Size aTextSize = GetTextRect( tools::Rectangle( Point(), Size( 
0x7fff, 0x7fff ) ),
+Size aTextSize = GetTextRect( tools::Rectangle( Point(), Size( 
nMaxWidth > 0 ? nMaxWidth : 0x7fff, 0x7fff ) ),
   aText, FixedText::ImplGetTextStyle( 
GetStyle() ) ).GetSize();
 
 aSize.AdjustWidth(2 );   // for focus rect
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 include/xmloff/xmltoken.hxx  |2 ++
 xmloff/qa/unit/tokenmap-test.cxx |2 ++
 xmloff/source/core/xmltoken.cxx  |3 +++
 3 files changed, 7 insertions(+)

New commits:
commit 5814f08c01ab7973cc83e6721ef434f5acc63a1a
Author: Mike Kaganski 
AuthorDate: Sat May 9 11:11:13 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 11 10:22:20 2020 +0200

Document relation between three lists that must be in sync

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

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index d04776be3265..4e23277dd485 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -40,6 +40,8 @@
 
 namespace xmloff::token {
 
+// IMPORTANT! XMLTokenEnum order MUST be in synch with aTokenList in
+// xmloff/source/core/xmltoken.cxx, and with 
xmloff/source/token/tokens.txt.
 
 /**
  * The enumeration of all XML tokens.
diff --git a/xmloff/qa/unit/tokenmap-test.cxx b/xmloff/qa/unit/tokenmap-test.cxx
index fb691654..476416fc3933 100644
--- a/xmloff/qa/unit/tokenmap-test.cxx
+++ b/xmloff/qa/unit/tokenmap-test.cxx
@@ -62,6 +62,8 @@ void TokenmapTest::test_roundTrip()
 void TokenmapTest::test_listEquality()
 {
 //make sure the two token lists stay in sync
+// This depends on same order in three places: XMLTokenEnum in 
include/xmloff/xmltoken.hxx,
+// aTokenList in xmloff/source/core/xmltoken.cxx, and 
xmloff/source/token/tokens.txt
 for ( sal_Int32 nToken = 0; nToken < XML_TOKEN_COUNT; ++nToken )
 {
 Sequence< sal_Int8 > rUtf8Name = pTokenMap->getUtf8TokenName(nToken);
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 4f7428dc431f..9c774c5ee46d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -49,6 +49,9 @@ namespace xmloff::token {
 #define TOKEN( s, e ) { sizeof(s)-1, s, std::nullopt }
 #endif
 
+// IMPORTANT! aTokenList order MUST be in synch with XMLTokenEnum in 
include/xmloff/xmltoken.hxx
+// and with xmloff/source/token/tokens.txt.
+
 struct XMLTokenEntry aTokenList[] =
 {
 #if OSL_DEBUG_LEVEL > 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/layout/README  |2 ++
 sw/qa/extras/layout/data/tdf105478_rowMinHeight.odt |binary
 sw/qa/extras/layout/layout.cxx  |9 +
 sw/source/core/layout/tabfrm.cxx|   16 +++-
 4 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit aa5dc0b48cd4db6883c9b52c68b16170c9c81d1f
Author: Justin Luth 
AuthorDate: Mon May 4 13:16:32 2020 +0300
Commit: Miklos Vajna 
CommitDate: Mon May 11 10:14:19 2020 +0200

tdf#105478 sw layout: treat minHeight as "do not split row"

Already, if minHeight is greater than the content of the row,
then the row will "stay intact" and not split just because there
is space for part of it on the preceeding page. However, if the
content is greater than minHeight, it can split anywhere and
moveBwd - since LO 5.3.

At least for MS compatibility, this needs to not be split.

But others agreed  to change this for ODT as well,
especially since this matches pre-5.3 behaviour,
and will help at design-time for MS interoperability,
as well as making minHeight consistent for the two
different scenarios.

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

diff --git a/sw/qa/extras/layout/README b/sw/qa/extras/layout/README
new file mode 100644
index ..82259fe15215
--- /dev/null
+++ b/sw/qa/extras/layout/README
@@ -0,0 +1,2 @@
+To run tests from this folder, do
+make CppunitTest_sw_layoutwriter CPPUNIT_TEST_NAME=
diff --git a/sw/qa/extras/layout/data/tdf105478_rowMinHeight.odt 
b/sw/qa/extras/layout/data/tdf105478_rowMinHeight.odt
new file mode 100644
index ..3a7fd600ceee
Binary files /dev/null and 
b/sw/qa/extras/layout/data/tdf105478_rowMinHeight.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index ea6ac4089a0b..27ba1d0a649c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2799,6 +2799,15 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTableExtrusion2)
 assertXPath(pXmlDoc, sXPath, 0);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf105478)
+{
+createDoc("tdf105478_rowMinHeight.odt");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// Minimum row height forces the cell (with table header as row 1) to 
start on page 2, not page 1.
+assertXPathContent(pXmlDoc, "/root/page[2]/body/tab/row[2]/cell/txt[1]", 
"Cell 1");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116848)
 {
 SwDoc* pDoc = createDoc("tdf116848.odt");
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 47a81b870125..bedce3a3f588 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1091,7 +1091,21 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool 
bTryToSplit, bool bTableRowK
 m_pTable->SetRowsToRepeat(0);
 return false;
 }
-else if ( !GetIndPrev() && nRepeat == nRowCount )
+
+// Minimum row height has the same force as "do not split row" (as long as 
it fits on one page)
+if ( bSplitRowAllowed && bTryToSplit && !pRow->IsRowSpanLine() )
+{
+const SwFormatFrameSize &rSz = pRow->GetFormat()->GetFrameSize();
+const sal_Int32 nMinHeight = rSz.GetHeightSizeType() == 
SwFrameSize::Minimum ? rSz.GetHeight() : 0;
+if ( nMinHeight > nRemainingSpaceForLastRow )
+{
+// TODO: what if we are not in a page, but a column or something 
that is not page-sized.
+const sal_Int32 nFullPageHeight = 
FindPageFrame()->getFramePrintArea().Height();
+bSplitRowAllowed = nMinHeight > nFullPageHeight;
+}
+}
+
+if ( !GetIndPrev() && nRepeat == nRowCount )
 {
 // Second case: The first non-headline row does not fit to the page.
 // If it is not allowed to be split, or it contains a sub-row that
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 4 commits - cui/qa cui/source cui/uiconfig include/svx oox/CppunitTest_oox_drawingml.mk oox/Module_oox.mk oox/qa oox/source sd/source

[Miklos Vajna (via logerrit)]

 cui/qa/uitest/dialogs/chardlg.py |   49 +++
 cui/source/inc/chardlg.hxx   |3 
 cui/source/tabpages/chardlg.cxx  |   40 -
 cui/uiconfig/ui/effectspage.ui   |   30 ++
 include/svx/flagsdef.hxx |1 
 oox/CppunitTest_oox_drawingml.mk |   45 ++
 oox/Module_oox.mk|1 
 oox/qa/unit/data/transparent-text.pptx   |binary
 oox/qa/unit/drawingml.cxx|  100 +++
 oox/source/drawingml/textcharacterproperties.cxx |   10 ++
 oox/source/export/drawingml.cxx  |   12 ++
 oox/source/token/properties.txt  |1 
 sd/source/ui/dlg/dlgchar.cxx |2 
 sw/CppunitTest_sw_core_text.mk   |1 
 sw/inc/unoprnms.hxx  |1 
 sw/qa/core/text/text.cxx |   32 +++
 sw/qa/extras/unowriter/unowriter.cxx |   16 +++
 sw/source/core/text/inftxt.cxx   |   75 +
 sw/source/core/unocore/unomap1.cxx   |2 
 sw/source/core/unocore/unomapproperties.hxx  |3 
 20 files changed, 421 insertions(+), 3 deletions(-)

New commits:
commit 8dcbd7aaca340b001b5c979ee097620de013588f
Author: Miklos Vajna 
AuthorDate: Mon Jan 6 20:35:08 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon May 11 09:58:30 2020 +0200

sw: add rendering for semi-transparent text

I considered passing the text color's alpha value down to the various
vcl backends, but this would need changes everywhere (cairo, opengl, pdf
export, etc). It's much easier to go via DrawTransparent(), that's how
semi-transparent text in Draw/Impress already works.

(cherry picked from commit bf540873f5e258452fed5006f65a403c95e7872a)

Change-Id: I96f15e6764c3c88ba67dd72dc8708414d7c6050c

diff --git a/sw/CppunitTest_sw_core_text.mk b/sw/CppunitTest_sw_core_text.mk
index 9fe4fadbf357..cb901fde29f2 100644
--- a/sw/CppunitTest_sw_core_text.mk
+++ b/sw/CppunitTest_sw_core_text.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_core_text, \
 test \
 unotest \
 utl \
+vcl \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,sw_core_text,\
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index 8074cbc9f45e..4e6d4fcdb14e 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -8,6 +8,9 @@
  */
 
 #include 
+
+#include 
+
 #include 
 
 static char const DATA_DIRECTORY[] = "/sw/qa/core/text/data/";
@@ -46,6 +49,35 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testFootnoteConnect)
 pWrtShell->DelLeft();
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testSemiTransparentText)
+{
+// Create an in-memory empty document.
+loadURL("private:factory/swriter", nullptr);
+
+// Set text to half-transparent and type a character.
+uno::Reference xParagraph(getParagraph(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xParagraph.is());
+sal_Int16 nTransparence = 50;
+xParagraph->setPropertyValue("CharTransparence", 
uno::makeAny(nTransparence));
+uno::Reference xTextRange(xParagraph, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xTextRange.is());
+xTextRange->setString("x");
+
+// Render the document to a metafile.
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+CPPUNIT_ASSERT(pDocShell);
+std::shared_ptr xMetaFile = pDocShell->GetPreviewMetaFile();
+CPPUNIT_ASSERT(xMetaFile);
+
+// Make sure that DrawTransparent() was used during rendering.
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, "//floattransparent");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 357360b69ec0..e9c6b6f2d1bc 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -73,6 +73,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
@@ -561,6 +564,71 @@ static bool lcl_IsDarkBackground( const SwTextPaintInfo& 
rInf )
 return pCol->IsDark();
 }
 
+namespace
+{
+/**
+ * Context class that captures the draw operations on rDrawInf's output device 
for transparency
+ * purposes.
+ */
+class SwTransparentTextGuard
+{
+ScopedVclPtrInstance m_aContentVDev;
+GDIMetaFile m_aContentMetafile;
+MapMode m_aNewMapMode;
+SwRect m_aPorRect;
+SwTextPaintInfo& m_rPaintInf;
+SwDrawTextInfo& m_rDrawInf;
+
+public:
+SwTransparentTextGuard(const SwLinePortion& rPor, SwTextPaintInfo& 
rPaintInf,
+   SwDrawTextInfo& rDrawInf);
+~SwT

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/SwUndoFmt.hxx  |   38 +-
 sw/source/core/undo/SwUndoFmt.cxx |  136 +++---
 2 files changed, 87 insertions(+), 87 deletions(-)

New commits:
commit 356edfa963bd1d1c8e081a012e6a2ccbe7bf53d3
Author: Miklos Vajna 
AuthorDate: Mon May 11 09:04:38 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 11 09:53:15 2020 +0200

sw: prefix members of SwUndoFormatCreate, SwUndoFormatDelete, ...

... SwUndoNumruleCreate and SwUndoNumruleDelete

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 905bc8f5ad06..17cafe144110 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -32,13 +32,13 @@ class SwRewriter;
 class SwUndoFormatCreate : public SwUndo
 {
 protected:
-SwFormat * pNew;
-OUString sDerivedFrom;
-SwDoc * pDoc;
-mutable OUString sNewName;
-SfxItemSet * pNewSet;
-sal_uInt16 nId; // FormatId related
-bool bAuto;
+SwFormat * m_pNew;
+OUString m_sDerivedFrom;
+SwDoc * m_pDoc;
+mutable OUString m_sNewName;
+SfxItemSet * m_pNewSet;
+sal_uInt16 m_nId; // FormatId related
+bool m_bAuto;
 
 public:
 SwUndoFormatCreate(SwUndoId nUndoId, SwFormat * pNew, SwFormat const * 
pDerivedFrom,
@@ -58,12 +58,12 @@ public:
 class SwUndoFormatDelete : public SwUndo
 {
 protected:
-OUString sDerivedFrom;
-SwDoc * pDoc;
-OUString sOldName;
-SfxItemSet aOldSet;
-sal_uInt16 nId; // FormatId related
-bool bAuto;
+OUString m_sDerivedFrom;
+SwDoc * m_pDoc;
+OUString m_sOldName;
+SfxItemSet m_aOldSet;
+sal_uInt16 m_nId; // FormatId related
+bool m_bAuto;
 
 public:
 SwUndoFormatDelete(SwUndoId nUndoId, SwFormat const * pOld, SwDoc * pDoc);
@@ -208,10 +208,10 @@ public:
 
 class SwUndoNumruleCreate : public SwUndo
 {
-const SwNumRule * pNew;
-mutable SwNumRule aNew;
-SwDoc * pDoc;
-mutable bool bInitialized;
+const SwNumRule * m_pNew;
+mutable SwNumRule m_aNew;
+SwDoc * m_pDoc;
+mutable bool m_bInitialized;
 
 public:
 SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc);
@@ -224,8 +224,8 @@ public:
 
 class SwUndoNumruleDelete : public SwUndo
 {
-SwNumRule aOld;
-SwDoc * pDoc;
+SwNumRule m_aOld;
+SwDoc * m_pDoc;
 
 public:
 SwUndoNumruleDelete(const SwNumRule  & aRule, SwDoc * pDoc);
diff --git a/sw/source/core/undo/SwUndoFmt.cxx 
b/sw/source/core/undo/SwUndoFmt.cxx
index ec2bc32658e2..02a93a1a8ead 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -30,11 +30,11 @@
 
 SwUndoFormatCreate::SwUndoFormatCreate
 (SwUndoId nUndoId, SwFormat * _pNew, SwFormat const * _pDerivedFrom, SwDoc * 
_pDoc)
-: SwUndo(nUndoId, _pDoc), pNew(_pNew),
-  pDoc(_pDoc), pNewSet(nullptr), nId(0), bAuto(false)
+: SwUndo(nUndoId, _pDoc), m_pNew(_pNew),
+  m_pDoc(_pDoc), m_pNewSet(nullptr), m_nId(0), m_bAuto(false)
 {
 if (_pDerivedFrom)
-sDerivedFrom = _pDerivedFrom->GetName();
+m_sDerivedFrom = _pDerivedFrom->GetName();
 }
 
 SwUndoFormatCreate::~SwUndoFormatCreate()
@@ -43,19 +43,19 @@ SwUndoFormatCreate::~SwUndoFormatCreate()
 
 void SwUndoFormatCreate::UndoImpl(::sw::UndoRedoContext &)
 {
-if (pNew)
+if (m_pNew)
 {
-if (sNewName.isEmpty())
-sNewName = pNew->GetName();
+if (m_sNewName.isEmpty())
+m_sNewName = m_pNew->GetName();
 
-if (!sNewName.isEmpty())
-pNew = Find(sNewName);
+if (!m_sNewName.isEmpty())
+m_pNew = Find(m_sNewName);
 
-if (pNew)
+if (m_pNew)
 {
-pNewSet = new SfxItemSet(pNew->GetAttrSet());
-nId = pNew->GetPoolFormatId() & COLL_GET_RANGE_BITS;
-bAuto = pNew->IsAuto();
+m_pNewSet = new SfxItemSet(m_pNew->GetAttrSet());
+m_nId = m_pNew->GetPoolFormatId() & COLL_GET_RANGE_BITS;
+m_bAuto = m_pNew->IsAuto();
 
 Delete();
 }
@@ -64,31 +64,31 @@ void SwUndoFormatCreate::UndoImpl(::sw::UndoRedoContext &)
 
 void SwUndoFormatCreate::RedoImpl(::sw::UndoRedoContext &)
 {
-SwFormat * pDerivedFrom = Find(sDerivedFrom);
+SwFormat * pDerivedFrom = Find(m_sDerivedFrom);
 SwFormat * pFormat = Create(pDerivedFrom);
 
-if (pFormat && pNewSet)
+if (pFormat && m_pNewSet)
 {
-pFormat->SetAuto(bAuto);
-pDoc->ChgFormat(*pFormat, *pNewSet);
+pFormat->SetAuto(m_bAuto);
+m_pDoc->ChgFormat(*pFormat, *m_pNewSet);
 pFormat->SetPoolFormatId((pFormat->GetPoolFormatId()
 & ~COLL_GET_RANGE_BITS)
-   | nId);
+   | m_nId)

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

[Stephan Bergmann (via logerrit)]

 sc/source/core/opencl/formulagroupcl.cxx |  745 +++
 1 file changed, 376 insertions(+), 369 deletions(-)

New commits:
commit ef1755273c13c40bee1bc4c3a5d6dd03e5e60ad3
Author: Stephan Bergmann 
AuthorDate: Fri Dec 6 17:04:11 2019 +0100
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:45:20 2020 +0200

Incomplete OpAverage, OpCount must not be used in dynamic_cast

...even in template code (which compilers often only analyze late during
compilation, but which Clang trunk now apparently processes more 
aggressively,
presumably since  "Reapply 'Fix crash on switch
conditions of non-integer types in templates'", emitting errors about 
incomplete
types)

Change-Id: I851d266007f72cc4063f299412eadacbc6084f70
Reviewed-on: https://gerrit.libreoffice.org/84657
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93699
Reviewed-by: Michael Weghorn 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 233ebaea14a3..27f3d2674ab7 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1032,9 +1032,6 @@ protected:
 /// Handling a Double Vector that is used as a sliding window input
 /// to either a sliding window average or sum-of-products
 /// Generate a sequential loop for reductions
-class OpAverage;
-class OpCount;
-
 template
 class DynamicKernelSlidingArgument : public Base
 {
@@ -1345,185 +1342,7 @@ public:
 }
 
 /// Emit the definition for the auxiliary reduction kernel
-virtual void GenSlidingWindowFunction( std::stringstream& ss )
-{
-if (!dynamic_cast(mpCodeGen.get()))
-{
-std::string name = Base::GetName();
-ss << "__kernel void " << name;
-ss << "_reduction(__global double* A, "
-"__global double *result,int arrayLength,int windowSize){\n";
-ss << "double tmp, current_result =" <<
-mpCodeGen->GetBottom();
-ss << ";\n";
-ss << "int writePos = get_group_id(1);\n";
-ss << "int lidx = get_local_id(0);\n";
-ss << "__local double shm_buf[256];\n";
-if (mpDVR->IsStartFixed())
-ss << "int offset = 0;\n";
-else // if (!mpDVR->IsStartFixed())
-ss << "int offset = get_group_id(1);\n";
-if (mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
-ss << "int end = windowSize;\n";
-else if (!mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
-ss << "int end = offset + windowSize;\n";
-else if (mpDVR->IsStartFixed() && !mpDVR->IsEndFixed())
-ss << "int end = windowSize + get_group_id(1);\n";
-else if (!mpDVR->IsStartFixed() && mpDVR->IsEndFixed())
-ss << "int end = windowSize;\n";
-ss << "end = min(end, arrayLength);\n";
-
-ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
-ss << "int loop = arrayLength/512 + 1;\n";
-ss << "for (int l=0; lGen2(
-"A[loopOffset + lidx + offset]", "tmp") << ", tmp);\n";
-ss << "tmp = legalize(" << mpCodeGen->Gen2(
-"A[loopOffset + lidx + offset + 256]", "tmp") << ", tmp);\n";
-ss << "} else if ((loopOffset + lidx + offset) < end)\n";
-ss << "tmp = legalize(" << mpCodeGen->Gen2(
-"A[loopOffset + lidx + offset]", "tmp") << ", tmp);\n";
-ss << "shm_buf[lidx] = tmp;\n";
-ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
-ss << "for (int i = 128; i >0; i/=2) {\n";
-ss << "if (lidx < i)\n";
-ss << "shm_buf[lidx] = ";
-// Special case count
-if (dynamic_cast(mpCodeGen.get()))
-ss << "shm_buf[lidx] + shm_buf[lidx + i];\n";
-else
-ss << mpCodeGen->Gen2("shm_buf[lidx]", "shm_buf[lidx + i]") << 
";\n";
-ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
-ss << "}\n";
-ss << "if (lidx == 0)\n";
-ss << "current_result =";
-if (dynamic_cast(mpCodeGen.get()))
-ss << "current_result + shm_buf[0]";
-else
-ss << mpCodeGen->Gen2("current_result", "shm_buf[0]");
-ss << ";\n";
-ss << "barrier(CLK_LOCAL_MEM_FENCE);\n";
-ss << "}\n";
-ss << "if (lidx == 0)\n";
-ss << "result[writePos] = current_result;\n";
-ss << "}\n";
-}
-else
-{
-std::string name = Base::GetName();
-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - external/mdds

[Stephan Bergmann (via logerrit)]

 external/mdds/UnpackedTarball_mdds.mk |1 +
 external/mdds/Wdeprecated-copy.patch  |   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 5eb7a3f26a36f9d53bcebc3fb6131232a709914f
Author: Stephan Bergmann 
AuthorDate: Mon Nov 25 17:01:03 2019 +0100
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:41:15 2020 +0200

external/mdds: -Werror,-Wdeprecated-copy

> In file included from sc/source/core/data/cellvalues.cxx:12:
> In file included from sc/inc/column.hxx:28:
> In file included from sc/inc/mtvelements.hxx:30:
> In file included from 
workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector.hpp:33:
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:74:9: 
error: definition of implicit copy assignment operator for 'private_data' is 
deprecated because it has a user-declared copy constructor 
[-Werror,-Wdeprecated-copy]
> private_data(const private_data& other) :
> ^
> workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:44:8: 
note: in implicit copy assignment operator for 
'mdds::detail::mtv::iterator_value_node::private_data' first required here
> struct iterator_value_node
>^
> 
workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:219:20: 
note: in implicit copy assignment operator for 
'mdds::detail::mtv::iterator_value_node' first required here
> m_cur_node = other.m_cur_node;
>^
> 
workdir/UnpackedTarball/mdds/include/mdds/multi_type_vector_itr.hpp:238:7: 
note: in instantiation of member function 
'mdds::detail::mtv::iterator_common_base, mdds::mtv::noncopyable_managed_element_block<53, 
EditTextObject>, mdds::mtv::noncopyable_managed_element_block<54, 
ScFormulaCell> >, sc::CellStoreEvent>::iterator_trait>::operator=' requested 
here
> class iterator_base : public iterator_common_base<_Trait>
>   ^

with recent Clang 10 trunk, similar to
 "Remove some redundantly
user-declared copy ctors and assignment ops"

Change-Id: I156674bad367ca68404c3c75d61ec72b401c6305
Reviewed-on: https://gerrit.libreoffice.org/83700
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93695
Reviewed-by: Michael Weghorn 

diff --git a/external/mdds/UnpackedTarball_mdds.mk 
b/external/mdds/UnpackedTarball_mdds.mk
index c015f4c13f5a..c5ca78bd368c 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
+external/mdds/Wdeprecated-copy.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mdds/Wdeprecated-copy.patch 
b/external/mdds/Wdeprecated-copy.patch
new file mode 100644
index ..edcb2ddaa9ec
--- /dev/null
+++ b/external/mdds/Wdeprecated-copy.patch
@@ -0,0 +1,11 @@
+--- include/mdds/multi_type_vector_itr.hpp
 include/mdds/multi_type_vector_itr.hpp
+@@ -71,8 +71,6 @@
+ private_data() : block_index(0) {}
+ private_data(size_type _block_index) :
+ block_index(_block_index) {}
+-private_data(const private_data& other) :
+-block_index(other.block_index) {}
+ 
+ void swap(private_data& other)
+ {
___
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' - sc/source

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 261b4dc45b359e07d4d3785aca55d75d78035551
Author: Stephan Bergmann 
AuthorDate: Tue Nov 19 16:32:49 2019 +0100
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:39:26 2020 +0200

Extend loplugin:external to warn about classes

Just for a single file in this change, to make another cherry-picked
fix to it apply cleanly.

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

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index cb1d01361fde..233ebaea14a3 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -345,6 +345,8 @@ size_t VectorRef::Marshal( cl_kernel k, int argno, int, 
cl_program )
 /// automatically disables use of OpenCL for a formula group. If at some point 
there are resources
 /// to drain the OpenCL swamp, this should go away.
 
+namespace {
+
 class ConstStringArgument : public DynamicKernelArgument
 {
 public:
@@ -875,6 +877,8 @@ public:
 virtual size_t Marshal( cl_kernel, int, int, cl_program ) override;
 };
 
+}
+
 /// Marshal a string vector reference
 size_t DynamicKernelStringArgument::Marshal( cl_kernel k, int argno, int, 
cl_program )
 {
@@ -964,6 +968,8 @@ size_t DynamicKernelStringArgument::Marshal( cl_kernel k, 
int argno, int, cl_pro
 return 1;
 }
 
+namespace {
+
 /// A mixed string/numeric vector
 class DynamicKernelMixedArgument : public VectorRef
 {
@@ -1304,6 +1310,8 @@ private:
 std::vector mParams;
 };
 
+}
+
 void SymbolTable::Marshal( cl_kernel k, int nVectorWidth, cl_program pProgram )
 {
 int i = 1; //The first argument is reserved for results
@@ -1313,6 +1321,8 @@ void SymbolTable::Marshal( cl_kernel k, int nVectorWidth, 
cl_program pProgram )
 }
 }
 
+namespace {
+
 /// Handling a Double Vector that is used as a sliding window input
 /// Performs parallel reduction based on given operator
 template
@@ -2316,7 +2326,7 @@ public:
 }
 virtual std::string BinFuncName() const override { return "fsop"; }
 };
-namespace {
+
 struct SumIfsArgs
 {
 explicit SumIfsArgs(cl_mem x) : mCLMem(x), mConst(0.0) { }
@@ -2324,7 +2334,6 @@ struct SumIfsArgs
 cl_mem mCLMem;
 double mConst;
 };
-}
 
 /// Helper functions that have multiple buffers
 class DynamicKernelSoPArguments : public DynamicKernelArgument
@@ -2619,6 +2628,8 @@ private:
 cl_mem mpClmem2;
 };
 
+}
+
 static DynamicKernelArgumentRef SoPHelper( const ScCalcConfig& config,
 const std::string& ts, const FormulaTreeNodeRef& ft, SlidingFunctionBase* 
pCodeGen,
 int nResultSize )
@@ -3793,6 +3804,8 @@ 
DynamicKernelSoPArguments::DynamicKernelSoPArguments(const ScCalcConfig& config,
 }
 }
 
+namespace {
+
 class DynamicKernel : public CompiledFormula
 {
 public:
@@ -3833,6 +3846,8 @@ private:
 int const mnResultSize;
 };
 
+}
+
 DynamicKernel::DynamicKernel( const ScCalcConfig& config, const 
FormulaTreeNodeRef& r, int nResultSize ) :
 mCalcConfig(config),
 mpRoot(r),
___
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' - sc/source

[Andrea Gelmini (via logerrit)]

 sc/source/core/opencl/formulagroupcl.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b06b67463a7c08fe28180e495e204ed38cfa86dd
Author: Andrea Gelmini 
AuthorDate: Fri Nov 22 21:16:54 2019 +0100
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:36:30 2020 +0200

Fix typo

Change-Id: Ibf2e90ff53f201d7b1f279c11eb8238eb403c05e
Reviewed-on: https://gerrit.libreoffice.org/83533
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93697
Reviewed-by: Michael Weghorn 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 24815b4937b1..cb1d01361fde 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1616,7 +1616,7 @@ public:
 // set work group size and execute
 size_t global_work_size[] = { 256, static_cast(w) };
 size_t const local_work_size[] = { 256, 1 };
-SAL_INFO("sc.opencl", "Enqueing kernel " << redKernel);
+SAL_INFO("sc.opencl", "Enqueuing kernel " << redKernel);
 err = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, redKernel, 2, nullptr,
 global_work_size, local_work_size, 0, nullptr, nullptr);
 if (CL_SUCCESS != err)
@@ -1674,7 +1674,7 @@ public:
 // set work group size and execute
 size_t global_work_size1[] = { 256, static_cast(w) };
 size_t const local_work_size1[] = { 256, 1 };
-SAL_INFO("sc.opencl", "Enqueing kernel " << redKernel);
+SAL_INFO("sc.opencl", "Enqueuing kernel " << redKernel);
 err = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, redKernel, 2, 
nullptr,
 global_work_size1, local_work_size1, 0, nullptr, nullptr);
 if (CL_SUCCESS != err)
@@ -2389,7 +2389,7 @@ public:
 // set work group size and execute
 size_t global_work_size[] = { 256, 
static_cast(nVectorWidth) };
 size_t const local_work_size[] = { 256, 1 };
-SAL_INFO("sc.opencl", "Enqueing kernel " << redKernel);
+SAL_INFO("sc.opencl", "Enqueuing kernel " << redKernel);
 err = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, redKernel, 2, 
nullptr,
 global_work_size, local_work_size, 0, nullptr, nullptr);
 if (CL_SUCCESS != err)
@@ -2472,7 +2472,7 @@ public:
 // set work group size and execute
 size_t global_work_size[] = { 256, 
static_cast(nVectorWidth) };
 size_t const local_work_size[] = { 256, 1 };
-SAL_INFO("sc.opencl", "Enqueing kernel " << redKernel);
+SAL_INFO("sc.opencl", "Enqueuing kernel " << redKernel);
 err = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, redKernel, 2, 
nullptr,
 global_work_size, local_work_size, 0, nullptr, nullptr);
 if (CL_SUCCESS != err)
@@ -4068,7 +4068,7 @@ void DynamicKernel::Launch( size_t nr )
 // The rest of buffers
 mSyms.Marshal(mpKernel, nr, mpProgram);
 size_t global_work_size[] = { nr };
-SAL_INFO("sc.opencl", "Enqueing kernel " << mpKernel);
+SAL_INFO("sc.opencl", "Enqueuing kernel " << mpKernel);
 err = clEnqueueNDRangeKernel(kEnv.mpkCmdQueue, mpKernel, 1, nullptr,
 global_work_size, nullptr, 0, nullptr, nullptr);
 if (CL_SUCCESS != err)
___
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' - connectivity/source

[Julien Nabet (via logerrit)]

 connectivity/source/drivers/mysql_jdbc/YTable.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ae513765f65c9497533f516e5cde2898c0911a1f
Author: Julien Nabet 
AuthorDate: Sun May 10 11:22:06 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:31:48 2020 +0200

tdf#132814: fix put autovalue to Yes in gui for Mysql/MariaDB

See part of bt:
https://bugs.documentfoundation.org/show_bug.cgi?id=132814#c3

Like this since at least:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8
author  Tamas Bunth2018-10-08 11:04:48 
+0200
committer   Tamás Bunth  2018-10-14 22:16:05 +0200
commit  b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 (patch)
treef1ab6e9fec3c66f0a3285b3cbae38dc7185d
parent  ba6723431afa843232fadf44e12ddab44e85c9f0 (diff)
Revert removal of mysql jdbc connector
And also make some minor fixes so it cooperates with the new mysqlc
library.

Change-Id: Id328c8378be1555fb5934c738def7fcd62f7a14b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93915
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 
Reviewed-by: Julien Nabet 
(cherry picked from commit f8c62ed408ae9b390d8268b43f4d49c2c6057227)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93794
Reviewed-by: Michael Weghorn 

diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx 
b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index 6eeaf3a23897..67b166d0e13e 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -208,6 +208,8 @@ void SAL_CALL OMySQLTable::alterColumnByName(const 
OUString& colName,
 if (sTypeName.indexOf(s_sAutoIncrement) == -1)
 {
 sTypeName += OUStringLiteral(" ") + s_sAutoIncrement;
+
descriptor->setPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME),
+ makeAny(sTypeName));
 }
 }
 else
___
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/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/frmdlg/cption.cxx  |   15 +++
 sw/source/uibase/inc/cption.hxx |1 -
 2 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit bc64f99a6a6a2134bd63d47dbfa23ed1d6cfd754
Author: Caolán McNamara 
AuthorDate: Sat May 9 19:28:40 2020 +0100
Commit: Michael Weghorn 
CommitDate: Mon May 11 09:29:27 2020 +0200

Resolves: tdf#132626 entry_insert_text works on the newly typed region

but in this case we want to work on the whole entry string to see
if it forms a legal result

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

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 4320d71aa4f8..b12a89696d19 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -97,12 +97,6 @@ OUString TextFilterAutoConvert::filter(const OUString &rText)
 return rText;
 }
 
-IMPL_LINK(SwCaptionDialog, TextFilterHdl, OUString&, rTest, bool)
-{
-rTest = m_aTextFilter.filter(rTest);
-return true;
-}
-
 SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, SwView &rV)
 : SfxDialogController(pParent, "modules/swriter/ui/insertcaption.ui", 
"InsertCaptionDialog")
 , m_sNone(SwResId(SW_STR_NONE))
@@ -126,8 +120,6 @@ SwCaptionDialog::SwCaptionDialog(weld::Window *pParent, 
SwView &rV)
 , m_xOptionButton(m_xBuilder->weld_button("options"))
 , m_xPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreview))
 {
-m_xCategoryBox->connect_entry_insert_text(LINK(this, SwCaptionDialog, 
TextFilterHdl));
-
 //#i61007# order of captions
 ApplyCaptionOrder();
 SwWrtShell &rSh = rView.GetWrtShell();
@@ -366,6 +358,13 @@ IMPL_LINK_NOARG(SwCaptionDialog, ModifyEntryHdl, 
weld::Entry&, void)
 
 IMPL_LINK_NOARG(SwCaptionDialog, ModifyComboHdl, weld::ComboBox&, void)
 {
+OUString sText = m_xCategoryBox->get_active_text();
+OUString sAllowedText = m_aTextFilter.filter(sText);
+if (sText != sAllowedText)
+{
+m_xCategoryBox->set_entry_text(sAllowedText);
+m_xCategoryBox->select_entry_region(sAllowedText.getLength(), 
sAllowedText.getLength());
+}
 ModifyHdl();
 }
 
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 58fffc2dce37..e12244ec49e9 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -64,7 +64,6 @@ class SwCaptionDialog : public SfxDialogController
 DECL_LINK(ModifyComboHdl, weld::ComboBox&, void);
 DECL_LINK(OptionHdl, weld::Button&, void);
 DECL_LINK(CaptionHdl, weld::Button&, void);
-DECL_LINK(TextFilterHdl, OUString&, bool);
 
 void Apply();
 
___
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' - sfx2/source

[Ashod Nakashian (via logerrit)]

 sfx2/source/sidebar/SidebarDockingWindow.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 1467a33543f56d4e6472d5e05ffdd8e6e41bc607
Author: Ashod Nakashian 
AuthorDate: Sun May 10 16:34:25 2020 -0400
Commit: Andras Timar 
CommitDate: Mon May 11 09:07:09 2020 +0200

sfx2: lok: separate sidebar notifications to mobile and desktop

If we have two notifiers for mobile and non-mobile,
we should check them separately, so we can support
one without the other.

Also, correctly check for null before dereferencing.

Change-Id: I3f21d2f4d5d430b7c876aaf4e90d5b4e55df04ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93944
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx 
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index ed4ac31d81c6..302605d6a65a 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -55,14 +55,13 @@ public:
 
 void Invoke() override
 {
-auto pNotifier = m_rSidebarDockingWin.GetLOKNotifier();
-auto pMobileNotifier = SfxViewShell::Current();
-if (!pNotifier || (!pMobileNotifier && 
!comphelper::LibreOfficeKit::isActive()))
+if (!comphelper::LibreOfficeKit::isActive())
 return;
 
 try
 {
-if (pMobileNotifier->isLOKMobilePhone())
+auto pMobileNotifier = SfxViewShell::Current();
+if (pMobileNotifier && pMobileNotifier->isLOKMobilePhone())
 {
 // Mobile phone.
 std::stringstream aStream;
@@ -79,6 +78,10 @@ public:
 
 // Notify the sidebar is created, and its LOKWindowId, which
 // is needed on mobile phones, tablets, and desktop.
+auto pNotifier = m_rSidebarDockingWin.GetLOKNotifier();
+if (!pNotifier)
+return;
+
 const Point pos = Point(m_rSidebarDockingWin.GetOutOffXPixel(),
 m_rSidebarDockingWin.GetOutOffYPixel());
 const OString posMessage = pos.toString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits