Re: [PATCH] libetonyek: std::for_each

[Mike Kaganski]

On 19.05.2020 9:34, Roland Illig wrote:
> On 19.05.2020 07:32, Mike Kaganski wrote:
>>
>> See
>> https://libreoffice-dev.blogspot.com/2020/05/create-patch-for-libreoffice-directly.html
>>
> 
> Thanks for this pointer.  I had previously bailed out when I had to
> select a project, and I typed "libre" and found nothing.
> 
> It's good to know that I have to type "core" instead of "libre".

For your case, you need "libetoneyk".


-- 
Best regards,
Mike Kaganski


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

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

[Stephan Bergmann (via logerrit)]

 external/skia/UnpackedTarball_skia.mk |1 +
 external/skia/c++20.patch.0   |   10 ++
 2 files changed, 11 insertions(+)

New commits:
commit dbdc14dfd90c40b6cc0cd951be236acd85ff4cea
Author: Stephan Bergmann 
AuthorDate: Tue May 19 07:47:00 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue May 19 08:36:16 2020 +0200

external/skia: Adapt to C++20 rewritten equality comparisons

...by avoiding the selection of rewritten ones that would use synthesized
operator== with non-bool return type:

> workdir/UnpackedTarball/skia/src/core/SkVM.cpp:1317:37: error: return 
type 'skvm::I32' of selected 'operator==' function for rewritten '==' 
comparison is not 'bool'
>select(s == 0.0f , d * (1-src.a)
>   ~ ^  
> workdir/UnpackedTarball/skia/src/core/SkVM.cpp:1217:17: note: in 
instantiation of function template specialization 
'skvm::Builder::blend(SkBlendMode, skvm::Color, skvm::Color)::(anonymous 
class)::operator()' requested here
> fn(src.r, dst.r),
> ^
> workdir/UnpackedTarball/skia/src/core/SkVM.cpp:1311:43: note: in 
instantiation of function template specialization 
'skvm::Builder::blend(SkBlendMode, skvm::Color, skvm::Color)::(anonymous 
class)::operator()<(lambda at 
workdir/UnpackedTarball/skia/src/core/SkVM.cpp:1311:44)>' requested here
> return apply_rgb_srcover_a([&](auto s, auto d) {
>   ^
> workdir/UnpackedTarball/skia/src/core/SkVM.h:912:23: note: declared here
> static inline I32 operator==(float x, F32  y) { return y->eq(x,y); }
>   ^

(There are more such operators here that could cause similar issues, but I 
only
adapted the one that caused the overall build of LibreOffice to fail.)

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

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index c4a248610ce4..1ac4c9b24061 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -36,6 +36,7 @@ skia_patches := \
 windows-typeface-directwrite.patch.0 \
 windows-raster-surface-no-copies.patch.1 \
 fix-windows-dwrite.patch.1 \
+c++20.patch.0 \
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/c++20.patch.0 b/external/skia/c++20.patch.0
new file mode 100644
index ..167c8d89c92d
--- /dev/null
+++ b/external/skia/c++20.patch.0
@@ -0,0 +1,10 @@
+--- src/core/SkVM.h
 src/core/SkVM.h
+@@ -909,6 +909,7 @@
+ static inline F32 max(float x, F32  y) { return y->max(x,y); }
+ 
+ static inline I32 operator==(F32   x, F32a y) { return x->eq(x,y); }
++static inline I32 operator==(F32   x, float y) { return x->eq(x,y); }
+ static inline I32 operator==(float x, F32  y) { return y->eq(x,y); }
+ static inline I32 eq_op(float x, F32  y) { return y->eq(x,y); }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] libetonyek: std::for_each

[Roland Illig]

On 19.05.2020 07:32, Mike Kaganski wrote:

On 19.05.2020 2:28, Jan-Marek Glogowski wrote:

Am 18.05.20 um 20:57 schrieb Roland Illig:

On 18.05.2020 09:21, Miklos Vajna wrote:

Could you please push your patch to gerrit?


Nope. I won't clone a 1 GB repository and install several tools just for
fixing a single line of code. It's much more efficient if you do that,
since you already have all the infrastructure set up.


You can create the change online via
https://gerrit.libreoffice.org/admin/repos/libetonyek,commands => Create
change

For this simple patch that is probably faster then the full setup.


See
https://libreoffice-dev.blogspot.com/2020/05/create-patch-for-libreoffice-directly.html


Thanks for this pointer.  I had previously bailed out when I had to
select a project, and I typed "libre" and found nothing.

It's good to know that I have to type "core" instead of "libre".

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

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

[Andrea Gelmini (via logerrit)]

 vcl/source/window/builder.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b2e511cb46c1f318803050d3a47e7a296ade04a0
Author: Andrea Gelmini 
AuthorDate: Mon May 18 22:22:27 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue May 19 08:14:53 2020 +0200

Removed duplicated include

Change-Id: Iee07f7fd011c17e583854a7cc0dfa25fce3ec948
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94469
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 03f9de9926bd..9fc721ddb010 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -68,7 +68,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #if defined(DISABLE_DYNLOADING) || defined(LINUX)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] libetonyek: std::for_each

[Mike Kaganski]

On 19.05.2020 2:28, Jan-Marek Glogowski wrote:
> Am 18.05.20 um 20:57 schrieb Roland Illig:
>> On 18.05.2020 09:21, Miklos Vajna wrote:
>>> Could you please push your patch to gerrit?
>>
>> Nope. I won't clone a 1 GB repository and install several tools just for
>> fixing a single line of code. It's much more efficient if you do that,
>> since you already have all the infrastructure set up.
> 
> You can create the change online via
> https://gerrit.libreoffice.org/admin/repos/libetonyek,commands => Create
> change
> 
> For this simple patch that is probably faster then the full setup.

See
https://libreoffice-dev.blogspot.com/2020/05/create-patch-for-libreoffice-directly.html

-- 
Best regards,
Mike Kaganski


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

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

[Mihkel Tõnnov (via logerrit)]

 i18npool/source/localedata/data/et_EE.xml |  126 --
 1 file changed, 87 insertions(+), 39 deletions(-)

New commits:
commit 4804d969bacd25ad586b3bf70d3dc8c27adb48ef
Author: Mihkel Tõnnov 
AuthorDate: Fri May 15 00:05:40 2020 +0200
Commit: Eike Rathke 
CommitDate: Tue May 19 01:45:35 2020 +0200

tdf#130154: update locale data for Estonian [et-EE]

* fix MinimalDaysInFirstWeek (supposed to be 4, not 1)
* fix FollowPageWord ("jj." = "ja järgmine/järgmised", not "pp.")
* fix Era DefaultAbbrvName & DefaultFullName to official spellings
* add DefaultNarrowName for months (using Roman numerals)
* translate TimeAM, TimePM - not commonly used, but abbreviations exist
* changes to date formats:
  - add some that are used, but were missing
  - remove those that aren't commonly used or which are ungrammatical
  - switch to more sensible defaults
  - minor re-sorting into more logical order

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

diff --git a/i18npool/source/localedata/data/et_EE.xml 
b/i18npool/source/localedata/data/et_EE.xml
index 219faf3990f4..5154760778ce 100644
--- a/i18npool/source/localedata/data/et_EE.xml
+++ b/i18npool/source/localedata/data/et_EE.xml
@@ -47,8 +47,8 @@
   „
   ”
 
-AM
-PM
+e.l.
+p.l.
 metric
   
   
@@ -110,67 +110,103 @@
 
   DD.MM.YY
 
-
-  DD.  . a
+
+  D.  
 
-
-  D.M.YY
+
+  D.M.
 
-
+
   DD.MM.
 
-
-  D. MMM YY
-
-
-  D. MMM . a
+
+  D. M 
 
-
-  D. MMM. 
+
+  D. MMM 
 
-
-  D.  . a
+
+  D. MMM . a
 
-
+
   D.  
 
-
-  NN, D. MMM YY
+
+  D.  . a
 
-
-  NN, DD. MMM YY
+
+  NN, D. M 
 
-
-  NN, D.  . a
+
+  NN, D. MMM 
 
-
-  D. , . a
+
+  NN, D.  
+
+
+  D.  . a
 
 
   MM-DD
 
-
+
   YY-MM-DD
 
 
   -MM-DD
   ISO 8601
 
-
-  MM.YY
+
+  M 
 
-
-  DD. MMM
+
+  D. MMM
 
 
   
 
 
-  QQ YY
+  QQ 
 
-
+
   WW
 
+
+  WW. "nädal"
+
+
+  WW. "nädal" 
+
+
+  NN, D.  . a
+
+
+  D.MM.
+
+
+  D.M.YY
+
+
+  D. 
+
+
+  DD.MM
+
+
+  D.MM
+
+
+   
+
+
+  MMM 
+
+
+   Q
+
+
+  Q YY
+
 
   HH:MM
 
@@ -214,8 +250,8 @@
 0
 1
 2
-p.
-pp.
+ jj.
+ jj.
   
   
 
@@ -261,79 +297,91 @@
   jan
   jaan
   jaanuar
+  I
 
 
   feb
   veebr
   veebruar
+  II
 
 
   mar
   märts
   märts
+  III
 
 
   apr
   apr
   aprill
+  IV
 
 
   may
   mai
   mai
+  V
 
 
   jun
   juuni
   juuni
+  VI
 
 
   jul
   juuli
   juuli
+  VII
 
 
   aug
   aug
   august
+  VIII
 
 
   sep
   sept
   september
+  IX
 
 
   oct
   okt
   oktoober
+  X
 
 
   nov
   nov
   november
+  XI
 
 
   dec
   dets
   detsember
+  XII
 
   
   
 
   bc
-  e.m.a.
-  enne meie aega
+  e.m.a
+  enne meie ajaarvamist
 
 
   ad
-  m.a.j.
-  meie aja järgi
+  m.a.j
+  meie ajaarvamise järgi
 
   
   
 mon
   
-  1
+  4
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] libetonyek: std::for_each

[Jan-Marek Glogowski]

Am 18.05.20 um 20:57 schrieb Roland Illig:
> On 18.05.2020 09:21, Miklos Vajna wrote:
>> Could you please push your patch to gerrit?
> 
> Nope. I won't clone a 1 GB repository and install several tools just for
> fixing a single line of code. It's much more efficient if you do that,
> since you already have all the infrastructure set up.

You can create the change online via
https://gerrit.libreoffice.org/admin/repos/libetonyek,commands => Create
change

For this simple patch that is probably faster then the full setup.

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

Re: Calc solvers - what to say in the Calc Guide

[Drew Jensen]

Great - well for now we can use an odt file to draft the content.
Added this section for COINMP in Solvers section:
---
CoinMP

The CoinMP optimizer is an open source solver, it is part of the
COIN-OR project which is an initiative to spur the development of
open-source software for the operations research community. CoinMP at
present is a linear and integer optimizer.

Algorithmic Features

COIN-OR is a large group of projects ranging from linear to nonlinear
programming right through to heuristic and modelling interfaces,
CoinMP is integrates the COIN's CLP (linear programming), CBC (Branch
and Cut library) and CGL (Cut Generation library) libraries into one
easy to use tool. Thus CoinMP can solve linear programming problems
accessing the functionality embedded in the CLP library, solve integer
and mixed integer programming problems utilizing the algorithmic
features of both the CBC and CGL libraries.
--
https://nextcloud.documentfoundation.org/s/ebisHjZo2rowM4Q has been
updated with the change and that pdf file has the .odt embedded in it
BTW.

I could sure use feedback on that added text from more technical folks.

Drew

On Mon, May 18, 2020 at 5:17 AM Stephen Fanning
 wrote:
>
> Drew,
>
> Many thanks for your efforts in trying to get to the bottom of this.
>
> I think that putting the information on the wiki is a good idea. The relevant 
> chapter of the Calc Guide (Chapter 9, Data Analysis) is already very thick 
> and would not benefit from being expanded further to include more solver 
> details.
>
> Regards,
>
> Steve
>
>
> On Mon, 18 May 2020 at 06:39, Drew Jensen  wrote:
>>
>> HI,
>>
>> Well, I noticed something aside from the Guide and that is the FAQ
>> over on the wiki.
>> https://wiki.documentfoundation.org/Faq/Calc/109/fr
>> Now, it turns out that the French version of that FAQ points to a page
>> (first link on the page) on the TDF wiki but none of the other
>> languages do. They point back to the AOO wiki and on that wiki page it
>> has links to things like extensions LibreOffice doesn't need and API
>> documentation in AOO SDK.
>>
>> So - I thought why not steal the content from the AOO page as a start
>> of a TDF page (or PDF maybe ;-).
>>
>> I did that and then I updated a few things in it. Not done updating
>> things, but done for tonight.
>>
>> You can review a draft of this
>> https://nextcloud.documentfoundation.org/s/ebisHjZo2rowM4Q
>>
>> Can see some easy edits in the top part of the text and I need to ask
>> for help filling in the information for scripting as needed for the
>> additional algorithm engines in LO - for one thing maybe a bit more.
>>
>> Anyway, any feedback is welcome. Will post tomorrow when those changes
>> are made.
>>
>> Thanks,
>>
>> Drew
>>
>> On Sat, May 16, 2020 at 7:31 PM Drew Jensen  
>> wrote:
>> >
>> > This is an interesting point of differentiation.
>> > Reviewing some of the tools yesterday and this morning;
>> > AOO with 1 solver engine in default install (4.2 pre-release binary);
>> >
>> > OnlyOffice (latest desktop Linux binary) has no Solver equivalent in
>> > either the desktop binary or the cloud version, not that I can find
>> > (didn't see any in the available plug-ins, but maybe their is
>> > something behind the paywall areas).
>> >
>> > WSP (May 2020 release) includes only one, a simplex linear solver.
>> >
>> > MS 365 and Google Sheets both require an plug-in, Frontline Systems
>> > Inc looks to be the leading supplier for both tools, but there are
>> > multiple other choices for each.
>> >
>> > Looking at this the first couple sentences, "The standard Microsoft
>> > Excel Solver uses a basic implementation of the primal Simplex method
>> > to solve LP problems.  It is limited to 200 decision variables.", from
>> > this web page https://www.solver.com/linear-quadratic-technology and
>> > thinking that we should be able to run down answers to some of the
>> > bounds information for the different engines also.
>> >
>> > Below are the different options sets for the engines.  Most
>> > specifically give bounds (ie Epsilon Level), but a few don't (ie
>> > Learning Cycles); I don't know if it would be worth it to get those
>> > numbers or not.
>> >
>> > I think it is worth it to, per engine, list these in the guide/help
>> > file. It is a lot easier to highlight something like "ACR Comparator
>> > (instead of BCH)" from a PDF/HTML then from that dialog box in the
>> > application so that you can do a DDG search on the term ;)
>> >
>> > LibreOffice CoinMP Linear Solver & LibreOffice Linear Solver
>> > Options
>> > - Assume variables as integers. (Default FALSE)
>> > - Assume variables as non-negative. (Default FALSE)
>> > - Epsilon Level 0-3. (Default 0)
>> > - Limit branch and bound depth. (Default FALSE)
>> > - Solving time limit (seconds). (Default 100)
>> >
>> > DEPS Evolutionary Algorithm
>> > Options
>> > - Agent Switch Rate (DE Probability): (Default .05)
>> > - Assume non-negative variables (Default FALSE)
>> 

Re: [PATCH] libetonyek: std::for_each

[Roland Illig]

On 18.05.2020 09:21, Miklos Vajna wrote:

Hi Roland,

Could you please push your patch to gerrit?


Nope. I won't clone a 1 GB repository and install several tools just for
fixing a single line of code. It's much more efficient if you do that,
since you already have all the infrastructure set up.


See . It's
much easier to take patches from there.


Maybe for you, but for me it's a lot harder than writing a simple mail.

I have set myself a 15 minutes time limit for setting everything up and
submitting the patch. That time has passed now.

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

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 58981c2d316ffeaf626667fbd2822443588efbed
Author: Caolán McNamara 
AuthorDate: Sun May 17 19:33:35 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon May 18 23:39:22 2020 +0200

Resolves: tdf#131076 GdkEventKey::state can contain e.g. num lock

which we don't want to consider

Change-Id: Idad3ae428450590b366897d08a845b43000b48e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94388
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 93b2a94b4c07..14be34515a50 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11454,12 +11454,12 @@ private:
 case KEY_RETURN:
 m_aQuickSelectionEngine.Reset();
 // tdf#131076 don't let bare return toggle menu popup active, 
but do allow deactive
-if (nCode == KEY_RETURN && !pEvent->state && !m_bPopupActive)
+if (nCode == KEY_RETURN && !aKeyCode.GetModifier() && 
!m_bPopupActive)
 bDone = combobox_activate();
 break;
 default:
 // tdf#131076 let base space toggle menu popup when its not 
already visible
-if (nCode == KEY_SPACE && !pEvent->state && !m_bPopupActive)
+if (nCode == KEY_SPACE && !aKeyCode.GetModifier() && 
!m_bPopupActive)
 bDone = false;
 else
 bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt);
@@ -12051,7 +12051,7 @@ private:
 
 bool signal_key_press(GdkEventKey* pEvent)
 {
-if (pEvent->state) // only with no modifiers held
+if (GtkSalFrame::GetMouseModCode(pEvent->state)) // only with no 
modifiers held
 return false;
 
 if (pEvent->keyval == GDK_KEY_KP_Up || pEvent->keyval == GDK_KEY_Up || 
pEvent->keyval == GDK_KEY_KP_Page_Up || pEvent->keyval == GDK_KEY_Page_Up ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 vcl/source/outdev/bitmap.cxx |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit e94e1ed8435606ae4a85638947fe02e72946ca0f
Author: Mike Kaganski 
AuthorDate: Mon May 18 16:55:50 2020 +0200
Commit: Mike Kaganski 
CommitDate: Mon May 18 23:18:19 2020 +0200

Move comment closer to where it belongs

The comment was introduced in commit 
bc584ddc617f1b6be2cd3b330c2b999ec8f376a4,
when a check for mpAlphaVDev was introduced. Later the code was refactored, 
so
the relation of the comment to the code was lost.

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

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 251219add82b..44d28e15229a 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -647,14 +647,6 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 if (!aDstRect.Intersection(tools::Rectangle(aOutPt, aOutSz)).IsEmpty())
 {
 static const char* pDisableNative = getenv( 
"SAL_DISABLE_NATIVE_ALPHA");
-// #i83087# Naturally, system alpha blending cannot work with
-// separate alpha VDev
-
-// Not clear how the above comment relates to the following 
declaration and initialisation
-// of bTryDirectPaint. Does bTryDirectPaint being true mean that we 
can use "system alpha
-// blending"? Or that we can't? Or are the two not related at all, and 
should the above
-// comment actually be better located below, before the "if 
(mpAlphaVDev)" test?
-
 bool bTryDirectPaint(!pDisableNative && !bHMirr && !bVMirr);
 
 if (bTryDirectPaint)
@@ -669,6 +661,9 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 SalBitmap* pSalSrcBmp = rBmp.ImplGetSalBitmap().get();
 SalBitmap* pSalAlphaBmp = rAlpha.ImplGetSalBitmap().get();
 
+// #i83087# Naturally, system alpha blending 
(SalGraphics::DrawAlphaBitmap) cannot work
+// with separate alpha VDev
+
 // try to blend the alpha bitmap with the alpha virtual device
 if (mpAlphaVDev)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/qa framework/qa include/comphelper solenv/clang-format starmath/source

[Miklos Vajna (via logerrit)]

 drawinglayer/qa/unit/border.cxx   |   98 ++-
 framework/qa/cppunit/dispatchtest.cxx |   69 +++--
 include/comphelper/propertyvalue.hxx  |4 
 solenv/clang-format/blacklist |5 
 starmath/source/wordexportbase.cxx|  171 --
 starmath/source/wordexportbase.hxx|   38 +++
 6 files changed, 179 insertions(+), 206 deletions(-)

New commits:
commit 6cc4aa93baed7916705b43ddce5dbb7c031e9997
Author: Miklos Vajna 
AuthorDate: Mon May 18 15:01:28 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 18 22:51:45 2020 +0200

comphelper, drawinglayer, framework, starmath: clang-format these files

I added these files more or less recently and they have long lines. Use
clang-format to break at a sane column limit.

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

diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index 8209d5172926..8c4e6e08419b 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -28,7 +28,6 @@ using namespace com::sun::star;
 
 namespace
 {
-
 class DrawinglayerBorderTest : public test::BootstrapFixture
 {
 };
@@ -50,37 +49,21 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, 
testDoubleDecompositionSolid)
 basegfx::BColor aColorLeft;
 const std::vector 
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
 const drawinglayer::attribute::StrokeAttribute aStrokeAttribute(aDashing);
-std::vector< drawinglayer::primitive2d::BorderLine > aBorderlines;
-
-aBorderlines.push_back(
-drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(
-aColorLeft,
-fLeftWidth),
-fExtendLeftStart,
-fExtendLeftStart,
-fExtendLeftEnd,
-fExtendLeftEnd));
-
-aBorderlines.push_back(
-drawinglayer::primitive2d::BorderLine(fDistance));
-
-aBorderlines.push_back(
-drawinglayer::primitive2d::BorderLine(
-drawinglayer::attribute::LineAttribute(
-aColorRight,
-fRightWidth),
-fExtendRightStart,
-fExtendRightStart,
-fExtendRightEnd,
-fExtendRightEnd));
+std::vector aBorderlines;
+
+aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorLeft, fLeftWidth), 
fExtendLeftStart,
+fExtendLeftStart, fExtendLeftEnd, fExtendLeftEnd));
+
+aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(fDistance));
+
+aBorderlines.push_back(drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(aColorRight, fRightWidth), 
fExtendRightStart,
+fExtendRightStart, fExtendRightEnd, fExtendRightEnd));
 
 rtl::Reference aBorder(
-new drawinglayer::primitive2d::BorderLinePrimitive2D(
-aStart,
-aEnd,
-aBorderlines,
-aStrokeAttribute));
+new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd, 
aBorderlines,
+ 
aStrokeAttribute));
 
 // Decompose it into polygons.
 drawinglayer::geometry::ViewInformation2D aView;
@@ -91,14 +74,16 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, 
testDoubleDecompositionSolid)
 CPPUNIT_ASSERT_EQUAL(static_cast(2), aContainer.size());
 
 // Get the inside line, now a PolygonStrokePrimitive2D
-auto pInside = dynamic_cast(aContainer[0].get());
+auto pInside = dynamic_cast(
+aContainer[0].get());
 CPPUNIT_ASSERT(pInside);
 
 // Make sure the inside line's height is fLeftWidth.
 const double fLineWidthFromDecompose = 
pInside->getLineAttribute().getWidth();
 
 // This was 2.47, i.e. the width of the inner line was 1 unit (in the 
bugdoc's case: 1 pixel) wider than expected.
-CPPUNIT_ASSERT_DOUBLES_EQUAL(fLeftWidth, fLineWidthFromDecompose, 
basegfx::fTools::getSmallValue());
+CPPUNIT_ASSERT_DOUBLES_EQUAL(fLeftWidth, fLineWidthFromDecompose,
+ basegfx::fTools::getSmallValue());
 }
 
 CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, testDoublePixelProcessing)
@@ -106,7 +91,8 @@ CPPUNIT_TEST_FIXTURE(DrawinglayerBorderTest, 
testDoublePixelProcessing)
 // Create a pixel processor.
 ScopedVclPtrInstance pDev;
 drawinglayer::geometry::ViewInformation2D aView;
-std::unique_ptr 
pProcessor(drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(*pDev,
 aView));
+std::unique_ptr pProcessor(
+
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(*pDev, aView));
 CPPUNIT_ASSERT(pProcessor);
 GDIMetaFile aMetaFile;
 // Start recording after the processor is created, so we can test the 

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2d2f00bd499d69a91eda99f31910c3998b560e86
Author: Tor Lillqvist 
AuthorDate: Mon May 18 17:33:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 18 22:52:24 2020 +0200

tdf#129177: Turn on --enable-readonly-installset unconditionally for macOS

An app bundle should never be written into. We have avoided it always
for a sandboxed (App Store) LibreOffice, but we should avoid it in all
cases for macOS.

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

diff --git a/configure.ac b/configure.ac
index 6e5e18021a3c..da0d3bad8c61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1493,7 +1493,7 @@ libo_FUZZ_ARG_ENABLE(readonly-installset,
 AS_HELP_STRING([--enable-readonly-installset],
 [Prevents any attempts by LibreOffice to write into its installation. 
That means
  at least that no "system-wide" extensions can be added. Partly 
experimental work in
- progress, probably not fully implemented (but is useful for sandboxed 
macOS builds).]),
+ progress, probably not fully implemented. Always enabled for macOS.]),
 ,)
 
 libo_FUZZ_ARG_ENABLE(postgresql-sdbc,
@@ -3121,8 +3121,9 @@ fi
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])
 
-if test \( -z "$enable_readonly_installset" -a "$ENABLE_MACOSX_SANDBOX" = TRUE 
\) -o \
-"$enable_extensions" != yes; then
+if test $_os = Darwin; then
+enable_readonly_installset=yes
+elif test "$enable_extensions" != yes; then
 enable_readonly_installset=yes
 fi
 if test "$enable_readonly_installset" = yes; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/charnamepage.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit acc8ff577b2087fa2734b569a9606d9acac09c2e
Author: Caolán McNamara 
AuthorDate: Mon May 18 16:48:56 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 18 22:12:01 2020 +0200

tdf#133121 limit style list width to that of the entry widget

which is maxed to the widest "standard" style text. So that the
dialog doesn't dance around depending on the font selected.

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

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index f62f48f1d110..96ad01fdb502 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -208,6 +208,7 @@
 3
 
   
+42
 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/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit fc59a701cceb6e83c00fc3c9fab747987376c00f
Author: Caolán McNamara 
AuthorDate: Mon May 18 17:23:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 18 22:11:28 2020 +0200

don't bother undoing the replacement of combobox if unparented

as seen in tdf#133098 example

Change-Id: I58bf5c5c931cbd1f002ff28f6844d0bebcdd1913
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94440
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 503da469aef5..530a115bd96b 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1714,11 +1714,15 @@ namespace
 
 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);
 
+// if pWidget was un-parented then don't bother
+if (!pParent)
+return;
+
+g_object_ref(pWidget);
+
 gint nTopAttach(0), nLeftAttach(0), nHeight(1), nWidth(1);
 if (GTK_IS_GRID(pParent))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx  |5 -
 vcl/source/window/stacking.cxx |2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit f7ceb1f805b45cbd4b322da2ca4039d56dd430b3
Author: Caolán McNamara 
AuthorDate: Mon May 18 17:26:09 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 18 22:11:04 2020 +0200

tdf#133098 cannot truly unparent a vcl widget

once is created it cannot truly get unparented like a gtk one can, so if we
want to "unparent" it, move it to be a child of the hidden DefaultWindow
instead

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 28005bce38ae..82b813a819b8 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1107,7 +1107,10 @@ void SalInstanceContainer::move(weld::Widget* pWidget, 
weld::Container* pNewPare
 assert(pVclWidget);
 SalInstanceContainer* pNewVclParent = 
dynamic_cast(pNewParent);
 assert(!pNewParent || pNewVclParent);
-pVclWidget->getWidget()->SetParent(pNewVclParent ? 
pNewVclParent->getWidget() : nullptr);
+if (pNewVclParent)
+pVclWidget->getWidget()->SetParent(pNewVclParent->getWidget());
+else
+pVclWidget->getWidget()->SetParentToDefaultWindow();
 }
 
 void SalInstanceContainer::recursively_unset_default_buttons()
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index 08b6cbaa987e..d5b130031de3 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -841,7 +841,7 @@ static SystemWindow *ImplGetLastSystemWindow( vcl::Window 
*pWin )
 
 void Window::SetParent( vcl::Window* pNewParent )
 {
-SAL_INFO_IF( !pNewParent, "vcl", "Window::SetParent(): pParent == NULL" );
+SAL_WARN_IF( !pNewParent, "vcl", "Window::SetParent(): pParent == NULL" );
 SAL_WARN_IF( pNewParent == this, "vcl", "someone tried to reparent a 
window to itself" );
 
 if( !pNewParent || pNewParent == this )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 include/vcl/svapp.hxx|2 
 include/vcl/weld.hxx |2 
 sfx2/source/dialog/basedlgs.cxx  |7 ++-
 vcl/Library_vcl.mk   |1 
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   31 +++
 vcl/inc/salvtables.hxx   |4 -
 vcl/jsdialog/jsdialogbuilder.cxx |   72 +++
 vcl/source/app/weldutils.cxx |4 -
 vcl/source/window/builder.cxx|   17 +++-
 9 files changed, 131 insertions(+), 9 deletions(-)

New commits:
commit a76116c867380836080adc86bc37c2248778825d
Author: Szymon Kłos 
AuthorDate: Tue Feb 18 15:41:56 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 18 22:08:05 2020 +0200

Create weld::Builder implementation for JSDialog

and use for WordCountDialog on mobile

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

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index b450043767f7..48a764b80125 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1328,7 +1328,7 @@ public:
 // For vclbootstrapprotector:
 static void setDeInitHook(Link const & hook);
 
-static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString 
&rUIFile);
+static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString 
&rUIFile, bool bMobile = false);
 static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const 
OUString &rUIFile); //for the duration of vcl parent windows
 
 static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, 
VclMessageType eMessageType,
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 684c70885231..fd734309d6a9 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2305,7 +2305,7 @@ protected:
 
 public:
 GenericDialogController(weld::Widget* pParent, const OUString& rUIFile,
-const OString& rDialogId);
+const OString& rDialogId, bool bMobile = false);
 virtual Dialog* getDialog() override;
 virtual ~GenericDialogController() COVERITY_NOEXCEPT_FALSE override;
 };
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 4bf16c55927e..d0cafa6926e2 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -29,6 +29,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star::uno;
 
@@ -200,7 +202,10 @@ void SfxModelessDialogController::Close()
 
 SfxDialogController::SfxDialogController(weld::Widget* pParent, const 
OUString& rUIFile,
  const OString& rDialogId)
-: GenericDialogController(pParent, rUIFile, rDialogId)
+: GenericDialogController(pParent, rUIFile, rDialogId,
+comphelper::LibreOfficeKit::isActive()
+&& SfxViewShell::Current()
+&& 
SfxViewShell::Current()->isLOKMobilePhone())
 {
 m_xDialog->SetInstallLOKNotifierHdl(LINK(this, SfxDialogController, 
InstallLOKNotifierHdl));
 m_xDialog->connect_toplevel_focus_changed(LINK(this, SfxDialogController, 
FocusChangeHdl));
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 65f65b525f4c..35590174946e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -472,6 +472,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/backendtest/outputdevice/polyline \
 vcl/backendtest/outputdevice/polyline_b2d \
 vcl/backendtest/outputdevice/rectangle \
+vcl/jsdialog/jsdialogbuilder \
 ))
 
 $(eval $(call gb_Library_add_cobjects,vcl,\
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
new file mode 100644
index ..9d8c68516320
--- /dev/null
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -0,0 +1,31 @@
+#ifndef INCLUDED_VCL_INC_JSDIALOG_JSDIALOG_HXX
+#define INCLUDED_VCL_INC_JSDIALOG_JSDIALOG_HXX
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+class VCL_DLLPUBLIC JSInstanceBuilder : public SalInstanceBuilder
+{
+public:
+JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIRoot, const 
OUString& rUIFile);
+virtual std::unique_ptr weld_dialog(const OString& id,
+  bool bTakeOwnership = 
true) override;
+virtual std::unique_ptr weld_label(const OString& id,
+bool bTakeOwnership = 
false) override;
+};
+
+class VCL_DLLPUBLIC JSLabel : public SalInstanceLabel
+{
+VclPtr m_aOwnedToplevel;
+
+public:
+JSLabel(VclPtr aOwnedToplevel, FixedText* pLabel, 
SalInstanceBuilder* pBuilder,
+bool bTakeOwnership);
+virtual void set

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

[Mike Kaganski (via logerrit)]

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

New commits:
commit c8961ff03fb8f136f6a123bd74f96adffd138840
Author: Mike Kaganski 
AuthorDate: Mon May 18 17:17:40 2020 +0200
Commit: Mike Kaganski 
CommitDate: Mon May 18 21:18:48 2020 +0200

Simplify this a bit

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

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 58cf53ef61ae..251219add82b 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -673,9 +673,8 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 if (mpAlphaVDev)
 {
 Bitmap aAlphaBitmap( mpAlphaVDev->GetBitmap( aRelPt, aOutSz ) 
);
-if (aAlphaBitmap.ImplGetSalBitmap())
+if (SalBitmap* pSalAlphaBmp2 = 
aAlphaBitmap.ImplGetSalBitmap().get())
 {
-SalBitmap* pSalAlphaBmp2 = 
aAlphaBitmap.ImplGetSalBitmap().get();
 if (mpGraphics->BlendAlphaBitmap(aTR, *pSalSrcBmp, 
*pSalAlphaBmp, *pSalAlphaBmp2, this))
 {
 mpAlphaVDev->BlendBitmap(aTR, rAlpha);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit aae1f31d969904c53d129684d40a9ff5174e56c4
Author: Mike Kaganski 
AuthorDate: Mon May 18 15:56:44 2020 +0200
Commit: Mike Kaganski 
CommitDate: Mon May 18 21:18:07 2020 +0200

Only transform polypolygon when needed

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

diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 0e74fe9bf2aa..131e51f34913 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -502,11 +502,10 @@ void 
VclPixelProcessor2D::processPolyPolygonGradientPrimitive2D(
 if (!aLocalPolyPolygon.count())
 return;
 
-aLocalPolyPolygon.transform(maCurrentTransformation);
-
 if (aStartColor == aEndColor)
 {
 // no gradient at all, draw as polygon in AA and non-AA case
+aLocalPolyPolygon.transform(maCurrentTransformation);
 mpOutputDevice->SetLineColor();
 mpOutputDevice->SetFillColor(Color(aStartColor));
 mpOutputDevice->DrawPolyPolygon(aLocalPolyPolygon);
___
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' - sd/source

[Pranam Lashkari (via logerrit)]

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

New commits:
commit 35a17267da430dbe638f0b56ede7c19dadb6b682
Author: Pranam Lashkari 
AuthorDate: Tue May 5 23:17:29 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 21:00:37 2020 +0200

resolved: Strange behavior of Paragraph Spacing controls

Increase Paragraph Spacing on the sidebar paragraph Spacing spinners aren't 
increased

Change-Id: Icc1ae684ff607909f87646c69e9acebf8f3d8000
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93511
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 2ab871e806595d555c0460652b52a3f369f95b57)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94275
Tested-by: Andras Timar 

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 3d2c68960752..13a998c95744 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -321,6 +321,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
 Invalidate();
 // to refresh preview (in outline mode), slot has to be 
invalidated:
 mpViewShell->GetViewFrame()->GetBindings().Invalidate( 
SID_PREVIEW_STATE, true );
+mpViewShell->GetViewFrame()->GetBindings().Invalidate( 
SID_ATTR_PARA_ULSPACE, true );
 }
 break;
 
___
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' - sw/source

[Pranam Lashkari (via logerrit)]

 sw/source/ui/frmdlg/frmdlg.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 837c067ded097d257332c6948f237bff72bea0b8
Author: Pranam Lashkari 
AuthorDate: Sun Apr 26 23:25:47 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 20:59:36 2020 +0200

remove macro tab for image dialog in online

Change-Id: I02de19e8048fd045a6ef6bdcc655c9911f0f9f01
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92958
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit 51d192a3bfa24dc979f7ad6178803d3262290b46)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94274
Tested-by: Andras Timar 

diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 2deb04142e7e..ca59c421b394 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // the dialog's carrier
 SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
@@ -112,6 +113,9 @@ SwFrameDlg::SwFrameDlg(SfxViewFrame const * pViewFrame,
 }
 }
 
+if(comphelper::LibreOfficeKit::isActive())
+RemoveTabPage("macro");
+
 if (m_bNew)
 SetCurPageId("type");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 fpicker/source/win32/IVistaFilePickerInternalNotify.hxx |1 -
 fpicker/source/win32/VistaFilePickerEventHandler.hxx|1 -
 2 files changed, 2 deletions(-)

New commits:
commit 01bdd3a8d17b53c4b953b074dbcd262a125527d8
Author: Julien Nabet 
AuthorDate: Mon May 18 18:03:55 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 18 20:59:35 2020 +0200

Unused #include "comptr.hxx"

Change-Id: I42ae8fd069a328df2b98e62ce3980dba8fb221b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94437
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx 
b/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
index 57f995715719..f39d5aff4560 100644
--- a/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
@@ -20,7 +20,6 @@
 #ifndef 
INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
 #define 
INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_IVISTAFILEPICKERINTERNALNOTIFY_HXX
 
-#include "comptr.hxx"
 #include "vistatypes.h"
 
 #include 
diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.hxx 
b/fpicker/source/win32/VistaFilePickerEventHandler.hxx
index 5cdb1bcc85b9..3ea47dbd8640 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.hxx
@@ -22,7 +22,6 @@
 
 #include 
 
-#include "comptr.hxx"
 #include "vistatypes.h"
 #include "IVistaFilePickerInternalNotify.hxx"
 
___
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' - sw/qa sw/source

[Justin Luth (via logerrit)]

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

New commits:
commit c3bbfc91b48654120e70ad769c5bb27f9cfa110e
Author: Justin Luth 
AuthorDate: Wed Apr 22 11:43:22 2020 +0300
Commit: Andras Timar 
CommitDate: Mon May 18 20:58:43 2020 +0200

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

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

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

A previous commit for tdf#73056 was needed to import
these sequences - instead of only the first instance.

Change-Id: I513c432ec11a78c7bb52ac6fb628851192e88023
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93638
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index acc68352102d..c8bbe96a1b9d 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -171,9 +171,8 @@ DECLARE_WW8EXPORT_TEST(testTdf73056_cellMargins, 
"tdf73056_cellMargins.doc")
 
 // only the first cell with specific margins was processed, leaving the 
rest at table defaults. Was 0.
 uno::Reference< beans::XPropertySet > xPropSet( xCell, 
uno::UNO_QUERY_THROW );
-if ( !mbExported )
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "bottom cell spacing to contents",
-sal_Int32(101), getProperty(xPropSet, 
"BottomBorderDistance" ) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "bottom cell spacing to contents",
+sal_Int32(101), getProperty(xPropSet, 
"BottomBorderDistance" ) );
 }
 DECLARE_WW8EXPORT_TEST(testTdf79435_legacyInputFields, 
"tdf79435_legacyInputFields.docx")
 {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e908cab35162..555f01de8f7d 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2571,6 +2571,21 @@ void WW8AttributeOutput::TableCellBorders(
 const SvxBoxItem * pLastBox = nullptr;
 sal_uInt8 nSeqStart = 0; // start of sequence of cells with same borders
 
+static const SvxBoxItemLine aBorders[] =
+{
+SvxBoxItemLine::TOP, SvxBoxItemLine::LEFT,
+SvxBoxItemLine::BOTTOM, SvxBoxItemLine::RIGHT
+};
+
+sal_uInt16 nDefaultMargin[4] = {31681, 31681, 31681, 31681};  // outside 
of documented valid range
+// last column in each row defines the row default in 
TableRowDefaultBorders()
+if ( nBoxes && rTabBoxes.size() == nBoxes )
+{
+const SvxBoxItem& rBox = rTabBoxes[ nBoxes-1 
]->GetFrameFormat()->GetBox();
+for ( int i = 0; i < 4; ++i )
+nDefaultMargin[i] = rBox.GetDistance( aBorders[i] );
+}
+
 // Detect sequences of cells which have the same borders, and output
 // a border description for each such cell range.
 for ( unsigned n = 0; n <= nBoxes; ++n )
@@ -2581,9 +2596,53 @@ void WW8AttributeOutput::TableCellBorders(
 pLastBox = pBox;
 else if( !pBox || *pLastBox != *pBox )
 {
+if ( !pLastBox )
+break;
+
 // This cell has different borders than the previous cell,
 // so output the borders for the preceding cell range.
 m_rWW8Export.Out_CellRangeBorders(pLastBox, nSeqStart, n);
+
+// The last column is used as the row default for margins, so we 
can ignore these matching ones
+if ( n == nBoxes )
+break;
+
+// Output cell margins.
+// One CSSA can define up to all four margins if they are the same 
size value.
+sal_uInt16 nMargin[4];
+sal_uInt8 nSideBits[4] = {0, 0, 0, 0}; // 0001:top, 0010:left, 
0100:bottom, 1000:right
+for ( int i = 0; i < 4; ++i )  // sides: top, left, bottom, right
+{
+nMargin[i] = std::min(sal_uInt16(31680), 
pLastBox->GetDistance( aBorders[i] ));
+if ( nMargin[i] == nDefaultMargin[i] )
+continue;
+
+// join a previous side's definition if it shares the same 
value
+for ( int p = 0; p < 4; ++p )
+{
+if ( nMargin[i] == nMargin[p] )
+{
+nSideBits[p] |= 1 << i;
+break;
+}
+}
+}
+
+// write out the cell margins definitions that were used
+for ( int i = 0; i < 4; ++i )
+{
+if ( nSideBits[i] )
+{
+SwWW8Writer::InsUInt16( *m_rWW8Export.pO, 
NS_sprm::sprmTCellPadding );
+m_rWW8Export.pO->push_back( sal_uInt8(6) );// 
6 bytes
+   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/data/tdf73056_cellMargins.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx|   13 +++
 sw/source/filter/ww8/ww8par2.cxx |   34 ++-
 3 files changed, 32 insertions(+), 15 deletions(-)

New commits:
commit 66d3832a1e9d09611f7c68d045270c906224b7ca
Author: Justin Luth 
AuthorDate: Tue Apr 21 14:25:38 2020 +0300
Commit: Andras Timar 
CommitDate: Mon May 18 20:58:18 2020 +0200

tdf#73056 doc import: table margins - unknown byte is EndCell

The problem was that the cell margin that overrides the
table defaults was only being applied to one cell,
while a range of cells might be defined.

a sprmTCellPadding is specified by a CSSA.
The CSSA starts with an ItcFirstLim, which consists of
a start and end cell. The end cell is NOT included.

Change-Id: Ia90bc28451d39d60ce343d24b02fd3661b05d950
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92628
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93637
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/sw/qa/extras/ww8export/data/tdf73056_cellMargins.doc 
b/sw/qa/extras/ww8export/data/tdf73056_cellMargins.doc
new file mode 100644
index ..7ae12d452e94
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf73056_cellMargins.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 38e79fed25e5..acc68352102d 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -162,6 +162,19 @@ DECLARE_WW8EXPORT_TEST(testFdo53985, "fdo53985.doc")
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Section4 is protected", false, 
getProperty(xSect, "IsProtected"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf73056_cellMargins, "tdf73056_cellMargins.doc")
+{
+uno::Reference< text::XTextTablesSupplier > xTablesSupplier( mxComponent, 
uno::UNO_QUERY );
+uno::Reference< container::XIndexAccess >   xTables( 
xTablesSupplier->getTextTables(), uno::UNO_QUERY );
+uno::Reference< text::XTextTable > xTable1( xTables->getByIndex( 0 ), 
uno::UNO_QUERY );
+uno::Reference< table::XCell > xCell = xTable1->getCellByName( "B4" );
+
+// only the first cell with specific margins was processed, leaving the 
rest at table defaults. Was 0.
+uno::Reference< beans::XPropertySet > xPropSet( xCell, 
uno::UNO_QUERY_THROW );
+if ( !mbExported )
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "bottom cell spacing to contents",
+sal_Int32(101), getProperty(xPropSet, 
"BottomBorderDistance" ) );
+}
 DECLARE_WW8EXPORT_TEST(testTdf79435_legacyInputFields, 
"tdf79435_legacyInputFields.docx")
 {
 //using .docx input file to verify cross-format compatibility.
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 12ce9f9e8db1..058662e47c12 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1499,29 +1499,33 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const 
sal_uInt8* pParams)
 OSL_ENSURE(nLen == 6, "Unexpected spacing len");
 if (nLen != 6)
 return;
-sal_uInt8 nWhichCell = *pParams++;
-OSL_ENSURE(nWhichCell < MAX_COL + 1, "Cell out of range in spacings");
-if (nWhichCell >= MAX_COL + 1)
+
+const sal_uInt8 nStartCell = *pParams++; // The first cell these margins 
could apply to.
+const sal_uInt8 nEndCell = *pParams++;   // The cell that does NOT apply 
these margins.
+OSL_ENSURE(nStartCell < MAX_COL + 1, "Cell out of range in spacings");
+if ( nStartCell >= nEndCell || nEndCell > MAX_COL+1 )
 return;
 
-++pParams; //unknown byte
 sal_uInt8 nSideBits = *pParams++;
 OSL_ENSURE(nSideBits < 0x10, "Unexpected value for nSideBits");
-nOverrideSpacing[nWhichCell] |= nSideBits;
 
-OSL_ENSURE(nOverrideSpacing[nWhichCell] < 0x10,
-"Unexpected value for nSideBits");
-#if OSL_DEBUG_LEVEL > 0
-sal_uInt8 nUnknown2 = *pParams;
-OSL_ENSURE(nUnknown2 == 0x3, "Unexpected value for spacing2");
-#endif
-++pParams;
+const sal_uInt8 nSizeType = *pParams++; // Fts: FtsDxa(0x3) is the only 
type that mentions cellMargin
+OSL_ENSURE(nSizeType == 0x3, "Unexpected non-twip value for margin width");
+if ( nSizeType != 0x3 )   // i.e FtsNil: The size is wrong (or 
unconverted) and MUST be ignored
+return;
+
 sal_uInt16 nValue =  SVBT16ToUInt16( pParams );
 
-for (int i=0; i < 4; i++)
+for (int nCell = nStartCell; nCell < nEndCell; ++nCell)
 {
-if (nSideBits & (1 << i))
-nOverrideValues[nWhichCell][i] = nValue;
+nOverrideSpacing[ nCell ] |= nSideBits;
+OSL_ENSURE(nOverrideSpacing[ nCell ] < 0x10, "Unexpected value for 
nSideBits");
+
+for (int i=0; i < 4; i++)
+{
+if (nSideBits & (1 << i))
+nOverrideV

Re: Guidance to where in the codebase the Menu structure is built

[Regina Henschel]

KKing schrieb am 18-May-20 um 16:13:
I have pulled code for Libreoffice 7.0.0.0 and have built it on Debian 
10 and seems to run fine.


I would like to look at modifying the default Menu structure potentially 
dependant on the user or a startup parameter.


Could someone point me to where in the codebase the default Menus get 
built?


There are a couple of things want to look at, but one of the main 
requests we get is if the old school list of 9 most recent documents (or 
we have had variation request of 9 favourite) can be assigned to the 
file menu so it is easier and quicker to just use keyboard to get access 
to the files e.g.  Alt+F-2   would load the 2nd most recent document.


The list of recent files is in file registrymodifications.xcu in the 
user directory. It should be possible to read it from there via macro, 
then make macros which opens the 1st, 2nd ... and then add items to the 
menu, which call these macros.


Or if using mouse it acceptable, the field "Load URL" in a toolbar might 
work for you too. That field shows the full path and not only the 
document name.


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 3 commits - dbaccess/source sc/source sw/source

[Vasily Melenchuk (via logerrit)]

 dbaccess/source/ui/dlg/ConnectionPage.cxx |1 +
 sc/source/core/opencl/formulagroupcl.cxx  |4 ++--
 sw/source/core/unocore/unodraw.cxx|   11 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 240a7c9cd6e064bbb5d9501c392e6a6897b703d4
Author: Vasily Melenchuk 
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Andras Timar 
CommitDate: Mon May 18 20:44:33 2020 +0200

tdf#128665: sw: set unique name for shape format

Set name even if received shape name is empty. This is required
to have unique style name for undo/redo correct work.

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

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index b205802231df..698b05b5ac96 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;
commit 5d617bfd96e8dd983e0fd962c5c323d9e8faf539
Author: Stephan Bergmann 
AuthorDate: Fri Dec 6 16:59:34 2019 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 20:44:24 2020 +0200

loplugin:implicitboolconversion

...in non-dependent templated code that Clang trunk now apparently processes
more aggressively, presumably since  "Reapply 'Fix crash on 
switch
conditions of non-integer types in templates'"

Change-Id: I561d046c736b4e9574565c01daf0f59e7d5ec414
Reviewed-on: https://gerrit.libreoffice.org/84656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93696
Reviewed-by: Tor Lillqvist 

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 27f3d2674ab7..f126311d5bf3 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1204,9 +1204,9 @@ public:
 
 size_t GetWindowSize() const { return mpDVR->GetRefRowSize(); }
 
-size_t GetStartFixed() const { return bIsStartFixed; }
+bool GetStartFixed() const { return bIsStartFixed; }
 
-size_t GetEndFixed() const { return bIsEndFixed; }
+bool GetEndFixed() const { return bIsEndFixed; }
 
 protected:
 bool bIsStartFixed, bIsEndFixed;
commit 3b6ad03de7b4c29891216c6be6dbb9e0f7442be1
Author: Julien Nabet 
AuthorDate: Sat May 16 19:39:29 2020 +0200
Commit: Andras Timar 
CommitDate: Mon May 18 20:44:14 2020 +0200

tdf#97416: fix Database password properties in ODB file not re-settable via 
UI

Just call save_state() of the checkbox

Change-Id: I3fa434b080efdcd284fba8e2f73d8e4846870576
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94363
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 
Reviewed-by: Julien Nabet 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94374

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx 
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 2fec1cee16b6..e763e3097c2d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -238,6 +238,7 @@ namespace dbaui
 m_xUserName->save_value();
 m_xConnectionURL->save_value();
 m_xJavaDriver->save_value();
+m_xPasswordRequired->save_state();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |   56 ++---
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx |   17 +-
 sc/source/ui/drawfunc/fuins2.cxx|   73 ++--
 sc/source/ui/inc/fuinsert.hxx   |   10 +
 sc/source/ui/inc/tabvwsh.hxx|2 
 sc/source/ui/view/tabvwsh2.cxx  |2 
 sc/source/ui/view/tabvwsh4.cxx  |1 
 sc/source/ui/view/tabvwshb.cxx  |   35 +
 sw/source/uibase/inc/chartins.hxx   |8 +
 sw/source/uibase/inc/textsh.hxx |3 
 sw/source/uibase/shells/textsh.cxx  |   23 +++
 sw/source/uibase/table/chartins.cxx |   32 ++---
 vcl/source/control/wizardmachine.cxx|   15 +-
 13 files changed, 169 insertions(+), 108 deletions(-)

New commits:
commit 77445e201c45e5593761e8399c32f80eea2178a4
Author: Szymon Kłos 
AuthorDate: Wed Apr 17 17:33:10 2019 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 20:45:26 2020 +0200

Make Chart Creation Wizard async

* FuInsertChart as a memeber in ScTabViewShell
  stores instance is needed to react on the dialog's result
* CreationWizardUnoDlg converted to XAsynchronousExecutableDialog
  added dialog close handler which notifies listeners
  In the Online dialog become dead after closing, additional
  PostUserEvent was needed to kill the dialog after real close
  (without it user needed to select any cell to close dialog)
* Reuse in Writer

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

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 40ab5f3d90ce..5411277f8f0b 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -29,6 +29,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace chart
 {
@@ -81,9 +83,9 @@ void SAL_CALL CreationWizardUnoDlg::release() throw ()
 }
 uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & 
rType )
 {
-if (rType == cppu::UnoType::get())
+if (rType == 
cppu::UnoType::get())
 {
-void * p = static_cast< ui::dialogs::XExecutableDialog * >( this );
+void * p = static_cast< ui::dialogs::XAsynchronousExecutableDialog * 
>( this );
 return uno::Any( &p, rType );
 }
 else if (rType == cppu::UnoType::get())
@@ -118,9 +120,8 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes()

cppu::UnoType::get(),

cppu::UnoType::get(),

cppu::UnoType::get(),
-   
cppu::UnoType::get(),
+   
cppu::UnoType::get(),

cppu::UnoType::get() };
-
 return aTypeList;
 }
 
@@ -145,7 +146,7 @@ void SAL_CALL CreationWizardUnoDlg::disposing( const 
lang::EventObject& /*Source
 //Listener should deregister himself and release all references to the 
closing object.
 }
 
-void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ )
+void SAL_CALL CreationWizardUnoDlg::setDialogTitle( const OUString& /*rTitle*/ 
)
 {
 }
 void CreationWizardUnoDlg::createDialogOnDemand()
@@ -169,24 +170,41 @@ void CreationWizardUnoDlg::createDialogOnDemand()
 uno::Reference< XComponent > xKeepAlive( this );
 if( m_xChartModel.is() )
 {
-m_xDialog = 
std::make_unique(Application::GetFrameWeld(m_xParentWindow), 
m_xChartModel, m_xCC);
+m_xDialog = 
std::make_shared(Application::GetFrameWeld(m_xParentWindow), 
m_xChartModel, m_xCC);
 }
 }
 
-sal_Int16 SAL_CALL CreationWizardUnoDlg::execute(  )
+IMPL_STATIC_LINK_NOARG(CreationWizardUnoDlg, InstallLOKNotifierHdl, void*, 
vcl::ILibreOfficeKitNotifier*)
 {
-sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
-{
-SolarMutexGuard aSolarGuard;
-createDialogOnDemand();
-if (!m_xDialog)
-return nRet;
-TimerTriggeredControllerLock aTimerTriggeredControllerLock( 
m_xChartModel );
-if( m_bUnlockControllersOnExecute && m_xChartModel.is() )
-m_xChartModel->unlockControllers();
-nRet = m_xDialog->run();
-}
-return nRet;
+return SfxViewShell::Current();
+}
+
+void SAL_CALL CreationWizardUnoDlg::startExecuteModal( const 
css::uno::Reference& xListener )
+{
+SolarMutexGuard aSolarGuard;
+createDialogOnDemand();
+
+if( !m_xDialog )
+return

Re: Guidance to where in the codebase the Menu structure is built

[Caolán McNamara]

On Mon, 2020-05-18 at 15:13 +0100, KKing wrote:
> Could someone point me to where in the codebase the default Menus get
> built?
> 
> There are a couple of things want to look at, but one of the main 
> requests we get is if the old school list of 9 most recent documents
> (or we have had variation request of 9 favourite) can be assigned to
> the file menu so it is easier and quicker to just use keyboard to get
> access to the files e.g.  Alt+F-2   would load the 2nd most recent
> document.

FWIW, sw/uiconfig/swriter/menubar/menubar.xml describes the default
writer menus. You can see that the recently used menu parent entry is
"uno:RecentFileList", that submenu is "special" in that RecentFileList
appears in
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu as
having a special controller of
"com.sun.star.comp.framework.RecentFilesMenuController" and that
corresponds to framework/source/uielement/recentfilesmenucontroller.cxx
which has RecentFilesMenuController::fillPopupMenu which puts the
recently used entries into that special submenu.

I'm not personally aware if it's possible, given the byzantine menu
description system, to have a dynamic/mru section in the toplevel File
menu

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

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

[Julien Nabet (via logerrit)]

 filter/source/graphicfilter/ieps/ieps.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 835bced249e95ccbf0a88266f8c1ba166cf5efcb
Author: Julien Nabet 
AuthorDate: Mon May 18 13:41:31 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 18 20:24:16 2020 +0200

fix potential leak in runProcessWithPathSearch (filter/ieps)

Change-Id: Ifa1d3c7aba95aa0800d6d0481d0258367ac1317a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94417
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index 1aaed97295b6..413e6725fc73 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -151,7 +151,7 @@ static oslProcessError runProcessWithPathSearch(const 
OUString &rProgName,
 rtl_uString* pArgs[], sal_uInt32 nArgs, oslProcess *pProcess,
 oslFileHandle *pIn, oslFileHandle *pOut, oslFileHandle *pErr)
 {
-oslProcessError result;
+oslProcessError result = osl_Process_E_None;
 oslSecurity pSecurity = osl_getCurrentSecurity();
 #ifdef _WIN32
 /*
@@ -174,11 +174,11 @@ static oslProcessError runProcessWithPathSearch(const 
OUString &rProgName,
 
 oslFileError err = osl_searchFileURL(rProgName.pData, path.pData, 
&url.pData);
 if (err != osl_File_E_None)
-return osl_Process_E_NotFound;
-
-result = osl_executeProcess_WithRedirectedIO(url.pData,
-pArgs, nArgs, osl_Process_HIDDEN,
-pSecurity, nullptr, nullptr, 0, pProcess, pIn, pOut, pErr);
+result = osl_Process_E_NotFound;
+else
+result = osl_executeProcess_WithRedirectedIO(url.pData,
+pArgs, nArgs, osl_Process_HIDDEN,
+pSecurity, nullptr, nullptr, 0, pProcess, pIn, pOut, pErr);
 #else
 result = osl_executeProcess_WithRedirectedIO(rProgName.pData,
 pArgs, nArgs, osl_Process_SEARCHPATH | osl_Process_HIDDEN,
___
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' - 6 commits - bridges/source sd/uiconfig sfx2/source sw/source vcl/uiconfig

[Muhammet Kara (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |7 -
 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx |  117 +-
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |1 
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |4 
 sd/uiconfig/simpress/ui/tabledesignpanel.ui   |1 
 sfx2/source/sidebar/DeckLayouter.cxx  |8 -
 sw/source/uibase/dochdl/swdtflvr.cxx  |3 
 vcl/uiconfig/theme_definitions/ios/definition.xml |7 -
 8 files changed, 107 insertions(+), 41 deletions(-)

New commits:
commit 2b6397882c3d3e22b6a80154008b509a9541b42d
Author: Muhammet Kara 
AuthorDate: Tue Dec 10 18:59:36 2019 +0300
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

Sidebar: Don't expand table design styles vertically

Otherwise, they become veeery high in Online.

Change-Id: I2572eb6ac94ad5e46aa596095cd718aef63eed6c
Reviewed-on: https://gerrit.libreoffice.org/84868
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/sd/uiconfig/simpress/ui/tabledesignpanel.ui 
b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
index 2e215515dd7c..28833b46e9ea 100644
--- a/sd/uiconfig/simpress/ui/tabledesignpanel.ui
+++ b/sd/uiconfig/simpress/ui/tabledesignpanel.ui
@@ -113,7 +113,6 @@
 True
 False
 True
-True
   
   
 0
commit 28c19dafdeec7e367569febfaeb63bc3cb10af52
Author: Ashod Nakashian 
AuthorDate: Sun Dec 8 11:26:27 2019 -0500
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

sidebar: no scrollbar in LOK

Scrolling in LOK is done in the client. We render
the sidebar as long as the original height is
(the minimum that will fit all panels) and scroll
in the client. For that, we keep the scrollbar
disabled when layouting the Deck.

Reviewed-on: https://gerrit.libreoffice.org/84720
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Ashod Nakashian 
(cherry picked from commit 09ddec08eaa0af1ca6a5f8a376abae9e62fe2607)

Change-Id: If0d813b04af679768f80ee88fc976bce9cde46d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85785
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 

diff --git a/sfx2/source/sidebar/DeckLayouter.cxx 
b/sfx2/source/sidebar/DeckLayouter.cxx
index 652268567753..bc1bf6e93986 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -179,8 +180,8 @@ tools::Rectangle LayoutPanels (
 nTotalPreferredHeight += rItem.maLayoutSize.Preferred;
 }
 
-if (nTotalMinimumHeight > nAvailableHeight
-&& ! bShowVerticalScrollBar)
+if (nTotalMinimumHeight > nAvailableHeight && !bShowVerticalScrollBar
+&& !comphelper::LibreOfficeKit::isActive())
 {
 // Not enough space, even when all panels are shrunk to their
 // minimum height.
@@ -524,7 +525,8 @@ void DistributeHeights (
 // There are no panels with unrestricted height.
 return;
 }
-const sal_Int32 nAdditionalHeightPerPanel (nRemainingHeightToDistribute / 
nNoMaximumCount);
+
+const sal_Int32 nAdditionalHeightPerPanel(nRemainingHeightToDistribute / 
nNoMaximumCount);
 // Handle rounding error.
 sal_Int32 nAdditionalHeightForFirstPanel (nRemainingHeightToDistribute
 - nNoMaximumCount*nAdditionalHeightPerPanel);
commit 4fc6d01047d71128617ac3e359a1fcad379a9280
Author: Dennis Francis 
AuthorDate: Fri Feb 7 12:08:21 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 19:15:43 2020 +0200

Classify shape(s) selections as 'complex'...

in isComplex() of XTransferable2 implementation SwTransferable.
This method is used by online via doc_getSelectionType() to determine the
type of selection. In writer this method used to classify shape objects as
non-complex which translates to 'text' in online, so if a shape is selected
in online, the js code there would treat it as text. This is problematic
when you want to send the correct align uno commands based on selection 
type.
So returning true in isComplex() for writer would correctly treat the shape
selections as 'complex' in online Writer.

Change-Id: I09fcd9e4fab48aa0d7e7d04c88bae9e1281a1b0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88158
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit c7178a12e6e57e3d85cecd09e9c0373ececbb33f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88495
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index f6e5990b1b3d..26567bca7743 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -463,6 +463,9 @@ sal_Bool SAL_C

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

[Justin Luth (via logerrit)]

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

New commits:
commit c50315c55dbb5daf86ccb2a91468c05a53e926e9
Author: Justin Luth 
AuthorDate: Mon May 18 12:21:04 2020 +0300
Commit: Justin Luth 
CommitDate: Mon May 18 19:24:10 2020 +0200

tdf#95495 ooxmlexport3: less implementation-specific unit test

Although the original document completely defines the numbering
in (inherited) paragraph styles, the unit test was checking
whether the paragaph itself had the exported numbering.
That tests the current implementation where style information
is copied to the paragrah, but in a correct world that information
would stay in the styles.

This unit test uses the EXTREME example where a "chapter numbering"
is inherited by a sub-style - something LO completely does not
support, so this needs serious emulation. Thus I am keeping
the implementation-specific check, but clearly documenting
that fact.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 48b2cef55586..2876bb47929a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1085,7 +1085,13 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingLevels, 
"tdf95495.docx")
 return;
 
 // tdf#95495: set list level of the custom style based on the setting of 
the parent style
+// [this assertXPath is not a very good test, since the numbering 
definition is not set on the paragraph itself,
+//  but in a style. This just tests the current copy-to-paragraph 
implementation. But leaving it for now,
+//  since this example is very much a corner case, so anyone trespassing 
here should double-check everything...]
 assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:numPr/w:ilvl 
[@w:val = '1']", 1);
+
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//body/txt[5]/LineBreak", "Line", "A.2.1 
.DESCRIPTION");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testVerticalBorders, "calendar3.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 desktop/inc/strings.hrc|1 +
 desktop/source/deployment/misc/dp_dependencies.cxx |9 +
 2 files changed, 10 insertions(+)

New commits:
commit 74597acc9318177a0266535b5387dba35305171a
Author: Tor Lillqvist 
AuthorDate: Mon May 18 16:44:20 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 18 18:52:20 2020 +0200

tdf#129177: Allow extensions to specify also maximum LibreOffice version

To be used by the potential packaging of language packs as extensions.
Language packs are by necessity specific to a LibreOffice version as
they contain message catalogs.

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

diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc
index 0f027731141a..d6d2c6244210 100644
--- a/desktop/inc/strings.hrc
+++ b/desktop/inc/strings.hrc
@@ -114,6 +114,7 @@
 #define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN 
NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN", "Extension requires at least 
OpenOffice.org reference version %VERSION")
 #define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX 
NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX", "Extension does not support 
OpenOffice.org reference versions greater than %VERSION")
 #define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN  
NC_("RID_DEPLOYMENT_DEPENDENCIES_LO_MIN", "Extension requires at least 
%PRODUCTNAME version %VERSION")
+#define RID_DEPLOYMENT_DEPENDENCIES_LO_MAX  
NC_("RID_DEPLOYMENT_DEPENDENCIES_LO_MAX", "Extension does not support 
%PRODUCTNAME versions greater than %VERSION")
 
 #define RID_STR_WARNING_VERSION_LESS
NC_("RID_STR_WARNING_VERSION_LESS", "You are about to install version $NEW of 
the extension '$NAME'.\n" \
"The newer 
version $DEPLOYED is already installed.\n"\
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx 
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 0105c4ba7d62..081144af3bc1 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -47,6 +47,7 @@ static char const namespaceOpenOfficeOrg[] =
 "http://openoffice.org/extensions/description/2006";;
 
 static char const minimalVersionLibreOffice[] = "LibreOffice-minimal-version";
+static char const maximalVersionLibreOffice[] = "LibreOffice-maximal-version";
 
 static char const minimalVersionOpenOfficeOrg[] =
 "OpenOffice.org-minimal-version";
@@ -134,6 +135,9 @@ check(dp_misc::DescriptionInfoset const & infoset) {
 sat = satisfiesMinimalVersion(
 getLibreOfficeMajorMinorMicro(),
 e->getAttribute("value"));
+} else if (e->getNamespaceURI() == namespaceLibreOffice && 
e->getTagName() == maximalVersionLibreOffice )
+{
+sat = satisfiesMaximalVersion(getLibreOfficeMajorMinorMicro(), 
e->getAttribute("value"));
 } else if (e->hasAttributeNS(namespaceOpenOfficeOrg,
minimalVersionOpenOfficeOrg))
 {
@@ -169,6 +173,11 @@ OUString getErrorText(
 return produceErrorText(
 DpResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN),
 dependency->getAttribute("value"));
+} else if (dependency->getNamespaceURI() == namespaceLibreOffice && 
dependency->getTagName() == maximalVersionLibreOffice )
+{
+return produceErrorText(
+DpResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MAX),
+dependency->getAttribute("value"));
 } else if (dependency->hasAttributeNS(namespaceOpenOfficeOrg,
minimalVersionOpenOfficeOrg))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |  100 
+-
 1 file changed, 50 insertions(+), 50 deletions(-)

New commits:
commit dd5ce7df94ad939fe93712c79ef58836d01b4aa8
Author: Tamás Zolnai 
AuthorDate: Mon May 18 14:02:36 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 18:42:14 2020 +0200

cypress: make zooming more stable in form field tests.

Change-Id: Ie897b256f13f06e7fc66bd0fac25376b849e5429
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94421
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 6aba35888..64e798b45 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -8,6 +8,14 @@ describe('Form field button tests.', function() {
helper.afterAll('form_field.odt', 'writer');
});
 
+   function before(fileName, subFolder) {
+   helper.loadTestDoc(fileName, subFolder);
+
+   // Wait for the sidebar to change the zoom level by load
+   cy.get('#tb_actionbar_item_zoom .w2ui-tb-caption')
+   .should('not.have.text', '100');
+   }
+
function buttonShouldNotExist() {
cy.get('.form-field-frame')
.should('not.exist');
@@ -48,8 +56,35 @@ describe('Form field button tests.', function() {
});
}
 
+   function doZoom(zoomIn) {
+   helper.initAliasToEmptyString('prevZoom');
+
+   cy.get('#tb_actionbar_item_zoom .w2ui-tb-caption')
+   .invoke('text')
+   .as('prevZoom');
+
+   cy.get('@prevZoom')
+   .should('not.be.equal', '');
+
+   if (zoomIn) {
+   cy.get('.w2ui-tb-image.w2ui-icon.zoomin')
+   .click();
+   } else {
+   cy.get('.w2ui-tb-image.w2ui-icon.zoomout')
+   .click();
+   }
+
+   cy.get('@prevZoom')
+   .then(function(prevZoom) {
+   cy.get('#tb_actionbar_item_zoom 
.w2ui-tb-caption')
+   .should(function(zoomItem) {
+   
expect(zoomItem.text()).to.be.not.equal(prevZoom);
+   });
+   });
+   }
+
it('Activate and deactivate form field button.', function() {
-   helper.loadTestDoc('form_field.odt', 'writer');
+   before('form_field.odt', 'writer');
 
// We don't have the button by default
buttonShouldNotExist();
@@ -80,7 +115,7 @@ describe('Form field button tests.', function() {
});
 
it('Check drop down list.', function() {
-   helper.loadTestDoc('form_field.odt', 'writer');
+   before('form_field.odt', 'writer');
 
// Move the cursor next to the form field
cy.get('textarea.clipboard')
@@ -123,7 +158,7 @@ describe('Form field button tests.', function() {
});
 
it('Test field editing', function() {
-   helper.loadTestDoc('form_field.odt', 'writer');
+   before('form_field.odt', 'writer');
 
// Move the cursor next to the form field
cy.get('textarea.clipboard')
@@ -186,7 +221,7 @@ describe('Form field button tests.', function() {
});
 
it('Multiple form field button activation.', function() {
-   helper.loadTestDoc('multiple_form_fields.odt', 'writer');
+   before('multiple_form_fields.odt', 'writer');
 
// We don't have the button by default
buttonShouldNotExist();
@@ -223,7 +258,7 @@ describe('Form field button tests.', function() {
});
 
it('Test drop-down field with no selection.', function() {
-   helper.loadTestDoc('drop_down_form_field_noselection.odt', 
'writer');
+   before('drop_down_form_field_noselection.odt', 'writer');
 
// Move the cursor next to the form field
cy.get('textarea.clipboard')
@@ -236,7 +271,7 @@ describe('Form field button tests.', function() {
});
 
it('Test drop-down field with no items.', function() {
-   helper.loadTestDoc('drop_down_form_field_noitem.odt', 'writer');
+   before('drop_down_form_field_noitem.odt', 'writer');
 
// Move the cursor next to the form field
cy.get('textarea.clipboard')
@@ -263,8 +298,8 @@ describe('Form field button tests.', function() {
.should('not.exist');
});
 
-   it.sk

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js  |   17 +
 cypress_test/integration_tests/desktop/writer/form_field_spec.js |   89 
++
 loleaflet/src/layer/FormFieldButtonLayer.js  |9 -
 3 files changed, 112 insertions(+), 3 deletions(-)

New commits:
commit 18325d8889f716ac5c5b243dfb27a43761ff49ef
Author: Tamás Zolnai 
AuthorDate: Mon May 18 13:16:15 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 18:41:48 2020 +0200

MSForms: make list items's font size relative to the button size.

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

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index 8d68cfb38..b2053c4a7 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -188,6 +188,22 @@ function initAliasToNegative(aliasName) {
cy.log('Initializing alias to a negative value - end.');
 }
 
+function initAliasToEmptyString(aliasName) {
+   cy.log('Initializing alias to empty string - start.');
+   cy.log('Param - aliasName: ' + aliasName);
+
+   // Do an empty slice to generate empty string
+   cy.get('#copy-paste-container')
+   .invoke('css', 'display')
+   .invoke('slice', '0', '0')
+   .as(aliasName);
+
+   cy.get('@' + aliasName)
+   .should('be.equal', '');
+
+   cy.log('Initializing alias to empty string - end.');
+}
+
 function isCalc() {
return Cypress.$('.spreadsheet-header-columns').length != 0;
 }
@@ -221,6 +237,7 @@ module.exports.clearAllText = clearAllText;
 module.exports.expectTextForClipboard = expectTextForClipboard;
 module.exports.afterAll = afterAll;
 module.exports.initAliasToNegative = initAliasToNegative;
+module.exports.initAliasToEmptyString = initAliasToEmptyString;
 module.exports.isCalc = isCalc;
 module.exports.isImpress = isImpress;
 module.exports.isWriter = isWriter;
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 1d2528472..6aba35888 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -315,5 +315,75 @@ describe('Form field button tests.', function() {
cy.contains('#tb_actionbar_item_zoom', '120')
.should('exist');
});
+
+   it.skip('Test dynamic font size.', function() {
+   helper.loadTestDoc('form_field.odt', 'writer');
+
+   // Move the cursor next to the form field
+   cy.get('textarea.clipboard')
+   .type('{rightArrow}');
+
+   buttonShouldExist();
+
+   // Get the initial font size from the style
+   helper.initAliasToEmptyString('prevFontSize');
+
+   cy.get('.drop-down-field-list-item')
+   .invoke('css', 'font-size')
+   .as('prevFontSize');
+
+   cy.get('@prevFontSize')
+   .should('not.be.equal', '');
+
+   // Do a zoom in
+   cy.get('#tb_actionbar_item_zoom')
+   .click();
+
+   cy.contains('.menu-text', '280')
+   .click();
+
+   cy.contains('#tb_actionbar_item_zoom', '280')
+   .should('exist');
+
+   buttonShouldExist();
+
+   // Check that the font size was changed
+   cy.get('@prevFontSize')
+   .then(function(prevFontSize) {
+   cy.get('.drop-down-field-list-item')
+   .should(function(items) {
+   var prevSize = 
parseInt(prevFontSize, 10);
+   var currentSize = 
parseInt(items.css('font-size'), 10);
+   
expect(currentSize).to.be.greaterThan(prevSize);
+   });
+   });
+
+   cy.get('.drop-down-field-list-item')
+   .invoke('css', 'font-size')
+   .as('prevFontSize');
+
+   // Do a zoom out
+   cy.get('#tb_actionbar_item_zoom')
+   .click();
+
+   cy.contains('.menu-text', '85')
+   .click();
+
+   cy.contains('#tb_actionbar_item_zoom', '85')
+   .should('exist');
+
+   buttonShouldExist();
+
+   // Check that the font size was changed
+   cy.get('@prevFontSize')
+   .then(function(prevFontSize) 

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/writeonlyvars.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit fd60c5a4879cb881b6c5abfe53ba80126ebb7303
Author: Stephan Bergmann 
AuthorDate: Mon May 18 14:52:16 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 18 18:32:53 2020 +0200

Adapt compilerplugins/clang/test/writeonlyvars.cxx

...to 1d0bc2139759f087d50432f8a2116060676f34e1
"use std::experimental::source_location in uno::Exception"

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

diff --git a/compilerplugins/clang/test/writeonlyvars.cxx 
b/compilerplugins/clang/test/writeonlyvars.cxx
index 740befb6f172..c2f78bddda88 100644
--- a/compilerplugins/clang/test/writeonlyvars.cxx
+++ b/compilerplugins/clang/test/writeonlyvars.cxx
@@ -16,6 +16,19 @@
 #include 
 #include 
 
+// See 1d0bc2139759f087d50432f8a2116060676f34e1 "use 
std::experimental::source_location in
+// uno::Exception" modification to
+// workdir/UnoApiHeadersTarget/udkapi/normal/com/sun/star/uno/Exception.hdl, 
which is indirectly
+// included through the above #include directives, in turn causing conditional 
inclusion of
+// include/o3tl/runtimetooustring.hxx (and where `ok` is only read in an 
assert in !NDEBUG builds):
+#if defined LIBO_USE_SOURCE_LOCATION
+// expected-error@o3tl/runtimetooustring.hxx:* {{read s 
[loplugin:writeonlyvars]}}
+// expected-error@o3tl/runtimetooustring.hxx:* {{write s 
[loplugin:writeonlyvars]}}
+#if !defined NDEBUG
+// expected-error@o3tl/runtimetooustring.hxx:* {{read ok 
[loplugin:writeonlyvars]}}
+#endif
+#endif
+
 namespace Bar
 {
 void test()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng |  128 
 1 file changed, 128 deletions(-)

New commits:
commit 101594c272a53727566b3533fd083178769a4b49
Author: Michael Stahl 
AuthorDate: Wed Apr 29 16:22:30 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 18:18:50 2020 +0200

schema: adapt libreoffice schema to ODF 1.3

Remove everything that's in ODF 1.3; it's no longer necessary and some
of it requires overriding named patterns from the schema so that has to
be removed.

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

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng 
b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index df9d84f09b7d..2f316b6764a0 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -964,43 +964,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
   
 
 
-
-
-  
-
-
-
-
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
-  
-
-
-
-  
-
-  
-
-
-  
-
-
-  
-
-  
-
-
 
   
 
@@ -1401,23 +1364,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
   
 
 
-  
-
-  
-
-  
-
-  
-
-
-  
-
-  
-  
-
-  
-
-
 
   
 
@@ -1924,32 +1870,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-  
-
-  
-
-  
-
-  
-
   
 
 
@@ -1995,22 +1915,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
-
-   
-  
-  
-
-  
-
-  
-
-   
-  
-  
-
-  
-
   
 
 
@@ -2025,15 +1929,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
-
-  
-  
-
-  
-
-  
-
   
 
 
@@ -2135,15 +2030,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
-  
-
-  
-
-  
-
-  
-
 
   
 
@@ -2269,15 +2155,6 @@ 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
 
   
 
-  
-  
-
-  
-
-  
-
-  
-
   
   
 
@@ -2319,11 +2196,6 @@ 
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: cui/source cui/uiconfig include/unotools officecfg/registry sfx2/source sw/qa unotools/source uui/source xmlsecurity/qa xmlsecurity/source

[Michael Stahl (via logerrit)]

 cui/source/options/optsave.cxx |   10 ++
 cui/uiconfig/ui/optsavepage.ui |6 --
 include/unotools/saveopt.hxx   |6 --
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   10 ++
 sfx2/source/doc/objstor.cxx|2 +-
 sw/qa/extras/fodfexport/fodfexport.cxx |8 
 sw/qa/extras/odfexport/odfexport.cxx   |2 +-
 unotools/source/config/saveopt.cxx |4 
 uui/source/iahndl.cxx  |2 +-
 xmlsecurity/qa/unit/signing/signing.cxx|   10 +-
 xmlsecurity/source/component/documentdigitalsignatures.cxx |2 +-
 11 files changed, 41 insertions(+), 21 deletions(-)

New commits:
commit a541cd91951eca15e40764244b34c72b347f9f26
Author: Michael Stahl 
AuthorDate: Tue Apr 28 18:04:14 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 18:19:03 2020 +0200

officecfg,unotools,cui: add ODF 1.2 Extended / ODF 1.3 versions

... to configuration and UI.

The new default is ODF 1.3 Extended, which is now ODFVER_LATEST and
stored as value "3" in configuration.

Adapt a few places related to DocumentDigitalSignatures etc. to new
default.

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

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index c165a3f9478b..564fabb730f6 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -87,10 +87,12 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xODFWarningFI(m_xBuilder->weld_widget("odfwarning_image"))
 , m_xODFWarningFT(m_xBuilder->weld_label("odfwarning_label"))
 {
-m_xODFVersionLB->set_id(0, OUString::number(2 )); // 1.0/1.1
-m_xODFVersionLB->set_id(1, OUString::number(4 )); // 1.2
-m_xODFVersionLB->set_id(2, OUString::number(8 )); // 1.2 Extended 
(compatibility mode)
-m_xODFVersionLB->set_id(3, OUString::number(0x7fff)); // 1.2 Extended 
(recommended)
+m_xODFVersionLB->set_id(0, OUString::number(SvtSaveOptions::ODFVER_011)); 
// 1.0/1.1
+m_xODFVersionLB->set_id(1, OUString::number(SvtSaveOptions::ODFVER_012)); 
// 1.2
+m_xODFVersionLB->set_id(2, 
OUString::number(SvtSaveOptions::ODFVER_012_EXT_COMPAT)); // 1.2 Extended 
(compatibility mode)
+m_xODFVersionLB->set_id(3, 
OUString::number(SvtSaveOptions::ODFVER_012_EXTENDED)); // 1.2 Extended
+m_xODFVersionLB->set_id(4, OUString::number(SvtSaveOptions::ODFVER_013)); 
// 1.3
+m_xODFVersionLB->set_id(5, 
OUString::number(SvtSaveOptions::ODFVER_LATEST)); // 1.3 Extended (recommended)
 
 m_xDocTypeLB->set_id(0, OUString::number(APP_WRITER)   );
 m_xDocTypeLB->set_id(1, OUString::number(APP_WRITER_WEB)   );
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index e9a090d45091..dccf9d948eba 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -288,7 +288,7 @@
   
 True
 False
-Not using ODF 1.2 Extended may cause information to be 
lost.
+Not using ODF 1.3 Extended may cause information to be 
lost.
   
   
 1
@@ -321,7 +321,9 @@
   1.0/1.1
   1.2
   1.2 Extended (compatibility mode)
-  1.2 Extended (recommended)
+  1.2 Extended
+  1.3
+  1.3 Extended (recommended)
 
   
   
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 2f0460e21fbc..d1e8f32af12b 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -64,6 +64,8 @@ public:
 DO_NOT_USE = 3, // Do not use this, only here for 
compatibility with pre OOo 3.2 configuration
 ODFVER_012 = 4, // ODF 1.2
 ODFVER_012_EXT_COMPAT = 8, // ODF 1.2 extended, but with compatibility 
fallbacks
+ODFVER_012_EXTENDED = 9, // ODF 1.2 extended
+ODFVER_013 = 10,// ODF 1.3
 
 ODFVER_LATEST = SAL_MAX_ENUM,  // ODF latest version with 
enhancements
 };
@@ -82,8 +84,8 @@ public:
 ODFSVER_FUTURE_EXTENDED = 1000 | ODFSVER_EXTENDED, ///< current 
extension, unknown future ODF version
 
 // The latest defined standard. Adapt when a new one is published.
-ODFSVER_LATEST = ODFSVER_012,   ///< @internal DO NOT 
USE in comparisons
-ODFSVER_LATEST_EXTENDED = ODFSVER_012_EX

Re: GSoC'20 Introduction

[Markus Mohrhard]

Hey Ahmed,

On Fri, May 15, 2020 at 12:41 PM ahmed El-Shreif 
wrote:

> Hello,
>
> I am Ahmed ElShreif a senior computer engineering student from Egypt. I am
> really happy to share with all of LO community that I am accepted this year
> again in GSoC.
>
> I was a GSoC'19 student with LO in this project [1]. And I am really happy
> to have the chance to work with LO community again. I would like to thank
> Markus Mohrhard and Xisco Fauli for the support and help that they always
> give to me.
>
> As we have in LO logger system that can log user interaction so my last
> year project was mainly about implementing new DSL that we could log all
> user action in its syntax then transpile it to python UITest that we can
> use in testing.
>
> This year project [2] is to extending the ability of the uitest to cover
> the unsupported items that can be found here[3] and add them to the logger
> system that we have with the new DSL. This will give more coverage for more
> features in our testing in the future.
>
> I am willing to make a blog about the project and provide weekly report
> about the status of the project and share it here. I am really hope to make
> great achievements this summer with LO.
>
> I am interested to hear all your feedbacks and comments about the 2
> projects. And I will be really happy to answer any question related to them
> on my mail or on the IRC:"shiko". Thanks everyone.
>
> [1]
> https://summerofcode.withgoogle.com/archive/2019/projects/4762543371845632/
> [2]https://summerofcode.withgoogle.com/projects/#5349139656736768
> [3]
> https://wiki.documentfoundation.org/Development/UITests#Unsupported_ui_items
>


Great to have you on board again and looking forward to an awesome summer.

Cheers,
Markus

>
> Regards,
> Ahmad ElShreif
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 7 commits - android/source comphelper/source configure.ac cppuhelper/source desktop/source extensions/Module_extensions.mk postproces

[Jan Holesovsky (via logerrit)]

 android/source/Makefile|   10 --
 comphelper/source/misc/lok.cxx |5 +
 configure.ac   |3 ++-
 cppuhelper/source/exc_thrower.cxx  |   10 ++
 desktop/source/deployment/misc/dp_dependencies.cxx |5 +
 desktop/source/lib/init.cxx|8 
 extensions/Module_extensions.mk|7 ++-
 postprocess/Rdb_services.mk|8 
 solenv/bin/native-code.py  |6 ++
 9 files changed, 50 insertions(+), 12 deletions(-)

New commits:
commit acd76621758a9dc1aa16d455101ce0a347b412bf
Author: Jan Holesovsky 
AuthorDate: Tue Feb 11 23:55:52 2020 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 18:06:44 2020 +0200

If asked to do so, enable icecream even in the 'build' part of configure.

Otherwise it is used only in the 'host' part of the cross-compile build.

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

diff --git a/configure.ac b/configure.ac
index 231384588a20..543d0ce3635d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4779,6 +4779,7 @@ if test "$cross_compiling" = "yes"; then
 --disable-gtk3 \
 --disable-pdfimport \
 --disable-postgresql-sdbc \
+--enable-icecream="$enable_icecream" \
 --with-parallelism="$with_parallelism" \
 --without-doxygen \
 --without-java \
commit ac014fc6e88c276b54aac6e5af3ced536a7fa98b
Author: Jan Holesovsky 
AuthorDate: Fri Feb 7 16:59:31 2020 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 18:06:44 2020 +0200

android hunspell: All languages we pack are the supported ones.

Without this, we disable all the languages, because the env. variable is
not set.

Change-Id: If8f6a9ec6270391d1f8c2bf225c8ea4bb1aae688
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88220
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88367
Tested-by: Jenkins

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 16996d885bf7..c4ff1c641240 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -188,6 +188,10 @@ bool isWhitelistedLanguage(const OUString& lang)
 if (!isActive())
 return true;
 
+#ifdef ANDROID
+(void) lang;
+return true;
+#else
 static bool bInitialized = false;
 static std::vector aWhitelist;
 if (!bInitialized)
@@ -228,6 +232,7 @@ bool isWhitelistedLanguage(const OUString& lang)
 }
 
 return false;
+#endif
 }
 
 static void (*pStatusIndicatorCallback)(void *data, 
statusIndicatorCallbackType type, int percent)(nullptr);
commit d5240b00f150cf0fbc1f451f97993c11fe735f8a
Author: Jan Holesovsky 
AuthorDate: Fri Feb 7 15:43:50 2020 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 18:06:44 2020 +0200

android hunspell: Hardcode the ReferenceOOoMajorMinor for version check.

From some reason it fails to be read from the versionrc; and I'm not
really eager to debug why...

Without this, only the dictionaries that do not mention the
OpenOffice.org-minimal-version are registered; which would be just 2 of
them.

Change-Id: I9fe0bc138eadbdcbe5e0d8231e7e90ef268163bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88219
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88366
Tested-by: Jenkins

diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx 
b/desktop/source/deployment/misc/dp_dependencies.cxx
index 49b64780ec04..c5507d9ba659 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -61,10 +61,15 @@ OUString getLibreOfficeMajorMinorMicro() {
 }
 
 OUString getReferenceOpenOfficeOrgMajorMinor() {
+#ifdef ANDROID
+// just hardcode the version
+OUString v("4.1");
+#else
 OUString v(
 "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version")
 ":Version:ReferenceOOoMajorMinor}");
 rtl::Bootstrap::expandMacros(v); //TODO: check for failure
+#endif
 return v;
 }
 
commit 230a8af4a2eb1bb42107213da47989949f65e3d4
Author: Jan Holesovsky 
AuthorDate: Fri Feb 7 14:18:40 2020 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 18:06:43 2020 +0200

android hunspell: Don't explicitly disable extensions on Android.

We need the bundled extensions for hunspell.

Change-Id: I423d71376652b7d54dfdcc81462a19db9dc785bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88218
Tested-by: Jan Holesovsky 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.l

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/paragraph-mark2.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   10 ++
 sw/source/core/unocore/unotext.cxx |   20 
 3 files changed, 30 insertions(+)

New commits:
commit fb001eab98934c5a4d0a8c6b9563f91337561b87
Author: László Németh 
AuthorDate: Fri May 15 13:32:07 2020 +0200
Commit: László Németh 
CommitDate: Mon May 18 17:57:43 2020 +0200

tdf#127616 DOCX import: fix char style of empty paragraph

When direct character formatting defined in w:pPr/w:rPr
overwrites some character style properties (character
style defined by w:pPr/w:rPr/w:rStyle), empty paragraphs
lost such direct formatting, resulting for example,
different page layout by different height of empty
paragraphs. Also text of that originally empty paragraphs
got different formatting during typing.

Co-authored-by: Justin Luth 

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

diff --git a/sw/qa/extras/ooxmlexport/data/paragraph-mark2.docx 
b/sw/qa/extras/ooxmlexport/data/paragraph-mark2.docx
new file mode 100644
index ..a465813dc668
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/paragraph-mark2.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5f521b8067c4..ed5216c15a10 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -633,6 +633,16 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphMark, 
"paragraph-mark.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Emphasis"), 
getProperty(getRun(getParagraph(1), 1), "CharStyleName"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testParagraphMark2, "paragraph-mark2.docx")
+{
+// The problem was that we didn't handle the situation when an empty 
paragraph's marker had both a char style and some direct formatting.
+
+// This was Segoe UI, set by Char Style FontStyle11 presumably.
+CPPUNIT_ASSERT_EQUAL(OUString("Arial"), 
getProperty(getRun(getParagraph(1), 1), "CharFontName"));
+// This was 11, set by Char Style FontStyle11 presumably.
+CPPUNIT_ASSERT_EQUAL(10.f, getProperty(getRun(getParagraph(1), 1), 
"CharHeight"));
+}
+
 DECLARE_OOXMLEXPORT_TEST(testParagraphMarkNonempty, 
"paragraph-mark-nonempty.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/sw/source/core/unocore/unotext.cxx 
b/sw/source/core/unocore/unotext.cxx
index 9ef0f55dc08c..ee5185b12f2b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1275,6 +1275,26 @@ SwXText::Impl::finishOrAppendParagraph(
 aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH);
 
 SwUnoCursorHelper::SetPropertyValues(aPam, *pParaPropSet, rProperties);
+
+// tdf#127616 keep direct character formatting of empty paragraphs,
+// if character style of the paragraph sets also the same attributes
+if (aPam.Start()->nNode.GetNode().GetTextNode()->Len() == 0)
+{
+auto itCharStyle = std::find_if(rProperties.begin(), 
rProperties.end(), [](const beans::PropertyValue& rValue)
+{
+return rValue.Name == "CharStyleName";
+});
+if ( itCharStyle != rProperties.end() )
+{
+for (const auto& rValue : rProperties)
+{
+if ( rValue != *itCharStyle && 
rValue.Name.startsWith("Char") )
+{
+SwUnoCursorHelper::SetPropertyValue(aPam, 
*pParaPropSet, rValue.Name, rValue.Value);
+}
+}
+}
+}
 }
 catch (const lang::IllegalArgumentException& rIllegal)
 {
___
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 - compilerplugins/clang desktop/source include/vcl vcl/inc vcl/jsdialog vcl/source

[Szymon Kłos (via logerrit)]

 compilerplugins/clang/badstatics.cxx |1 
 desktop/source/lib/init.cxx  |  126 +-
 include/vcl/jsdialog/jsdialogbuilder.hxx |   33 +++
 include/vcl/salvtables.hxx   |2 
 include/vcl/weld.hxx |2 
 vcl/jsdialog/jsdialogbuilder.cxx |  130 ---
 vcl/source/app/salvtables.cxx|2 
 vcl/source/window/builder.cxx|2 
 8 files changed, 246 insertions(+), 52 deletions(-)

New commits:
commit ca9fb8ca376b14bf64397f0e80b05d129b00b4be
Author: Szymon Kłos 
AuthorDate: Fri Mar 6 11:11:57 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 18 17:52:21 2020 +0200

jsdialog: remember weld instances

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d4050c4def8d..bd5cdc9a937b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3552,7 +3552,6 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 
 StringMap aMap(jsonToStringMap(pArguments));
 VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
-JSInstanceBuilder* pBuilder = 
JSInstanceBuilder::FindLOKWeldBuilder(nWindowId);
 
 if (!pWindow && nWindowId >= 10 /* why unsigned? */)
 pWindow = getSidebarWindow();
@@ -3574,18 +3573,20 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 
 try
 {
-bool bIsWeldedDialog = pBuilder != nullptr;
+OString sControlId = OUStringToOString(aMap["id"], 
RTL_TEXTENCODING_ASCII_US);
+weld::Widget* pWidget = 
JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, sControlId);
+
+bool bIsWeldedDialog = pWidget != nullptr;
 bool bContinueWithLOKWindow = false;
 
 if (bIsWeldedDialog)
 {
-OString sControlId = OUStringToOString(aMap["id"], 
RTL_TEXTENCODING_ASCII_US);
 OUString sControlType = aMap["type"];
 OUString sAction = aMap["cmd"];
 
 if (sControlType == "tabcontrol")
 {
-auto pNotebook = pBuilder->weld_notebook(sControlId, 
false);
+auto pNotebook = dynamic_cast(pWidget);
 if (pNotebook)
 {
 if (sAction == "selecttab")
@@ -3601,7 +3602,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 }
 else if (sControlType == "combobox")
 {
-auto pCombobox = pBuilder->weld_combo_box(sControlId, 
false);
+auto pCombobox = dynamic_cast(pWidget);
 if (pCombobox)
 {
 if (sAction == "selected")
@@ -3615,6 +3616,11 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 pCombobox->set_active(pos);
 }
 }
+else if (sAction == "change")
+{
+pCombobox->set_entry_text(aMap["data"]);
+pCombobox->signal_changed();
+}
 else
 bContinueWithLOKWindow = true;
 }
diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/include/vcl/jsdialog/jsdialogbuilder.hxx
index b26b2ac2ff16..e0d4bc2dcdc1 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -10,6 +10,8 @@
 #include 
 #include 
 
+typedef std::map WidgetMap;
+
 class JSDialogSender
 {
 VclPtr m_aOwnedToplevel;
@@ -27,6 +29,9 @@ class VCL_DLLPUBLIC JSInstanceBuilder : public 
SalInstanceBuilder
 {
 vcl::LOKWindowId m_nWindowId;
 
+static std::map& GetLOKWeldWidgetsMap();
+void RememberWidget(const OString& id, weld::Widget* pWidget);
+
 public:
 JSInstanceBuilder(weld::Widget* pParent, const OUString& rUIRoot, const 
OUString& rUIFile);
 virtual ~JSInstanceBuilder() override;
@@ -43,8 +48,7 @@ public:
 virtual std::unique_ptr weld_notebook(const OString& id,
   bool bTakeOwnership 
= false) override;
 
-static std::map& 
GetLOKWeldBuilderMap();
-static JSInstanceBuilder* FindLOKWeldBuilder(vcl::LOKWindowId nWindowId);
+static weld::Widget* FindWeldWidgetsMap(vcl::LOKWindowId nWindowId, const 
OString& rWidget);
 };
 
 template 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 6e719fd23239..5e63e7bd9804 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -576,10 +576,10 @@ prote

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 9 commits - bridges/source config_host/config_features.h.in config_host.mk.in configure.ac cppuhelper/Library_cppuhelper.mk cppuhelpe

[Jan Holesovsky (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |2 
 bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |   12 ++-
 bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |8 +-
 config_host.mk.in |1 
 config_host/config_features.h.in  |6 +
 configure.ac  |   25 +++
 cppuhelper/Library_cppuhelper.mk  |1 
 cppuhelper/source/exc_thrower.cxx |   57 --
 desktop/source/lib/init.cxx   |   22 ++
 external/cairo/UnpackedTarball_cairo.mk   |3 
 external/nss/ExternalProject_nss.mk   |4 -
 external/nss/nss-android.patch.1  |   40 
 include/ios/ios.hxx   |   19 --
 ios/Module_ios.mk |1 
 ios/StaticLibrary_ios.mk  |   20 --
 ios/source/ios.cxx|   42 -
 sal/android/libreofficekit-jni.c  |8 --
 vcl/headless/svpgdi.cxx   |4 -
 vcl/inc/headless/svpgdi.hxx   |4 -
 19 files changed, 155 insertions(+), 124 deletions(-)

New commits:
commit 786911906f7377576485c7c1d0ef5c31824c3ad8
Author: Jan Holesovsky 
AuthorDate: Mon Dec 2 12:01:05 2019 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 17:43:03 2020 +0200

lok: Fix the condition of setting the transparent background.

Change-Id: I7b201296efe6541761896e0af1b230aecb534cdc
Reviewed-on: https://gerrit.libreoffice.org/84211
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5cc2a590f37b..7fbd42371fc6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2995,12 +2995,13 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #else
 ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
 
-#if HAVE_FEATURE_ANDROID_LOK
+#if defined(ANDROID) && !HAVE_FEATURE_ANDROID_LOK
+// Don't set the transparent background in the 'old' (JNI-based) Android
+// app - no idea why it needs avoiding this.
+if (false)
+#endif
 // Set background to transparent by default.
-// [Unless it is the 'old' (JNI-based) Android app - no idea why it
-// needs avoiding this.]
 pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
-#endif
 
 pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
commit 31efad6168d2b2c4a99a02d69d9a71fb750d1a5e
Author: Jan Holesovsky 
AuthorDate: Wed Nov 20 17:55:43 2019 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 17:43:03 2020 +0200

android: Get rid of the 'old' vs. Online-based runtime distinction.

No need for this when we have a compile-time distinction now anyway.

Change-Id: Ic86c8cce38a86635ea3efb4229c08f63059c9ee6
Reviewed-on: https://gerrit.libreoffice.org/83719
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ddb42e0f3860..5cc2a590f37b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include 
 
 #include 
@@ -2957,13 +2958,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* 
pThis,
 }
 }
 
-#if defined(ANDROID)
-/// For the distinction if the LOK is used for the 'old' (JNI-based) or the
-/// 'new' (loolwsd-based) app.  Default to the 'new', ie. not used from JNI as
-/// implemented in sal/android/libreofficekit-jni.c.
-bool android_lok_from_jni = false;
-#endif
-
 static void doc_paintTile(LibreOfficeKitDocument* pThis,
   unsigned char* pBuffer,
   const int nCanvasWidth, const int nCanvasHeight,
@@ -3001,15 +2995,12 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 #else
 ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
 
-#if defined(ANDROID)
-if (!android_lok_from_jni)
+#if HAVE_FEATURE_ANDROID_LOK
+// Set background to transparent by default.
+// [Unless it is the 'old' (JNI-based) Android app - no idea why it
+// needs avoiding this.]
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
 #endif
-{
-// Set background to transparent by default.
-// [Unless it is the 'old' (JNI-based) Android app - no idea why it
-// needs avoiding this.]
-pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
-}
 
 pDevice->SetOutputSizePixelScaleOffsetAndBuffer(
 Size(nCanvasWidth, nCanvasHeight), Fraction(1.0), Point(),
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index e4d7f

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   28 +
 sw/qa/extras/ww8export/ww8export3.cxx|   30 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |3 ++
 sw/source/filter/ww8/wrtw8num.cxx|1 
 sw/source/filter/ww8/ww8atr.cxx  |4 +++
 sw/source/filter/ww8/ww8par3.cxx |4 +++
 6 files changed, 70 insertions(+)

New commits:
commit 68fc9688f36f420e16f87de4da3b3ce75288b76c
Author: Miklos Vajna 
AuthorDate: Fri Mar 6 10:44:19 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon May 18 17:39:10 2020 +0200

sw chicago numbering: add DOC footnote export

Note that chicago numbering can't be used for paragraph numbering. It
would be possible technically, but the spec && bffvalidator && Word
agrees on forbidding that.

Change-Id: Ic3de51f9724d399542f4fe6ac48e70e94c6ea4ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90080
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 9a1dd2e242794b4f26d207efc80a2f5bc088ab7c)

diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 84677fb3403c..38e79fed25e5 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -95,6 +95,36 @@ CPPUNIT_TEST_FIXTURE(SwModelTestBase, 
testArabicZeroNumberingFootnote)
 CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
 }
 
+CPPUNIT_TEST_FIXTURE(SwModelTestBase, testChicagoNumberingFootnote)
+{
+// Create a document, set footnote numbering type to SYMBOL_CHICAGO.
+loadURL("private:factory/swriter", nullptr);
+uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFootnoteSettings
+= xFootnotesSupplier->getFootnoteSettings();
+sal_uInt16 nNumberingType = style::NumberingType::SYMBOL_CHICAGO;
+xFootnoteSettings->setPropertyValue("NumberingType", 
uno::makeAny(nNumberingType));
+
+// Insert a footnote.
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFootnote(
+xFactory->createInstance("com.sun.star.text.Footnote"), 
uno::UNO_QUERY);
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTextContentAppend(xTextDocument->getText(),
+
uno::UNO_QUERY);
+xTextContentAppend->appendTextContent(xFootnote, {});
+
+reload("MS Word 97", "");
+xFootnotesSupplier.set(mxComponent, uno::UNO_QUERY);
+sal_uInt16 nExpected = style::NumberingType::SYMBOL_CHICAGO;
+auto nActual = 
getProperty(xFootnotesSupplier->getFootnoteSettings(), 
"NumberingType");
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 63
+// - Actual  : 4
+// i.e. the numbering type was ARABIC, not SYMBOL_CHICAGO.
+CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc")
 {
 uno::Reference pageStyles = 
getStyles("PageStyles");
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index 59f69e506686..b89d40445e50 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -288,6 +288,7 @@ static sal_uInt8 GetLevelNFC(  sal_uInt16 eNumType, const 
SfxItemSet *pOutSet)
 case style::NumberingType::NUMBER_HANGUL_KO: nRet = 41; break;
 case style::NumberingType::NUMBER_UPPER_KO: nRet = 44; break;
 case SVX_NUM_NUMBER_NONE:   nRet = 0xff;break;
+// No SVX_NUM_SYMBOL_CHICAGO here: LVLF can't contain 0x09, 
msonfcChiManSty.
 case SVX_NUM_ARABIC_ZERO:
 // 0x16, msonfcArabicLZ
 nRet = 22;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 18a9da4e8d50..2f487133997d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -740,6 +740,10 @@ sal_uInt8 WW8Export::GetNumId( sal_uInt16 eNumType )
 
 // nothing, WW does the same (undocumented)
 case SVX_NUM_NUMBER_NONE:   nRet = 0xff;break;
+case SVX_NUM_SYMBOL_CHICAGO:
+// 0x09, msonfcChiManSty
+nRet = 9;
+break;
 case SVX_NUM_ARABIC_ZERO:
 // 0x16, msonfcArabicLZ
 nRet = 22;
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 966fb66fb121..0158c950db31 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -540,6 +540,10 @@ SvxNumType 
WW8ListManager::GetSvxNumTypeFromMSONFC(sal_uInt16 nNFC)
 // actually: ORDINAL
 nType = SVX_NUM_ARABIC;
 break;
+case 9:
+// 0x09, msonfcChiManSty
+nType = SVX_NUM_SYMBOL_CHICAGO;
+break;
 case 22:
 // 0x16, msonfcArabicLZ
 nType = SVX_NUM_ARABIC_ZERO;
commit 2d327742d99799c543ad579fc0a570231e870595
Author: Miklos Vajna 

Guidance to where in the codebase the Menu structure is built

[KKing]

I have pulled code for Libreoffice 7.0.0.0 and have built it on Debian 
10 and seems to run fine.


I would like to look at modifying the default Menu structure potentially 
dependant on the user or a startup parameter.


Could someone point me to where in the codebase the default Menus get built?

There are a couple of things want to look at, but one of the main 
requests we get is if the old school list of 9 most recent documents (or 
we have had variation request of 9 favourite) can be assigned to the 
file menu so it is easier and quicker to just use keyboard to get access 
to the files e.g.  Alt+F-2   would load the 2nd most recent document.


k.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - desktop/source sc/source

[Dennis Francis (via logerrit)]

 desktop/source/lib/init.cxx  |   10 ++
 sc/source/ui/view/output.cxx |9 +
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit be84f24a42ee0b5b94a0daa75cc01c053bb76881
Author: Dennis Francis 
AuthorDate: Wed Apr 1 20:20:19 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 17:17:14 2020 +0200

tdf#127158 :lokit: preload liblocaledata_others.so

...even if LOK_WHITELIST_LANGUAGES does not contain an Asian language.
Not preloading this module causes locale-fallbacks for example
when a calc-cell with Asian locale has some date with number-formatting,
LOOL displays the date with the fallback locale(en_US).
(more details in comments)

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c86b2eb72dd4..ddb42e0f3860 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -93,6 +93,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -5722,6 +5724,14 @@ static void preloadData()
 }
 std::cerr << "\n";
 
+// Hack to load and cache the module liblocaledata_others.so which is not 
loaded normally
+// (when loading dictionaries of just non-Asian locales). Creating a 
XCalendar4 of one Asian locale
+// will cheaply load this missing "others" locale library. Appending an 
Asian locale in
+// LOK_WHITELIST_LANGUAGES env-var also works but at the cost of loading 
that dictionary.
+css::uno::Reference< css::i18n::XCalendar4 > xCal = 
css::i18n::LocaleCalendar2::create(comphelper::getProcessComponentContext());
+css::lang::Locale aAsianLocale = {"hi", "IN", ""};
+xCal->loadDefaultCalendar(aAsianLocale);
+
 // preload all available thesauri
 css::uno::Reference 
xThesaurus(xLngSvcMgr->getThesaurus());
 css::uno::Reference 
xThesLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
commit 3c4e4cc92d0850d53b2a875bc4ffd09883521c7f
Author: Dennis Francis 
AuthorDate: Tue Jan 21 22:11:19 2020 +0530
Commit: Andras Timar 
CommitDate: Mon May 18 17:17:13 2020 +0200

tdf#130112 lok: Do not apply zoom-factor twice...

... in ScOutputData::FillReferenceMarks().
mnPPT[XY] already has the factor aZoom[XY] in it. Refer
ScViewData::CalcPPT() to see how PPT[XY] are derived.

Change-Id: I3f9b5c01cb53514450fad5f7b2b6861b112effdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87158
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 3f62c10548466119ec6b1a662ab339e5dbe0b05f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87170
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index e14647bd7954..ced84e795ecd 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1958,10 +1958,11 @@ ReferenceMark ScOutputData::FillReferenceMark( SCCOL 
nRefStartX, SCROW nRefStart
 
 if (bTop && bBottom && bLeft && bRight)
 {
-aResult = ReferenceMark( nMinX / mnPPTX * double( aZoomX ),
- nMinY / mnPPTY * double( aZoomY ),
- ( nMaxX - nMinX ) / mnPPTX * double( 
aZoomX ),
- ( nMaxY - nMinY ) / mnPPTY * double( 
aZoomY ),
+// mnPPT[XY] already has the factor aZoom[XY] in it.
+aResult = ReferenceMark( nMinX / mnPPTX,
+ nMinY / mnPPTY,
+ ( nMaxX - nMinX ) / mnPPTX,
+ ( nMaxY - nMinY ) / mnPPTY,
  nTab,
  rColor );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 5 commits - sw/qa sw/source writerfilter/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/layout/data/tdf128959.docx|binary
 sw/qa/extras/layout/layout.cxx |   23 +
 sw/qa/extras/ooxmlexport/data/tdf130494.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |   13 +
 sw/qa/extras/ooxmlimport/data/wrap-poly-crop.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   53 +
 sw/source/core/text/xmldump.cxx|   19 ++-
 sw/source/filter/ww8/docxsdrexport.cxx |3 -
 sw/source/filter/ww8/rtfattributeoutput.cxx|4 -
 sw/source/filter/ww8/writerhelper.cxx  |   24 +
 sw/source/filter/ww8/writerhelper.hxx  |2 
 sw/source/filter/ww8/wrtw8esh.cxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |   29 +--
 writerfilter/source/dmapper/GraphicImport.cxx  |   11 
 writerfilter/source/dmapper/WrapPolygonHandler.cxx |   21 +++-
 writerfilter/source/dmapper/WrapPolygonHandler.hxx |7 ++
 16 files changed, 186 insertions(+), 25 deletions(-)

New commits:
commit 2e8fde3485f07d48d61b6040961c394e2121720b
Author: Miklos Vajna 
AuthorDate: Thu May 14 18:02:23 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 18 17:00:06 2020 +0200

DOCX export: fix interaction between the crop and the wrap polygon of image

If the wrap polygon is influenced by crop at import time, we need to do
the opposite at export time.

Do this for RTF and DOCX, where there is matching import code in
writerfilter/, leave DOC alone for now.

Test this by changing testFdo76803 into an export test, then seeing how
the first point's Y position fails and fixing up the exporter, so we
get back the old good value.

Conflicts:
sw/source/filter/ww8/docxsdrexport.cxx
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx

(cherry picked from commit c68b458514b35cae70c9a6630e06f46a867aa3b9)

Change-Id: Ieef18aad3c76f7945c7348201b07bcb27a4cd48d

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 513a5d64a7d4..fdcd8af60d0d 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -882,8 +882,13 @@ DECLARE_OOXMLIMPORT_TEST(testFdo75722dml, 
"fdo75722-dml.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int64(3128), nRot);
 }
 
-DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
+DECLARE_OOXMLEXPORT_TEST(testFdo76803, "fdo76803.docx")
 {
+if (!mbExported)
+{
+return;
+}
+
 // The ContourPolyPolygon was wrong
 uno::Reference xPropertySet(getShape(1), 
uno::UNO_QUERY);
 
@@ -898,16 +903,20 @@ DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
 
 CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), aPolygon.count());
 
-CPPUNIT_ASSERT_EQUAL(double(-162), aPolygon.getB2DPoint(0).getX());
+CPPUNIT_ASSERT_EQUAL(double(-149), aPolygon.getB2DPoint(0).getX());
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: -35
+// - Actual  : -67
+// i.e. the cropping did not influence the wrap polygon during export.
 CPPUNIT_ASSERT_EQUAL(double(-35), aPolygon.getB2DPoint(0).getY());
 
-CPPUNIT_ASSERT_EQUAL(double(-162), aPolygon.getB2DPoint(1).getX());
-CPPUNIT_ASSERT_EQUAL(double(3510), aPolygon.getB2DPoint(1).getY());
+CPPUNIT_ASSERT_EQUAL(double(-149), aPolygon.getB2DPoint(1).getX());
+CPPUNIT_ASSERT_EQUAL(double(3511), aPolygon.getB2DPoint(1).getY());
 
-CPPUNIT_ASSERT_EQUAL(double(16892), aPolygon.getB2DPoint(2).getX());
-CPPUNIT_ASSERT_EQUAL(double(3510), aPolygon.getB2DPoint(2).getY());
+CPPUNIT_ASSERT_EQUAL(double(16889), aPolygon.getB2DPoint(2).getX());
+CPPUNIT_ASSERT_EQUAL(double(3511), aPolygon.getB2DPoint(2).getY());
 
-CPPUNIT_ASSERT_EQUAL(double(16892), aPolygon.getB2DPoint(3).getX());
+CPPUNIT_ASSERT_EQUAL(double(16889), aPolygon.getB2DPoint(3).getX());
 CPPUNIT_ASSERT_EQUAL(double(-35), aPolygon.getB2DPoint(3).getY());
 }
 
@@ -1624,13 +1633,14 @@ DECLARE_OOXMLIMPORT_TEST(testWrapPolyCrop, 
"wrap-poly-crop.docx")
 // 10582, the lower 33% of the graphic is cropped, and the wrap polygon 
covers the middle third
 // of the area vertically. Which means 10582*2/3 = 7054.67 is the cropped 
height, and the top of
 // the middle third is 2351.55.
+// Then there is a 15 twips shift from the origo, so it's 2351.55 + 26.46 
= 2378.01 in mm100.
 //
 // Without the accompanying fix in place, this test would have failed with:
-// - Expected: 2361
+// - Expected: 2368
 // - Actual  : 3542
 // i.e. the wrap polygon covered a larger-than-correct area, which end the 
end means 3 lines
 // were wrapping around the image, not only 2 as Word does it.
-CPPUNIT_ASSERT_EQUAL(2361., aPolygon.getB2DPoint(0).getY());
+CPPUNIT_ASSERT_EQUAL(2368., aPolygon.getB2DPoint(0).getY());

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 17 commits - configure.ac dbaccess/source helpcontent2 icon-themes/breeze icon-themes/breeze_dark icon-themes/colibre ic

[Michael Weghorn (via logerrit)]

 configure.ac |   18 +++-
 dbaccess/source/ui/dlg/ConnectionPage.cxx|1 
 helpcontent2 |2 
 icon-themes/breeze/links.txt |5 -
 icon-themes/breeze_dark/links.txt|5 -
 icon-themes/colibre/links.txt|9 --
 icon-themes/colibre/res/fp010.png|binary
 icon-themes/colibre/res/fp015.png|binary
 icon-themes/colibre/svtools/res/folder.png   |binary
 icon-themes/colibre_svg/res/fp010.svg|1 
 icon-themes/colibre_svg/res/fp015.svg|2 
 icon-themes/colibre_svg/svtools/res/folder.svg   |2 
 icon-themes/elementary/fpicker/res/fp015.png |binary
 icon-themes/elementary/links.txt |5 -
 icon-themes/elementary/res/fp015.png |binary
 icon-themes/elementary/sfx2/res/grip.png |binary
 icon-themes/elementary_svg/fpicker/res/fp015.svg |1 
 icon-themes/elementary_svg/res/fp015.svg |1 
 icon-themes/elementary_svg/sfx2/res/grip.svg |2 
 icon-themes/sifr/links.txt   |   11 +-
 icon-themes/sifr/res/fp015.png   |binary
 icon-themes/sifr/svtools/res/folder.png  |binary
 icon-themes/sifr_dark/links.txt  |   11 +-
 icon-themes/sifr_dark/res/fp015.png  |binary
 icon-themes/sifr_dark/svtools/res/folder.png |binary
 icon-themes/sifr_dark_svg/res/fp015.svg  |1 
 icon-themes/sifr_dark_svg/svtools/res/folder.svg |1 
 icon-themes/sifr_svg/res/fp015.svg   |1 
 icon-themes/sifr_svg/svtools/res/folder.svg  |1 
 include/o3tl/enumarray.hxx   |   24 ++---
 include/svl/macitem.hxx  |2 
 package/source/xstor/xstorage.hxx|6 -
 sc/inc/pivot.hxx |1 
 sc/inc/scmatrix.hxx  |3 
 sc/source/core/data/pivot2.cxx   |8 -
 sc/source/core/opencl/formulagroupcl.cxx |4 
 svl/source/items/macitem.cxx |   12 --
 svl/source/numbers/zformat.cxx   |   16 +++
 svl/source/numbers/zforscan.hxx  |1 
 sw/qa/extras/ooxmlexport/data/tdf132514.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf132766.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |   21 +---
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   16 +++
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|   10 ++
 sw/source/core/inc/mvsave.hxx|7 -
 sw/source/core/unocore/unodraw.cxx   |   11 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |5 -
 sw/source/filter/ww8/wrtw8num.cxx|   65 ++-
 sw/source/filter/ww8/ww8par.cxx  |5 -
 sw/source/filter/ww8/ww8par.hxx  |1 
 vcl/source/app/salvtables.cxx|   10 ++
 vcl/source/window/paint.cxx  |6 -
 vcl/unx/gtk3/gtk3gtkinst.cxx |   12 +-
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   17 +++
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|2 
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   10 --
 writerfilter/source/dmapper/PropertyMap.hxx  |9 ++
 xmloff/source/core/attrlist.cxx  |6 -
 xmloff/source/style/xmlprmap.cxx |   17 ---
 61 files changed, 204 insertions(+), 189 deletions(-)

New commits:
commit 3f98a148e689bf1c1a2c6c9fd6579bfd54b06672
Merge: 71a734b66731 0a4d3852794b
Author: Michael Weghorn 
AuthorDate: Mon May 18 17:04:18 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 18 17:04:18 2020 +0200

Merge branch 'libreoffice-6-4'

into distro/lhm/libreoffice-6-4+backports

Change-Id: I6861987a5897fa12bf962d4274f1ce52c3efa05e

commit 0a4d3852794bae8887dc11613b47cb8d2c4aa829
Author: Vasily Melenchuk 
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 18 12:54:28 2020 +0200

tdf#128665: sw: set unique name for shape format

Set name even if received shape name is empty. This is required
to have unique style name for undo/redo correct work.

Change-Id: I26cc8ec7ec831286c7afa8e17b94e6c0a270cf20
Reviewed-on: ht

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 3 commits - include/toolkit toolkit/source

[Michael Weghorn (via logerrit)]

 include/toolkit/awt/vclxtabpagecontainer.hxx   |5 +++
 include/toolkit/controls/controlmodelcontainerbase.hxx |1 
 include/toolkit/controls/tabpagecontainer.hxx  |3 ++
 include/toolkit/controls/unocontrol.hxx|2 -
 toolkit/source/awt/vclxtabpagecontainer.cxx|   23 +
 toolkit/source/controls/controlmodelcontainerbase.cxx  |   13 ++---
 toolkit/source/controls/tabpagecontainer.cxx   |   11 +++-
 7 files changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 71a734b66731219b1a2f543d45ff1b85872ecd11
Author: Michael Weghorn 
AuthorDate: Mon May 18 10:51:14 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 18 16:55:40 2020 +0200

tdf#133142 UnoControlTabPageContainer: Handle tab property changes

In the model, changing a tab page's title or enabled/disabled
status is done via methods 'XTabPageModel.setTitle' and
'XTabPageModel.setEnabled'.

Changes to the title and enabled/disabled status are
propagated to the tab page container containing the
tab page (s.a. 25c692c2a94ab83c2c859ac5ab334b62ac8b825e
("ControlModelContainerBase: Use property for enabled status",
2020-05-15)).

Make 'VCLXTabPageContainer' derive from 'XPropertiesChangeListener'
and implement the 'propertiesChange' method defined in that
interface to handle property changes for the tab pages and have
'UnoControlTabPageContainer' forward 'PropertyChangeEvent's
to its peer so they can be handled there.

This way, changes for those tab page properties via UNO
are now properly updated in the UI as well.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94402
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 92289c5f121499959b6f5edf859e5f34b5b96a78)

 Conflicts:
toolkit/inc/awt/vclxtabpagecontainer.hxx
toolkit/inc/controls/tabpagecontainer.hxx

Change-Id: I6fa1fadf781575c4ad1d066aed9c3a651b10869d

diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx 
b/include/toolkit/awt/vclxtabpagecontainer.hxx
index ffb6feb5ad73..756bbe4733c6 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -29,6 +30,7 @@
 
 typedef cppu::ImplInheritanceHelper< VCLXContainer,
  css::awt::tab::XTabPageContainer,
+ css::beans::XPropertiesChangeListener,
  css::container::XContainerListener
> VCLXTabPageContainer_Base;
 class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
@@ -57,6 +59,9 @@ public:
 virtual void SAL_CALL elementRemoved( const 
css::container::ContainerEvent& Event ) override;
 virtual void SAL_CALL elementReplaced( const 
css::container::ContainerEvent& Event ) override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 // css::awt::XVclWindowPeer
 void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
 private:
diff --git a/include/toolkit/controls/tabpagecontainer.hxx 
b/include/toolkit/controls/tabpagecontainer.hxx
index 2e071ae16f3c..0a3c117bc8b4 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -113,6 +113,9 @@ public:
 virtual void SAL_CALL addTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 virtual void SAL_CALL removeTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 virtual void SAL_CALL addControl( const OUString& Name, const 
css::uno::Reference< css::awt::XControl >& Control ) override;
 // css::lang::XServiceInfo
 DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, 
"com.sun.star.awt.tab.UnoControlTabPageContainer" )
diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index 94b3f09a1999..e77479656f3d 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -219,7 +219,7 @@ public:
 // XStyleSettingsSupplier
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 
-private:
+protected:
 // css::beans::XPropertiesChangeListener
 void SAL_CALL propertiesChange( const css::uno::Sequence

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/vcl vcl/jsdialog

[Szymon Kłos (via logerrit)]

 include/vcl/jsdialog/jsdialogbuilder.hxx |1 +
 vcl/jsdialog/jsdialogbuilder.cxx |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit ad513aadc9f2330fbe52ce23ce87dc7db14c5307
Author: Szymon Kłos 
AuthorDate: Thu Mar 5 14:42:44 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 18 16:31:50 2020 +0200

jsdialog: send JSON on selection change

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

diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/include/vcl/jsdialog/jsdialogbuilder.hxx
index b375daf4f2b1..8befb2b0f79b 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -128,6 +128,7 @@ public:
 const OUString* pIconName, VirtualDevice* 
pImageSurface) override;
 virtual void remove(int pos) override;
 virtual void set_entry_text(const OUString& rText) override;
+virtual void set_active(int pos) override;
 };
 
 class VCL_DLLPUBLIC JSNotebook : public JSWidget
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 1d572534e46c..080d5089eeb2 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -286,6 +286,12 @@ void JSComboBox::set_entry_text(const OUString& rText)
 notifyDialogState();
 }
 
+void JSComboBox::set_active(int pos)
+{
+SalInstanceComboBoxWithEdit::set_active(pos);
+notifyDialogState();
+}
+
 JSNotebook::JSNotebook(VclPtr aOwnedToplevel, ::TabControl* 
pControl,
SalInstanceBuilder* pBuilder, bool bTakeOwnership)
 : JSWidget(aOwnedToplevel, pControl, 
pBuilder,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Weghorn (via logerrit)]

 include/toolkit/controls/unocontrol.hxx  |2 +-
 toolkit/inc/awt/vclxtabpagecontainer.hxx |5 +
 toolkit/inc/controls/tabpagecontainer.hxx|3 +++
 toolkit/source/awt/vclxtabpagecontainer.cxx  |   23 +++
 toolkit/source/controls/tabpagecontainer.cxx |9 +
 5 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 92289c5f121499959b6f5edf859e5f34b5b96a78
Author: Michael Weghorn 
AuthorDate: Mon May 18 10:51:14 2020 +0200
Commit: Michael Weghorn 
CommitDate: Mon May 18 16:28:22 2020 +0200

tdf#133142 UnoControlTabPageContainer: Handle tab property changes

In the model, changing a tab page's title or enabled/disabled
status is done via methods 'XTabPageModel.setTitle' and
'XTabPageModel.setEnabled'.

Changes to the title and enabled/disabled status are
propagated to the tab page container containing the
tab page (s.a. 25c692c2a94ab83c2c859ac5ab334b62ac8b825e
("ControlModelContainerBase: Use property for enabled status",
2020-05-15)).

Make 'VCLXTabPageContainer' derive from 'XPropertiesChangeListener'
and implement the 'propertiesChange' method defined in that
interface to handle property changes for the tab pages and have
'UnoControlTabPageContainer' forward 'PropertyChangeEvent's
to its peer so they can be handled there.

This way, changes for those tab page properties via UNO
are now properly updated in the UI as well.

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

diff --git a/include/toolkit/controls/unocontrol.hxx 
b/include/toolkit/controls/unocontrol.hxx
index cc83a6b7a934..a406a22bc5e8 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -218,7 +218,7 @@ public:
 // XStyleSettingsSupplier
 virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL 
getStyleSettings() override;
 
-private:
+protected:
 // css::beans::XPropertiesChangeListener
 void SAL_CALL propertiesChange( const css::uno::Sequence< 
css::beans::PropertyChangeEvent >& evt ) override;
 };
diff --git a/toolkit/inc/awt/vclxtabpagecontainer.hxx 
b/toolkit/inc/awt/vclxtabpagecontainer.hxx
index fee096cc04ba..54fe0e0503aa 100644
--- a/toolkit/inc/awt/vclxtabpagecontainer.hxx
+++ b/toolkit/inc/awt/vclxtabpagecontainer.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -28,6 +29,7 @@
 
 typedef cppu::ImplInheritanceHelper< VCLXContainer,
  css::awt::tab::XTabPageContainer,
+ css::beans::XPropertiesChangeListener,
  css::container::XContainerListener
> VCLXTabPageContainer_Base;
 class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
@@ -56,6 +58,9 @@ public:
 virtual void SAL_CALL elementRemoved( const 
css::container::ContainerEvent& Event ) override;
 virtual void SAL_CALL elementReplaced( const 
css::container::ContainerEvent& Event ) override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 // css::awt::XVclWindowPeer
 void SAL_CALL setProperty( const OUString& PropertyName, const 
css::uno::Any& Value ) override;
 private:
diff --git a/toolkit/inc/controls/tabpagecontainer.hxx 
b/toolkit/inc/controls/tabpagecontainer.hxx
index 9873ad3272b1..e00c0bd89e58 100644
--- a/toolkit/inc/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/controls/tabpagecontainer.hxx
@@ -111,6 +111,9 @@ public:
 virtual void SAL_CALL addTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 virtual void SAL_CALL removeTabPageContainerListener( const 
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener ) 
override;
 
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence< 
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
 virtual void SAL_CALL addControl( const OUString& Name, const 
css::uno::Reference< css::awt::XControl >& Control ) override;
 // css::lang::XServiceInfo
 DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase, 
"com.sun.star.awt.tab.UnoControlTabPageContainer" )
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 0bfacc695136..bc5d19964d2e 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -208,4 +209,26 @@ void SAL_CALL VCLXTabPageContainer::el

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

[Szabolcs Toth (via logerrit)]

 oox/source/export/drawingml.cxx   |2 +-
 sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |   12 
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 96319d662dca12616eb52c601a2d5b5adca3ae57
Author: Szabolcs Toth 
AuthorDate: Mon May 11 15:56:27 2020 +0200
Commit: László Németh 
CommitDate: Mon May 18 15:55:41 2020 +0200

tdf#92526 DrawingML shape export: fix 0 line width

0 line width is the thinnest possible line width,
but without its explicit export (a:ln w="0"), shape
outline was imported with 0.75 pt line width by MSO.

Co-authored-by: Balázs Regényi

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

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 12a4506a8e75..c925819dd9f8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -866,7 +866,7 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 
 mpFS->startElementNS( XML_a, XML_ln,
   XML_cap, cap,
-  XML_w, nLineWidth > 1 && nStyleLineWidth != 
nLineWidth ?
+  XML_w, nLineWidth == 0 || (nLineWidth > 1 && 
nStyleLineWidth != nLineWidth) ?
   
OString::number(oox::drawingml::convertHmmToEmu(nLineWidth)).getStr() : nullptr 
);
 
 if( bColorSet )
diff --git a/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt 
b/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt
new file mode 100644
index ..fffd9b9b2037
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf92526_ShapeLineWidth.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 6993eb54c273..48b2cef55586 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1135,6 +1135,18 @@ DECLARE_OOXMLEXPORT_TEST(testArrowMarker, 
"tdf123346_ArrowMarker.docx")
 "/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:tailEnd", "type", 
"arrow");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testShapeLineWidth, "tdf92526_ShapeLineWidth.odt")
+{
+// tdf#92526: Make sure that line with stays 0.
+xmlDocUniquePtr pXml = parseExport("word/document.xml");
+if (!pXml)
+return;
+
+// "w" attribute was not exported.
+assertXPath(pXml, 
"/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing"
+"/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln", "w", "0");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - desktop/source vcl/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx  |2 +-
 vcl/source/control/field.cxx |   25 -
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 432dd816c7bbf69542f07cb6c98b9a2cd225e95b
Author: Ashod Nakashian 
AuthorDate: Mon Jun 17 23:32:04 2019 -0400
Commit: Noel Grandin 
CommitDate: Mon May 18 15:45:48 2020 +0200

vcl: better decimal handling in NumericFormatter

When the user deletes the decimal point from
MetricBox, it ends up with the number
with the fractional portion (to the right of
the decimal point) appended to it, which is
(with two decimal points) a 100x larger value.

This makes such editing smarter. In the case
that we detect that the user deleted the
decimal point (which we know should've been
there, because we have a configured fixed
number of decimal points,) we restore it.
This makes it more intuitive, since when
the user enters digits, they get the correct
and expected result, but when they delete the
decimal point, they almost always didn't mean
to grow the number 100x. If that was the goal,
they could enter two extra digits before
the decimal point.

In addition, we set the default maximum to
a more user-friendly value of a million,
instead of int-max, which seems like a
random number to the uninitiated.

Change-Id: Ib535f06e4f111d20f35c4209ad65969dca5928e8
Reviewed-on: https://gerrit.libreoffice.org/75511
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 42761c688053155ae87628e69eb4d2a28e6c78e6)
Reviewed-on: https://gerrit.libreoffice.org/78453
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit e9a48869fe1f1e90c03d299ae419ea5b1f43de50)

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 6307b9ae49d7..6d518486fe84 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -201,6 +201,29 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& 
rValue,
 aStr1.append(std::u16string_view(aStr).substr(0, nDecPos));
 aStr2.append(std::u16string_view(aStr).substr(nDecPos+1));
 }
+else if (nDecDigits > 0 && aStr.getLength() > nDecDigits)
+{
+// We expect a decimal point and a certain number of decimal digits,
+// but seems the user has deleted the decimal point, so we restore it.
+// Otherwise, they end up with unexpectedly (to them) large numbers.
+
+// Find the first digit from the right.
+sal_Int32 nVirtualDecPos = aStr.getLength();
+while (--nVirtualDecPos > 0)
+{
+if ((aStr[nVirtualDecPos] >= '0') && (aStr[nVirtualDecPos] <= '9'))
+break;
+}
+
+if (nVirtualDecPos >= nDecDigits)
+{
+nVirtualDecPos -= nDecDigits - 1; // nVirtualDecPos is already on 
a digit (so discount it).
+aStr1.append(aStr.getStr(), nVirtualDecPos);
+aStr2.append(aStr.getStr() + nVirtualDecPos);
+}
+else
+aStr1 = aStr;
+}
 else
 aStr1 = aStr;
 
@@ -540,7 +563,7 @@ void NumericFormatter::ImplInit()
 mnFieldValue= 0;
 mnLastValue = 0;
 mnMin   = 0;
-mnMax   = SAL_MAX_INT32;
+mnMax   = 1; // A user-friendly round number.
 // a "large" value substantially smaller than SAL_MAX_INT64, to avoid
 // overflow in computations using this "dummy" value
 mnDecimalDigits = 2;
commit c2f5b4fc0a67118dd89ef86a40bc854b80b54a1a
Author: Ashod Nakashian 
AuthorDate: Sun Mar 10 12:21:33 2019 -0400
Commit: Noel Grandin 
CommitDate: Mon May 18 15:44:52 2020 +0200

LOK: don't segfault when reporting error

Change-Id: Ia6d614eb15b15f43ddd3e0b5742b888060dfd581
Reviewed-on: https://gerrit.libreoffice.org/69069
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 9fa568dced78011072390320f64eae28dd06d2b9)
Reviewed-on: https://gerrit.libreoffice.org/78443
(cherry picked from commit fa18cdce824525ebd76b542a44741a35062741ce)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 505ce91e8da5..c86b2eb72dd4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3824,7 +3824,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 else
 bResult = comphelper::dispatchCommand(aCommand, 
comphelper::containerToSequence(aPropertyValuesVector));
 
-if (!bResult)
+if (!bResult && gImpl)
 {
 SetLastExceptionMsg("Failed to dispatch " + aCommand);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Vivien Geoffroy license statement

[Vivien GEOFFROY]

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

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

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

[Caolán McNamara (via logerrit)]

 editeng/source/editeng/impedit2.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit d6fce28dea6e1e51ec5de88ef17cc56180b8c2db
Author: Caolán McNamara 
AuthorDate: Mon May 18 12:21:09 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon May 18 15:47:57 2020 +0200

Resolves: tdf#129620 crash because there is no associated window

only an outputdevice in this editeng-in-a-widget case

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 124b310ca249..eb9ef5eca2c3 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -478,13 +478,17 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 if ( nInputEnd > rLine.GetEnd() )
 nInputEnd = rLine.GetEnd();
 tools::Rectangle aR2 = PaMtoEditCursor( EditPaM( 
aPaM.GetNode(), nInputEnd ), GetCursorFlags::EndOfLine );
-tools::Rectangle aRect = 
pView->GetImpEditView()->GetWindowPos( aR1 );
-pView->GetWindow()->SetCursorRect( &aRect, 
aR2.Left()-aR1.Right() );
+if (vcl::Window* pWindow = pView->GetWindow())
+{
+tools::Rectangle aRect = 
pView->GetImpEditView()->GetWindowPos( aR1 );
+pWindow->SetCursorRect( &aRect, aR2.Left()-aR1.Right() );
+}
 }
 }
 else
 {
-pView->GetWindow()->SetCursorRect();
+if (vcl::Window* pWindow = pView->GetWindow())
+  pWindow->SetCursorRect();
 }
 }
 else if ( rCEvt.GetCommand() == CommandEventId::SelectionChange )
@@ -545,7 +549,8 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 tools::Rectangle aR2 = GetEditCursor( pParaPortion, 
nInputPos );
 aRects[ i ] = pView->GetImpEditView()->GetWindowPos( aR2 );
 }
-pView->GetWindow()->SetCompositionCharRect( aRects.get(), 
mpIMEInfos->nLen );
+if (vcl::Window* pWindow = pView->GetWindow())
+pWindow->SetCompositionCharRect( aRects.get(), 
mpIMEInfos->nLen );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_skia.h.in download.lst external/skia

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

 config_host/config_skia.h.in|3 ++
 download.lst|4 +--
 external/skia/Library_skia.mk   |   25 +++-
 external/skia/UnpackedTarball_skia.mk   |1 
 external/skia/fix-alpha-difference-copy.patch.1 |6 ++---
 external/skia/fix-windows-dwrite.patch.1|   20 +++
 external/skia/inc/pch/precompiled_skia.hxx  |   25 +++-
 7 files changed, 65 insertions(+), 19 deletions(-)

New commits:
commit be6d95b75131f8044512c1b2f2743c556169f56d
Author: Luboš Luňák 
AuthorDate: Mon May 18 11:47:01 2020 +0200
Commit: Luboš Luňák 
CommitDate: Mon May 18 15:30:56 2020 +0200

update to Skia chrome/m84 snapshot

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

diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index f079e26cab8f..f262161b1a46 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -31,6 +31,9 @@ are the same.
 
 #define SK_VULKAN 1
 
+// Memory allocator for Vulkan.
+#define SK_USE_VMA 1
+
 #define SK_CODEC_DECODES_PNG 1
 #define SK_ENCODE_PNG 1
 
diff --git a/download.lst b/download.lst
index eec07e80c253..122a94da787a 100644
--- a/download.lst
+++ b/download.lst
@@ -241,8 +241,8 @@ export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 
d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f
-export SKIA_TARBALL := skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz
+export SKIA_SHA256SUM := 
f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0
+export SKIA_TARBALL := skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
 export STAROFFICE_VERSION_MICRO := 7
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 96566b958a7c..62fdeffed46e 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -205,6 +205,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/core/SkLocalMatrixImageFilter \
 UnpackedTarball/skia/src/core/SkMalloc \
 UnpackedTarball/skia/src/core/SkMallocPixelRef \
+UnpackedTarball/skia/src/core/SkMarkerStack \
 UnpackedTarball/skia/src/core/SkMaskBlurFilter \
 UnpackedTarball/skia/src/core/SkMaskCache \
 UnpackedTarball/skia/src/core/SkMask \
@@ -418,6 +419,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/sksl/ir/SkSLType \
 UnpackedTarball/skia/src/sksl/ir/SkSLVariableReference \
 UnpackedTarball/skia/src/sksl/SkSLASTNode \
+UnpackedTarball/skia/src/sksl/SkSLByteCode \
 UnpackedTarball/skia/src/sksl/SkSLByteCodeGenerator \
 UnpackedTarball/skia/src/sksl/SkSLCFGGenerator \
 UnpackedTarball/skia/src/sksl/SkSLCompiler \
@@ -431,6 +433,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/sksl/SkSLOutputStream \
 UnpackedTarball/skia/src/sksl/SkSLParser \
 UnpackedTarball/skia/src/sksl/SkSLPipelineStageCodeGenerator \
+UnpackedTarball/skia/src/sksl/SkSLSampleMatrix \
 UnpackedTarball/skia/src/sksl/SkSLSPIRVCodeGenerator \
 UnpackedTarball/skia/src/sksl/SkSLSPIRVtoHLSL \
 UnpackedTarball/skia/src/sksl/SkSLSectionAndParameterHelper \
@@ -443,9 +446,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/utils/SkDashPath \
 UnpackedTarball/skia/src/utils/SkEventTracer \
 UnpackedTarball/skia/src/utils/SkFloatToDecimal \
-UnpackedTarball/skia/src/utils/SkFrontBufferedStream \
 UnpackedTarball/skia/src/utils/SkCharToGlyphCache \
 UnpackedTarball/skia/src/utils/SkClipStackUtils \
+UnpackedTarball/skia/src/utils/SkCustomTypeface \
 UnpackedTarball/skia/src/utils/SkInterpolator \
 UnpackedTarball/skia/src/utils/SkJSON \
 UnpackedTarball/skia/src/utils/SkJSONWriter \
@@ -510,6 +513,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/gpu/effects/generated/GrHSLToRGBFilterEffect \
 UnpackedTarball/skia/src/gpu/effects/generated/GrLumaColorFilterEffect \
 UnpackedTarball/skia/src/gpu/effects/generated/GrMagnifierEffect \
+UnpackedTarball/skia/src/gpu/effects/generated/GrMatrixEffect \
 UnpackedTarball/skia/src/gpu/effects/generated/GrMixerEffect \
 
UnpackedTarball/skia/src/gpu/effects/generated/GrOve

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

[Michael Stahl (via logerrit)]

 xmlsecurity/qa/unit/signing/signing.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ff75d6653e34b7cbb94f74ff8a71db9f738463e
Author: Michael Stahl 
AuthorDate: Mon May 18 12:57:23 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 15:25:39 2020 +0200

xmlsecurity: actually validate in testODFEncryptedGPG

Follow-up to 5eda583443cd0ec323e925395ea734c20fdbcf13

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

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index fb2c91fc3f42..f47f2c12da33 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -968,6 +968,7 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testODFEncryptedGPG)
 uno::Reference xDocStorable(mxComponent, 
uno::UNO_QUERY);
 xDocStorable->storeToURL(aTempFile.GetURL(), props);
 }
+validate(aTempFile.GetFileName(), test::ODF);
 
 createDoc(aTempFile.GetURL());
 pBaseModel = dynamic_cast(mxComponent.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 package/source/manifest/ManifestExport.cxx |   82 ++---
 1 file changed, 40 insertions(+), 42 deletions(-)

New commits:
commit ba0d1a850ad118b5889a4814ef6d01b989029a58
Author: Michael Stahl 
AuthorDate: Mon May 18 12:56:04 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 15:24:40 2020 +0200

package: ODF export: fix position of manifest:start-key-generation child

META-INF/manifest.xml[8,137]:  Error: element 
"manifest:start-key-generation" was found where no element may occur

The problem is that in the schema, manifest:start-key-generation
precedes key-derivation but LO writes it in swapped order.

This is apparently a workaround for a bug in OOo < 3.2 ODF import and
specific to ODF >= 1.2 because the element didn't exist in ODF 1.1; as
it turns out we don't care about OOo < 3.4 being able to load encrypted
ODF 1.2 documents anway since commit
0b7c3b7d9fa71f59eed75c3e80e5e12245c5e1c5 "tdf#114939 officecfg,sfx2:
always use AES/SHA256 in ODF 1.2".

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

diff --git a/package/source/manifest/ManifestExport.cxx 
b/package/source/manifest/ManifestExport.cxx
index fefb1aa7c1e9..1546b7dbb3c7 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -452,48 +452,6 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
 xHandler->ignorableWhitespace ( sWhiteSpace );
 xHandler->endElement( sAlgorithmElement );
 
-//  Key Derivation
-pNewAttrList = new ::comphelper::AttributeList;
-xNewAttrList = pNewAttrList;
-
-if ( pKeyInfoProperty )
-{
-pNewAttrList->AddAttribute ( sKeyDerivationNameAttribute,
- sCdataAttribute,
- sPGP_Name );
-// no start-key-generation needed, our session key has
-// max size already
-bStoreStartKeyGeneration = false;
-}
-else
-{
-pNewAttrList->AddAttribute ( sKeyDerivationNameAttribute,
- sCdataAttribute,
- sPBKDF2_Name );
-
-if ( bStoreStartKeyGeneration )
-{
-aBuffer.append( nDerivedKeySize );
-pNewAttrList->AddAttribute ( sKeySizeAttribute, 
sCdataAttribute, aBuffer.makeStringAndClear() );
-}
-
-sal_Int32 nCount = 0;
-*pIterationCount >>= nCount;
-aBuffer.append (nCount);
-pNewAttrList->AddAttribute ( sIterationCountAttribute, 
sCdataAttribute, aBuffer.makeStringAndClear() );
-
-*pSalt >>= aSequence;
-::comphelper::Base64::encode(aBuffer, aSequence);
-pNewAttrList->AddAttribute ( sSaltAttribute, sCdataAttribute, 
aBuffer.makeStringAndClear() );
-}
-
-xHandler->ignorableWhitespace ( sWhiteSpace );
-xHandler->startElement( sKeyDerivationElement , xNewAttrList);
-xHandler->ignorableWhitespace ( sWhiteSpace );
-xHandler->endElement( sKeyDerivationElement );
-
-// we have to store start-key-generation element as the last one 
to workaround the parsing problem
-// in OOo3.1 and older versions
 if ( bStoreStartKeyGeneration )
 {
 //  Start Key Generation
@@ -528,6 +486,46 @@ ManifestExport::ManifestExport( uno::Reference< 
xml::sax::XDocumentHandler > con
 xHandler->endElement( sStartKeyGenerationElement );
 }
 
+//  Key Derivation
+pNewAttrList = new ::comphelper::AttributeList;
+xNewAttrList = pNewAttrList;
+
+if (pKeyInfoProperty)
+{
+pNewAttrList->AddAttribute(sKeyDerivationNameAttribute,
+   sCdataAttribute,
+   sPGP_Name);
+// no start-key-generation needed, our session key has
+// max size already
+bStoreStartKeyGeneration = false;
+}
+else
+{
+pNewAttrList->AddAttribute(sKeyDerivationNameAttribute,
+   sCdataAttribute,
+   sPBKDF2_Name);
+
+if (bStoreStartKeyGeneration)
+{
+aBuffer.append(nDerivedKeySize);
+pNewAttrList->AddAttribute(sKeySizeAttribute, 
sCdataAttribute, aBuffer.makeStringAndClear());
+}

[Libreoffice-commits] core.git: download.lst

[Michael Stahl (via logerrit)]

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

New commits:
commit 75187e0a59b16b06c5adf16987919a39153030d5
Author: Michael Stahl 
AuthorDate: Fri May 8 17:55:25 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 15:25:17 2020 +0200

upgrade ODF validator with ODF 1.3 support

ODF 1.3 schemas are supported; only thing missing is the MIME-type
for the master template document.

(actually we don't need this in the LO build because we use custom
schemas anyway but let's test if there aren't any problems with
the validator itself)

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

diff --git a/download.lst b/download.lst
index 7c78e3071fb9..eec07e80c253 100644
--- a/download.lst
+++ b/download.lst
@@ -198,8 +198,8 @@ export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
-export ODFVALIDATOR_SHA256SUM := 
984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
-export ODFVALIDATOR_JAR := 
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
+export ODFVALIDATOR_SHA256SUM := 
d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
+export ODFVALIDATOR_JAR := 
odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
 export OFFICEOTRON_SHA256SUM := 
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
 export OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: schema/odf1.3

[Michael Stahl (via logerrit)]

 schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng  |   41 +++---
 schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng  |   42 +++
 schema/odf1.3/OpenDocument-schema-v1.3.rng   |   13 +
 schema/odf1.3/OpenDocument-v1.3-metadata.owl |   39 ++---
 schema/odf1.3/OpenDocument-v1.3-package-metadata.owl |   39 ++---
 5 files changed, 75 insertions(+), 99 deletions(-)

New commits:
commit 34ec838f0607564097cb08ce65165279e31888aa
Author: Michael Stahl 
AuthorDate: Wed Apr 29 14:39:15 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 15:24:20 2020 +0200

schema: update ODF 1.3 rng drafts to cs01

... but remove unintentional changes from manifest-schema.

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

diff --git a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng 
b/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
index 7fd47cf2352e..be2e9788ca08 100644
--- a/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-dsig-schema-v1.3.rng
@@ -1,36 +1,27 @@
 
+
 
 
-   The limited permissions granted above are perpetual and will not be 
revoked by
-   OASIS or its successors or assigns.
+
 
-   This document and the information contained herein is provided on an 
"AS IS"
-   basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT
-   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-   INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF 
MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. 
--->
 http://www.w3.org/2000/09/xmldsig#"; 
xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0" 
xmlns:rng="http://relaxng.org/ns/structure/1.0"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
   
 
diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng 
b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
index 48c11a0f7010..09f6bd35bc23 100644
--- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
@@ -1,36 +1,26 @@
 
+
 
 
-   The limited permissions granted above are perpetual and will not be 
revoked by
-   OASIS or its successors or assigns.
+
 
-   This document and the information contained herein is provided on an 
"AS IS"
-   basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT
-   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-   INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF 
MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. 
--->
 http://relaxng.org/ns/structure/1.0"; 
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";>
   
 
diff --git a/schema/odf1.3/OpenDocument-schema-v1.3.rng 
b/schema/odf1.3/OpenDocument-schema-v1.3.rng
index e8fac152483f..4b49c3e35dc5 100644
--- a/schema/odf1.3/OpenDocument-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-schema-v1.3.rng
@@ -1,4 +1,13 @@
 
+
 
 
 
-   The limited permissions granted above are perpetual and will not be 
revoked by
-   OASIS or its successors or assigns.
+
 
-   This document and the information contained herein is provided on an 
"AS IS"
-   basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT
-   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-   INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF 
MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. 
--->
 http://purl.org/dc/elements/1.1/"; 
xmlns:odf="http://docs.oasis-open.org/ns/office/1.2/meta/odf#"; 
xmlns:owl="http://www.w3.org/2002/07/owl#"; 
xmlns:pkg="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#"; 
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; 
xmlns="http://www.w3.org/2000/01/rdf-schema#";>
 
 http://docs.oasis-open.org/ns/office/1.2/meta/odf#";>
diff --git a/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl 
b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
index 9281dff7752f..60a9cb297834 100644
--- a/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
+++ b/schema/odf1.3/OpenDocument-v1.3-package-metadata.owl
@@ -1,36 +1,27 @@
 
+
 
 
-   The limited permissions granted above are perpetual and will not be 
revoked by
-   OASIS or its successors or assigns.
+
 
-   This document and the information contained herein is provided on an 
"AS IS"
-   basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING 
BUT NOT
-   LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-   INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF 
MERCHANTABILITY OR
-   FITNESS FOR A PARTICULAR PURPOSE. 
--->
 http://purl.org/dc/elements/1.1/"; 
xmlns:owl="http://www.w3.org/2002/07/o

About consumption of GDI

[julien2412]

Hello,

I made this test:
- launch Writer
- type 3 words and use a different font for each of them
- export in pdf

Using GDIView, it seems that each time I export in PDF, the number of GDI
increases.
Trying to use Windbg !htrace -enable, then diff 

It seems LO leaks in VistaFilePickerImpl::impl_sta_ShowDialogModal
Indeed, after:
1037  if (iSave.is())
1038  hResult = iSave->Show( m_hParentWindow ); // parent window
needed

See
https://opengrok.libreoffice.org/xref/core/fpicker/source/win32/VistaFilePickerImpl.cxx?r=ffa636ba#1037
then leave the function, the GDI number doesn't decrease.

"iSave" is declared some lines above, like this:
TFileSaveDialog iSave = m_iDialogSave;

"TFileSaveDialog " is declared like this:
typedef ComPtr< IFileSaveDialog , IID_IFileSaveDialog  ,
CLSID_FileSaveDialog > TFileSaveDialog;

ComPtr is a specific class which should release handle when the instance is
destroyed (see
https://opengrok.libreoffice.org/xref/core/fpicker/source/win32/comptr.hxx?r=591db0f9#30).

I wonder if this mechanism really works as expected.

I mean, shouldn't we try to release manually in impl_sta_ShowDialogModal ?

I'm quite a beginner with Windbg + GDI stuff so my analysis may be very
incomplete or even wrong.

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: configure.ac

[Stephan Bergmann (via logerrit)]

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

New commits:
commit cce42f7de6bdc406f40a0a16ad15285adc4a4c62
Author: Stephan Bergmann 
AuthorDate: Mon May 18 11:54:08 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Mon May 18 15:03:14 2020 +0200

Apply dirname to the first word of CXX

...in case it contains addtional arguments like -fsized-deallocation 
besides the
compiler's pathname, which would have caused failures like

  basename: extra operand '-fsized-deallocation'
  Try 'basename --help' for more information.
  dirname: missing operand
  Try 'dirname --help' for more information.
  dirname: missing operand
  Try 'dirname --help' for more information.

(printf reuses the format operand to satisfy all argument operands, so that 
\n |
head hack is needed to get just the first one, assuming that CXX did not 
contain
any carefully crafted escape sequences inside that first argument that would
expand to a newline when printing.  Also, this does not cater for leading
var=value or (even more far-fetched) redirection words in CXX, but the 
original
code did not, either.)

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

diff --git a/configure.ac b/configure.ac
index 1d531f32edec..6e5e18021a3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7205,7 +7205,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 dnl The prefix where Clang resides, override to where Clang resides if
 dnl using a source build:
 if test -z "$CLANGDIR"; then
-CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename 
$CXX
+CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename 
$(printf '%s\n' $CXX | head -n 1)
 fi
 # Assume Clang is self-built, but allow overriding 
COMPILER_PLUGINS_CXX to the compiler Clang was built with.
 if test -z "$COMPILER_PLUGINS_CXX"; then
___
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' - include/vcl sfx2/source vcl/jsdialog

[Szymon Kłos (via logerrit)]

 include/vcl/jsdialog/jsdialogbuilder.hxx |5 +
 sfx2/source/dialog/tabdlg.cxx|4 +
 vcl/jsdialog/jsdialogbuilder.cxx |   84 ++-
 3 files changed, 70 insertions(+), 23 deletions(-)

New commits:
commit 92e0a646f958fd149c2a0d56e684e47ae52a8b5d
Author: Szymon Kłos 
AuthorDate: Mon Mar 9 14:11:06 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:48:09 2020 +0200

jsdialog: handle nested tab pages

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

diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx 
b/include/vcl/jsdialog/jsdialogbuilder.hxx
index e0d4bc2dcdc1..b375daf4f2b1 100644
--- a/include/vcl/jsdialog/jsdialogbuilder.hxx
+++ b/include/vcl/jsdialog/jsdialogbuilder.hxx
@@ -28,8 +28,12 @@ public:
 class VCL_DLLPUBLIC JSInstanceBuilder : public SalInstanceBuilder
 {
 vcl::LOKWindowId m_nWindowId;
+/// used in case of tab pages where dialog is not a direct top level
+VclPtr m_aParentDialog;
+bool m_bHasTopLevelDialog;
 
 static std::map& GetLOKWeldWidgetsMap();
+static void InsertWindowToMap(int nWindowId);
 void RememberWidget(const OString& id, weld::Widget* pWidget);
 
 public:
@@ -112,6 +116,7 @@ public:
 virtual void insert(int pos, const OUString& rStr, const OUString* pId,
 const OUString* pIconName, VirtualDevice* 
pImageSurface) override;
 virtual void remove(int pos) override;
+virtual void set_active(int pos) override;
 };
 
 class VCL_DLLPUBLIC JSComboBox : public JSWidget
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 8ef457dd31a7..6cc7e797d3d2 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -187,7 +188,8 @@ SfxTabPage::SfxTabPage(TabPageParent pParent, const 
OUString& rUIXMLDescription,
 , pSet( rAttrSet )
 , bHasExchangeSupport ( false )
 , pImpl   ( new TabPageImpl )
-, m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, 
rUIXMLDescription)
+, m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, 
rUIXMLDescription, comphelper::LibreOfficeKit::isActive()
+&& SfxViewShell::Current() && 
SfxViewShell::Current()->isLOKMobilePhone())
: Application::CreateInterimBuilder(this, 
rUIXMLDescription))
 , m_xContainer(m_xBuilder->weld_container(rID))
 {
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index da9f04fe4044..1d572534e46c 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -31,12 +31,21 @@ JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, 
const OUString& rUIR
  : nullptr,
  rUIRoot, rUIFile)
 , m_nWindowId(0)
+, m_aParentDialog(nullptr)
+, m_bHasTopLevelDialog(false)
 {
+vcl::Window* pRoot = get_builder().get_widget_root();
+if (pRoot && pRoot->GetParent())
+{
+m_aParentDialog = pRoot->GetParent()->GetParentWithLOKNotifier();
+m_nWindowId = m_aParentDialog->GetLOKWindowId();
+InsertWindowToMap(m_nWindowId);
+}
 }
 
 JSInstanceBuilder::~JSInstanceBuilder()
 {
-if (m_nWindowId)
+if (m_nWindowId && m_bHasTopLevelDialog)
 GetLOKWeldWidgetsMap().erase(m_nWindowId);
 }
 
@@ -52,6 +61,7 @@ weld::Widget* 
JSInstanceBuilder::FindWeldWidgetsMap(vcl::LOKWindowId nWindowId,
 const OString& rWidget)
 {
 const auto it = GetLOKWeldWidgetsMap().find(nWindowId);
+
 if (it != GetLOKWeldWidgetsMap().end())
 {
 auto widgetIt = it->second.find(rWidget);
@@ -62,6 +72,15 @@ weld::Widget* 
JSInstanceBuilder::FindWeldWidgetsMap(vcl::LOKWindowId nWindowId,
 return nullptr;
 }
 
+void JSInstanceBuilder::InsertWindowToMap(int nWindowId)
+{
+WidgetMap map;
+auto it = GetLOKWeldWidgetsMap().find(nWindowId);
+if (it == GetLOKWeldWidgetsMap().end())
+GetLOKWeldWidgetsMap().insert(
+std::map::value_type(nWindowId, map));
+}
+
 void JSInstanceBuilder::RememberWidget(const OString& id, weld::Widget* 
pWidget)
 {
 auto it = GetLOKWeldWidgetsMap().find(m_nWindowId);
@@ -76,9 +95,7 @@ std::unique_ptr 
JSInstanceBuilder::weld_dialog(const OString& id,
 ::Dialog* pDialog = m_xBuilder->get<::Dialog>(id);
 m_nWindowId = pDialog->GetLOKWindowId();
 
-WidgetMap map;
-GetLOKWeldWidgetsMap().insert(
-std::map::value_type(m_nWindowId, map));
+InsertWindowToMap(m_nWindowId);
 
 std::unique_ptr pRet(pDialog ? new 
SalInstanceDialog(pDialog, this, false)
: nullptr);
@@ -87,6 +1

[Libreoffice-commits] core.git: stoc/test

[Andrea Gelmini (via logerrit)]

 stoc/test/testiadapter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da552b29a4c894e02262c3ea26f231cf1a9a0858
Author: Andrea Gelmini 
AuthorDate: Mon May 18 12:52:24 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 18 14:26:38 2020 +0200

Fix typo in code

Change-Id: I66c0d8fc4d307c376af20673e756944626df907b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94411
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index ced8c836f5ea..1525032d2af3 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -924,7 +924,7 @@ sal_Bool raiseException( const 
Reference & xLBT )
 {
 OSL_ENSURE( aExc.Message.startsWith("dum dum dum I dance around the 
circle..."),
  "### unexpected exception content!" );
-return aExc.Messag.startsWith("dum dum dum I dance around the 
circle...");
+return aExc.Message.startsWith("dum dum dum I dance around the 
circle...");
 }
 return sal_False;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/jsdialogs' - 109 commits - android/app android/lib configure.ac cypress_test/data cypress_test/integration_tests cypress_test/Makefile.am docker/Debia

[Szymon Kłos (via logerrit)]

Rebased ref, commits from common ancestor:
commit 9eb64fd441a50b55b77f252fc7e2aedfb3b0d385
Author: Szymon Kłos 
AuthorDate: Wed May 6 10:49:47 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:22:09 2020 +0200

jsdialog: use edit instead of combobox in find & replace

Change-Id: I1d365ef8ac3860ffa581f830c1b989842532723a

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 492bbe3dd..0de7e0aba 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1393,8 +1393,12 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (data.id === 'applystyle' ||
data.id === 'fontnamecombobox' ||
data.id === 'fontsizecombobox' ||
-   data.id === 'FontBox')
+   data.id === 'FontBox') {
builder._listboxControl(parentContainer, data, builder);
+   } else if (data.id === 'searchterm' ||
+   data.id === 'replaceterm') {
+   builder._editControl(parentContainer, data, builder);
+   }
else
builder._explorableEditControl(parentContainer, data, 
builder);
},
commit 0e90c7a99fc1a1eff4c6347f370e96e6a4371a16
Author: Szymon Kłos 
AuthorDate: Wed May 6 10:20:37 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:22:09 2020 +0200

Add spell check dialog in mobile menu

Change-Id: I926025cdda2658865dcdb417ea4f030b325ff685

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1531e7142..323d40917 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -505,6 +505,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:SelectAll'}
]},
{name: _('Search'), id: 'searchdialog', uno: 
'.uno:SearchDialog'},
+   {uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:WordCountDialog'},
{name: _UNO('.uno:ChangesMenu', 'text'), id: 
'changesmenu', type: 'menu', menu: [
{uno: '.uno:TrackChanges'},
commit 048af68f2f57b3776a24f38072a3fda1dd64c622
Author: Szymon Kłos 
AuthorDate: Wed May 6 10:18:30 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:22:09 2020 +0200

Add data validation dialog in menu

Change-Id: I8887eac359f87fa2fe59b29f10a5fe9804bf33b9

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 86e175841..1531e7142 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -617,6 +617,8 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DeleteColumnbreak'}]}
]},
{name: _UNO('.uno:DataMenu', 'spreadsheet'), id: 
'datamenu', type: 'menu', menu: [
+   {uno: '.uno:Validation'},
+   {type: 'separator'},
{uno: '.uno:DataSort'},
{uno: '.uno:SortAscending'},
{uno: '.uno:SortDescending'},
commit eeceb5e82f9cf4ba134c4766d72a9180b52931a8
Author: Szymon Kłos 
AuthorDate: Wed May 6 10:15:23 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:22:07 2020 +0200

Add watermark dialog in menu

Change-Id: I76054a101c8d45f46761bbc7b70d4939a48acd30

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 481cfa2ac..86e175841 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -516,6 +516,7 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:NextTrackedChange'}
]},
{name: _('Page Setup'), id: 'pagesetup', type: 
'action'},
+   {uno: '.uno:Watermark'},
{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 
'menu', menu: [
{uno: '.uno:ControlCodes'},
{uno: '.uno:SpellOnline'},
commit 7b95ee1908626f260852f64f2e7f2ca3b7e74529
Author: Szymon Kłos 
AuthorDate: Wed May 6 10:13:40 2020 +0200
Commit: Szymon Kłos 
CommitDate: Mon May 18 14:21:31 2020 +0200

Add word count dialog in menu

Change-Id: I1417ac3b261bbd9ce7411c5f4bb37e3093ee88bf

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 184e6bdc7..481cfa2ac 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -505,6 +505,7 @@ L.Control.Menub

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1262f7b3180e984bff53b5958aa059562966f79
Author: Tamás Zolnai 
AuthorDate: Mon May 18 14:15:26 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 14:15:26 2020 +0200

cypress: this is unstable.

Change-Id: Ifb492aa60594a98f7274e09682e3042797431ce8

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 9ae817ec7..a1554fa3b 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -263,7 +263,7 @@ describe('Form field button tests.', function() {
.should('not.exist');
});
 
-   it('Test field button after zoom.', function() {
+   it.skip('Test field button after zoom.', function() {
helper.loadTestDoc('form_field.odt', 'writer');
 
// Move the cursor next to the form field
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |   39 +++
 sw/qa/uitest/writer_tests7/tdf128782.py |   45 
 2 files changed, 39 insertions(+), 45 deletions(-)

New commits:
commit d08d42fd7f10f2d2c1bb42dc2aed11693bd882be
Author: Xisco Fauli 
AuthorDate: Mon May 18 11:49:33 2020 +0200
Commit: Xisco Faulí 
CommitDate: Mon May 18 14:01:12 2020 +0200

tdf#128782: move UItest to CppunitTest

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

diff --git a/sw/qa/uitest/writer_tests/data/tdf128782.odt 
b/sw/qa/extras/uiwriter/data3/tdf128782.odt
similarity index 100%
rename from sw/qa/uitest/writer_tests/data/tdf128782.odt
rename to sw/qa/extras/uiwriter/data3/tdf128782.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index ec33238f407e..3b67a6fde7ca 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -685,6 +685,45 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf117601)
 CPPUNIT_ASSERT(xCellB1->getString().endsWith("test1"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf128782)
+{
+load(DATA_DIRECTORY, "tdf128782.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(2, getShapes());
+uno::Reference xShape1 = getShape(1);
+uno::Reference xShape2 = getShape(2);
+
+awt::Point aPos[2];
+aPos[0] = xShape1->getPosition();
+aPos[1] = xShape2->getPosition();
+
+//select shape 2 and move it down
+dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
+dispatchCommand(mxComponent, ".uno:JumpToNextFrame", {});
+Scheduler::ProcessEventsToIdle();
+
+pTextDoc->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_DOWN);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(aPos[1].X, xShape2->getPosition().X);
+//Y position in shape 2 has changed
+CPPUNIT_ASSERT(aPos[1].Y != xShape2->getPosition().Y);
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(aPos[0].X, xShape1->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(aPos[0].Y, xShape1->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(aPos[1].X, xShape2->getPosition().X);
+// Shape2 has come back to the original position
+// without the fix in place, it would have failed
+CPPUNIT_ASSERT_EQUAL(aPos[1].Y, xShape2->getPosition().Y);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132637_protectTrackChanges)
 {
 load(DATA_DIRECTORY, "tdf132637_protectTrackChanges.doc");
diff --git a/sw/qa/uitest/writer_tests7/tdf128782.py 
b/sw/qa/uitest/writer_tests7/tdf128782.py
deleted file mode 100644
index 13104c4bed29..
--- a/sw/qa/uitest/writer_tests7/tdf128782.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from uitest.framework import UITestCase
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.path import get_srcdir_url
-
-def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
-
-class tdf128782(UITestCase):
-
-   def test_tdf128782_move_textbox_undo(self):
-self.ui_test.load_file(get_url_for_data_file("tdf128782.odt"))
-xWriterDoc = self.xUITest.getTopFocusWindow()
-xWriterEdit = xWriterDoc.getChild("writer_edit")
-document = self.ui_test.get_component()
-
-oldX1 = document.getDrawPage()[0].Position.X
-oldY1 = document.getDrawPage()[0].Position.Y
-oldX2 = document.getDrawPage()[1].Position.X
-oldY2 = document.getDrawPage()[1].Position.Y
-
-#select shape 2 and move it down
-document.getCurrentController().select(document.getDrawPage()[1])
-xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
-
-#Only the Y value of shape 2 changes
-self.assertEqual(oldX1, document.getDrawPage()[0].Position.X)
-self.assertEqual(oldY1, document.getDrawPage()[0].Position.Y)
-self.assertEqual(oldX2, document.getDrawPage()[1].Position.X)
-self.assertNotEqual(oldY2, document.getDrawPage()[1].Position.Y)
-
-self.xUITest.executeCommand(".uno:Undo")
-
-#Both shapes should have the same position as before
-self.assertEqual(oldX1, document.getDrawPage()[0].Position.X)
-self.assertEqual(oldY1, document.getDrawPage()[0].Position.Y)
-self.assertEqual(oldX2, document.getDrawPage()[1].Position.X)
-self.assertEqual(oldY2, document.g

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.only-used-in-constructor.results |   16 
+++-
 compilerplugins/clang/unusedfields.readonly.results |   10 
+++--
 compilerplugins/clang/unusedfields.untouched.results|   20 
--
 compilerplugins/clang/unusedfields.writeonly.results|   18 
-
 vcl/source/control/combobox.cxx |3 -
 5 files changed, 32 insertions(+), 35 deletions(-)

New commits:
commit 18dc598a6e0017df375369a81c8df3bbd41ed8ab
Author: Noel Grandin 
AuthorDate: Mon May 18 11:32:34 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon May 18 13:51:03 2020 +0200

loplugin:unusedfields

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

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 21177759ae59..bd57ae985122 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:43
 avmedia/source/vlc/wrapper/Types.hxx:44
 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:45
-libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:42:7)
+libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:42:7)
 avmedia/source/vlc/wrapper/Types.hxx:46
-libvlc_event_t u union (anonymous union at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:40:5)
+libvlc_event_t u union (anonymous union at 
/home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:40:5)
 avmedia/source/vlc/wrapper/Types.hxx:52
 libvlc_track_description_t psz_name char *
 basegfx/source/polygon/b2dpolygontriangulator.cxx:112
@@ -86,8 +86,6 @@ cppcanvas/source/mtfrenderer/textaction.cxx:1641
 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo 
const tools::TextLineInfo
 cppu/source/threadpool/threadpool.cxx:361
 _uno_ThreadPool dummy sal_Int32
-cppu/source/typelib/typelib.cxx:60
-(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:38
 (anonymous namespace)::C1 n1 sal_Int16
 cppu/source/uno/check.cxx:67
@@ -120,6 +118,8 @@ cppu/source/uno/check.cxx:107
 (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
 (anonymous namespace)::second a int
+cppu/source/uno/check.cxx:120
+(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
 (anonymous namespace)::Char1 c1 char
 cppu/source/uno/check.cxx:130
@@ -170,6 +170,8 @@ dbaccess/source/core/dataaccess/connection.hxx:102
 dbaccess::OConnection m_nInAppend std::atomic
 dbaccess/source/core/inc/databasecontext.hxx:85
 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2782
+  class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:61
 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 drawinglayer/inc/texture/texture3d.hxx:63
@@ -720,19 +722,15 @@ svx/source/xml/xmleohlp.cxx:68
 OutputStorageWrapper_Impl aTempFile class utl::TempFile
 svx/source/xml/xmlgrhlp.cxx:87
 (anonymous namespace)::GraphicInputStream maTempFile utl::TempFile
-sw/inc/accessibilityoptions.hxx:25
-SwAccessibilityOptions bIsStopAnimatedText _Bool
 sw/inc/unosett.hxx:145
 SwXNumberingRules m_pImpl ::sw::UnoImplPtr
 sw/qa/core/test_ToxTextGenerator.cxx:145
 (anonymous namespace)::ToxTextGeneratorWithMockedChapterField 
mChapterFieldType class SwChapterFieldType
-sw/qa/extras/layout/layout.cxx:2921
-  class SvtSysLocaleOptions &
 sw/qa/extras/uiwriter/uiwriter.cxx:4214
 (anonymous namespace)::IdleTask maIdle class Idle
 sw/source/core/crsr/crbm.cxx:64
 (anonymous namespace)::CursorStateHelper m_aSaveState class 
SwCursorSaveState
-sw/source/core/inc/swfont.hxx:987
+sw/source/core/inc/swfont.hxx:980
 SvStatistics nGetStretchTextSize sal_uInt16
 sw/source/core/layout/dbg_lay.cxx:171
 SwImplEnterLeave nAction enum DbgAction
diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index d995a856ab07..38f5b00b99ec 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -156,6 +156,8 @@ cppu/source/uno/check.cxx:107
 (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
 (anonymous namespace)::second a int
+cppu/source/uno/check.cxx:120
+(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
 (anonymous namespace)::Char1 c1 char
 cppu/source/

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results |   46 +++-
 sw/inc/charatr.hxx  |2 -
 sw/inc/swatrset.hxx |1 
 3 files changed, 12 insertions(+), 37 deletions(-)

New commits:
commit bd428b45d793ffc2f764c952ffcd7ef814ee5dc8
Author: Noel Grandin 
AuthorDate: Mon May 18 11:28:07 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon May 18 13:38:54 2020 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 35675d0393ea..a17231a1400e 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -808,11 +808,7 @@ include/vcl/ColorMask.hxx:114
 void ColorMask::SetColorFor16BitMSB(const class BitmapColor &,unsigned 
char *) const
 include/vcl/ColorMask.hxx:116
 void ColorMask::SetColorFor16BitLSB(const class BitmapColor &,unsigned 
char *) const
-include/vcl/combobox.hxx:117
-void ComboBox::SetDoubleClickHdl(const class Link 
&)
-include/vcl/combobox.hxx:118
-const class Link & ComboBox::GetDoubleClickHdl() 
const
-include/vcl/combobox.hxx:141
+include/vcl/combobox.hxx:138
 class rtl::OUString ComboBox::GetSelectedEntry() const
 include/vcl/commandevent.hxx:249
  CommandMediaData::CommandMediaData(enum MediaCommand)
@@ -852,10 +848,6 @@ include/vcl/ITiledRenderable.hxx:190
 enum PointerStyle vcl::ITiledRenderable::getPointer()
 include/vcl/lok.hxx:24
 void vcl::lok::unregisterPollCallbacks()
-include/vcl/lstbox.hxx:175
-void * ListBox::GetSelectedEntryData() const
-include/vcl/lstbox.hxx:224
-const class Link & ListBox::GetDoubleClickHdl() 
const
 include/vcl/menu.hxx:456
 unsigned short MenuBar::AddMenuBarButton(const class Image &,const class 
Link &,const class 
rtl::OUString &)
 include/vcl/menu.hxx:460
@@ -872,9 +864,9 @@ include/vcl/opengl/OpenGLHelper.hxx:67
 void OpenGLHelper::renderToFile(long,long,const class rtl::OUString &)
 include/vcl/opengl/OpenGLHelper.hxx:100
 void OpenGLHelper::debugMsgStreamWarn(const class 
std::__cxx11::basic_ostringstream &)
-include/vcl/outdev.hxx:1742
+include/vcl/outdev.hxx:1744
 class basegfx::B2DPolyPolygon OutputDevice::LogicToPixel(const class 
basegfx::B2DPolyPolygon &,const class MapMode &) const
-include/vcl/outdev.hxx:1762
+include/vcl/outdev.hxx:1764
 class basegfx::B2DPolyPolygon OutputDevice::PixelToLogic(const class 
basegfx::B2DPolyPolygon &,const class MapMode &) const
 include/vcl/pngread.hxx:56
 void vcl::PNGReader::SetIgnoreGammaChunk(_Bool)
@@ -896,8 +888,6 @@ include/vcl/settings.hxx:721
 _Bool AllSettings::operator!=(const class AllSettings &) const
 include/vcl/split.hxx:92
 void Splitter::SetHorizontal(_Bool)
-include/vcl/splitwin.hxx:140
-void SplitWindow::Clear()
 include/vcl/svapp.hxx:169
  ApplicationEvent::ApplicationEvent(enum ApplicationEvent::Type,const 
class std::__debug::vector > &)
 include/vcl/svapp.hxx:802
@@ -920,12 +910,6 @@ include/vcl/treelist.hxx:171
 const class SvTreeListEntry * SvTreeList::GetParent(const class 
SvTreeListEntry *) const
 include/vcl/treelistbox.hxx:368
 void SvTreeListBox::RemoveSelection()
-include/vcl/treelistbox.hxx:441
-const class Link & 
SvTreeListBox::GetDoubleClickHdl() const
-include/vcl/treelistbox.hxx:618
-void SvTreeListBox::SetSublistOpenWithReturn()
-include/vcl/treelistbox.hxx:655
-void SvTreeListBox::SetIndent(short)
 include/vcl/txtattr.hxx:56
 _Bool TextAttrib::operator!=(const class TextAttrib &) const
 include/vcl/uitest/uiobject.hxx:278
@@ -1056,8 +1040,6 @@ include/vcl/weld.hxx:2198
 class std::unique_ptr > weld::Builder::weld_window(const class rtl::OString &,_Bool)
 include/vcl/window.hxx:410
 const char * ImplDbgCheckWindow(const void *)
-include/vcl/window.hxx:1047
-class tools::Rectangle vcl::Window::GetClientWindowExtentsRelative() const
 include/xmloff/txtimp.hxx:385
 class XMLPropertyBackpatcher & XMLTextImportHelper::GetFootnoteBP()
 include/xmloff/txtimp.hxx:386
@@ -1078,10 +1060,10 @@ 
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:72
 void ::operator()(struct _GtkBuilder *) const
 libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:31
 void * gtv_comments_sidebar_get_instance_private(struct GtvCommentsSidebar 
*)
-libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx:49
-void ::operator()(struct _GList *) const
 libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx:80
 void ::operator()(struct _GtkTargetList *) const
+libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.cxx:183
+void ::operator()(struct _GList *) const
 libreofficekit/qa/gtktiledviewer/gtv-signal-handlers.hxx:35
 void openLokDialog(struct _GtkWidget *,void *)
 l

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

[Noel Grandin (via logerrit)]

 configmgr/qa/unit/test.cxx|6 ++---
 configmgr/source/dconf.cxx|   16 +++---
 configmgr/source/writemodfile.cxx |   10 
 connectivity/source/commontools/dbtools.cxx   |   13 +--
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |8 +++
 connectivity/source/drivers/flat/ETable.cxx   |2 -
 connectivity/source/drivers/postgresql/pq_connection.cxx  |8 +++
 connectivity/source/drivers/postgresql/pq_statement.cxx   |8 +++
 connectivity/source/drivers/postgresql/pq_xbase.cxx   |8 +++
 9 files changed, 39 insertions(+), 40 deletions(-)

New commits:
commit 454eb3bc05f861712bff0f7593f9aa9809e4ee7c
Author: Noel Grandin 
AuthorDate: Mon May 18 09:18:34 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon May 18 13:18:38 2020 +0200

use for-range on Sequence in cli_ure..connectivity

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

diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index e553c1947f66..daa2070086f7 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -316,15 +316,15 @@ void Test::testReadCommands()
 "/org.openoffice.Office.UI.GenericCommands/UserInterface/"
  "Commands"),
 css::uno::UNO_QUERY_THROW);
-css::uno::Sequence< OUString > names(access->getElementNames());
+const css::uno::Sequence< OUString > names(access->getElementNames());
 
 /*CPPUNIT_ASSERT_EQUAL(749, names.getLength());*/
 // testSetSetMemberName() already removed ".uno:FontworkGalleryFloater"
 sal_uInt32 n = osl_getGlobalTimer();
 for (int i = 0; i < 8; ++i) {
-for (sal_Int32 j = 0; j < names.getLength(); ++j) {
+for (OUString const & childName : names) {
 css::uno::Reference< css::container::XNameAccess > child;
-if (access->getByName(names[j]) >>= child) {
+if (access->getByName(childName) >>= child) {
 CPPUNIT_ASSERT(child.is());
 child->getByName("Label");
 child->getByName("ContextLabel");
diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index 8493b3351e83..75c0bb360ce3 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -1264,12 +1264,12 @@ bool addProperty(
 }
 case TYPE_STRING_LIST:
 {
-css::uno::Sequence seq(
+const css::uno::Sequence seq(
 value.get>());
 std::vector vs;
-for (sal_Int32 i = 0; i != seq.getLength(); ++i) {
+for (OUString const & s : seq) {
 children.emplace_front(
-g_variant_new_string(encodeString(seq[i]).getStr()));
+g_variant_new_string(encodeString(s).getStr()));
 if (children.front().get() == nullptr) {
 SAL_WARN(
 "configmgr.dconf", "g_variant_new_string failed");
@@ -1287,11 +1287,11 @@ bool addProperty(
 }
 case TYPE_HEXBINARY_LIST:
 {
-css::uno::Sequence> seq(
+const css::uno::Sequence> seqSeq(
 value.get<
 css::uno::Sequence>>());
 std::vector vs;
-for (sal_Int32 i = 0; i != seq.getLength(); ++i) {
+for (css::uno::Sequence const & seq : seqSeq) {
 static_assert(
 sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
@@ -1299,8 +1299,8 @@ bool addProperty(
 sizeof (sal_Int8) == sizeof (guchar), "size mismatch");
 children.emplace_front(
 g_variant_new_fixed_array(
-G_VARIANT_TYPE_BYTE, seq[i].getConstArray(),
-seq[i].getLength(), sizeof (sal_Int8)));
+G_VARIANT_TYPE_BYTE, seq.getConstArray(),
+seq.getLength(), sizeof (sal_Int8)));
 if (children.front().get() == nullptr) {
 SAL_WARN(
 "configmgr.dconf",
@@ -1318,7 +1318,7 @@ bool addProperty(
 sizeof(sal_Int32) <= sizeof(gsize),
 "G_MAXSIZE too small");
 v.reset(
-g_variant_new_array(ty.get(), vs.data(), seq.getLength()));
+g_variant_new_array(ty.get(), vs.data(), 
seqSeq.getLength()));
 break;
 }
 default:
diff --git a/configmgr/source/writemodfile.cxx 
b/configmgr/source/writemodfile.cxx
index 22fd43ecf797..3df150c44

[Libreoffice-commits] core.git: Makefile.in

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

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc8cefd025d89e7f981f07814a16030f92413a8b
Author: Luboš Luňák 
AuthorDate: Fri Mar 20 12:59:26 2020 +0100
Commit: Luboš Luňák 
CommitDate: Mon May 18 13:13:24 2020 +0200

Revert "make: map slowcheck to gbuild's build and slowcheck"

This does not actually ensure everything is built before tests
are run, so this doesn't fix the test failures it was intended to fix.

This reverts commit 4054a30e2b2fa254dfb20718ce757ceb2f638fd5.

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

diff --git a/Makefile.in b/Makefile.in
index 7107d7a2ec6c..6af416b8a2f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck 
subsequentcheck perfcheck uic
 .PHONY : check-if-root bootstrap gbuild build build-non-l10n-only 
build-l10n-only check clean clean-build clean-host test-install distclean 
distro-pack-install docs download etags fetch get-submodules id install 
install-gdb-printers install-strip tags debugrun help showmodules translations 
packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=build
-build_goal:=$(if $(filter build build-nocheck slowcheck 
uicheck,$(MAKECMDGOALS)),build)\
+build_goal:=$(if $(filter build build-nocheck uicheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),unitcheck slowcheck subsequentcheck $(if 
$(filter Linux, $(shell uname)), uicheck))\
  $(filter build-l10n-only build-non-l10n-only debugrun help showmodules 
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo 
gbuildtojson,$(MAKECMDGOALS))
 
___
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

[Vasily Melenchuk (via logerrit)]

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

New commits:
commit 0a4d3852794bae8887dc11613b47cb8d2c4aa829
Author: Vasily Melenchuk 
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon May 18 12:54:28 2020 +0200

tdf#128665: sw: set unique name for shape format

Set name even if received shape name is empty. This is required
to have unique style name for undo/redo correct work.

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

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index b205802231df..698b05b5ac96 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] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |   52 
++
 1 file changed, 52 insertions(+)

New commits:
commit 82f96b40f8b8ae714f9c86ce47cde1652f8db8d5
Author: Tamás Zolnai 
AuthorDate: Mon May 18 11:50:24 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 12:45:05 2020 +0200

cypress: add zooming test for form fields.

Make sure the text cursor is inside the form field
button's frame.

Change-Id: Ib8a6fe50c14d01b5d3864f04e9668b9b1844b50e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94408
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 def301989..9ae817ec7 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -28,6 +28,24 @@ describe('Form field button tests.', function() {
 
cy.get('.drop-down-field-list')
.should('exist');
+
+   // Check also the position relative to the blinking cursor
+   cy.get('.blinking-cursor')
+   .then(function(cursors) {
+   // TODO: why we have two blinking cursors here?
+   //expect(cursors).to.have.lengthOf(1);
+
+   var cursorRect = 
cursors[0].getBoundingClientRect();
+   cy.get('.form-field-frame')
+   .should(function(frames) {
+   
expect(frames).to.have.lengthOf(1);
+   var frameRect = 
frames[0].getBoundingClientRect();
+   
expect(frameRect.top).to.be.lessThan(cursorRect.top);
+   
expect(frameRect.bottom).to.be.greaterThan(cursorRect.bottom);
+   
expect(frameRect.left).to.be.lessThan(cursorRect.left);
+   
expect(frameRect.right).to.be.greaterThan(cursorRect.right);
+   });
+   });
}
 
it('Activate and deactivate form field button.', function() {
@@ -244,5 +262,39 @@ describe('Form field button tests.', function() {
cy.get('.drop-down-field-list-item.selected')
.should('not.exist');
});
+
+   it('Test field button after zoom.', function() {
+   helper.loadTestDoc('form_field.odt', 'writer');
+
+   // Move the cursor next to the form field
+   cy.get('textarea.clipboard')
+   .type('{rightArrow}');
+
+   buttonShouldExist();
+
+   // Do a zoom in
+   cy.get('#tb_actionbar_item_zoom')
+   .click();
+
+   cy.contains('.menu-text', '120')
+   .click();
+
+   cy.contains('#tb_actionbar_item_zoom', '120')
+   .should('exist');
+
+   buttonShouldExist();
+
+   // Do a zoom out
+   cy.get('#tb_actionbar_item_zoom')
+   .click();
+
+   cy.contains('.menu-text', '85')
+   .click();
+
+   cy.contains('#tb_actionbar_item_zoom', '85')
+   .should('exist');
+
+   buttonShouldExist();
+   });
 });
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/layer/FormFieldButtonLayer.js |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 13f1f0182edd159034489caed910b5e1608d07f3
Author: Tamás Zolnai 
AuthorDate: Mon May 18 11:27:54 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 12:41:48 2020 +0200

MSForms: rerender form field button on zoom.

Hide the button on zoom start and display it again with
the new size on zoom end.

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

diff --git a/loleaflet/src/layer/FormFieldButtonLayer.js 
b/loleaflet/src/layer/FormFieldButtonLayer.js
index fcd826c28..a8c268872 100644
--- a/loleaflet/src/layer/FormFieldButtonLayer.js
+++ b/loleaflet/src/layer/FormFieldButtonLayer.js
@@ -41,6 +41,9 @@ L.FormFieldButton = L.Layer.extend({
 
// Build list of items opened by clicking on the drop down 
button
this._buildDropDownList(framePos, frameWidth, frameHeight);
+
+   map.on('zoomstart', this._onZoomStart, this);
+   map.on('zoomend', this._onZoomEnd, this);
},
 
_calculateButtonArea: function(map) {
@@ -161,6 +164,16 @@ L.FormFieldButton = L.Layer.extend({
this.map._socket.sendMessage(message);
},
 
+   _onZoomStart: function() {
+   $('.drop-down-field-list').hide();
+   this._clearButton();
+   },
+
+   _onZoomEnd: function() {
+   // rebuild button on zoom
+   this.onAdd(this.map);
+   },
+
_clearButton: function() {
this.getPane('formfieldPane').innerHTML = '';
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - 17 commits - sw/qa sw/source writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf104348_contextMargin.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf104354-2.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf106062_nonHangingFootnote.odt   |binary
 sw/qa/extras/ooxmlexport/data/tdf117504_numberingIndent.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf118521_marginsLR.docx   |binary
 sw/qa/extras/ooxmlexport/data/tdf119188_list_margin_in_cell.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf126723.docx |binary
 sw/qa/extras/ooxmlexport/data/tdf95377.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |3 
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |   31 
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   59 +
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|   52 +
 sw/qa/extras/uiwriter/data2/tdf90069.docx|binary
 sw/qa/extras/uiwriter/uiwriter2.cxx  |   33 +
 sw/source/filter/ww8/wrtw8nds.cxx|   13 
 writerfilter/source/dmapper/DomainMapper.cxx |  138 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|  315 
+-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   17 
 writerfilter/source/dmapper/NumberingManager.cxx |1 
 writerfilter/source/dmapper/StyleSheetTable.cxx  |3 
 writerfilter/source/dmapper/StyleSheetTable.hxx  |1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|3 
 22 files changed, 514 insertions(+), 155 deletions(-)

New commits:
commit f30585abfe198914511df004ac712f0e066cf0b9
Author: László Németh 
AuthorDate: Wed Jan 8 14:26:40 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon May 18 12:36:50 2020 +0200

tdf#90069 DOCX: fix character style of new table rows

DOCX table import didn't set paragraph level
character styles on paragraph level, only on
text portions, resulting default character style
in the newly inserted table rows instead of copying
the style of the previous table row.

(cherry picked from commit 2ab481b038b62b1ff576ac4d49d03c1798cd7f84)

Conflicts:
sw/qa/extras/uiwriter/uiwriter2.cxx

Change-Id: Idb4438c767bdc7e0026fc6e0f0a795d8efdda3c8

diff --git a/sw/qa/extras/uiwriter/data2/tdf90069.docx 
b/sw/qa/extras/uiwriter/data2/tdf90069.docx
new file mode 100644
index ..719502a67e78
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf90069.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 2da2640e7fcc..374c8c6b2b37 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace
 {
@@ -45,6 +47,7 @@ public:
 void testDropDownFormFieldInsertion();
 void testMixedFormFieldInsertion();
 void testTdf122942();
+void testTdf90069();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testTdf101534);
@@ -57,6 +60,7 @@ public:
 CPPUNIT_TEST(testDropDownFormFieldInsertion);
 CPPUNIT_TEST(testMixedFormFieldInsertion);
 CPPUNIT_TEST(testTdf122942);
+CPPUNIT_TEST(testTdf90069);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -475,6 +479,35 @@ void SwUiWriterTest2::testTdf122942()
 #endif
 }
 
+void SwUiWriterTest2::testTdf90069()
+{
+SwDoc* pDoc = createDoc("tdf90069.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+CPPUNIT_ASSERT(pDocShell);
+
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+
+lcl_dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
+pWrtShell->Down(false);
+pWrtShell->Insert("foo");
+
+SwTextNode* pTextNodeA1 = 
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT(pTextNodeA1->GetText().startsWith("Insert"));
+nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+SwTextNode* pTextNodeA2 = 
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), pTextNodeA2->GetText());
+CPPUNIT_ASSERT_EQUAL(true, 
pTextNodeA2->GetSwAttrSet().HasItem(RES_CHRATR_FONT));
+OUString sFontName = 
pTextNodeA2->GetSwAttrSet().GetItem(RES_CHRATR_FONT)->GetFamilyName();
+CPPUNIT_ASSERT_EQUAL(OUString("Lohit Devanagari"), sFontName);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0838e1713967..a6f62a7b4f23 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfi

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

[Tamás Zolnai (via logerrit)]

 sw/source/core/crsr/FormFieldButton.cxx |6 +-
 sw/source/core/crsr/bookmrk.cxx |8 
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 1bf0118e6cf4b8b4546a7ce494ff2973724bae1b
Author: Tamás Zolnai 
AuthorDate: Fri May 15 10:30:51 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 12:23:25 2020 +0200

MSForms: fix rendering of form field button.

It's not enough to check the paint area. because it's
in logic units, which does not change by zooming.

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

diff --git a/sw/source/core/crsr/FormFieldButton.cxx 
b/sw/source/core/crsr/FormFieldButton.cxx
index 162d03f43224..43d8ff6e07e9 100644
--- a/sw/source/core/crsr/FormFieldButton.cxx
+++ b/sw/source/core/crsr/FormFieldButton.cxx
@@ -49,7 +49,11 @@ void FormFieldButton::CalcPosAndSize(const SwRect& 
rPortionPaintArea)
 // Then extend the size with the button area
 
aBoxSize.AdjustWidth(GetParent()->LogicToPixel(rPortionPaintArea.SSize()).Height());
 
-SetPosSizePixel(aBoxPos, aBoxSize);
+if (aBoxPos != GetPosPixel() || aBoxSize != GetSizePixel())
+{
+SetPosSizePixel(aBoxPos, aBoxSize);
+Invalidate();
+}
 }
 
 void FormFieldButton::MouseButtonUp(const MouseEvent&)
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 583ddaff4a12..bd7e5d48fd12 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -700,19 +700,11 @@ namespace sw::mark
 
 void DropDownFieldmark::SetPortionPaintArea(const SwRect& 
rPortionPaintArea)
 {
-if(m_aPortionPaintArea == rPortionPaintArea &&
-   m_pButton && m_pButton->IsVisible())
-{
-SendLOKMessage("show");
-return;
-}
-
 m_aPortionPaintArea = rPortionPaintArea;
 if(m_pButton)
 {
 m_pButton->Show();
 m_pButton->CalcPosAndSize(m_aPortionPaintArea);
-m_pButton->Invalidate();
 SendLOKMessage("show");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: I am told we don't want to use old style help files any longer

[Stephan Bergmann]

On 18/05/2020 09:35, Tor Lillqvist wrote:
(If somebody doesn't approve of that commit, feel free to revert. I 
don't really have any personal preference.)


...which I see has now been done with 
 
"Revert 'I am told we don't want to use old style help files any longer'"


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

[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-14'

[Thorsten Behrens (via logerrit)]

Tag 'cib-6.1-14' created by Thorsten Behrens  at 
2020-05-18 09:47 +

Release LibreOffice powered by CIB 6.1-14
-BEGIN PGP SIGNATURE-

iQKTBAABCgB9FiEEHp/al2IcD3tw8LrPZ7OyyFo1BNkFAl7CWcVfFIAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFF
OUZEQTk3NjIxQzBGN0I3MEYwQkFDRjY3QjNCMkM4NUEzNTA0RDkACgkQZ7OyyFo1
BNmQmhAAlzcPo1NDjOzNsNGBDBra1jT86H5OjtaAGPsZWTPA1bjpYZglLcuwAPYq
tJYyQ3EH6f2qV+7kBtTmD7/0heFhFigC0vB6VYQUjGXZRMLvPX45d67YSfFJv9uH
0ta8ejxzmFKeblW8OmOafGlx771lVyHzUdigH6JvUvfL4QBFkloIzLx5vJ7uqSkW
MlO2xZSRhwYViYHBdg0AP6No7A6duRBYKCx6mBx+jZ9mGLU8OStBJdnbM4DjURyQ
/Qb69mteySUWE+txklLvcvJ2QdVs5anFVae1SJCRznRsiizzbc6rvxAXGNoFNZsn
WtH8TDLkLkQbxJBM1W+CYVwUiIMnBl9/qvbHJZQGT22skpJWM74YHNUTF2qZ9/JX
UA+eVAyu8veAVJlkLQgI4yK8fYKyUvcv5ODyUJdH7DvV74jG7XftvlnsKavD5Aql
PSAaZtESlGdv/C4QG36QqYA3mPUK1rqrrh38n5wwSDPBdCeEnIcZqtmOGokC/rg6
/CbyokCBVLbxyuEkIYg4MhY4XeFJafjTKeG3HQ8rNJaF7Nof4zDOBApwoeIYCZIn
Jio9lbm8uwQOC7RVCyXFNibtP1ijrSElCUFXMIgKAf5hbmmJq7jHfHBkqc+mehnG
8UlhxZn7aYuUi+NjWJCtDuHip6Dmn5aphIpBh+SoA4yPgO2L3hI=
=i+Qr
-END PGP SIGNATURE-

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

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

[Noel Grandin (via logerrit)]

 chart2/qa/extras/chart2export.cxx  |   12 -
 chart2/qa/extras/charttest.hxx |   50 
++--
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx |   20 -
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx  |   12 -
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx  |   24 
--
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx   |6 
 chart2/source/controller/dialogs/DataBrowserModel.cxx  |   56 
++--
 chart2/source/controller/dialogs/DialogModel.cxx   |   35 
+-
 chart2/source/controller/dialogs/tp_AxisPositions.cxx  |4 
 chart2/source/controller/dialogs/tp_DataSource.cxx |   10 
 chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx|   11 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |4 
 chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx |4 
 chart2/source/controller/main/ChartController_Insert.cxx   |   12 -
 chart2/source/controller/main/ChartModelClone.cxx  |8 
 chart2/source/controller/main/ObjectHierarchy.cxx  |   11 
 chart2/source/model/filter/XMLFilter.cxx   |   12 -
 chart2/source/model/main/ChartModel_Persistence.cxx|6 
 chart2/source/model/template/BubbleDataInterpreter.cxx |   13 -
 chart2/source/model/template/ChartType.cxx |   10 
 chart2/source/model/template/ChartTypeTemplate.cxx |   65 
++---
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx   |   20 -
 chart2/source/model/template/DataInterpreter.cxx   |   32 
+-
 chart2/source/model/template/PieChartTypeTemplate.cxx  |   22 -
 chart2/source/model/template/StockChartTypeTemplate.cxx|   20 -
 chart2/source/model/template/StockDataInterpreter.cxx  |6 
 chart2/source/model/template/XYDataInterpreter.cxx |   27 
+-
 chart2/source/tools/AxisHelper.cxx |   56 
++--
 chart2/source/tools/ChartModelHelper.cxx   |8 
 chart2/source/tools/ConfigColorScheme.cxx  |6 
 chart2/source/tools/DataSeriesHelper.cxx   |   44 
+--
 chart2/source/tools/DataSourceHelper.cxx   |   16 -
 chart2/source/tools/DiagramHelper.cxx  |  120 
--
 chart2/source/tools/ErrorBar.cxx   |6 
 chart2/source/tools/MediaDescriptorHelper.cxx  |4 
 chart2/source/tools/ObjectIdentifier.cxx   |   11 
 chart2/source/tools/RangeHighlighter.cxx   |8 
 chart2/source/tools/ReferenceSizeProvider.cxx  |   30 
+-
 chart2/source/tools/RegressionCurveHelper.cxx  |   60 
++---
 chart2/source/tools/TitleHelper.cxx|6 
 chart2/source/tools/WrappedPropertySet.cxx |   10 
 chart2/source/view/axes/VCartesianGrid.cxx |6 
 chart2/source/view/axes/VCoordinateSystem.cxx  |9 
 chart2/source/view/charttypes/VSeriesPlotter.cxx   |   19 -
 chart2/source/view/main/ShapeFactory.cxx   |   13 -
 chart2/source/view/main/VDataSeries.cxx|8 
 chart2/workbench/addin/sampleaddin.cxx |2 
 47 files changed, 450 insertions(+), 504 deletions(-)

New commits:
commit 337a9a454c1bc95214111578d3f9c0622c55c509
Author: Noel Grandin 
AuthorDate: Mon May 18 09:17:04 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon May 18 11:28:50 2020 +0200

use for-range on Sequence in chart2

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index f960edf8b1a0..84a38b258733 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -775,15 +775,15 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
const char* const testEmbeddedFileNames[] 
{"word/embeddings/Microsoft_Excel_Worksheet3.xlsx",
 
"word/embeddings/Microsoft_Excel_Worksheet2.xlsx",
 
"word/embeddings/Microsoft_Excel_Worksheet1.xlsx"};
-   for(int i = 0; i < aGrabBag.getLength(); ++i)
+   for(beans::PropertyValue const & prop : std::as_const(aGrabBag))
{
-   if

Re: Calc solvers - what to say in the Calc Guide

[Stephen Fanning]

Drew,

Many thanks for your efforts in trying to get to the bottom of this.

I think that putting the information on the wiki is a good idea. The
relevant chapter of the Calc Guide (Chapter 9, Data Analysis) is already
very thick and would not benefit from being expanded further to include
more solver details.

Regards,

Steve


On Mon, 18 May 2020 at 06:39, Drew Jensen 
wrote:

> HI,
>
> Well, I noticed something aside from the Guide and that is the FAQ
> over on the wiki.
> https://wiki.documentfoundation.org/Faq/Calc/109/fr
> Now, it turns out that the French version of that FAQ points to a page
> (first link on the page) on the TDF wiki but none of the other
> languages do. They point back to the AOO wiki and on that wiki page it
> has links to things like extensions LibreOffice doesn't need and API
> documentation in AOO SDK.
>
> So - I thought why not steal the content from the AOO page as a start
> of a TDF page (or PDF maybe ;-).
>
> I did that and then I updated a few things in it. Not done updating
> things, but done for tonight.
>
> You can review a draft of this
> https://nextcloud.documentfoundation.org/s/ebisHjZo2rowM4Q
>
> Can see some easy edits in the top part of the text and I need to ask
> for help filling in the information for scripting as needed for the
> additional algorithm engines in LO - for one thing maybe a bit more.
>
> Anyway, any feedback is welcome. Will post tomorrow when those changes
> are made.
>
> Thanks,
>
> Drew
>
> On Sat, May 16, 2020 at 7:31 PM Drew Jensen 
> wrote:
> >
> > This is an interesting point of differentiation.
> > Reviewing some of the tools yesterday and this morning;
> > AOO with 1 solver engine in default install (4.2 pre-release binary);
> >
> > OnlyOffice (latest desktop Linux binary) has no Solver equivalent in
> > either the desktop binary or the cloud version, not that I can find
> > (didn't see any in the available plug-ins, but maybe their is
> > something behind the paywall areas).
> >
> > WSP (May 2020 release) includes only one, a simplex linear solver.
> >
> > MS 365 and Google Sheets both require an plug-in, Frontline Systems
> > Inc looks to be the leading supplier for both tools, but there are
> > multiple other choices for each.
> >
> > Looking at this the first couple sentences, "The standard Microsoft
> > Excel Solver uses a basic implementation of the primal Simplex method
> > to solve LP problems.  It is limited to 200 decision variables.", from
> > this web page https://www.solver.com/linear-quadratic-technology and
> > thinking that we should be able to run down answers to some of the
> > bounds information for the different engines also.
> >
> > Below are the different options sets for the engines.  Most
> > specifically give bounds (ie Epsilon Level), but a few don't (ie
> > Learning Cycles); I don't know if it would be worth it to get those
> > numbers or not.
> >
> > I think it is worth it to, per engine, list these in the guide/help
> > file. It is a lot easier to highlight something like "ACR Comparator
> > (instead of BCH)" from a PDF/HTML then from that dialog box in the
> > application so that you can do a DDG search on the term ;)
> >
> > LibreOffice CoinMP Linear Solver & LibreOffice Linear Solver
> > Options
> > - Assume variables as integers. (Default FALSE)
> > - Assume variables as non-negative. (Default FALSE)
> > - Epsilon Level 0-3. (Default 0)
> > - Limit branch and bound depth. (Default FALSE)
> > - Solving time limit (seconds). (Default 100)
> >
> > DEPS Evolutionary Algorithm
> > Options
> > - Agent Switch Rate (DE Probability): (Default .05)
> > - Assume non-negative variables (Default FALSE)
> > - DE: Crossover Probability (0-1): (Default 0.9)
> > - DE: Max Scaling Factor (0-1.2): (Default 0.5)
> > - DE: Min Scaling Factor (0-1.2): (Default 0.5)
> > - Learning Cycles: (Default 2000)
> > - PS: Cognitive Constant: (Default 1.494)
> > - PS: Mutation Probability (0-0.005): (Default 0.729)
> > - PS: Social Constant: (Default 1.494)
> > - Show enhanced solver status (Default TRUE)
> > - Size of library; (Default 210)
> > - Size of swarm; (Default 70)
> > - Stagnation limit: (Default 70)
> > - Stagnation tolerance: (Default 0.001)
> > - Use ACR Comparator (instead of BCH). (Default FALSE)
> > - Use random starting point. (Default FALSE)
> > - Variable bounds testing. (Default TRUE)
> > - Variable bounds threshold (when guessing): (Default 3)
> >
> > SCO Evolutionary Algorithm
> > Options
> > - Assume variables as non-negative. (Default FALSE)
> > - Learning Cycles: (Default False)
> > - Show enhanced solver status (Default TRUE)
> > - Size of library; (Default 210)
> > - Size of swarm; (Default 70)
> > - Stagnation limit: (Default 70)
> > - Stagnation tolerance: (Default 0.001)
> > - Use ACR Comparator (instead of BCH). (Default FALSE)
> > - Use random starting point. (Default FALSE)
> > - Variable bounds testing. (Default TRUE)
> > - Variable bounds threshold (when guessing): (Default 3)
> >
> > LibreOff

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/libxslt

[Michael Stahl (via logerrit)]

 download.lst  |4 
 external/libxslt/UnpackedTarball_libxslt.mk   |2 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
--
 external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 |   69 +
 external/libxslt/libxslt-config.patch.1   |   18 -
 external/libxslt/libxslt-internal-symbols.patch.1 |8 
 6 files changed, 85 insertions(+), 136 deletions(-)

New commits:
commit d415bd55d9b3f96a908c6f15516dc1cf234364f3
Author: Michael Stahl 
AuthorDate: Wed Nov 20 15:08:24 2019 +0100
Commit: Andras Timar 
CommitDate: Mon May 18 11:14:13 2020 +0200

libxslt: upgrade to release 1.1.34

Fixes CVE-2019-18197.

Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1.

Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9
Reviewed-on: https://gerrit.libreoffice.org/83312
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1)
Reviewed-on: https://gerrit.libreoffice.org/83378
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94382
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index e239cb515b2e..8b901874c5cf 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
 export LIBXML_SHA256SUM := 
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
 export LIBXML_VERSION_MICRO := 10
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_SHA256SUM := 
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
-export LIBXSLT_VERSION_MICRO := 33
+export LIBXSLT_SHA256SUM := 
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
+export LIBXSLT_VERSION_MICRO := 34
 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
 export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index beb591b8b2a8..b035e99f0a79 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
-   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
+   external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
deleted file mode 100644
index 260f35d1a35e..
--- a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
+++ /dev/null
@@ -1,120 +0,0 @@
-From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer 
-Date: Sun, 24 Mar 2019 09:51:39 +0100
-Subject: [PATCH] Fix security framework bypass
-
-xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
-don't check for this condition and allow access. With a specially
-crafted URL, xsltCheckRead could be tricked into returning an error
-because of a supposedly invalid URL that would still be loaded
-succesfully later on.
-
-Fixes #12.
-
-Thanks to Felix Wilhelm for the report.

- libxslt/documents.c | 18 ++
- libxslt/imports.c   |  9 +
- libxslt/transform.c |  9 +
- libxslt/xslt.c  |  9 +
- 4 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/libxslt/documents.c b/libxslt/documents.c
-index 3f3a7312..4aad11bb 100644
 a/libxslt/documents.c
-+++ b/libxslt/documents.c
-@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const 
xmlChar *URI) {
-   int res;
- 
-   res = xsltCheckRead(ctxt->sec, ctxt, URI);
--  if (res == 0) {
--  xsltTransformError(ctxt, NULL, NULL,
--   "xsltLoadDocument: read rights for %s denied\n",
--   URI);
-+  if (res <= 0) {
-+if (res == 0)
-+xsltTransformError(ctxt, NULL, NULL,
-+ "xsltLoadDocument: read rights for %s denied\n",
-+ URI);
-   return(NULL);
-   }
- }
-@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const 
xmlChar *URI) {
-   int res;
- 
-   res = xsltCheckRead(sec, NULL, URI);
--  if (res == 0) {
--  xsltTransformError(NULL, NULL, NULL,
--   "xsltLoadStyleDocument: read rights for %s denied\n",
--

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6089755d197528d071906846c58a397add0876a5
Author: Tor Lillqvist 
AuthorDate: Mon May 18 12:06:29 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 18 12:08:00 2020 +0300

Revert "I am told we don't want to use old style help files any longer"

Pitäkää tunkkinne.

This reverts commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2.

diff --git a/configure.ac b/configure.ac
index 171dd945a241..1d531f32edec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2021,7 +2021,7 @@ AC_ARG_WITH(help,
  can be used to bundle only the common part, .e.g help-specific icons.
  This is useful when you build the helpcontent separately.])
 [
-  Usage: --with-helpbuild the new HTML local 
help
+  Usage: --with-helpbuild the old local help
  --without-help no local help (default)
  --with-help=html   build the new HTML local 
help
  --with-help=online build the new HTML online 
help
@@ -5049,9 +5049,8 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os 
!= iOS -a $_os != Androi
 AC_MSG_RESULT([HTML])
 ;;
 yes)
-ENABLE_HTMLHELP=TRUE
 SCPDEFS="$SCPDEFS -DWITH_HELP"
-AC_MSG_RESULT([HTML])
+AC_MSG_RESULT([yes])
 ;;
 *)
 AC_MSG_ERROR([Unknown --with-help=$with_help])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry svx/Library_svx.mk svx/source svx/uiconfig svx/UIConfig_svx.mk

[Shivam Kumar Singh (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |   49 +++
 svx/Library_svx.mk   |1 
 svx/UIConfig_svx.mk  |1 
 svx/source/sidebar/PanelFactory.cxx  |5 
 svx/source/sidebar/inspector/InspectorTextPanel.cxx  |   77 +
 svx/source/sidebar/inspector/InspectorTextPanel.hxx  |   55 +++
 svx/uiconfig/ui/inspectortextpanel.ui|  156 +++
 7 files changed, 344 insertions(+)

New commits:
commit 9d6e64ba575c12ce4ab381332f8971e55ffe9972
Author: Shivam Kumar Singh 
AuthorDate: Sat May 9 19:41:25 2020 +0530
Commit: Mike Kaganski 
CommitDate: Mon May 18 11:01:41 2020 +0200

Added a new tab "Styles Inspector" at the side bar

Patch significance :-
1) Added a new tab "Styles Inspector" at the side bar
2) Added the "Character Styles" properties in the inspector

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

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index af6acf5218a9..fae993013b49 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -41,6 +41,29 @@
 
   
 
+  
+
+  Styles Inspector
+
+
+  InspectorDeck
+
+
+  private:graphicrepository/cmd/lc_editglossary.png
+
+
+  
+WriterVariants, any, visible ;
+  
+
+
+  450
+
+
+  true
+
+  
+
   
 
   Page
@@ -372,6 +395,32 @@
 
   
 
+  
+
+  Character Styles
+
+
+  InspectorTextPanel
+
+
+  InspectorDeck
+
+
+  
+WriterVariants, any, visible ;
+  
+
+
+  
private:resource/toolpanel/SvxPanelFactory/InspectorTextPanel
+
+
+  120
+
+
+  true
+
+  
+
   
 
   Media Playback
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 8f8dd0c7020f..a378df63702d 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -177,6 +177,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/mnuctrls/smarttagmenu \
 svx/source/sidebar/ContextChangeEventMultiplexer \
 svx/source/sidebar/EmptyPanel \
+svx/source/sidebar/inspector/InspectorTextPanel \
 svx/source/sidebar/nbdtmg \
 svx/source/sidebar/nbdtmgfact  \
 svx/source/sidebar/PanelFactory \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 1a6a87cca4de..fdc7d1b3bc52 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/imapmenu \
+   svx/uiconfig/ui/inspectortextpanel \
svx/uiconfig/ui/interimdockparent \
svx/uiconfig/ui/interimparent \
svx/uiconfig/ui/labelbox \
diff --git a/svx/source/sidebar/PanelFactory.cxx 
b/svx/source/sidebar/PanelFactory.cxx
index e37648b38c25..6b8ed657351e 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include "text/TextPropertyPanel.hxx"
+#include "inspector/InspectorTextPanel.hxx"
 #include "styles/StylesPropertyPanel.hxx"
 #include "paragraph/ParaPropertyPanel.hxx"
 #include "lists/ListsPropertyPanel.hxx"
@@ -124,6 +125,10 @@ Reference SAL_CALL 
PanelFactory::createUIElement (
 {
 pControl = TextPropertyPanel::Create(pParentWindow, xFrame);
 }
+else if (rsResourceURL.endsWith("/InspectorTextPanel"))
+{
+pControl = InspectorTextPanel::Create(pParentWindow, xFrame);
+}
 else if (rsResourceURL.endsWith("/StylesPropertyPanel"))
 {
 pControl = StylesPropertyPanel::Create(pParentWindow, xFrame);
diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx 
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
new file mode 100644
index ..0c719dfccb2f
--- /dev/null
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apa

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

[Tibor Nagy (via logerrit)]

 oox/source/vml/vmlshape.cxx  |   14 ++
 sw/qa/extras/ooxmlexport/data/tdf123622.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx   |   15 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 52442a4c0192cbedafe7b77459dd2c3d1cf3614b
Author: Tibor Nagy 
AuthorDate: Fri May 8 10:32:09 2020 +0200
Commit: László Németh 
CommitDate: Mon May 18 10:51:03 2020 +0200

tdf#123622 DOCX VML import: fix relative horizontal alignment

Margin (left, right, inner, outer) alignments of VML shapes
weren't handled.

Co-authored-by: Attila Bakos (NISZ)

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

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index a6687ab65100..55eb9020ae11 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -632,10 +632,16 @@ static void lcl_SetAnchorType(PropertySet& rPropSet, 
const ShapeTypeModel& rType
 
 if ( rTypeModel.maPositionHorizontalRelative == "page" )
 rPropSet.setAnyProperty(PROP_HoriOrientRelation, 
makeAny(text::RelOrientation::PAGE_FRAME));
-else if ( rTypeModel.maPositionVerticalRelative == "margin" )
-rPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::PAGE_PRINT_AREA);
-else if ( rTypeModel.maPositionVerticalRelative == "text" )
-rPropSet.setProperty(PROP_VertOrientRelation, 
text::RelOrientation::FRAME);
+else if ( rTypeModel.maPositionHorizontalRelative == "margin" )
+rPropSet.setProperty(PROP_HoriOrientRelation, 
text::RelOrientation::PAGE_PRINT_AREA);
+else if (rTypeModel.maPositionHorizontalRelative == "right-margin-area" ||
+ rTypeModel.maPositionHorizontalRelative == "inner-margin-area")
+rPropSet.setProperty(PROP_HoriOrientRelation, 
text::RelOrientation::PAGE_RIGHT);
+else if (rTypeModel.maPositionHorizontalRelative == "left-margin-area" ||
+ rTypeModel.maPositionHorizontalRelative == "outer-margin-area")
+rPropSet.setProperty(PROP_HoriOrientRelation, 
text::RelOrientation::PAGE_LEFT);
+else if ( rTypeModel.maPositionHorizontalRelative == "text" )
+rPropSet.setProperty(PROP_HoriOrientRelation, 
text::RelOrientation::FRAME);
 
 if ( rTypeModel.maPositionVertical == "center" )
 rPropSet.setAnyProperty(PROP_VertOrient, 
makeAny(text::VertOrientation::CENTER));
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123622.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123622.docx
new file mode 100644
index ..54ef0cbd7670
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123622.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index cf6d3f6e2671..a591a3caa8fe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -44,7 +44,7 @@ protected:
 }
 };
 
-DECLARE_OOXMLIMPORT_TEST(Tdf130907,"tdf130907.docx")
+DECLARE_OOXMLIMPORT_TEST(Tdf130907, "tdf130907.docx")
 {
 uno::Reference xPara1 = getParagraph(2);
 CPPUNIT_ASSERT(xPara1.is());
@@ -74,6 +74,19 @@ DECLARE_OOXMLIMPORT_TEST(Tdf130907,"tdf130907.docx")
 sal_Int16(style::ParagraphAdjust::ParagraphAdjust_RIGHT), nHOri3);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf123622, "tdf123622.docx")
+{
+uno::Reference 
XPropsRight(getShape(1),uno::UNO_QUERY);
+sal_Int16 nRelativePosR = 0;
+XPropsRight->getPropertyValue("HoriOrientRelation")>>=nRelativePosR;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape inside the margin", sal_Int16(4), 
nRelativePosR);
+
+uno::Reference XPropsLeft(getShape(2), 
uno::UNO_QUERY);
+sal_Int16 nRelativePosL = 0;
+XPropsLeft->getPropertyValue("HoriOrientRelation") >>= nRelativePosL;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Shape inside the margin", sal_Int16(3), 
nRelativePosL);
+}
+
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf78749, "tdf78749.docx")
 {
 //Shape lost the background image before, now check if it still has...
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/qa/uitest/writer_dialogs/openDialogs.py |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a782cce919952cff41c7cfa7ec3a6a915e1851aa
Author: Michael Stahl 
AuthorDate: Sat May 16 19:58:19 2020 +0200
Commit: Michael Stahl 
CommitDate: Mon May 18 10:49:17 2020 +0200

sw: UITest_writer_dialogs: disable MailMergeWizard

In a build via ssh, the test hangs while trying to connect to Evolution
Data Server that presumably isn't running:

1  in g_cond_wait () at /lib64/libglib-2.0.so.0
2  in e_flag_wait () at /lib64/libedataserver-1.2.so.24
3  in e_client_wait_for_connected_sync () at /lib64/libedataserver-1.2.so.24
4  in e_book_client_connect_sync () at /lib64/libebook-1.2.so.20
5  in e_book_client_connect_direct_sync () at /lib64/libebook-1.2.so.20
6  in connectivity::evoab::(anonymous 
namespace)::OEvoabVersion38Helper::createClient(ESource*) (this=0x912d150, 
pSource=0x90c0660) at connectivity/source/drivers/evoab2/NResultSet.cxx:480
...
35 in SwMailMergeConfigItem::GetResultSet() const (this=0x8f10b30) at 
sw/source/uibase/dbui/mmconfigitem.cxx:875
...
63 in SwMailMergeWizard::SwMailMergeWizard(SwView&, 
std::shared_ptr const&) (this=0x8f0f340, rView=..., 
rItem=std::shared_ptr (use count 3, weak count 0) = 
{...}) at sw/source/ui/dbui/mailmergewizard.cxx:60

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

diff --git a/sw/qa/uitest/writer_dialogs/openDialogs.py 
b/sw/qa/uitest/writer_dialogs/openDialogs.py
index 442d0eef9095..60e126780d69 100644
--- a/sw/qa/uitest/writer_dialogs/openDialogs.py
+++ b/sw/qa/uitest/writer_dialogs/openDialogs.py
@@ -99,7 +99,8 @@ dialogs = [
 # {"command": ".uno:LineNumberingDialog", "closeButton": "cancel"},
 # tested in sw/qa/uitest/writer_tests3/lineNumbering.py
 {"command": ".uno:FootnoteDialog", "closeButton": "cancel"},
-{"command": ".uno:MailMergeWizard", "closeButton": "cancel"},
+# {"command": ".uno:MailMergeWizard", "closeButton": "cancel"},
+# may hang forever in e_book_client_connect_direct_sync
 {"command": ".uno:AddressBookSource", "closeButton": "cancel"},
 {"command": ".uno:RunMacro", "closeButton": "cancel"},
 {"command": ".uno:ScriptOrganizer", "closeButton": "close"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/alignment_options_spec.js  |8 
+++-
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 29b08b31d7460b6dbdeb3dcb5fca193abcabdc2e
Author: Tamás Zolnai 
AuthorDate: Mon May 18 10:25:44 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon May 18 10:36:36 2020 +0200

Revert "cypress: enable some more tests."

This reverts commit 53e887d193c5361c4152dcee55a1a43271c518f8.

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

diff --git 
a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js 
b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
index 6d854372d..a3b5c0165 100644
--- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js
@@ -219,7 +219,8 @@ describe('Change alignment settings.', function() {
});
});
 
-   it('Change text indent via input field.', function() {
+   it.skip('Change text indent via input field.', function() {
+   // TODO: this fails, because the input field always becomes 
disabled.
helper.initAliasToNegative('originalTextPos');
 
getTextPosForFirstCell();
@@ -232,6 +233,11 @@ describe('Change alignment settings.', function() {
openAlignmentPaneForFirstCell();
 
// TODO: First we need to increase indent to make the input 
enabled
+   cy.get('#IncrementIndent')
+   .click();
+
+   cy.wait(300);
+
cy.get('#IncrementIndent')
.click();
 
diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 5ed397d1d..d54869074 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -113,7 +113,7 @@ describe('Change shape properties via mobile wizard.', 
function() {
.should('have.attr', 'd', 'M 1965,4863 L 7957,18073 
1965,18073 1965,4863 1965,4863 Z');
});
 
-   it('Change size with keep ratio enabled.', function() {
+   it.skip('Change size with keep ratio enabled.', function() {
// TODO: Entering a value inside the spinbutton has no effect 
on the shape.
if (Cypress.env('LO_CORE_VERSION') === 'master')
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   15 +++
 sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
 sw/source/filter/ww8/wrtww8.cxx   |3 +++
 sw/source/filter/ww8/wrtww8.hxx   |1 +
 4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 195f4f6840d105ae6cb9c16bd499924fa3d99f1e
Author: Justin Luth 
AuthorDate: Wed Mar 21 21:57:54 2018 +0300
Commit: Miklos Vajna 
CommitDate: Mon May 18 10:31:41 2020 +0200

tdf93121 MS export: only one fake tab per footnote

Every paragraph was getting the fake tab added.

The fake tab is only inserted by LO in order to emulate the
spacing between the footnote character and the
footnote paragraph, so it is not desirable to insert it
before additional paragraphs.
The fake tab is also only removed once per
footnote during the import process, so this fake tab
was altering the document during the first round-trip.

(cherry picked from commit add7a962bc33b3c1f2252a9920bebf324df688de)

Conflicts:
sw/source/filter/ww8/wrtww8.cxx

Change-Id: Ia54cea1b04c747a021032f46f22b673fe6658995
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94324
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 52f632cdbb3b..88e15f302270 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -527,6 +528,20 @@ DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx")
 if (!pXmlEndNotes)
 return;
 assertXPath(pXmlEndNotes, "/w:endnotes", "Ignorable", "w14 wp14");
+
+//tdf#93121 don't add fake tabs in front of extra footnote paragraphs
+uno::Reference xFootnoteSupp(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xFootnoteIdxAcc(xFootnoteSupp->getFootnotes(), uno::UNO_QUERY);
+uno::Reference xFootnote(xFootnoteIdxAcc->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xFootnoteText(xFootnote, uno::UNO_QUERY);
+
uno::ReferencexParaEnumAccess(xFootnoteText->getText(),
 uno::UNO_QUERY);
+uno::ReferencexParaEnum = 
xParaEnumAccess->createEnumeration();
+
+uno::Reference xTextRange;
+xParaEnum->nextElement();
+xParaEnum->nextElement() >>= xTextRange;
+OUString sFootnotePara = xTextRange->getString();
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Paragraph starts with W(87), not tab(9)", 
u'W', sFootnotePara[0] );
 }
 
 DECLARE_OOXMLEXPORT_TEST(testfdo79668,"fdo79668.docx")
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 9361943a7636..93bf00b75482 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2509,8 +2509,9 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 if ( ( m_nTextTyp == TXT_EDN || m_nTextTyp == TXT_FTN ) && 
nAktPos == 0 && nLen > 0 )
 {
 // Insert tab for aesthetic purposes #i24762#
-if ( aSnippet[0] != 0x09 )
+if ( m_bAddFootnoteTab && aSnippet[0] != 0x09 )
 aSnippet = "\x09" + aSnippet;
+m_bAddFootnoteTab = false;
 }
 
 if ( bPostponeWritingText && ( FLY_POSTPONED != 
nStateOfFlyFrame ) )
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 64bf90dfdac5..18b21ff63bef 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1826,6 +1826,8 @@ void MSWordExportBase::WriteSpecialText( sal_uLong 
nStart, sal_uLong nEnd, sal_u
 bool bOldPageDescs = m_bOutPageDescs;
 m_bOutPageDescs = false;
 // bOutKF was set / stored in WriteKF1
+if ( nTTyp == TXT_FTN || nTTyp == TXT_EDN )
+m_bAddFootnoteTab = true;   // enable one aesthetic tab for this 
footnote
 SetCurPam(nStart, nEnd);
 
 // clear linked textboxes since old ones can't be linked to frames in this 
section
@@ -3638,6 +3640,7 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, 
SwPaM *pCurrentPam, SwPaM
 , m_bHideTabLeaderAndPageNumbers(false)
 , m_bExportModeRTF(false)
 , m_bFontSizeWritten(false)
+, m_bAddFootnoteTab(false)
 , m_pDoc(pDocument)
 , m_nCurStart(pCurrentPam->GetPoint()->nNode.GetIndex())
 , m_nCurEnd(pCurrentPam->GetMark()->nNode.GetIndex())
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index c95323f6edfc..ab01bcdb576f 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -558,6 +558,7 @@ public:
 bool m_bExportModeRTF;
 /// Is font size written already as part of the current character 
properties?
 bool m_bFontSizeWritten;
+bool m_bAddFootnoteTab; // only one aesthetic spacing tab per foo

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - writerfilter/source

[Justin Luth (via logerrit)]

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

New commits:
commit 0e6f32b3fa4883cca7d413d494ad03e4a7d903f3
Author: Justin Luth 
AuthorDate: Wed Mar 21 20:47:11 2018 +0300
Commit: Miklos Vajna 
CommitDate: Mon May 18 10:30:59 2020 +0200

comment: Word does not use tabs in footnote implementation

Tabs are inserted when LO exports to MS formats in an attempt to
emulate its "magical" spacing which uses the paragraph margin.

By default, the Footnote paragraph style has a paragraph margin of
0.60cm. A hanging indent places the footnote character before the
margin, and thus a tab advances to the margin. So the emulation
works well.

The previous comment was misleading because it suggests that this
was a Microsoft convention, but actually this is an OOo innovation.

(cherry picked from commit d47c84a5fd38c1aa28fe6e3144b4efd0226f8f97)

Change-Id: Ie8708998457bcb3363bbc760086cf2b41d3eb104
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94323
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d5fbaa9f2af6..776a003f2ba2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1751,9 +1751,9 @@ void DomainMapper_Impl::PushFootOrEndnote( bool 
bIsFootnote )
 // Redlines for the footnote anchor
 CheckRedline( xFootnote->getAnchor( ) );
 
-// Word has a leading tab on footnotes, but we may implement space
-// between the footnote number and text using a paragraph margin, not a
-// tab (Writer default). So ignore that in case there is a margin set.
+// LO inserts a tab when exporting to MS formats in order to emulate 
its automatic space
+// between the footnote number and text using the paragraph margin.
+// So ignore that tab when there is a margin set.
 uno::Reference xStylesSupplier( 
GetTextDocument(), uno::UNO_QUERY);
 uno::Reference xStyleFamilies = 
xStylesSupplier->getStyleFamilies();
 uno::Reference xStyles;
___
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' - desktop/source

[Szymon Kłos (via logerrit)]

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

New commits:
commit d1cc69426e126611d026aafe5d6b27a59e53849d
Author: Szymon Kłos 
AuthorDate: Tue Mar 10 16:24:16 2020 +0100
Commit: Szymon Kłos 
CommitDate: Mon May 18 10:12:17 2020 +0200

jsdialog: avoid crash in watermark dialog

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 322a691bd908..b91240ad1b31 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3615,12 +3615,14 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 static const OUString sDownAction("DOWN");
 static const OUString sValue("VALUE");
 
+bool bIsWeldedDialog = false;
+
 try
 {
 OString sControlId = OUStringToOString(aMap["id"], 
RTL_TEXTENCODING_ASCII_US);
 weld::Widget* pWidget = 
JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, sControlId);
 
-bool bIsWeldedDialog = pWidget != nullptr;
+bIsWeldedDialog = pWidget != nullptr;
 bool bContinueWithLOKWindow = false;
 
 if (bIsWeldedDialog)
@@ -3723,7 +3725,8 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 } catch(...) {}
 
 // force resend
-pWindow->Resize();
+if (!bIsWeldedDialog)
+pWindow->Resize();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/txtfrm.hxx  |1 -
 sw/source/core/text/porrst.cxx |6 --
 2 files changed, 7 deletions(-)

New commits:
commit cc76f6b6fb50e220a084266419bac61ee39cdf74
Author: Miklos Vajna 
AuthorDate: Mon May 18 09:08:04 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon May 18 10:11:27 2020 +0200

sw: HasBlinkPor() now always returns false

So it can be removed and client code can be adjusted accordingly.

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

diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 197d6d3cec4a..b4b96c5fc6b5 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -519,7 +519,6 @@ public:
 inline void ResetRepaint() const;
 bool HasRepaint() const { return mbRepaint; }
 inline void ResetBlinkPor() const;
-bool HasBlinkPor() const { return mbHasBlinkPortions; }
 void SetHasRotatedPortions(bool bHasRotatedPortions);
 bool GetHasRotatedPortions() const { return mbHasRotatedPortions; }
 void SetAnimation() const
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 0cd1523482f1..32b1e0b389c0 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -334,12 +334,6 @@ bool SwTextFrame::FormatEmpty()
 SetUndersized( false );
 AdjustFrame( nChg );
 
-if( HasBlinkPor() )
-{
-ClearPara();
-ResetBlinkPor();
-}
-
 if (GetHasRotatedPortions())
 {
 ClearPara();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: compile / build libreoffice 'single threaded' or with '--disable-threads' to ease debugging

[Mike Kaganski]

Hi,

On 17.05.2020 17:36, newbie...@gmx.de wrote:
> not experienced with lists i was urged by @Mike to send this question here:
> 
 is it possible to compile / build libreoffice 'single threaded' or
> with '--disable-threads' to ease debugging? <<<
> 
> more background there:
> https://ask.libreoffice.org/en/question/244584/compile-build-lo-single-threaded/

There's no '--disable-threads' configure for LibreOffice build as far as
I know - reading through the options mentioned by './autogen.sh --help'.

Still, as far as I understand the task, the problem is not *building*
it, but debugging, which implies that you possibly want to disable
threaded calculations in the built LibreOffice instance config. To do
that, make sure that you do not enable OpenCL
(Options->LibreOffice->OpenCL) and multi-threaded calculation (the
bottom of Options->LibreOffice Calc->Calculate).

Yet, you should be aware that some of the problems that you might want
to debug *could* be related to the calculation mode; and choosing a
different calculation mode (or building with specific configuration, if
it would be possible) could change the end result and prevent you from
successfully debugging. In that case, you might still need to find ways
to debug multi-threaded processing; e.g., finding problematic routines
by reading the code or watching how threads are created, and putting
breakpoints in relevant places before the calculation starts, so that
gdb could break into it correctly.

Hope this helps; possibly you would like to come with a specific example
where you debug (a place in the source code), which steps you would like
to enter, and what happens for you actually - that could enable to
suggest what to do in a specific case, and learn by example.

-- 
Best regards,
Mike Kaganski


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

Re: [Libreoffice-commits] core.git: I am told we don't want to use old style help files any longer

[Ilmari Lauhakangas]

Still an open issue: 
https://bugs.documentfoundation.org/show_bug.cgi?id=33209


Ilmari

Stephan Bergmann kirjoitti 18.5.2020 klo 10.28:
So this would be the final nail in the coffin for the traditional HELP ∈ 
BUILD_TYPE && !ENABLE_HTMLHELP mode.  (Though it fails to clean up any 
newly dead code, of which I assume there is some.)


What is the story for help content brought along by extensions?  That 
has always been an open issue since that new HTML help mode was introduced.


On 18/05/2020 08:08, Tor Lillqvist (via logerrit) wrote:

  configure.ac |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2
Author: Tor Lillqvist 
AuthorDate: Wed May 13 18:15:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 18 08:07:43 2020 +0200

 I am told we don't want to use old style help files any longer
 Make --with-help mean the same as --with-help=html to avoid 
generating

 such unintentionally.
 Change-Id: Ie53b3604f53c3301cb196b2239dce6f0c08acbd3
 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94145
 Tested-by: Jenkins
 Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 1d531f32edec..171dd945a241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2021,7 +2021,7 @@ AC_ARG_WITH(help,
   can be used to bundle only the common part, .e.g 
help-specific icons.

   This is useful when you build the helpcontent separately.])
  [
-  Usage: --with-help    build the old 
local help
+  Usage: --with-help    build the new 
HTML local help
   --without-help no local help 
(default)
   --with-help=html   build the new 
HTML local help
   --with-help=online build the new 
HTML online help
@@ -5049,8 +5049,9 @@ if test -n "$with_help" -a "$with_help" != "no" 
-a $_os != iOS -a $_os != Androi

  AC_MSG_RESULT([HTML])
  ;;
  yes)
+    ENABLE_HTMLHELP=TRUE
  SCPDEFS="$SCPDEFS -DWITH_HELP"
-    AC_MSG_RESULT([yes])
+    AC_MSG_RESULT([HTML])
  ;;
  *)
  AC_MSG_ERROR([Unknown --with-help=$with_help])


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

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

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

[Julien Nabet (via logerrit)]

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

New commits:
commit 02fe5ec54e339d4f8983a5bf131b9c2d5db9d771
Author: Julien Nabet 
AuthorDate: Sun May 17 17:53:41 2020 +0200
Commit: Julien Nabet 
CommitDate: Mon May 18 09:36:27 2020 +0200

tdf#131963: regression from fix for tdf#92472

tdf#92472 DOCX import: fix checkbox size set by direct formatting
at beginning of paragraphs.

Follow-up of the commit 22ad4d69d771708f28a2d9e137cfd43ac846cf3a
(tdf#121045 DOCX import: fix checkbox size in table).

See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=160936

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2cb148920e68..c570562d5e12 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4834,7 +4834,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 OUString const sFirstParam(vArguments.empty() ? OUString() : 
vArguments.front());
 
 // apply font size to the form control
-if ( m_pLastCharacterContext && 
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+if (!m_aTextAppendStack.empty() &&  m_pLastCharacterContext && 
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
 {
 uno::Reference< text::XTextAppend >  xTextAppend = 
m_aTextAppendStack.top().xTextAppend;
 if (xTextAppend.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: I am told we don't want to use old style help files any longer

[Tor Lillqvist]

(If somebody doesn't approve of that commit, feel free to revert. I don't
really have any personal preference.)

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

Re: [Libreoffice-commits] core.git: I am told we don't want to use old style help files any longer

[Stephan Bergmann]

So this would be the final nail in the coffin for the traditional HELP ∈ 
BUILD_TYPE && !ENABLE_HTMLHELP mode.  (Though it fails to clean up any 
newly dead code, of which I assume there is some.)


What is the story for help content brought along by extensions?  That 
has always been an open issue since that new HTML help mode was introduced.


On 18/05/2020 08:08, Tor Lillqvist (via logerrit) wrote:

  configure.ac |5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1f6b7678d52e1bf9092e3ce2cf7b7c4ffdcb2ba2
Author: Tor Lillqvist 
AuthorDate: Wed May 13 18:15:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Mon May 18 08:07:43 2020 +0200

 I am told we don't want to use old style help files any longer
 
 Make --with-help mean the same as --with-help=html to avoid generating

 such unintentionally.
 
 Change-Id: Ie53b3604f53c3301cb196b2239dce6f0c08acbd3

 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94145
 Tested-by: Jenkins
 Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 1d531f32edec..171dd945a241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2021,7 +2021,7 @@ AC_ARG_WITH(help,
   can be used to bundle only the common part, .e.g help-specific icons.
   This is useful when you build the helpcontent separately.])
  [
-  Usage: --with-helpbuild the old local help
+  Usage: --with-helpbuild the new HTML local 
help
   --without-help no local help (default)
   --with-help=html   build the new HTML local 
help
   --with-help=online build the new HTML online 
help
@@ -5049,8 +5049,9 @@ if test -n "$with_help" -a "$with_help" != "no" -a $_os 
!= iOS -a $_os != Androi
  AC_MSG_RESULT([HTML])
  ;;
  yes)
+ENABLE_HTMLHELP=TRUE
  SCPDEFS="$SCPDEFS -DWITH_HELP"
-AC_MSG_RESULT([yes])
+AC_MSG_RESULT([HTML])
  ;;
  *)
  AC_MSG_ERROR([Unknown --with-help=$with_help])


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - comphelper/source framework/source package/source sfx2/source

[Vasily Melenchuk (via logerrit)]

 comphelper/source/misc/docpasswordhelper.cxx |   41 ++-
 framework/source/services/autorecovery.cxx   |   32 +
 package/source/xstor/owriteablestream.cxx|8 +++--
 package/source/xstor/owriteablestream.hxx|3 +
 package/source/xstor/xstorage.cxx|2 -
 sfx2/source/appl/appopen.cxx |   16 ++
 6 files changed, 96 insertions(+), 6 deletions(-)

New commits:
commit b2d08cac8e6b76a96d307c92653181a396ebf42a
Author: Vasily Melenchuk 
AuthorDate: Mon Feb 17 10:52:11 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 18 09:25:31 2020 +0200

tdf#129096: Document Recovery: Use TypeDetection on load

Loading of recovered document happend before via XFilter::filter
is not updating media descriptor of document. But this is
important for password protected documents to store entered password
and used encryption type.

To avoid this problem let's use TypeDetection which during its work
will ask user for password and store all the info in modified media
descriptor before actual recovery attempt.

Change-Id: Ide2ebf0955e0937cdc7c9d7165593b71f904649b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88844
Reviewed-by: Mike Kaganski 
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins
(cherry picked from commit 8461127750e1fe92a615409505256132e54fb8e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89789
Reviewed-by: Vasily Melenchuk 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94348
Tested-by: Jenkins CollaboraOffice 

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index da6c33022c23..8dce1f8c994c 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -56,6 +56,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3355,6 +3356,37 @@ void AutoRecovery::implts_openOneDoc(const OUString& 
  sURL   ,
 }
 else
 {
+OUString sFilterName;
+lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= 
sFilterName;
+if (!sFilterName.isEmpty()
+&& (   sFilterName == "Calc MS Excel 2007 XML"
+|| sFilterName == "Impress MS PowerPoint 2007 XML"
+|| sFilterName == "MS Word 2007 XML"))
+// TODO: Propbably need to check other affected formats + 
templates?
+{
+// tdf#129096: in case of recovery of password protected OOXML 
document it is done not
+// the same way as ordinal loading. Inside 
XDocumentRecovery::recoverFromFile
+// there is a call to XFilter::filter which has constant media 
descriptor and thus
+// all encryption data used in document is lost. To avoid this 
try to walkaround
+// with explicit call to FormatDetector. It will try to load 
document, prompt for password
+// and store this info in media descriptor we will use for 
recoverFromFile call.
+Reference< css::document::XExtendedFilterDetection > 
xDetection(
+m_xContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.oox.FormatDetector", m_xContext),
+UNO_QUERY_THROW);
+lDescriptor[utl::MediaDescriptor::PROP_URL()] <<= sURL;
+Sequence< css::beans::PropertyValue > aDescriptorSeq = 
lDescriptor.getAsConstPropertyValueList();
+OUString sType = xDetection->detect(aDescriptorSeq);
+
+OUString sNewFilterName;
+lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= 
sNewFilterName;
+if (!sType.isEmpty() && sNewFilterName == sFilterName)
+{
+// Filter detection was okay, update media descriptor with 
one received from FilterDetect
+lDescriptor = aDescriptorSeq;
+}
+}
+
 // let it recover itself
 Reference< XDocumentRecovery > xDocRecover( xModel, 
UNO_QUERY_THROW );
 xDocRecover->recoverFromFile(
commit 65ce7e8a64a7af6ff2fb5b776d60b89bbec32c5e
Author: Mike Kaganski 
AuthorDate: Fri Jan 3 22:40:07 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 18 09:25:16 2020 +0200

tdf#93389: keep encryption information for autorecovered MS formats

The autorecovery data is stored in ODF, regardless of the original
document format. When restoring, type detection generates ODF data,
which is stored in the media descriptor attached to document, even
after real filter was restored (see AutoRecovery::implts_openDocs).
If real filter is not ODF, then at the save time, it doesn't find
necessary information in encryption data, and makes not encrypted

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - comphelper/source sfx2/source

[Mike Kaganski (via logerrit)]

 comphelper/source/misc/docpasswordhelper.cxx |   30 +--
 sfx2/source/dialog/filedlghelper.cxx |   18 ++--
 2 files changed, 40 insertions(+), 8 deletions(-)

New commits:
commit aa1e92a889f5e5c25980437f172896d029b15fad
Author: Mike Kaganski 
AuthorDate: Fri Nov 29 13:07:57 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon May 18 09:24:59 2020 +0200

tdf#118639: store ODF encryption data for autorecovery

When saving autorecovery information, ODF is used. If the original
document is password-protected, its autorecovery is also generated
password-protected (since ef87ff6680f79362a431db6e7ef2f40cfc576219).
But when the stored encryption data for non-ODF document does not
contain "PackageSHA256UTF8EncryptionKey" value, following
ZipPackage::GetEncryptionKey fails, so the whole save fails.

So just generate and append ODF encryption keys where we still have
user password.

Reviewed-on: https://gerrit.libreoffice.org/84052
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 63634738dd03cc74806ce6843c16ff5e51a371a0)
Reviewed-on: https://gerrit.libreoffice.org/84133
Reviewed-by: Xisco Faulí 
(cherry picked from commit e569dc9824e95617d921bb8f115d243aea0125b9)
Reviewed-on: https://gerrit.libreoffice.org/84232
Reviewed-by: Adolfo Jayme Barrientos 

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

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index 6cf07d4795fb..9963e90309d4 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -428,6 +428,7 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 bool* pbIsDefaultPassword )
 {
 css::uno::Sequence< css::beans::NamedValue > aEncData;
+OUString aPassword;
 DocPasswordVerifierResult eResult = 
DocPasswordVerifierResult::WrongPassword;
 
 // first, try provided default passwords
@@ -441,8 +442,12 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 if( !aIt->isEmpty() )
 {
 eResult = rVerifier.verifyPassword( *aIt, aEncData );
-if( pbIsDefaultPassword )
-*pbIsDefaultPassword = eResult == 
DocPasswordVerifierResult::OK;
+if (eResult == DocPasswordVerifierResult::OK)
+{
+aPassword = *aIt;
+if (pbIsDefaultPassword)
+*pbIsDefaultPassword = true;
+}
 }
 }
 }
@@ -462,7 +467,11 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 if( eResult == DocPasswordVerifierResult::WrongPassword )
 {
 if( !rMediaPassword.isEmpty() )
+{
 eResult = rVerifier.verifyPassword( rMediaPassword, aEncData );
+if (eResult == DocPasswordVerifierResult::OK)
+aPassword = rMediaPassword;
+}
 }
 
 // request a password (skip, if result is OK or ABORT)
@@ -478,6 +487,8 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 {
 if( !pRequest->getPassword().isEmpty() )
 eResult = rVerifier.verifyPassword( 
pRequest->getPassword(), aEncData );
+if (eResult == DocPasswordVerifierResult::OK)
+aPassword = pRequest->getPassword();
 }
 else
 {
@@ -490,6 +501,21 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 {
 }
 
+if (eResult == DocPasswordVerifierResult::OK && !aPassword.isEmpty())
+{
+if (std::find_if(std::cbegin(aEncData), std::cend(aEncData),
+ [](const css::beans::NamedValue& val) {
+ return val.Name == 
PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
+ })
+== std::cend(aEncData))
+{
+// tdf#118639: We need ODF encryption data for autorecovery, where 
password
+// will already be unavailable, so generate and append it here
+aEncData = comphelper::concatSequences(
+aEncData, 
OStorageHelper::CreatePackageEncryptionData(aPassword));
+}
+}
+
 return (eResult == DocPasswordVerifierResult::OK) ? aEncData : 
uno::Sequence< beans::NamedValue >();
 }
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 0e5a3610ee3e..8f221b8bfb19 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2697,6 +2697,8 @@ ErrCode RequestPassword(const std::shared_ptr& pCurrentFilter,
 {
 if ( pPasswordRequest->getPassword().getLength() )
 {
+css::uno::Sequence< css::beans::NamedValue > aEncryptionData;
+

Re: [PATCH] libetonyek: std::for_each

[Miklos Vajna]

Hi Roland,

Could you please push your patch to gerrit?

See . It's
much easier to take patches from there.

Thanks,

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