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

[Miklos Vajna (via logerrit)]

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

New commits:
commit 75e3e7f2890438aadab28964c207f5308b7ffd4f
Author: Miklos Vajna 
AuthorDate: Tue Apr 23 21:04:29 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 24 08:58:39 2019 +0200

extern: update xmlsec to 1.2.28

Meant to fix the build problems reported in the mail thread starting at

"Build failure with latest ICU 64.1".

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

diff --git a/download.lst b/download.lst
index 0d9f9b719aa5..2e1ee3d94467 100644
--- a/download.lst
+++ b/download.lst
@@ -154,8 +154,8 @@ export LIBNUMBERTEXT_SHA256SUM := 
e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dd
 export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export XMLSEC_SHA256SUM := 
97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6
-export XMLSEC_TARBALL := xmlsec1-1.2.27.tar.gz
+export XMLSEC_SHA256SUM := 
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
+export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
 export LIBXML_SHA256SUM := 
94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
 export LIBXML_VERSION_MICRO := 9
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Vasily Melenchuk (via logerrit)]

 sc/source/core/data/dociter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c69f23247ca9a915c7a8f9f94566c6d33e096387
Author: Vasily Melenchuk 
AuthorDate: Wed Apr 24 09:00:03 2019 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Apr 24 08:37:47 2019 +0200

calc: reset stored row heights between iterations

Previously list of row heights was not reset between iterations
causing unwanted max heights to appear in next segments
and thus breaking row autoheight correct work on document load.

Change-Id: I471b4dbe8899eb1cd20b97a4f70957c4ee62948c
Reviewed-on: https://gerrit.libreoffice.org/71213
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 82efdb08aba1..e747d1e4cdf9 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -2628,6 +2628,8 @@ void ScDocRowHeightUpdater::update()
 if (!aData.mbValue)
 continue;
 
+aCxt.getHeightArray().clear();
+
 mrDoc.maTabs[nTab]->SetOptimalHeight(
 aCxt, aData.mnRow1, aData.mnRow2, &aProgress, nProgressStart);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/attarray.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 943a2f44bdc67cc795e553fd98693dba501ad717
Author: Noel Grandin 
AuthorDate: Sun Apr 21 18:47:25 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 24 08:29:55 2019 +0200

tdf#81765 slow loading of .ods with >1000 of conditional formats, part 4

This takes the loading time from 13s to 10.5s

Avoid expensive text-invalidation while we are loading

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

diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 7559331533ff..3c91d5b9dc03 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -494,9 +495,10 @@ const ScPatternAttr* ScAttrArray::SetPatternAreaImpl(SCROW 
nStartRow, SCROW nEnd
 
 // ensure that attributing changes text width of cell
 // otherwise, conditional formats need to be reset or deleted
+bool bIsLoading = !pDocument->GetDocumentShell() || 
pDocument->GetDocumentShell()->IsLoading();
 while ( ns <= nEndRow )
 {
-if ( nCol != -1 )
+if ( nCol != -1 && !bIsLoading )
 {
 const SfxItemSet& rNewSet = pPattern->GetItemSet();
 const SfxItemSet& rOldSet = 
mvData[nx].pPattern->GetItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 connectivity/source/drivers/file/fcode.cxx |2 +-
 editeng/source/editeng/impedit2.cxx|4 ++--
 sw/source/uibase/docvw/edtwin.cxx  |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 615cc81e9c594ae1ae67f5965cb61384ee55
Author: Andrea Gelmini 
AuthorDate: Tue Apr 23 17:50:59 2019 +
Commit: Julien Nabet 
CommitDate: Wed Apr 24 07:12:20 2019 +0200

Fix typos

Change-Id: I9cc5e13681b047fe772704b42796e210ad070601
Reviewed-on: https://gerrit.libreoffice.org/71148
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/connectivity/source/drivers/file/fcode.cxx 
b/connectivity/source/drivers/file/fcode.cxx
index 90b7bbdd8c43..e3731671ae10 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -85,7 +85,7 @@ OOperandParam::OOperandParam(OSQLParseNode const * pNode, 
sal_Int32 _nPos)
 
 // set up Parameter-Column with default type, can be specified more 
precisely later using Describe-Parameter
 
-// save Identity (not escpecially necessary here, just for the sake of 
symmetry)
+// save Identity (not especially necessary here, just for the sake of 
symmetry)
 
 // todo
 //  OColumn* pColumn = new 
OFILEColumn(aParameterName,eDBType,255,0,SQL_FLAGS_NULLALLOWED);
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 11023be03dd4..6b4b8da61b2e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -364,7 +364,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 if( mpIMEInfos )
 {
 // #102812# convert quotes in IME text
-// works on the last input character, this is escpecially in 
Korean text often done
+// works on the last input character, this is especially in Korean 
text often done
 // quotes that are inside of the string are not replaced!
 // Borrowed from sw: edtwin.cxx
 if ( mpIMEInfos->nLen )
@@ -373,7 +373,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 aSel.Min().SetIndex( aSel.Min().GetIndex() + 
mpIMEInfos->nLen-1 );
 aSel.Max().SetIndex( aSel.Max().GetIndex() + mpIMEInfos->nLen 
);
 // #102812# convert quotes in IME text
-// works on the last input character, this is escpecially in 
Korean text often done
+// works on the last input character, this is especially in 
Korean text often done
 // quotes that are inside of the string are not replaced!
 const sal_Unicode nCharCode = aSel.Min().GetNode()->GetChar( 
aSel.Min().GetIndex() );
 if ( ( GetStatus().DoAutoCorrect() ) && ( ( nCharCode == '\"' 
) || ( nCharCode == '\'' ) ) )
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 69a9b025f694..4e9095568392 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5318,7 +5318,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
 if ( !sRecord.isEmpty() )
 {
 // convert quotes in IME text
-// works on the last input character, this is escpecially 
in Korean text often done
+// works on the last input character, this is especially 
in Korean text often done
 // quotes that are inside of the string are not replaced!
 const sal_Unicode aCh = sRecord[sRecord.getLength() - 1];
 SvxAutoCorrCfg& rACfg = SvxAutoCorrCfg::Get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Regina Henschel (via logerrit)]

 svx/source/customshapes/EnhancedCustomShape2d.cxx   |   12 
 svx/source/customshapes/EnhancedCustomShapeGeometry.cxx |   15 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 951282a27a9dd4c64fc206fcbdd805b4cb602816
Author: Regina Henschel 
AuthorDate: Thu Apr 18 16:51:13 2019 +0200
Commit: Regina Henschel 
CommitDate: Wed Apr 24 00:27:17 2019 +0200

tdf#124787 mso-spt143 (RingOutside) has angles in degree

When reworking command U the shape 'RingOutside' was not considered.
Although it is a 'mso-' shape, it has angles in degree and not in
fixed-point number in its defaults. The patch removes in addition the
changes introduced by Symphony, which erroneously used total width
and height instead of radii for the ellipse size.

Change-Id: Iede8e346681796fb3e147dbcfaaa08ed8fe87c54
Reviewed-on: https://gerrit.libreoffice.org/70941
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx 
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 339973707bdd..0e38216c1cd1 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1660,10 +1660,14 @@ void EnhancedCustomShape2d::CreateSubPath(
 // The following implementation generates such 
rendering. It is only for rendering legacy
 // MS shapes and independent of the meaning of 
commands U and T in ODF specification.
 
-// Convert from fixedfloat to double
-double fSwingAngle;
-fStartAngle /= 65536.0;
-fSwingAngle = fEndAngle / 65536.0;
+// The WordArt shape 'RingOutside' has already 
angles in degree, all other need
+// convertion from fixed-point number.
+double fSwingAngle = fEndAngle;
+if (sShpType != "mso-spt143")
+{
+fStartAngle /= 65536.0;
+fSwingAngle = fEndAngle / 65536.0;
+}
 // Convert orientation
 fStartAngle = -fStartAngle;
 fSwingAngle = -fSwingAngle;
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx 
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index ab6d19bcfa07..ce4223582ff1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -6499,20 +6499,17 @@ static const mso_CustomShape msoTextRingInside =
 const_cast(mso_sptTextRingInsideHandle), SAL_N_ELEMENTS( 
mso_sptTextRingInsideHandle )
 };
 //mso_sptTextRingOutside
-//path = U 10800 ?f0 21600 ?f2 180 539 N U 10800 ?f1 21600 ?f2 180 539 N
+//path = U 10800 ?f0 10800 ?f2 180 539 N U 10800 ?f1 10800 ?f2 180 539 N
+// MSO binary format has swing angle, not end angle, therefore 359 instead of 
539.
 static const SvxMSDffVertPair mso_sptTextRingOutsideVert[] =
 {
-{ 10800, 0 MSO_I }, { 21600, 2 MSO_I }, { 180, 539},//U
-{ 10800, 1 MSO_I }, { 21600, 2 MSO_I }, { 180, 539 }//U
-//{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
-//{ 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
+{ 10800, 0 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 },
+{ 10800, 1 MSO_I }, { 10800, 0 MSO_I }, { 180, 359 }
 };
 static const SvxMSDffCalculationData mso_sptTextRingOutsideCalc[] = // 
adjustment1 : 6629 - 14971
 {
 { 0x2001, { DFF_Prop_adjustValue, 1, 2 } },
-{ 0x8000, { 21600, 0, 0x400 } },
-{ 0x2000, { DFF_Prop_adjustValue, 0, 0 } }, //$0
-{ 0x8000, { 21600, 0, DFF_Prop_adjustValue } }//21600-$0
+{ 0x8000, { 21600, 0, 0x400 } }
 };
 static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
 {
@@ -6521,7 +6518,7 @@ static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
 };
 static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
 {
-{   SvxMSDffHandleFlags::RANGE | 
SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL | 
SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL,
+{   SvxMSDffHandleFlags::RANGE,
 10800, 0x100, 10800, 10800, MIN_INT32, 0x7fff, 10800, 21600 }
 };
 static const mso_CustomShape msoTextRingOutside =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Katarina Behrens (via logerrit)]

New branch 'feature/cib_contract935b' available with the following commits:
commit 489cb0662ce4c58ee4467942a117c9f54bc3eca7
Author: Katarina Behrens 
Date:   Tue Apr 23 11:59:40 2019 +0200

Skip clipboard queries while the document is still loading

Use-case here is .ods document with 16k tracked changes. For every
tracked change, Calc generates a formula cell. For every formula
cell, clipboard content is queried (via ScDocument::IsClipboardSource,
ScModule::GetClipDoc respectively). This is dog-slow on Windows

Therefore don't query clipboard content while the document is in
the process of being loaded. Instead return from ScDocument::
IsClipboardSource early and return 'false' because at this point
of time it can't be reliably determined whether this doc is a clipboard
source anyway

Change-Id: If5aa62cbfb62fb326a3c73b4d9be839127d3c03b
Reviewed-on: https://gerrit.libreoffice.org/71121
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
(cherry picked from commit 9c8aa1c217f016fae9a57c6a4feca43551e5068e)

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

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

[Katarina Behrens (via logerrit)]

 sc/source/core/data/document.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9c8aa1c217f016fae9a57c6a4feca43551e5068e
Author: Katarina Behrens 
AuthorDate: Tue Apr 23 11:59:40 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 23 23:32:46 2019 +0200

Skip clipboard queries while the document is still loading

Use-case here is .ods document with 16k tracked changes. For every
tracked change, Calc generates a formula cell. For every formula
cell, clipboard content is queried (via ScDocument::IsClipboardSource,
ScModule::GetClipDoc respectively). This is dog-slow on Windows

Therefore don't query clipboard content while the document is in
the process of being loaded. Instead return from ScDocument::
IsClipboardSource early and return 'false' because at this point
of time it can't be reliably determined whether this doc is a clipboard
source anyway

Change-Id: If5aa62cbfb62fb326a3c73b4d9be839127d3c03b
Reviewed-on: https://gerrit.libreoffice.org/71121
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9c1875869099..134e5998ef22 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2570,7 +2570,8 @@ void ScDocument::SetClipParam(const ScClipParam& rParam)
 
 bool ScDocument::IsClipboardSource() const
 {
-if (bIsClip || mpShell == nullptr)
+if (bIsClip || mpShell == nullptr ||
+(mpShell && mpShell->IsLoading()))
 return false;
 
 ScDocument* pClipDoc = ScModule::GetClipDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Tagging text as being in arbitrary complex-script languages

[Richard Wordingham]

On Tue, 23 Apr 2019 17:35:10 +0200
Eike Rathke  wrote:

> Hi Richard,
> 
> On Thursday, 2019-04-18 20:40:01 +0100, Richard Wordingham wrote:

> > It sounds as though one has to specify the script where there is
> > doubt as to what type of script will dominate. Is it an issue if
> > there are two competing scripts of the same type, e.g Thai v. Lanna
> > for Northern Thai?  A dual script dictionary would correct
> > inefficiently.  

> Competing in the sense two different scripts under one language tag?
> I wouldn't do that and IMHO it would be wrong.

It's worse than that.  The spoken language nod-TH resolves, ignoring
subregional variations, into the three written groups:

nod-Lana-TH
nod-Thai-etymo-TH (name but not concept declared unsuitable on 10 Jan)
nod-Thai-phonetic-TH (ditto)

The scheme 'nod-Thai-etymo-TH' often accompanies published material in
non-Lana-TH. The New Testament is published in nod-Lana-TH and
'nod-Thai-phonetic-TH'.

Until I can find names for the Thai-script variants more specific to
Northern Thai, my plan is to handle the difference by letting the user
choose the dictionary if I ever get round to Thai script Northern Thai
dictionaries.  The biggest need I see for the variant tags is user
interfaces.

The Lana script dictionary is highly desirable for
handling the visual ambiguities in the script for the vernacular
languages and has high priority.  Eyeballs are probably good enough for
the Thai script.

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

Re: [ABANDONED] Re: Build fail on Libgpg-error on Windows with gawk 5.0

[Thorsten Behrens]

Hi Julien,

Julien Nabet wrote:
> Gerrit failed on it. I had the same on Linux but thought it was something
> else. Since I got no idea of the pb and don't want to waste some time on it,
> let's wait next release of libgpg-error.
> 
Ugh - so it seems that there are breaking changes in gawk 5.0 then?

Didn't find much else beyond this announcement on hacker news:

  https://news.ycombinator.com/item?id=19671983

, but at any rate there's apparently older gawk packages still
available for cygwin:

  https://cygwin.com/packages/x86_64/gawk/

Cheers,

-- Thorsten

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

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/inc/redlndlg.hxx  |   12 +++---
 sw/source/uibase/misc/redlndlg.cxx |   69 +
 2 files changed, 47 insertions(+), 34 deletions(-)

New commits:
commit 74a58038b2001ddea5673300bd0317d29c100459
Author: Caolán McNamara 
AuthorDate: Tue Apr 23 16:56:31 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 23 22:41:01 2019 +0200

multiple concatted AcceptChgDat

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

diff --git a/sw/source/uibase/inc/redlndlg.hxx 
b/sw/source/uibase/inc/redlndlg.hxx
index 4f551e76ddec..7892fcb48fc6 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -128,7 +128,7 @@ public:
 voidInit(SwRedlineTable::size_type nStart = 0);
 voidCallAcceptReject( bool bSelect, bool bAccept );
 
-voidInitialize(const OUString &rExtraData);
+voidInitialize(OUString &rExtraData);
 voidFillInfo(OUString &rExtraData) const;
 
 voidActivate();
@@ -146,16 +146,16 @@ public:
 
 virtual voidActivate() override;
 virtual voidFillInfo(SfxChildWinInfo&) const override;
-voidInitialize (SfxChildWinInfo const * pInfo);
+voidInitialize(SfxChildWinInfo * pInfo);
 };
 
 class SwRedlineAcceptChild : public SwChildWinWrapper
 {
 public:
-SwRedlineAcceptChild(   vcl::Window* ,
-sal_uInt16 nId,
-SfxBindings*,
-SfxChildWinInfo const *  );
+SwRedlineAcceptChild(vcl::Window* ,
+ sal_uInt16 nId,
+ SfxBindings*,
+ SfxChildWinInfo*);
 
 SFX_DECL_CHILDWINDOW_WITHID( SwRedlineAcceptChild );
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 71bcf99cc62b..6afaaa11712f 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -60,11 +60,11 @@ SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, 
FN_REDLINE_ACCEPT )
 static sal_uInt16 nSortMode = 0x;
 static bool   bSortDir = true;
 
-SwRedlineAcceptChild::SwRedlineAcceptChild( vcl::Window* _pParent,
-sal_uInt16 nId,
-SfxBindings* pBindings,
-SfxChildWinInfo const * pInfo ) :
-SwChildWinWrapper( _pParent, nId )
+SwRedlineAcceptChild::SwRedlineAcceptChild(vcl::Window* _pParent,
+   sal_uInt16 nId,
+   SfxBindings* pBindings,
+   SfxChildWinInfo* pInfo)
+: SwChildWinWrapper(_pParent, nId)
 {
 SetWindow( VclPtr::Create( pBindings, this, 
_pParent) );
 
@@ -122,7 +122,7 @@ void SwModelessRedlineAcceptDlg::Activate()
 pImplDlg->Activate();
 }
 
-void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo const *pInfo)
+void SwModelessRedlineAcceptDlg::Initialize(SfxChildWinInfo* pInfo)
 {
 if (pInfo != nullptr)
 pImplDlg->Initialize(pInfo->aExtraString);
@@ -1160,45 +1160,58 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl, 
SvSimpleTable*, void)
 }
 }
 
-void SwRedlineAcceptDlg::Initialize(const OUString& rExtraData)
+namespace
 {
-if (!rExtraData.isEmpty())
+OUString lcl_StripAcceptChgDat(OUString &rExtraString)
 {
-sal_Int32 nPos = rExtraData.indexOf("AcceptChgDat:");
-
-// try to read the alignment string "ALIGN:(...)"; if none existing,
-// it's an old version
-if (nPos != -1)
+OUString aStr;
+while(true)
 {
-sal_Int32 n1 = rExtraData.indexOf('(', nPos);
+sal_Int32 nPos = rExtraString.indexOf("AcceptChgDat:");
+if (nPos == -1)
+break;
+// try to read the alignment string "ALIGN:(...)"; if none 
existing,
+// it's an old version
+sal_Int32 n1 = rExtraString.indexOf('(', nPos);
 if (n1 != -1)
 {
-sal_Int32 n2 = rExtraData.indexOf(')', n1);
+sal_Int32 n2 = rExtraString.indexOf(')', n1);
 if (n2 != -1)
 {
 // cut out the alignment string
-OUString aStr = rExtraData.copy(nPos, n2 - nPos + 1);
+aStr = rExtraString.copy(nPos, n2 - nPos + 1);
+rExtraString = rExtraString.replaceAt(nPos, n2 - nPos + 1, 
"");
 aStr = aStr.copy(n1 - nPos + 1);
-
-if (!aStr.isEmpty())
-{
-sal_uInt16 nCount = static_cast< sal_uInt16 
>(aStr.toInt32());
-
-for (sal_

Re: Tagging text as being in arbitrary complex-script languages

[Richard Wordingham]

On Tue, 23 Apr 2019 18:00:22 +0200
Eike Rathke  wrote:

> On Friday, 2019-04-19 03:32:34 +0100, Richard Wordingham wrote:

> > In answer to what was intended to be a rhetorical question, I
> > suppose und-Latn-t-sa-m0-iast and und-Latn-t-sa-m0-iso would work
> > for the normative forms.  
> 
> Seem.. at least when entered at https://r12a.github.io/app-subtags/ in
> the Check form it doesn't overly complain.

It seems that some people think that IAST also defines a Cyrillic
representation, so I think the 'Latn' is justified.

> However, I'd avoid 'und', to me it annotates as "can't determine what
> this could be" and in fact it is listed as Undetermined.

Well, as the two systems are international standards (the 'i' in
'iast' and 'iso'), it should be hard to tell whether the intended
audience is English, German, Japanese or whatever.  The what of the
underlying content is contained in the extension - in this case the
'sa'.


> Yes, that's ugly, but unavoidable. For which sa-Latn would be a better
> solution.

And allow for mixtures of the two schemes!

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

[ABANDONED] Re: Build fail on Libgpg-error on Windows with gawk 5.0

[Julien Nabet]

On 23/04/2019 21:27, Julien Nabet wrote:

On 23/04/2019 18:01, Thorsten Behrens wrote:

Hi Julien,

julien2412 wrote:

It's been fixed upstream (see
https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9bb19072fbdf) 


but the last release hasn't included yet this fix.

I fixed Windows build locally by taking parts of the patch.


Thx a lot - then let's please carry that patch in LibreOffice until
upstream has included it in a release - we patch libgpg-error anyway,
see external/libgpg-error/UnpackedTarball_libgpg-error.mk - could you
add it there?


Thank you Thorsten for your feedback, I've just submitted the patch on 
gerrit, see https://gerrit.libreoffice.org/#/c/71144/


Gerrit failed on it. I had the same on Linux but thought it was 
something else. Since I got no idea of the pb and don't want to waste 
some time on it, let's wait next release of libgpg-error.


Julien

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

Re: Build fail on Libgpg-error on Windows with gawk 5.0

[Julien Nabet]

On 23/04/2019 18:01, Thorsten Behrens wrote:

Hi Julien,

julien2412 wrote:

It's been fixed upstream (see
https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9bb19072fbdf)
but the last release hasn't included yet this fix.

I fixed Windows build locally by taking parts of the patch.


Thx a lot - then let's please carry that patch in LibreOffice until
upstream has included it in a release - we patch libgpg-error anyway,
see external/libgpg-error/UnpackedTarball_libgpg-error.mk - could you
add it there?


Thank you Thorsten for your feedback, I've just submitted the patch on 
gerrit, see https://gerrit.libreoffice.org/#/c/71144/


Julien

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

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

[Stephan Bergmann (via logerrit)]

 ucb/source/ucp/gio/gio_content.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 0a04150b6eefb5feb7ecefaa5cd63dbac8c1574f
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 15:10:53 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 23 20:08:56 2019 +0200

tdf#124635 MountOperation::Mount can be called with SolarMutex unlocked

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

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index b1b51551ef15..d3a910c02c4a 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -349,8 +349,15 @@ GError *MountOperation::Mount(GFile *pFile)
 // GdkThreadsLeave unlock the SolarMutex down to zero at the end of
 // g_main_loop_run, so we need ~SolarMutexReleaser to raise it back to
 // the original value again:
-SolarMutexReleaser rel;
-g_main_loop_run(mpLoop);
+if (comphelper::SolarMutex::get()->IsCurrentThread())
+{
+SolarMutexReleaser rel;
+g_main_loop_run(mpLoop);
+}
+else
+{
+g_main_loop_run(mpLoop);
+}
 }
 return mpError;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski (via logerrit)]

 svx/source/stbctrls/selctrl.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit aafc733e8d8447f1ba878faa6e7ed3804ed44007
Author: Jim Raykowski 
AuthorDate: Tue Apr 23 19:00:09 2019 +0200
Commit: Jim Raykowski 
CommitDate: Tue Apr 23 19:57:16 2019 +0200

Revert "tdf#122280: Hide Block selection mode from Calc"

This reverts commit 220ce1a5b1db6e456afe04b7e9002c524dcf1044.

Including a header file of another module and even a module that is above 
is a no-go.

Change-Id: I3c8107d8c667c34259bdfee9d83afb2651f5e11c
Reviewed-on: https://gerrit.libreoffice.org/71142
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index d9af2ef4ac2e..1e97e160f289 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -29,7 +29,6 @@
 
 #include "stbctrls.h"
 #include 
-#include <../sc/inc/sc.hrc>
 
 #include 
 
@@ -47,7 +46,6 @@ public:
 OUString GetItemTextForState(sal_uInt16 nState) { return 
m_xMenu->GetItemText(state_to_id(nState)); }
 sal_uInt16 GetState() const { return 
id_to_state(m_xMenu->GetCurItemIdent()); }
 sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return 
m_xMenu->Execute(pWindow, rPopupPos); }
-void HideSelectionType(const OString& rIdent) { 
m_xMenu->HideItem(m_xMenu->GetItemId(rIdent)); }
 };
 
 sal_uInt16 SelectionTypePopup::id_to_state(const OString& rIdent)
@@ -110,12 +108,6 @@ bool SvxSelectionModeControl::MouseButtonDown( const 
MouseEvent& rEvt )
 SelectionTypePopup aPop(mnState);
 StatusBar& rStatusbar = GetStatusBar();
 
-// Check if Calc is opened and hide block selection state if true 
tdf#122280
-if ( GetSlotId() == SID_STATUS_SELMODE )
-{
-aPop.HideSelectionType("block");
-}
-
 if (rEvt.IsMiddle() && aPop.Execute(&rStatusbar, rEvt.GetPosPixel()))
 {
 sal_uInt16 nNewState = aPop.GetState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 framework/source/uielement/toolbarmanager.cxx |3 ++-
 sc/source/core/data/patattr.cxx   |   10 ++
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 1e3d0a57689006cd7244481958025177c01e4d09
Author: Noel Grandin 
AuthorDate: Tue Apr 23 11:23:36 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Apr 23 19:56:53 2019 +0200

fix bad comparison in StrCmp/StrLess

comment from Miklos:
 > Won't this do a comparison of two null-terminated strings, while
 > the strings here are utf16, i.e. abc is a\0b\0c\0? That would mean
 > in practice you compare the first char only.

introduced in
commit 003d11f410b7e515981b3efbd65d936d94d87121
Date:   Sat Apr 20 08:32:33 2019 +0200
tdf#81765 slow loading of .ods with >1000 of conditional formats

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

diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index bff76e330233..13639a9977e3 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -117,10 +117,7 @@ static bool StrCmp( const OUString* pStr1, const OUString* 
pStr2 )
 return false;
 if (!pStr1 && pStr2)
 return false;
-// we don't care about a proper lexicographic ordering, we just care about 
a stable order, and
-// this is faster
-return strcmp(reinterpret_cast(pStr1->getStr()),
-  reinterpret_cast(pStr2->getStr())) == 0;
+return *pStr1 == *pStr2;
 }
 
 static bool StrLess( const OUString* pStr1, const OUString* pStr2 )
@@ -131,10 +128,7 @@ static bool StrLess( const OUString* pStr1, const 
OUString* pStr2 )
 return false;
 if (!pStr1 && pStr2)
 return true;
-// we don't care about a proper lexicographic ordering, we just care about 
a stable order, and
-// this is faster
-return strcmp(reinterpret_cast(pStr1->getStr()),
-  reinterpret_cast(pStr2->getStr())) < 0;
+return *pStr1 < *pStr2;
 }
 
 static bool EqualPatternSets( const SfxItemSet& rSet1, const SfxItemSet& rSet2 
)
commit 7482a400cc90ddb8bf1d53d7655a4027e50fe593
Author: Noel Grandin 
AuthorDate: Tue Apr 23 16:12:30 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Apr 23 19:56:41 2019 +0200

tdf#124886 Toolbar button icons are off by one

regression from
commit 1a5b12aa5da2c718848d3cc5d9bce7bfcdeacf54
Date:   Thu Apr 18 15:13:19 2019 +0200
optimise find/insert pattern

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

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index abaface6e133..280958311ae4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1046,6 +1046,7 @@ void ToolBarManager::FillToolbar( const Reference< 
XIndexAccess >& rItemContaine
 if ( pIter.second )
 {
 aCmdInfo.nId = nId;
+pIter.first->second.nId = nId;
 }
 else
 {
@@ -1199,7 +1200,7 @@ void ToolBarManager::FillOverflowToolbar( ToolBox const * 
pParent )
 if ( pIter.second )
 {
 aCmdInfo.nId = nId;
-const CommandToInfoMap::value_type aValue( aCommandURL, 
aCmdInfo );
+pIter.first->second.nId = nId;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 5 commits - uitest/mass-testing

[Libreoffice Gerrit user]

 uitest/mass-testing/calc.py|  161 +
 uitest/mass-testing/impress.py |   13 +--
 uitest/mass-testing/run.py |   42 +++---
 uitest/mass-testing/writer.py  |   13 +--
 4 files changed, 124 insertions(+), 105 deletions(-)

New commits:
commit f9be4795bac37d177402f49a7f2de7daf9b764d0
Author: Xisco Fauli 
AuthorDate: Tue Apr 23 19:02:14 2019 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 23 19:02:14 2019 +0200

mass-uitesting: thread not loaded files as skipped

diff --git a/uitest/mass-testing/run.py b/uitest/mass-testing/run.py
index 65bbc1d..40d88c6 100755
--- a/uitest/mass-testing/run.py
+++ b/uitest/mass-testing/run.py
@@ -126,12 +126,17 @@ def run_tests_and_get_results(liboPath, listFiles, 
isDebug, isResume):
 fileInterval = 10
 testIternval = 20
 timeout = time.time() + fileInterval
+notLoaded = True
 while True:
 time.sleep(1)
 
 if time.time() > timeout:
-logger.info("TIMEOUT: " + fileName)
-results['timeout'] += 1
+if notLoaded:
+logger.info("SKIP: " + fileName)
+results['skip'] += 1
+else:
+logger.info("TIMEOUT: " + fileName)
+results['timeout'] += 1
 
 # kill popen process
 os.killpg(process.pid, signal.SIGKILL)
@@ -164,6 +169,8 @@ def run_tests_and_get_results(liboPath, listFiles, isDebug, 
isResume):
 
 break
 elif message == 'loaded':
+notLoaded = False
+
 #Extend timeout
 timeout += testIternval
 
commit 77efd108d283951e7bc8ec3bb2ecb519fa7b3c57
Author: Xisco Fauli 
AuthorDate: Tue Apr 23 18:49:32 2019 +0200
Commit: Xisco Fauli 
CommitDate: Tue Apr 23 18:49:32 2019 +0200

mass-uitesting: Make sure the sheet is not protected...

... while changing text formatting

diff --git a/uitest/mass-testing/calc.py b/uitest/mass-testing/calc.py
index 58d532d..f1ac576 100755
--- a/uitest/mass-testing/calc.py
+++ b/uitest/mass-testing/calc.py
@@ -148,47 +148,55 @@ class massTesting(UITestCase):
 def test_change_text_formatting_and_undo(self):
 xEdit = self.load_file()
 if xEdit:
-self.xUITest.executeCommand(".uno:SelectAll")
-self.xUITest.executeCommand(".uno:Bold")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Italic")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Underline")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:UnderlineDouble")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Strikeout")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Overline")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:SuperScript")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:SubScript")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Shadowed")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:OutlineFont")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Grow")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:Shrink")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseToUpper")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseToLower")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseRotateCase")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseToSentenceCase")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseToTitleCase")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:ChangeCaseToToggleCase")
-self.xUITest.executeCommand(".uno:Undo")
-self.xUITest.executeCommand(".uno:SmallCaps")
-self.xUITest.executeCommand(".uno:Undo")
-
self.xUITest.executeCommand(".uno:StyleApply?Style:string=Heading%202&FamilyName:string=ParagraphStyles")
-self.xUITest.executeCommand(".uno:Undo")
+document = self.ui_test.get_component()
+nrSheets = document.Sheets.getCount()  #number of sheets in the 
document
+
+#go to first sheet
+for 

Re: Build fail on Libgpg-error on Windows with gawk 5.0

[Thorsten Behrens]

Hi Julien,

julien2412 wrote:
> It's been fixed upstream (see
> https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9bb19072fbdf)
> but the last release hasn't included yet this fix.
> 
> I fixed Windows build locally by taking parts of the patch.
>
Thx a lot - then let's please carry that patch in LibreOffice until
upstream has included it in a release - we patch libgpg-error anyway,
see external/libgpg-error/UnpackedTarball_libgpg-error.mk - could you
add it there?

Cheers,

-- Thorsten


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

Re: Tagging text as being in arbitrary complex-script languages

[Eike Rathke]

Hi Richard,

On Friday, 2019-04-19 03:32:34 +0100, Richard Wordingham wrote:

> In answer to what was intended to be a rhetorical question, I suppose
> und-Latn-t-sa-m0-iast and und-Latn-t-sa-m0-iso would work for the
> normative forms.

Seem.. at least when entered at https://r12a.github.io/app-subtags/ in
the Check form it doesn't overly complain.

However, I'd avoid 'und', to me it annotates as "can't determine what
this could be" and in fact it is listed as Undetermined.

Also, my guess is most applications would not support these tags at all.
Of course it depends what you want to use it for, whether it's inhouse
tagging you control the tools used with these tags, or meant for
publicly available classification of languages. Where some
standardization among the parties involved would come handy..

> I've successfully loaded a mocked up extension for the
> former (as explicitly using a Western script), though I don't much like
> the consequent tagging  in
> the document's content.xml.

Yes, that's ugly, but unavoidable. For which sa-Latn would be a better
solution.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/miscdlgs/acredlin.cxx |   45 +++--
 1 file changed, 28 insertions(+), 17 deletions(-)

New commits:
commit 65f81f6acdeb03b34033a1c6515618936d5f8eca
Author: Caolán McNamara 
AuthorDate: Tue Apr 23 11:06:20 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 23 17:57:33 2019 +0200

multiple concatted AcceptChgDat stored in config

FillInfo is called more often than Initialize, so we've ended up
with multiple AcceptChgDat strings

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

diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index 3e39243c5210..00b841ed4bc5 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1701,34 +1701,43 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl, 
SvSimpleTable*, void)
 }
 }
 
-void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
+namespace
 {
-OUString aStr;
-if(pInfo!=nullptr)
+//at one point we were writing multiple AcceptChgDat strings,
+//so strip all of them and keep the results of the last one
+OUString lcl_StripAcceptChgDat(OUString &rExtraString)
 {
-if ( !pInfo->aExtraString.isEmpty() )
+OUString aStr;
+while (true)
 {
-sal_Int32 nPos = pInfo->aExtraString.indexOf("AcceptChgDat:");
-
+sal_Int32 nPos = rExtraString.indexOf("AcceptChgDat:");
+if (nPos == -1)
+break;
 // Try to read the alignment string "ALIGN:(...)"; if it is missing
 // we have an old version
-if ( nPos != -1 )
+sal_Int32 n1 = rExtraString.indexOf('(', nPos);
+if ( n1 != -1 )
 {
-sal_Int32 n1 = pInfo->aExtraString.indexOf('(', nPos);
-if ( n1 != -1 )
+sal_Int32 n2 = rExtraString.indexOf(')', n1);
+if ( n2 != -1 )
 {
-sal_Int32 n2 = pInfo->aExtraString.indexOf(')', n1);
-if ( n2 != -1 )
-{
-// cut out alignment string
-aStr = pInfo->aExtraString.copy(nPos, n2 - nPos + 1);
-pInfo->aExtraString = 
pInfo->aExtraString.replaceAt(nPos, n2 - nPos + 1, "");
-aStr = aStr.copy( n1-nPos+1 );
-}
+// cut out alignment string
+aStr = rExtraString.copy(nPos, n2 - nPos + 1);
+rExtraString = rExtraString.replaceAt(nPos, n2 - nPos + 1, 
"");
+aStr = aStr.copy( n1-nPos+1 );
 }
 }
 }
+return aStr;
 }
+}
+
+void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
+{
+OUString aStr;
+if (pInfo && !pInfo->aExtraString.isEmpty())
+aStr = lcl_StripAcceptChgDat(pInfo->aExtraString);
+
 SfxModelessDialog::Initialize(pInfo);
 
 if ( !aStr.isEmpty())
@@ -1747,6 +1756,8 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
 void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const
 {
 SfxModelessDialog::FillInfo(rInfo);
+//remove any old one before adding a new one
+lcl_StripAcceptChgDat(rInfo.aExtraString);
 rInfo.aExtraString += "AcceptChgDat:(";
 
 sal_uInt16  nCount=pTheView->TabCount();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/uitest/writer_tests/xwindow.py |  150 +++
 toolkit/source/awt/vclxwindow.cxx|   84 +++
 2 files changed, 200 insertions(+), 34 deletions(-)

New commits:
commit a2fcf51a77f4a37fb1c14f47bab450eea79a0dcb
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 10 11:21:32 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 23 17:48:40 2019 +0200

tdf#122920 Send UNO mouse events to parent window listeners as well

When user registers a mouse listener to a window, he expects
to receive mouse events when a user clicks in somewhere in that
window, even if it's technically a widget inside that window

Change-Id: Ie6d3f8b140e4a5b516051014282b43775ecec59e
Reviewed-on: https://gerrit.libreoffice.org/70512
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit 6f43902b12dd36fa2b69401065df198ef9ffdb09)
Reviewed-on: https://gerrit.libreoffice.org/71139
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/uitest/writer_tests/xwindow.py 
b/sw/qa/uitest/writer_tests/xwindow.py
index d63df73c69ea..428dd3723a05 100644
--- a/sw/qa/uitest/writer_tests/xwindow.py
+++ b/sw/qa/uitest/writer_tests/xwindow.py
@@ -43,15 +43,13 @@ class XMouseListenerExtended(unohelper.Base, 
XMouseListener):
 # is invoked when the mouse enters a window.
 @classmethod
 def mouseEntered(self, xMouseEvent):
-global mouseEventsIntercepted
-mouseEventsIntercepted += 1
+# doesn't work in UI tests
 return super(XMouseListenerExtended, self).mouseEntered(xMouseEvent)
 
 # is invoked when the mouse exits a window.
 @classmethod
 def mouseExited(self, xMouseEvent):
-global mouseEventsIntercepted
-mouseEventsIntercepted += 1
+# doesn't work in UI tests
 return super(XMouseListenerExtended, self).mouseExited(xMouseEvent)
 
 
@@ -142,8 +140,8 @@ class XWindow(UITestCase):
 self.assertEqual(0, keymouseEventsIntercepted)
 
 global mouseEventsIntercepted
-# Not expected 3 interceptions
-self.assertEqual(0, mouseEventsIntercepted)
+# mousePressed, mouseReleased and mouseEntered should be triggered
+self.assertEqual(2, mouseEventsIntercepted)
 
 # close document
 self.ui_test.close_doc()
diff --git a/toolkit/source/awt/vclxwindow.cxx 
b/toolkit/source/awt/vclxwindow.cxx
index 6d89c13f3697..31438dfec9e2 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -704,50 +704,66 @@ void VCLXWindow::ProcessWindowEvent( const 
VclWindowEvent& rVclWindowEvent )
 case VclEventId::WindowMouseMove:
 {
 MouseEvent* pMouseEvt = 
static_cast(rVclWindowEvent.GetData());
-if ( mpImpl->getMouseListeners().getLength() && ( 
pMouseEvt->IsEnterWindow() || pMouseEvt->IsLeaveWindow() ) )
+VclPtr pWin = GetWindow();
+while (pWin)
 {
-awt::MouseEvent aEvent( VCLUnoHelper::createMouseEvent( 
*pMouseEvt, *this ) );
-bool const isEnter(pMouseEvt->IsEnterWindow());
-Callback aCallback = [ this, isEnter, aEvent ]()
- { MouseListenerMultiplexer& rMouseListeners = 
this->mpImpl->getMouseListeners();
-   isEnter
-   ? rMouseListeners.mouseEntered(aEvent)
-   : rMouseListeners.mouseExited(aEvent); };
-
-ImplExecuteAsyncWithoutSolarLock( aCallback );
-}
+VCLXWindow* pXWindow = pWin->GetWindowPeer();
+if (!pXWindow || 
pXWindow->mpImpl->getMouseListeners().getLength() == 0)
+{
+pWin = pWin->GetWindow(GetWindowType::RealParent);
+continue;
+}
+awt::MouseEvent 
aEvent(VCLUnoHelper::createMouseEvent(*pMouseEvt, *pXWindow));
 
-if ( mpImpl->getMouseMotionListeners().getLength() && 
!pMouseEvt->IsEnterWindow() && !pMouseEvt->IsLeaveWindow() )
-{
-awt::MouseEvent aEvent( VCLUnoHelper::createMouseEvent( 
*pMouseEvt, *this ) );
-aEvent.ClickCount = 0;
-if ( pMouseEvt->GetMode() & MouseEventModifiers::SIMPLEMOVE )
-mpImpl->getMouseMotionListeners().mouseMoved( aEvent );
+if (pMouseEvt->IsEnterWindow() || pMouseEvt->IsLeaveWindow())
+{
+bool const isEnter(pMouseEvt->IsEnterWindow());
+Callback aCallback = [pXWindow, isEnter, aEvent]() {
+isEnter ? 
pXWindow->mpImpl->getMouseListeners().mouseEntered(aEvent)
+: 
pXWindow->mpImpl->getMouseListeners().mouseExited(aEvent);
+};
+ImplExecuteAsyncWithoutSolarLock(aCallback);
+}
   

Re: Tagging text as being in arbitrary complex-script languages

[Eike Rathke]

Hi Richard,

On Thursday, 2019-04-18 20:40:01 +0100, Richard Wordingham wrote:

> On Thu, 18 Apr 2019 12:25:11 +0200
> Eike Rathke  wrote:
> 
> > What I usually did is, lookup the language at SIL and the Ethnologue
> > and use the most prevalent script as implied default script. Which
> > here https://www.ethnologue.com/language/san would lead to
> > Devanagari, but in this case more important is also what MS assigned
> > the LCID for.
> 
> So I shouldn't be misled by the fact that the CTL script I most
> frequently write Sanskrit in is Thai -:)  Seriously, though, I believe
> the script of sa-TH is Thai is rather than Devanagari, and I am quite
> sure that the script of sa-MM is Mymr.

Your expertise is welcome!
If the IANA language tag registry doesn't indicate a Suppress-Script
field for a specific language then nowadays it is indeed better practice
to explicitly state the script tag for languages that otherwise could be
ambiguous. So that would be sa-Thai-TH and sa-Mymr-MM. Deducing the
script from the language-country combo is deprecated, but for backwards
and MS compatibility not avoidable for existing tags.


> It sounds as though one has to specify the script where there is doubt
> as to what type of script will dominate. Is it an issue if there are
> two competing scripts of the same type, e.g Thai v. Lanna for Northern
> Thai?  A dual script dictionary would correct inefficiently.

Competing in the sense two different scripts under one language tag?
I wouldn't do that and IMHO it would be wrong.


> > Though with sa-Latn
> > I doubt there's a use case, so I wouldn't call that "correct" in
> > common sense.
> 
> So how do you suggest we tag Sanskrit in Latin script?  Within English
> works, its not uncommon for any Sankrit quoted precisely to be in the
> Latin script; about half the English language articles in the
> 'International Journal of Sanskrit
> Research' (http://www.anantaajournal.com/) that quote Sanskrit passages
> quote them in the Latin script.  Several papers would benefit from the
> application of sa-Latn proofing tools, though I don't denying that
> proofing Sanskrit may be difficult.

I wasn't aware that there is indeed Sanskrit transcribed to Latin ... so
then, sa-Latn might make sense.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

Re: MacUpdate - your app listing has been updated

[Eike Rathke]

Hi Michael,

On Thursday, 2019-04-18 12:17:01 -0500, Michael H wrote:

> Seems like it might be a security issue to having a public account with a
> community mailing list as the contact/recovery email...

And the developer's account recovery email is ...?
AFAIK LibreOffice doesn't have an account at macupdate, specifically not
with the mailing list address, they just keep sending their update
notifications. Which isn't too bad, if they only would listen to an
answer..

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter2.cxx  |   16 
 sw/source/core/layout/anchoreddrawobject.cxx |   18 --
 2 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit da21956366a13b62b056d6074262f44c1559b29d
Author: Miklos Vajna 
AuthorDate: Thu Feb 7 11:06:24 2019 +0100
Commit: Aron Budea 
CommitDate: Tue Apr 23 16:33:12 2019 +0200

tdf#123032 sw, AddVerticalFrameOffsets: fix shape pos after mouse move

Regression from commit 50223ea6e212b60b7d33839c2753c5601fb50f95
(tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31),
the problem was that vertical position of the shape was wrong after
mouse move, even if we attempted to take fly frames of the paragraph
into account. (Similar situation is when saving and loading the file;
which is much easier to test.)

Fly frames are created as the
text frames is formatted, and then SwTextFrame::CalcBaseOfstForFly() can
calculate the vertical offset correctly. But in the "move with mouse"
case SwToContentAnchoredObjectPosition::CalcPosition() was invoked by
the time the old flys of the text frame were already removed, but the
new ones were not yet added.

Solve the problem by formatting the text frame from
SwAnchoredDrawObject::MakeObjPosAnchoredAtPara() (if any of its validity
flags are set to false) -- this is expected to be safe, as the object
formatter is invoked by SwLayAction::FormatContent(), i.e. there is no
recursive SwFrame::Calc() call here.

(cherry picked from commit 961ba62df045473e5793d9e103be86eaad8d9575)

Change-Id: I95851874e3da3f50f304421537c6743e04bdfc7b
Reviewed-on: https://gerrit.libreoffice.org/71127
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index df4fef72e547..6d3355af30bb 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -460,6 +460,22 @@ void SwUiWriterTest2::testTdf122942()
 // paragraph mark, not above it.
 const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
 CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
+
+reload("writer8", "tdf122942.odt");
+pTextDoc = dynamic_cast(mxComponent.get());
+pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pDoc = pWrtShell->GetDoc();
+const SwFrameFormats& rFormats2 = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats2.size());
+
+SdrObject* pObject = rFormats2[1]->FindSdrObject();
+CPPUNIT_ASSERT(pObject);
+
+const tools::Rectangle& rOutRect = pObject->GetLastBoundRect();
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected greater than: 5000; Actual  : 2817', i.e. the shape moved up
+// after a reload(), while it's expected to not change its position (5773).
+CPPUNIT_ASSERT_GREATER(static_cast(5000), rOutRect.Top());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx 
b/sw/source/core/layout/anchoreddrawobject.cxx
index ca5014f7e9b5..1706fafe4372 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -391,12 +391,18 @@ void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara()
 // --> #i50356# - format anchor frame containing the anchor
 // position. E.g., for at-character anchored object this can be the follow
 // frame of the anchor frame, which contains the anchor character.
-const bool bFormatAnchor =
-!static_cast( 
GetAnchorFrameContainingAnchPos() )->IsAnyJoinLocked() &&
-!ConsiderObjWrapInfluenceOnObjPos() &&
-!ConsiderObjWrapInfluenceOfOtherObjs();
-
-if ( bFormatAnchor )
+bool bJoinLocked
+= static_cast(GetAnchorFrameContainingAnchPos())->IsAnyJoinLocked();
+const bool bFormatAnchor = !bJoinLocked && 
!ConsiderObjWrapInfluenceOnObjPos()
+   && !ConsiderObjWrapInfluenceOfOtherObjs();
+
+// Format of anchor is needed for (vertical) fly offsets, otherwise the
+// lack of fly portions will result in an incorrect 0 offset.
+bool bAddVerticalFlyOffsets = 
GetFrameFormat().getIDocumentSettingAccess().get(
+DocumentSettingId::ADD_VERTICAL_FLY_OFFSETS);
+bool bFormatAnchorOnce = !bJoinLocked && bAddVerticalFlyOffsets;
+
+if (bFormatAnchor || bFormatAnchorOnce)
 {
 // --> #i50356#
 
GetAnchorFrameContainingAnchPos()->Calc(GetAnchorFrameContainingAnchPos()->getRootFrame()->GetCurrShell()->GetOut());
___
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' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/layout/data/tdf123651.docx |binary
 sw/qa/extras/layout/layout.cxx  |   11 +++
 sw/qa/extras/uiwriter/uiwriter2.cxx |   23 +--
 sw/source/core/text/txtfrm.cxx  |3 ++-
 4 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 08985dcb5df638a67934f22aa628744fb3441aba
Author: Miklos Vajna 
AuthorDate: Mon Mar 25 21:36:02 2019 +0100
Commit: Aron Budea 
CommitDate: Tue Apr 23 16:34:00 2019 +0200

tdf#123651 sw AddVerticalFrameOffsets: make vert offset depend on hori 
offset

Regression from commit 961ba62df045473e5793d9e103be86eaad8d9575
(tdf#123032 sw, AddVerticalFrameOffsets: fix shape pos after mouse move,
2019-02-07), the vertical position of the bugdoc was too large, and
turns out Word only works with vertical offsets if there is already a
horizontal offset.

For example open tdf98987.docx in Word, remove the left square shape,
notice how the other square shape jumps up due to no longer working with
a vertical offset (while the doc model vertical position of the shape is
unchanged).

Change our layout, so that in case the AddVerticalFrameOffsets
compatibility flag is on (which was added to emulate Word's behavior),
we also consider the horizontal offset before setting the vertical
offset.

Also improve the SwUiWriterTest2::testTdf122942() test that asserted doc
model positions, which are now different (needed so that at the end the
layout position visible to the user is unchanged).

(cherry picked from commit 27894be916d5d03ee820e757d2f4abbf21d54615)

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

Change-Id: I8ac451efbacefdd3578b3a578260e7b2060c16a6
Reviewed-on: https://gerrit.libreoffice.org/71128
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/qa/extras/layout/data/tdf123651.docx 
b/sw/qa/extras/layout/data/tdf123651.docx
new file mode 100644
index ..4cda0b4e7f36
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf123651.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 5dee5c580402..59f73e0b78bd 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -24,6 +24,7 @@ public:
 void testTdf118058();
 void testTdf117188();
 void testTdf119875();
+void testTdf123651();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
@@ -33,6 +34,7 @@ public:
 CPPUNIT_TEST(testTdf118058);
 CPPUNIT_TEST(testTdf117188);
 CPPUNIT_TEST(testTdf119875);
+CPPUNIT_TEST(testTdf123651);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -171,6 +173,15 @@ void SwLayoutWriter::testTdf119875()
 CPPUNIT_ASSERT_LESS(nSecondTop, nFirstTop);
 }
 
+void SwLayoutWriter::testTdf123651()
+{
+createDoc("tdf123651.docx");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// Without the accompanying fix in place, this test would have failed with 
'Expected: 7639;
+// Actual: 12926'. The shape was below the second "Lorem ipsum" text, not 
above it.
+assertXPath(pXmlDoc, "//SwAnchoredDrawObject/bounds", "top", "7639");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6d3355af30bb..a5b74cc8265b 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -455,12 +455,6 @@ void SwUiWriterTest2::testTdf122942()
 const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
 CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats.size());
 
-// Without the accompanying fix in place, this test would have failed with
-// 'Expected less than: 0; Actual  : 1030', i.e. the shape was below the
-// paragraph mark, not above it.
-const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
-CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
-
 reload("writer8", "tdf122942.odt");
 pTextDoc = dynamic_cast(mxComponent.get());
 pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
@@ -468,14 +462,15 @@ void SwUiWriterTest2::testTdf122942()
 const SwFrameFormats& rFormats2 = *pDoc->GetSpzFrameFormats();
 CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats2.size());
 
-SdrObject* pObject = rFormats2[1]->FindSdrObject();
-CPPUNIT_ASSERT(pObject);
-
-const tools::Rectangle& rOutRect = pObject->GetLastBoundRect();
-// Without the accompanying fix in place, this test would have failed with
-// 'Expected greater than: 5000; Actual  : 2817', i.e. the shape moved up
-// after a reload(), while it's expected to not change its position (5773).
-CPPUNIT_ASSERT_GREATER(static_cast(5000), rOutRect.Top());
+// Make sure the top of the inserted shape does not move outside the 
existing shape, even after
+// reload.
+  

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/data2/tdf122942.odt |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   43 +++---
 sw/source/core/frmedt/feshview.cxx|   23 +---
 3 files changed, 54 insertions(+), 12 deletions(-)

New commits:
commit aafafca61527fb650d3f9f11ec6c8226cd612fae
Author: Miklos Vajna 
AuthorDate: Mon Jan 28 17:18:34 2019 +0100
Commit: Aron Budea 
CommitDate: Tue Apr 23 16:32:53 2019 +0200

tdf#122942 sw: update shape insert UI for the AddVerticalFrameOffsets option

Regression from commit 50223ea6e212b60b7d33839c2753c5601fb50f95
(tdf#98987 sw: add AddVerticalFrameOffsets compat mode, 2016-03-31),
SwFEShell::ImpEndCreate() was not adapted to call
SwTextFrame::GetBaseVertOffsetForFly() when determining the vertical
position of the inserted shape.

The call can be unconditional, the returned value is already 0 when the
DocumentSettingId::ADD_VERTICAL_FLY_OFFSETS compat setting is false.

(cherry picked from commit 4218caf142a7ecac34548c6d38c6f6fbebb898b9)

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

Change-Id: Iec6af5a6d1ff3466e08377853cc8ca84f33a76d1
Reviewed-on: https://gerrit.libreoffice.org/71126
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/sw/qa/extras/uiwriter/data2/tdf122942.odt 
b/sw/qa/extras/uiwriter/data2/tdf122942.odt
new file mode 100644
index ..c56583d305f2
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf122942.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index e104e2e4dde4..df4fef72e547 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -43,6 +44,7 @@ public:
 void testCheckboxFormFieldInsertion();
 void testDropDownFormFieldInsertion();
 void testMixedFormFieldInsertion();
+void testTdf122942();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest2);
 CPPUNIT_TEST(testTdf101534);
@@ -54,6 +56,7 @@ public:
 CPPUNIT_TEST(testCheckboxFormFieldInsertion);
 CPPUNIT_TEST(testDropDownFormFieldInsertion);
 CPPUNIT_TEST(testMixedFormFieldInsertion);
+CPPUNIT_TEST(testTdf122942);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -67,14 +70,17 @@ SwDoc* SwUiWriterTest2::createDoc(const char* pName)
 else
 load(DATA_DIRECTORY, pName);
 
-SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
 CPPUNIT_ASSERT(pTextDoc);
 return pTextDoc->GetDocShell()->GetDoc();
 }
 
-static void lcl_dispatchCommand(const uno::Reference& 
xComponent, const OUString& rCommand, const 
uno::Sequence& rPropertyValues)
+static void lcl_dispatchCommand(const uno::Reference& 
xComponent,
+const OUString& rCommand,
+const uno::Sequence& 
rPropertyValues)
 {
-uno::Reference xController = 
uno::Reference(xComponent, 
uno::UNO_QUERY)->getCurrentController();
+uno::Reference xController
+= uno::Reference(xComponent, 
uno::UNO_QUERY)->getCurrentController();
 CPPUNIT_ASSERT(xController.is());
 uno::Reference xFrame(xController->getFrame(), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xFrame.is());
@@ -425,6 +431,37 @@ void SwUiWriterTest2::testMixedFormFieldInsertion()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(3), pMarkAccess->getAllMarksCount());
 }
 
+void SwUiWriterTest2::testTdf122942()
+{
+load(DATA_DIRECTORY, "tdf122942.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+
+// Do the moral equivalent of mouse button down, move and up.
+// Start creating a custom shape that overlaps with the rounded rectangle
+// already present in the document.
+Point aStartPos(8000, 3000);
+pWrtShell->BeginCreate(static_cast(OBJ_CUSTOMSHAPE), 
aStartPos);
+
+// Set its size.
+Point aMovePos(1, 5000);
+pWrtShell->MoveCreate(aMovePos);
+
+// Finish creation.
+pWrtShell->EndCreate(SdrCreateCmd::ForceEnd);
+
+// Make sure that the shape is inserted.
+SwDoc* pDoc = pWrtShell->GetDoc();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats.size());
+
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected less than: 0; Actual  : 1030', i.e. the shape was below the
+// paragraph mark, not above it.
+const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
+CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 4f17c72777f1..8066f9f4108e 100644

Build fail on Libgpg-error on Windows with gawk 5.0

[julien2412]

Hello,

On Win10, I updated Cygwin package and had the update gawk 5.0
The build failed because of the use of "namespace" as var name + wrong
substitution.

It's been fixed upstream (see
https://github.com/gpg/libgpg-error/commit/7865041c77f4f7005282f10f9bb19072fbdf)
but the last release hasn't included yet this fix.

I fixed Windows build locally by taking parts of the patch.
I haven't checked yet my gawk version on Linux (Debian testing).

Now I see 2 different actions possible:
- wait for next release of libgpg-error and include it on LO
- patch LO so it's ready for gawk 5.0 (but is it ok with gawk < 5.0)

I thought about checking if libgpg-error is still useful, it seems used by
gpgme which is used in xmlsecurity.
Now I'm not sure what to check.

Any thoughts?

Julien



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

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

[Miklos Vajna (via logerrit)]

 oox/source/ppt/pptshapegroupcontext.cxx |   26 --
 sd/qa/unit/data/pptx/tdf123684.pptx |binary
 sd/qa/unit/import-tests.cxx |   16 
 3 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 1d0729a5b7a96c6fb962b60a51eddf773773e379
Author: Miklos Vajna 
AuthorDate: Tue Apr 23 09:09:21 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Apr 23 15:42:02 2019 +0200

tdf#123684 PPTX import: fix wrong background color for 

Regression from commit 59339dec1ce56213dc74a06af2f0d35ac1c534d7
(tdf#105150 PPTX import: try harder to handle ,
2017-01-06), the problem was that we gave a white solid fill to a shape
which is meant to be transparent.

Fix the problem by limiting the scope of the mentioned commit to solid
colors only, and also extend to code to look for background fill from
the masterpage as well. This allows not hardcoding the white solid fill
and leaves the fill style of shapes as transparent where the slide
background is a bitmap or other more complex fill type.

(cherry picked from commit 943a534ac7cb3df513583e226c986dafd8ba246b)

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

diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index 4caa76b1c1c7..1180af3f10fb 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -103,13 +103,27 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( 
sal_Int32 aElementToken
 oox::drawingml::FillPropertiesPtr pBackgroundPropertiesPtr = 
mpSlidePersistPtr->getBackgroundProperties();
 if (!pBackgroundPropertiesPtr)
 {
-// The shape wants a background, but the slide doesn't have
-// one: default to white.
-pBackgroundPropertiesPtr.reset(new 
oox::drawingml::FillProperties);
-pBackgroundPropertiesPtr->moFillType = XML_solidFill;
-pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFF);
+// The shape wants a background, but the slide doesn't 
have one.
+SlidePersistPtr pMaster = 
mpSlidePersistPtr->getMasterPersist();
+if (pMaster)
+{
+oox::drawingml::FillPropertiesPtr pMasterBackground
+= pMaster->getBackgroundProperties();
+if (pMasterBackground)
+{
+if (pMasterBackground->moFillType.has()
+&& pMasterBackground->moFillType.get() == 
XML_solidFill)
+{
+// Master has a solid background, use that.
+pBackgroundPropertiesPtr = pMasterBackground;
+}
+}
+}
+}
+if (pBackgroundPropertiesPtr)
+{
+
pShape->getFillProperties().assignUsed(*pBackgroundPropertiesPtr);
 }
-pShape->getFillProperties().assignUsed( 
*pBackgroundPropertiesPtr );
 }
 pShape->setModelId(rAttribs.getString( XML_modelId ).get());
 return new PPTShapeContext( *this, mpSlidePersistPtr, 
mpGroupShapePtr, pShape );
diff --git a/sd/qa/unit/data/pptx/tdf123684.pptx 
b/sd/qa/unit/data/pptx/tdf123684.pptx
new file mode 100644
index ..87243422753b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf123684.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 2c5295abcd36..879e13d8f90f 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -166,6 +166,7 @@ public:
 void testTdf104445();
 void testTdf105150();
 void testTdf105150PPT();
+void testTdf123684();
 void testTdf100926();
 void testTdf89064();
 void testTdf108925();
@@ -252,6 +253,7 @@ public:
 CPPUNIT_TEST(testTdf104445);
 CPPUNIT_TEST(testTdf105150);
 CPPUNIT_TEST(testTdf105150PPT);
+CPPUNIT_TEST(testTdf123684);
 CPPUNIT_TEST(testTdf100926);
 CPPUNIT_TEST(testPatternImport);
 CPPUNIT_TEST(testTdf89064);
@@ -1768,6 +1770,20 @@ void SdImportTest::testTdf105150()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testTdf123684()
+{
+sd::DrawDocShellRef xDocShRef
+= 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf123684.pptx"), 
PPTX);
+const SdrPage* pPage = GetPage(1, xDocShRef);
+const SdrObject* pObj = pPage->GetObj(0);
+auto& rFillStyleItem
+= dynamic_cast(pObj->GetMergedItem(XATTR_FILLSTYLE));
+// Without the accompanying fix in 

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

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/scalc.false |   60 +++
 solenv/sanitizers/ui/modules/scalc.suppr |   59 --
 2 files changed, 60 insertions(+), 59 deletions(-)

New commits:
commit b5c0f1cd50f87a3a1a3ae887c80f168076c58a3f
Author: Caolán McNamara 
AuthorDate: Tue Apr 23 08:41:31 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 23 15:39:26 2019 +0200

move RefButon 'button-no-label' from .suppr to .false

because we know all these get a label/tooltip set at runtime

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

diff --git a/solenv/sanitizers/ui/modules/scalc.false 
b/solenv/sanitizers/ui/modules/scalc.false
index 57257bf1e6c5..41ea2f893f4b 100644
--- a/solenv/sanitizers/ui/modules/scalc.false
+++ b/solenv/sanitizers/ui/modules/scalc.false
@@ -1 +1,61 @@
 
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkComboBox[@id='comboLB_DEFINED']
 duplicate-mnemonic
+sc/uiconfig/scalc/ui/advancedfilterdialog.ui://GtkButton[@id='rbfilterarea'] 
button-no-label
+sc/uiconfig/scalc/ui/advancedfilterdialog.ui://GtkButton[@id='rbcopyarea'] 
button-no-label
+sc/uiconfig/scalc/ui/analysisofvariancedialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/analysisofvariancedialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/chisquaretestdialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/chisquaretestdialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkButton[@id='rbdataarea'] 
button-no-label
+sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkButton[@id='rbdestarea'] 
button-no-label
+sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/correlationdialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='input-range-button'] 
button-no-label
+sc/uiconfig/scalc/ui/covariancedialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkButton[@id='assignrb'] 
button-no-label
+sc/uiconfig/scalc/ui/definename.ui://GtkButton[@id='refbutton'] button-no-label
+sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/goalseekdlg.ui://GtkButton[@id='formulabutton'] 
button-no-label
+sc/uiconfig/scalc/ui/goalseekdlg.ui://GtkButton[@id='varbutton'] 
button-no-label
+sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkButton[@id='rbassign'] 
button-no-label
+sc/uiconfig/scalc/ui/namerangesdialog.ui://GtkButton[@id='rbassign2'] 
button-no-label
+sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkButton[@id='assign'] 
button-no-label
+sc/uiconfig/scalc/ui/movingaveragedialog.ui://GtkButton[@id='input-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/movingaveragedialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/multipleoperationsdialog.ui://GtkButton[@id='formulasref']
 button-no-label
+sc/uiconfig/scalc/ui/multipleoperationsdialog.ui://GtkButton[@id='rowref'] 
button-no-label
+sc/uiconfig/scalc/ui/multipleoperationsdialog.ui://GtkButton[@id='colref'] 
button-no-label
+sc/uiconfig/scalc/ui/printareasdialog.ui://GtkButton[@id='rbprintarea'] 
button-no-label
+sc/uiconfig/scalc/ui/printareasdialog.ui://GtkButton[@id='rbrepeatrow'] 
button-no-label
+sc/uiconfig/scalc/ui/printareasdialog.ui://GtkButton[@id='rbrepeatcol'] 
button-no-label
+sc/uiconfig/scalc/ui/randomnumbergenerator.ui://GtkButton[@id='cell-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/regressiondialog.ui://GtkButton[@id='variable1-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/regressiondialog.ui://GtkButton[@id='variable2-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/regressiondialog.ui://GtkButton[@id='output-range-button']
 button-no-label
+sc/uiconfig/scalc/ui/samplingdialog.ui://GtkButton[@id='input-range-button'] 
button-no-label
+sc/uiconfig/scalc/ui/samplingdialog.ui://GtkButton[@id='output-range-button'] 
button-no-label
+sc/uiconfig/scalc/ui/standardfilterdialog.ui://GtkButton[@id='rbcopyarea'] 
button-no-label
+sc/uiconfig/scalc/ui/simplerefdialog.

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svl/Library_svl.mk svl/source sw/qa

[Caolán McNamara (via logerrit)]

 svl/Library_svl.mk   |5 
 svl/source/crypto/cryptosign.cxx |   33 ---
 sw/qa/core/data/odt/pass/tdf122599-1.odt |binary
 3 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 790bdd69926cf53359b35a105c3e9e1f61314aa7
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 17:29:57 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Apr 23 15:34:53 2019 +0200

crashtesting: tdf#122599 NSS_CMSMessage_CreateFromDER asserts

because NSS_Init wasn't called first

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

diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index aacbb273d87c..2103a1483a45 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -111,6 +111,11 @@ $(eval $(call gb_Library_use_externals,svl,\
 nss3 \
 plc4 \
 ))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,svl, \
+-lpthread \
+))
+endif
 endif # BUILD_TYPE=DESKTOP
 endif
 
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 9f18e53a3eca..617c926201fa 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -18,8 +18,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -54,6 +55,13 @@
 #endif
 
 #if HAVE_FEATURE_NSS
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
 // Is this length truly the maximum possible, or just a number that
 // seemed large enough when the author tested this (with some type of
 // certificates)? I suspect the latter.
@@ -1962,15 +1970,34 @@ OUString GetSubjectName(PCCERT_CONTEXT pCertContext)
 #endif
 }
 
+#ifdef SVL_CRYPTO_NSS
+namespace
+{
+void ensureNssInit()
+{
+// e.g. tdf#122599 ensure NSS library is initialized for 
NSS_CMSMessage_CreateFromDER
+css::uno::Reference
+xNSSInitializer = 
css::xml::crypto::NSSInitializer::create(comphelper::getProcessComponentContext());
+
+// this calls NSS_Init
+css::uno::Reference xDigestContext(
+
xNSSInitializer->getDigestContext(css::xml::crypto::DigestID::SHA256,
+  
uno::Sequence()));
+}
+}
+#endif
+
 bool Signing::Verify(const std::vector& aData,
  const bool bNonDetached,
  const std::vector& aSignature,
  SignatureInformation& rInformation)
 {
 #ifdef SVL_CRYPTO_NSS
-// Validate the signature. No need to call NSS_Init() here, assume that the
-// caller did that already.
+// ensure NSS_Init() is called before using NSS_CMSMessage_CreateFromDER
+static std::once_flag aInitOnce;
+std::call_once(aInitOnce, ensureNssInit);
 
+// Validate the signature.
 SECItem aSignatureItem;
 aSignatureItem.data = const_cast(aSignature.data());
 aSignatureItem.len = aSignature.size();
diff --git a/sw/qa/core/data/odt/pass/tdf122599-1.odt 
b/sw/qa/core/data/odt/pass/tdf122599-1.odt
new file mode 100644
index ..4bbb2dfea00f
Binary files /dev/null and b/sw/qa/core/data/odt/pass/tdf122599-1.odt differ
___
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/crsr/findattr.cxx |  222 +++
 1 file changed, 111 insertions(+), 111 deletions(-)

New commits:
commit 14ff941dc94fc363c78e19aff21ca51ca87601e0
Author: Miklos Vajna 
AuthorDate: Tue Apr 23 13:41:47 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 15:13:57 2019 +0200

sw: prefix members of SwAttrCheckArr

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

diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 47a2a1e04266..1af7577d2c58 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -195,14 +195,14 @@ struct SwSrchChrAttr
 
 class SwAttrCheckArr
 {
-SwSrchChrAttr *pFndArr, *pStackArr;
-sal_Int32 nNdStt;
-sal_Int32 nNdEnd;
-sal_uInt16 nArrStart, nArrLen;
-sal_uInt16 nFound, nStackCnt;
-SfxItemSet aCmpSet;
-bool const bNoColls;
-bool const bForward;
+SwSrchChrAttr *m_pFindArr, *m_pStackArr;
+sal_Int32 m_nNodeStart;
+sal_Int32 m_nNodeEnd;
+sal_uInt16 m_nArrStart, m_nArrLen;
+sal_uInt16 m_nFound, m_nStackCount;
+SfxItemSet m_aComapeSet;
+bool const m_bNoColls;
+bool const m_bForward;
 
 public:
 SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections 
);
@@ -211,15 +211,15 @@ public:
 void SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam );
 
 /// how many attributes are there in total?
-sal_uInt16 Count() const{ return aCmpSet.Count(); }
-bool Found() const   { return nFound == aCmpSet.Count(); }
+sal_uInt16 Count() const{ return m_aComapeSet.Count(); }
+bool Found() const   { return m_nFound == m_aComapeSet.Count(); }
 bool CheckStack();
 
 sal_Int32 Start() const;
 sal_Int32 End() const;
 
-sal_Int32 GetNdStt() const { return nNdStt; }
-sal_Int32 GetNdEnd() const { return nNdEnd; }
+sal_Int32 GetNdStt() const { return m_nNodeStart; }
+sal_Int32 GetNdEnd() const { return m_nNodeEnd; }
 
 bool SetAttrFwd( const SwTextAttr& rAttr );
 bool SetAttrBwd( const SwTextAttr& rAttr );
@@ -227,62 +227,62 @@ public:
 
 SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd,
 bool bNoCollections )
-: nNdStt(0)
-, nNdEnd(0)
-, nFound(0)
-, nStackCnt(0)
-, aCmpSet( *rSet.GetPool(), svl::Items{} )
-, bNoColls(bNoCollections)
-, bForward(bFwd)
+: m_nNodeStart(0)
+, m_nNodeEnd(0)
+, m_nFound(0)
+, m_nStackCount(0)
+, m_aComapeSet( *rSet.GetPool(), svl::Items{} )
+, m_bNoColls(bNoCollections)
+, m_bForward(bFwd)
 {
-aCmpSet.Put( rSet, false );
+m_aComapeSet.Put( rSet, false );
 
 // determine area of Fnd/Stack array (Min/Max)
-SfxItemIter aIter( aCmpSet );
-nArrStart = aCmpSet.GetWhichByPos( aIter.GetFirstPos() );
-nArrLen = aCmpSet.GetWhichByPos( aIter.GetLastPos() ) - nArrStart+1;
+SfxItemIter aIter( m_aComapeSet );
+m_nArrStart = m_aComapeSet.GetWhichByPos( aIter.GetFirstPos() );
+m_nArrLen = m_aComapeSet.GetWhichByPos( aIter.GetLastPos() ) - 
m_nArrStart+1;
 
-char* pFndChar  = new char[ nArrLen * sizeof(SwSrchChrAttr) ];
-char* pStackChar = new char[ nArrLen * sizeof(SwSrchChrAttr) ];
+char* pFndChar  = new char[ m_nArrLen * sizeof(SwSrchChrAttr) ];
+char* pStackChar = new char[ m_nArrLen * sizeof(SwSrchChrAttr) ];
 
-pFndArr = reinterpret_cast(pFndChar);
-pStackArr = reinterpret_cast(pStackChar);
+m_pFindArr = reinterpret_cast(pFndChar);
+m_pStackArr = reinterpret_cast(pStackChar);
 }
 
 SwAttrCheckArr::~SwAttrCheckArr()
 {
-delete[] reinterpret_cast(pFndArr);
-delete[] reinterpret_cast(pStackArr);
+delete[] reinterpret_cast(m_pFindArr);
+delete[] reinterpret_cast(m_pStackArr);
 }
 
 void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam )
 {
-std::fill(pFndArr, pFndArr + nArrLen, SwSrchChrAttr());
-std::fill(pStackArr, pStackArr + nArrLen, SwSrchChrAttr());
-nFound = 0;
-nStackCnt = 0;
+std::fill(m_pFindArr, m_pFindArr + m_nArrLen, SwSrchChrAttr());
+std::fill(m_pStackArr, m_pStackArr + m_nArrLen, SwSrchChrAttr());
+m_nFound = 0;
+m_nStackCount = 0;
 
-if( bForward )
+if( m_bForward )
 {
-nNdStt = rPam.GetPoint()->nContent.GetIndex();
-nNdEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
+m_nNodeStart = rPam.GetPoint()->nContent.GetIndex();
+m_nNodeEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
 ? rPam.GetMark()->nContent.GetIndex()
 : rTextNd.GetText().getLength();
 }
 else
 {
-nNdEnd = rPam.GetPoint()->nContent.GetIndex();
-nNdStt = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
+m_nNodeEnd = rPam.GetPoint()->nContent.GetIndex();
+m_

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

[Tomaž Vajngerl (via logerrit)]

 vcl/source/control/edit.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6de6f97e775d0c9426b51471d742ab5dd461b9df
Author: Tomaž Vajngerl 
AuthorDate: Wed Apr 17 12:24:17 2019 +0900
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 15:11:59 2019 +0200

tdf#124032 fix Edit background drawing

IsPaintTransparent() is preventing to paint the background but
not sure why this is needed. removing this condition doesn't
seem to have any ill effects.

Reviewed-on: https://gerrit.libreoffice.org/70855
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 1e917af27d18d934f3e9122aa98cd950b74ca246)

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 547f9464186d..6e4e49018bff 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -328,6 +328,7 @@ void Edit::ImplInit(vcl::Window* pParent, WinBits nStyle)
 SetCursor( new vcl::Cursor );
 
 SetPointer( Pointer( PointerStyle::Text ) );
+ApplySettings(*this);
 
 uno::Reference< datatransfer::dnd::XDragGestureListener> xDGL( 
mxDnDListener, uno::UNO_QUERY );
 uno::Reference< datatransfer::dnd::XDragGestureRecognizer > xDGR = 
GetDragGestureRecognizer();
@@ -381,7 +382,7 @@ void Edit::ApplySettings(vcl::RenderContext& rRenderContext)
 Color aTextColor = rStyleSettings.GetFieldTextColor();
 ApplyControlForeground(rRenderContext, aTextColor);
 
-if (ImplUseNativeBorder(rRenderContext, GetStyle()) || 
IsPaintTransparent())
+if (ImplUseNativeBorder(rRenderContext, GetStyle()))
 {
 // Transparent background
 rRenderContext.SetBackground();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - include/sfx2 include/unotools include/vcl sfx2/source svx/source sw/Library_sw.mk sw/source unotools/source vcl/source

[Caolán McNamara (via logerrit)]

 include/sfx2/linkmgr.hxx  |3 
 include/unotools/ucbstreamhelper.hxx  |8 +-
 include/vcl/GraphicLoader.hxx |7 +-
 sfx2/source/appl/linkmgr2.cxx |5 -
 svx/source/svdraw/svdograf.cxx|2 
 sw/Library_sw.mk  |1 
 sw/source/core/doc/DocumentLinksAdministrationManager.cxx |8 --
 sw/source/core/docnode/swbaslnk.cxx   |6 +
 sw/source/core/inc/dialoghelp.hxx |   30 
 sw/source/core/view/dialoghelp.cxx|   48 ++
 unotools/source/ucbhelper/ucbstreamhelper.cxx |   16 ++--
 vcl/source/graphic/GraphicLoader.cxx  |7 +-
 12 files changed, 115 insertions(+), 26 deletions(-)

New commits:
commit ab401b59209ae6bd0d050558063800409278e8c8
Author: Caolán McNamara 
AuthorDate: Fri Apr 12 12:07:22 2019 +0100
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 15:11:30 2019 +0200

Resolves: tdf#124698 bubble down parent for modal dialog

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

diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 128dd47e4462..02ba1a91875b 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -159,7 +159,8 @@ public:
 static bool GetGraphicFromAny(const OUString& rMimeType,
   const css::uno::Any & rValue,
   const OUString& rReferer,
-  Graphic& rGrf);
+  Graphic& rGrf,
+  weld::Window* pParentWin);
 
 private:
 LinkManager( const LinkManager& ) = delete;
diff --git a/include/unotools/ucbstreamhelper.hxx 
b/include/unotools/ucbstreamhelper.hxx
index fd0a8cd13bad..0d7d867d21f6 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
 #define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
 
+#include 
+
 #include 
 
 #include 
@@ -45,9 +47,9 @@ namespace utl
 class UNOTOOLS_DLLPUBLIC UcbStreamHelper
 {
 public:
-static std::unique_ptr CreateStream( const OUString& 
rFileName, StreamMode eOpenMode );
-static std::unique_ptr CreateStream( const OUString& 
rFileName, StreamMode eOpenMode,
-   bool bFileExists );
+static std::unique_ptr CreateStream(const OUString& 
rFileName, StreamMode eOpenMode, css::uno::Reference 
xParentWin = nullptr);
+static std::unique_ptr CreateStream(const OUString& 
rFileName, StreamMode eOpenMode,
+  bool bFileExists, 
css::uno::Reference xParentWin = nullptr);
 static std::unique_ptr CreateStream( const 
css::uno::Reference < css::io::XInputStream >& xStream );
 static std::unique_ptr CreateStream( const 
css::uno::Reference < css::io::XStream >& xStream );
 static std::unique_ptr CreateStream( const 
css::uno::Reference < css::io::XInputStream >& xStream, bool bCloseStream );
diff --git a/include/vcl/GraphicLoader.hxx b/include/vcl/GraphicLoader.hxx
index 9b96ec13b8a2..5cca83a99d94 100644
--- a/include/vcl/GraphicLoader.hxx
+++ b/include/vcl/GraphicLoader.hxx
@@ -12,11 +12,16 @@
 
 #include 
 
+namespace weld
+{
+class Window;
+}
+
 namespace vcl
 {
 namespace graphic
 {
-Graphic VCL_DLLPUBLIC loadFromURL(OUString const& rURL);
+Graphic VCL_DLLPUBLIC loadFromURL(OUString const& rURL, weld::Window* 
pParentWin = nullptr);
 }
 } // end vcl::graphic
 
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 05c817ab7855..be6ad47b0a38 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -501,7 +501,8 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId()
 bool LinkManager::GetGraphicFromAny(const OUString& rMimeType,
 const css::uno::Any & rValue,
 const OUString& rReferer,
-Graphic& rGraphic )
+Graphic& rGraphic,
+weld::Window* pParentWin)
 {
 bool bRet = false;
 
@@ -512,7 +513,7 @@ bool LinkManager::GetGraphicFromAny(const OUString& 
rMimeType,
 {
 OUString sURL = rValue.get();
 if (!SvtSecurityOptions().isUntrustedReferer(rReferer))
-rGraphic = vcl::graphic::loadFromURL(sURL);
+rGraphic = vcl::graphic::loadFromURL(sURL, pParentWin);
 if (!rGraphic)
 rGraphic.SetDefaultType();
 rGraphic.setOriginURL(sURL);
diff --git a/svx/source/svdraw/svdograf.cxx b/svx

[no subject]

[Rafał Hanuszewicz]

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

[Libreoffice-commits] dev-tools.git: uitest/mass-testing

[Libreoffice Gerrit user]

 uitest/mass-testing/calc.py |   84 
 1 file changed, 84 insertions(+)

New commits:
commit 9c71cc5c9e35060e153e026289edf89b09bb8303
Author: Zdeněk Crhonek 
AuthorDate: Sun Apr 21 21:42:31 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Apr 23 14:26:59 2019 +0200

mass-uitesting: Add more Calc tests

Change-Id: Ie22d88160ec39170de2e5c4540d19ef8489aec85
Reviewed-on: https://gerrit.libreoffice.org/71044
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 

diff --git a/uitest/mass-testing/calc.py b/uitest/mass-testing/calc.py
index 7217c3a..91bd21b 100755
--- a/uitest/mass-testing/calc.py
+++ b/uitest/mass-testing/calc.py
@@ -108,4 +108,88 @@ class massTesting(UITestCase):
 
 self.ui_test.close_doc()
 
+def test_copy_sheet_undo_delete_sheet(self):
+xEdit = self.load_file()
+if xEdit:
+document = self.ui_test.get_component()
+nrSheets = document.Sheets.getCount()  #number of sheets in the 
document
+if nrSheets == 1:
+#copy sheet and undo
+self.ui_test.execute_dialog_through_command(".uno:Move")
+xDialog = self.xUITest.getTopFocusWindow()
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+self.assertEqual(document.Sheets.getCount(), 2)
+self.xUITest.executeCommand(".uno:Undo")
+else:
+#copy sheet and undo and delete
+#go to first sheet
+for i in range(nrSheets - 1):
+self.xUITest.executeCommand(".uno:JumpToPrevTable")
+#copy sheet; delete sheet
+for i in range(nrSheets - 1):
+self.ui_test.execute_dialog_through_command(".uno:Move")
+xDialog = self.xUITest.getTopFocusWindow()
+xCopy = xDialog.getChild("copy")
+xCopy.executeAction("CLICK", tuple())
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.ui_test.execute_dialog_through_command(".uno:Remove") 
 #delete sheet
+xDialog = self.xUITest.getTopFocusWindow()
+xOKButton = xDialog.getChild("yes")
+xOKButton.executeAction("CLICK", tuple())
+
+self.assertEqual(document.Sheets.getCount(), 1)
+
+self.ui_test.close_doc()
+
+def test_change_text_formatting_and_undo(self):
+xEdit = self.load_file()
+if xEdit:
+self.xUITest.executeCommand(".uno:SelectAll")
+self.xUITest.executeCommand(".uno:Bold")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Italic")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Underline")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:UnderlineDouble")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Strikeout")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Overline")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:SuperScript")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:SubScript")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Shadowed")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:OutlineFont")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Grow")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:Shrink")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseToUpper")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseToLower")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseRotateCase")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseToSentenceCase")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseToTitleCase")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:ChangeCaseToToggleCase")
+self.xUITest.executeCommand(".uno:Undo")
+self.xUITest.executeCommand(".uno:SmallCaps")
+self.xUITest.executeCommand(".uno:Undo")
+

[Libreoffice-commits] core.git: svl/Library_svl.mk

[Stephan Bergmann (via logerrit)]

 svl/Library_svl.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 634ce0cfe5effb3ebf0cf8fe73f2527d3f825b22
Author: Stephan Bergmann 
AuthorDate: Tue Apr 23 11:57:50 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 23 14:13:51 2019 +0200

std::call_once needs -lpthread

...at least on Fedora 29:

> [LNK] Library/libsvllo.so
> ld.lld: error: undefined symbol: pthread_once
> >>> referenced by gthr-default.h:699 
(/usr/lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/x86_64-redhat-linux/bits/gthr-default.h:699)
> >>>   
/data/sbergman/lo-clang2/core/workdir/CxxObject/svl/source/crypto/cryptosign.o:(__gthread_once(int*,
 void (*)()))

and the call to std::call_once was introduced with
d43cc00cf97fa1151560aa6fe0a3fef38e7507f6 "crashtesting: tdf#122599
NSS_CMSMessage_CreateFromDER asserts".

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

diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 7d268905b720..4dad7be2a929 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -111,6 +111,11 @@ $(eval $(call gb_Library_use_externals,svl,\
 nss3 \
 plc4 \
 ))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_libs,svl, \
+-lpthread \
+))
+endif
 endif # BUILD_TYPE=DESKTOP
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-4' - external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_xslt.mk  |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit 15354a7d76473de8bd748b3077c40871996548de
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Apr 23 13:02:40 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)

diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index f17a42aba179..04ef80703e86 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+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",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-  if (ret == 0) {
+-  xsltTransformError(ctxt, NULL, inst,
+-   "xsltDocumentElem: write rig

[Libreoffice-commits] core.git: chart2/source include/svl reportdesign/source sc/source sd/source svx/source sw/source

[Noel Grandin (via logerrit)]

 chart2/source/view/main/ChartView.cxx|4 
 include/svl/hint.hxx |3 
 reportdesign/source/ui/report/SectionView.cxx|   21 +--
 sc/source/ui/Accessibility/AccessibleDocument.cxx|   66 +--
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |   63 --
 sc/source/ui/Accessibility/DrawModelBroadcaster.cxx  |4 
 sc/source/ui/view/drawvie3.cxx   |3 
 sc/source/ui/view/prevwsh2.cxx   |3 
 sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx   |   12 +-
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx |4 
 sd/source/ui/animations/motionpathtag.cxx|2 
 sd/source/ui/app/sdxfer.cxx  |4 
 sd/source/ui/dlg/SpellDialogChildWindow.cxx  |   10 -
 sd/source/ui/sidebar/MasterPageObserver.cxx  |4 
 sd/source/ui/slidesorter/controller/SlsListener.cxx  |4 
 sd/source/ui/tools/EventMultiplexer.cxx  |4 
 sd/source/ui/unoidl/unomodel.cxx |   17 +-
 sd/source/ui/unoidl/unopback.cxx |   18 +--
 sd/source/ui/view/drawview.cxx   |2 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx   |5 
 svx/source/core/extedit.cxx  |9 -
 svx/source/form/fmundo.cxx   |3 
 svx/source/form/fmvwimp.cxx  |6 -
 svx/source/form/navigatortreemodel.cxx   |4 
 svx/source/svdraw/svdedxv.cxx|5 
 svx/source/svdraw/svdmodel.cxx   |   12 +-
 svx/source/svdraw/svdmrkv.cxx|5 
 svx/source/svdraw/svdpage.cxx|3 
 svx/source/svdraw/svdpntv.cxx|5 
 svx/source/unodraw/UnoNameItemTable.cxx  |7 -
 svx/source/unodraw/unomtabl.cxx  |   10 +
 svx/source/unodraw/unoshape.cxx  |   17 +-
 svx/source/unodraw/unoshtxt.cxx  |3 
 sw/source/core/access/accmap.cxx |9 -
 34 files changed, 150 insertions(+), 201 deletions(-)

New commits:
commit 10c934147d469965dba6abc78efd02759a010b8e
Author: Noel Grandin 
AuthorDate: Tue Apr 23 09:26:46 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Apr 23 14:10:38 2019 +0200

tdf#113266 slow opening XLS with 45 MB drawing

Some hot-spots around dynamic_cast of SdrHint, so avoid that by creating
special SfxHintId::ThisIsAnSdrHint

The most common CPU hot-spot was in SvxShape::Notify, the other changes
are just for consistency.

Also remove some dead code in ScShapeChildren, the Notify method was
doing nothing useful.

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

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 872406f9f16b..8b0548f909ee 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2610,9 +2610,9 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const 
SfxHint& rHint )
 }
 }
 
-const SdrHint* pSdrHint = dynamic_cast< const SdrHint* >(&rHint);
-if( !pSdrHint )
+if (rHint.GetId() != SfxHintId::ThisIsAnSdrHint)
 return;
+const SdrHint* pSdrHint = static_cast< const SdrHint* >(&rHint);
 
 bool bShapeChanged = false;
 switch( pSdrHint->GetKind() )
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 98d0ca81de55..708986e31631 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -112,6 +112,8 @@ enum class SfxHintId {
 SwDrawViewsCreated,
 SwSplitNodeOperation,
 SwSectionFrameMoveAndDelete,
+
+ThisIsAnSdrHint // used to avoid dynamic_cast
 };
 
 template< typename charT, typename traits >
@@ -190,6 +192,7 @@ inline std::basic_ostream & operator <<(
 case SfxHintId::SwDrawViewsCreated: return stream << "SwDrawViewsCreated";
 case SfxHintId::SwSplitNodeOperation: return stream << 
"SwSplitNodeOperation";
 case SfxHintId::SwSectionFrameMoveAndDelete: return stream << 
"SwSectionFrameMoveAndDelete";
+case SfxHintId::ThisIsAnSdrHint: return stream << "SdrHint";
 default: return stream << "unk(" << std::to_string(int(id)) << ")";
 }
 }
diff --git a/reportdesign/source/ui/report/SectionView.cxx 
b/reportdesign/source/ui/report/SectionView.cxx
index 1181581737cb..9a23632da48a 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -128,17 +128,

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-0' - external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_libxslt.mk   |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit e8479d0a4112c7d30b3f2fd81ccdb12c077afc06
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Apr 23 13:02:08 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)

diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index eae318ef74b9..beb591b8b2a8 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,6 +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 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+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",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-  if (ret == 0) {
+-  xsltTransformError(ctxt, NULL, inst,
+-   "xsltDocument

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_xslt.mk  |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit e3a7d1ff5086e252145f6ce429b0725ced340615
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Apr 23 14:09:56 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)

diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index f17a42aba179..04ef80703e86 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+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",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-  if (ret == 0) {
+-  xsltTransformError(ctxt, NULL, inst,
+-   "xsltDocumentElem: write rig

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_xslt.mk  |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit ff0bde26ff2bbf91333d78d20aab11dbb4c2f9c2
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 23 13:42:48 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)
Reviewed-on: https://gerrit.libreoffice.org/71123
Tested-by: Thorsten Behrens 

diff --git a/external/libxslt/UnpackedTarball_xslt.mk 
b/external/libxslt/UnpackedTarball_xslt.mk
index f17a42aba179..04ef80703e86 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
+   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+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",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xsltCheckWrite(ctxt->sec, ctxt, filename);
+-  if (ret == 0) {
+-  

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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/extras/odfimport/data/tdf123968.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   18 ++
 2 files changed, 18 insertions(+)

New commits:
commit b7fbe9ab25b16d2a6a2fb1e2cf8d198234b4
Author: Samuel Mehrbrodt 
AuthorDate: Thu Apr 18 11:07:48 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Apr 23 13:42:39 2019 +0200

tdf#123968 Test that imported field is editable

Reviewed-on: https://gerrit.libreoffice.org/70921
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 053b1417137b0cdec4e4fed7ae0c57cf67ff2698)

Change-Id: I2dbcc6fa8ee9c469cfc038a2622962b8939ec174
Reviewed-on: https://gerrit.libreoffice.org/71112
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/odfimport/data/tdf123968.odt 
b/sw/qa/extras/odfimport/data/tdf123968.odt
new file mode 100644
index ..1c081619ea30
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf123968.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 9ee4f206f5a5..9800607e371a 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 typedef std::map > 
AllBordersMap;
 typedef std::pair > 
StringSequencePair;
@@ -926,5 +927,22 @@ DECLARE_ODFIMPORT_TEST(testTdf123829, "tdf123829.odt")
 
pDoc->getIDocumentSettingAccess().get(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf123968, "tdf123968.odt")
+{
+// The test doc is special in that it starts with a table and it also has 
a header.
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+
+pWrtShell->SelAll();
+SwTextNode& rStart = 
dynamic_cast(pShellCursor->Start()->nNode.GetNode());
+
+// The field is now editable like any text, thus the field content "New 
value" shows up for the cursor.
+CPPUNIT_ASSERT_EQUAL(OUString("inputfield: " + 
OUStringLiteral1(CH_TXT_ATR_INPUTFIELDSTART)
+  + "New value" + 
OUStringLiteral1(CH_TXT_ATR_INPUTFIELDEND)),
+ rStart.GetText());
+}
+
 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 'libreoffice-6-2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/bmpacc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b929fd7a369630fa70a74eec3040761cea58b660
Author: Caolán McNamara 
AuthorDate: Thu Apr 18 10:24:19 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Apr 23 13:09:22 2019 +0200

forcepoint#78 large double cast to sal_Int32 wraps to neg

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

diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index f970c93428ce..bb9db3d3b862 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -221,8 +221,8 @@ BitmapColor 
BitmapReadAccess::GetInterpolatedColorWithFallback( double fY, doubl
 // double values, e.g. static_cast< sal_Int32 >(-0.25) is 0, not -1, but 
*has* to be outside (!)
 if(mpBuffer && fX >= 0.0 && fY >= 0.0)
 {
-const sal_Int32 nX(static_cast< sal_Int32 >(fX));
-const sal_Int32 nY(static_cast< sal_Int32 >(fY));
+const sal_Int64 nX(static_cast(fX));
+const sal_Int64 nY(static_cast(fY));
 
 if(nX < mpBuffer->mnWidth && nY < mpBuffer->mnHeight)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Roman Kuznetsov (via logerrit)]

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

New commits:
commit a08401155a0b4b49878e8e50d39b2fd3e5278779
Author: Roman Kuznetsov 
AuthorDate: Mon Apr 22 21:19:28 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Apr 23 13:03:02 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#105848 Change EFFECTIVE function name to EFFECT

Change-Id: Id2bd603a0330f1d85e665c0524635e0369061a18
Reviewed-on: https://gerrit.libreoffice.org/71079
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 5c561c2f3744..f52790876dae 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5c561c2f3744c5697ea6d25357f4223f0dbe977e
+Subproject commit f52790876dae6ffe59fd71bf5f59df33678f0b5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit f52790876dae6ffe59fd71bf5f59df33678f0b5a
Author: Roman Kuznetsov 
AuthorDate: Mon Apr 22 21:19:28 2019 +0200
Commit: Olivier Hallot 
CommitDate: Tue Apr 23 13:03:02 2019 +0200

tdf#105848 Change EFFECTIVE function name to EFFECT

Change-Id: Id2bd603a0330f1d85e665c0524635e0369061a18
Reviewed-on: https://gerrit.libreoffice.org/71079
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/01/04060103.xhp 
b/source/text/scalc/01/04060103.xhp
index 4592d9d5f..b22e8dd06 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -588,14 +588,14 @@
 annual net interest rates
  calculating; annual net interest 
rates
  net annual interest rates
- EFFECTIVE function
+ EFFECT function
 mw added one entry
 
-EFFECTIVE
+EFFECT
  Returns the net annual interest 
rate for a nominal interest rate.
  Nominal interest refers to the amount of interest due at the 
end of a calculation period. Effective interest increases with the number of 
payments made. In other words, interest is often paid in installments (for 
example, monthly or quarterly) before the end of the calculation 
period.
  
- EFFECTIVE(Nom; P)
+ EFFECT(Nom; P)
  
 Nom is the nominal interest.
  
@@ -603,7 +603,7 @@
 
  If 
the annual nominal interest rate is 9.75% and four interest calculation periods 
are defined, what is the actual interest rate (effective rate)?
  
-=EFFECTIVE(9.75%;4) = 10.11% The annual 
effective rate is therefore 10.11%.
+=EFFECT(9.75%;4) = 10.11% The annual 
effective rate is therefore 10.11%.
   
   
 effective interest rates
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/source

[Tomoyuki Kubota (via logerrit)]

 basctl/source/basicide/baside2b.cxx |8 
 basic/source/sbx/sbxvar.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 47d25dc5abe000ce751cb1e4dbd1f85f7198ca05
Author: Tomoyuki Kubota 
AuthorDate: Sat Apr 20 22:46:27 2019 +0900
Commit: Michael Stahl 
CommitDate: Tue Apr 23 12:51:51 2019 +0200

tdf#123043 make type character detection unicode-aware

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index b18ef9ab1190..2e3425da97ce 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -92,7 +92,7 @@ int const nScrollLine = 12;
 int const nScrollPage = 60;
 int const DWBORDER = 3;
 
-char const cSuffixes[] = "%&!#@$";
+OUString const cSuffixes {"%&!#@$"};
 
 } // namespace
 
@@ -166,13 +166,13 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, 
OUString& rVar, OUString&
 if ( !rVar.isEmpty() )
 {
 sal_uInt16 nLastChar = rVar.getLength()-1;
-if ( strchr( cSuffixes, rVar[ nLastChar ] ) )
+if ( cSuffixes.indexOf(rVar[ nLastChar ] ) >= 0 )
 rVar = rVar.replaceAt( nLastChar, 1, "" );
 }
 if ( !rIndex.isEmpty() )
 {
 sal_uInt16 nLastChar = rIndex.getLength()-1;
-if ( strchr( cSuffixes, rIndex[ nLastChar ] ) )
+if ( cSuffixes.indexOf(rIndex[ nLastChar ] ) >=0 )
 rIndex = rIndex.replaceAt( nLastChar, 1, "" );
 }
 }
@@ -355,7 +355,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 if ( !aWord.isEmpty() && 
!comphelper::string::isdigitAsciiString(aWord) )
 {
 sal_uInt16 nLastChar = aWord.getLength() - 1;
-if ( strchr( cSuffixes, aWord[ nLastChar ] ) )
+if ( cSuffixes.indexOf(aWord[ nLastChar ] ) >= 0 )
 aWord = aWord.replaceAt( nLastChar, 1, "" );
 SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
 if (SbxVariable const* pVar = IsSbxVariable(pSBX))
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index ec67be889e3a..bab30af36989 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -220,7 +220,7 @@ void SbxVariable::SetName( const OUString& rName )
 
 const OUString& SbxVariable::GetName( SbxNameType t ) const
 {
-static const char cSuffixes[] = "  %&!#@ $";
+static const OUString cSuffixes { "  %&!#@ $" };
 if( t == SbxNameType::NONE )
 {
 return maName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source cui/source editeng/source filter/source include/editeng include/IwyuFilter_include.yaml include/svx sc/source sd/source sfx2/source svx/source sw/qa sw/so

[Gabor Kelemen (via logerrit)]

 chart2/source/controller/inc/ChartController.hxx|1 
 cui/source/dialogs/SpellDialog.cxx  |4 ++
 cui/source/dialogs/hyphen.cxx   |2 +
 cui/source/options/optdict.cxx  |2 +
 cui/source/options/optgdlg.cxx  |1 
 cui/source/options/optlingu.cxx |3 +
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |1 
 editeng/source/editeng/editview.cxx |2 +
 editeng/source/editeng/edtspell.cxx |1 
 editeng/source/items/numitem.cxx|1 
 editeng/source/items/paperinf.cxx   |1 
 editeng/source/items/paraitem.cxx   |1 
 editeng/source/misc/splwrap.cxx |5 +++
 editeng/source/misc/svxacorr.cxx|2 +
 editeng/source/misc/unolingu.cxx|1 
 editeng/source/rtf/rtfitem.cxx  |1 
 editeng/source/rtf/svxrtf.cxx   |1 
 editeng/source/uno/unofdesc.cxx |1 
 editeng/source/uno/unofield.cxx |1 
 editeng/source/uno/unonrule.cxx |1 
 editeng/source/uno/unotext.cxx  |3 +
 editeng/source/xml/xmltxtexp.cxx|1 
 filter/source/msfilter/svdfppt.cxx  |1 
 include/IwyuFilter_include.yaml |   20 
 include/editeng/SpellPortions.hxx   |3 +
 include/editeng/Trie.hxx|1 
 include/editeng/eeitem.hxx  |2 +
 include/editeng/fhgtitem.hxx|2 -
 include/editeng/fontitem.hxx|4 --
 include/editeng/forbiddencharacterstable.hxx|1 
 include/editeng/hangulhanja.hxx |   11 +++---
 include/editeng/hyphenzoneitem.hxx  |2 -
 include/editeng/itemtype.hxx|2 -
 include/editeng/kernitem.hxx|2 -
 include/editeng/langitem.hxx|2 -
 include/editeng/lspcitem.hxx|5 +--
 include/editeng/measfld.hxx |3 -
 include/editeng/memberids.h |2 -
 include/editeng/numitem.hxx |6 +--
 include/editeng/opaqitem.hxx|2 -
 include/editeng/orphitem.hxx|2 -
 include/editeng/outliner.hxx|   18 +-
 include/editeng/overflowingtxt.hxx  |2 -
 include/editeng/paperinf.hxx|8 ++--
 include/editeng/postitem.hxx|4 --
 include/editeng/protitem.hxx|2 -
 include/editeng/shaditem.hxx|4 +-
 include/editeng/shdditem.hxx|2 -
 include/editeng/spltitem.hxx|2 -
 include/editeng/splwrap.hxx |2 -
 include/editeng/svxacorr.hxx|5 +--
 include/editeng/svxfont.hxx |2 -
 include/editeng/svxrtf.hxx  |   13 ---
 include/editeng/twolinesitem.hxx|2 -
 include/editeng/txtrange.hxx|1 
 include/editeng/udlnitem.hxx|3 -
 include/editeng/unoedsrc.hxx|2 -
 include/editeng/unofdesc.hxx|6 +--
 include/editeng/unofield.hxx|4 +-
 include/editeng/unoipset.hxx|6 +--
 include/editeng/unolingu.hxx|   18 +-
 include/editeng/unonrule.hxx|3 +
 include/editeng/unotext.hxx |   12 +--
 include/editeng/wghtitem.hxx|3 -
 include/editeng/widwitem.hxx|2 -
 include/editeng/wrlmitem.hxx|2 -
 include/editeng/xmlcnitm.hxx|2 -
 include/svx/sdtfchim.hxx|1 
 sc/source/ui/app/transobj.cxx   |1 
 sc/source/ui/drawfunc/fuins2.cxx|1 
 sc/source/ui/unoobj/PivotTableDataProvider.cxx   

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sfx2 default_images/svtools default_images/vcl

[Matthias Seidel (via logerrit)]

 default_images/sfx2/res/symphony/morebutton.png   |binary
 default_images/sfx2/res/symphony/morebutton_h.png |binary
 default_images/sfx2/res/symphony/open_more.png|binary
 default_images/svtools/res/closer.png |binary
 default_images/vcl/res/closedoc.png   |binary
 5 files changed

New commits:
commit 8b005725dea8f09cd4bb66b63f371f385268bdd3
Author: Matthias Seidel 
AuthorDate: Tue Apr 23 09:51:57 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Apr 23 09:51:57 2019 +

Updated graphics for sidebar

diff --git a/default_images/sfx2/res/symphony/morebutton.png 
b/default_images/sfx2/res/symphony/morebutton.png
index 5cffa97ca41c..c01e480a8c4c 100644
Binary files a/default_images/sfx2/res/symphony/morebutton.png and 
b/default_images/sfx2/res/symphony/morebutton.png differ
diff --git a/default_images/sfx2/res/symphony/morebutton_h.png 
b/default_images/sfx2/res/symphony/morebutton_h.png
index 5cffa97ca41c..a1681fedbcdc 100644
Binary files a/default_images/sfx2/res/symphony/morebutton_h.png and 
b/default_images/sfx2/res/symphony/morebutton_h.png differ
diff --git a/default_images/sfx2/res/symphony/open_more.png 
b/default_images/sfx2/res/symphony/open_more.png
index c981abf0f3a5..6cc812765063 100644
Binary files a/default_images/sfx2/res/symphony/open_more.png and 
b/default_images/sfx2/res/symphony/open_more.png differ
diff --git a/default_images/svtools/res/closer.png 
b/default_images/svtools/res/closer.png
index 410982a21b05..875b59190e6b 100644
Binary files a/default_images/svtools/res/closer.png and 
b/default_images/svtools/res/closer.png differ
diff --git a/default_images/vcl/res/closedoc.png 
b/default_images/vcl/res/closedoc.png
index 410982a21b05..875b59190e6b 100644
Binary files a/default_images/vcl/res/closedoc.png and 
b/default_images/vcl/res/closedoc.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/Map.js |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c05d8719395d0ffdaf84eca27cc24dc3e780e9ff
Author: Szymon Kłos 
AuthorDate: Wed Mar 13 18:05:14 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Apr 23 12:07:35 2019 +0200

Show progressbar centered in the mobile

When Online was embodied in the nextcloud app (Android)
the progressbar was moved into top-left corner.
During a loading all functions to get container
or browser size were returning (0,0).
This hack assumed that webview size is almost equal
to the mobile screen size.

Change-Id: I0fff53639a3baa88b57d91bf671e00ad8c71180d
Reviewed-on: https://gerrit.libreoffice.org/69219
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6f213dd9d..4aad141c5 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -108,7 +108,14 @@ L.Map = L.Evented.extend({
}
this._addLayers(this.options.layers);
this._socket = L.socket(this);
-   this._progressBar = L.progressOverlay(this.getCenter(), 
L.point(150, 25));
+
+   var center = this.getCenter();
+   if (L.Browser.mobile) {
+   var doubledProgressHeight = 200;
+   var size = new L.point(screen.width, screen.height - 
doubledProgressHeight);
+   center = this.layerPointToLatLng(size._divideBy(2));
+   }
+   this._progressBar = L.progressOverlay(center, new L.point(150, 
25));
 
if (L.Browser.mobile) {
this._clipboardContainer = 
L.control.mobileInput().addTo(this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/Map.js |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit dfd22ba35c00160f00292d6aa0e156d786111d48
Author: Szymon Kłos 
AuthorDate: Wed Mar 13 18:05:14 2019 +0100
Commit: Szymon Kłos 
CommitDate: Tue Apr 23 11:59:45 2019 +0200

Show progressbar centered in the mobile

When Online was embodied in the nextcloud app (Android)
the progressbar was moved into top-left corner.
During a loading all functions to get container
or browser size were returning (0,0).
This hack assumed that webview size is almost equal
to the mobile screen size.

Change-Id: I0fff53639a3baa88b57d91bf671e00ad8c71180d
Reviewed-on: https://gerrit.libreoffice.org/71117
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 01da473b6..1c3e00096 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -108,7 +108,14 @@ L.Map = L.Evented.extend({
}
this._addLayers(this.options.layers);
this._socket = L.socket(this);
-   this._progressBar = L.progressOverlay(this.getCenter(), 
L.point(150, 25));
+
+   var center = this.getCenter();
+   if (L.Browser.mobile) {
+   var doubledProgressHeight = 200;
+   var size = new L.point(screen.width, screen.height - 
doubledProgressHeight);
+   center = this.layerPointToLatLng(size._divideBy(2));
+   }
+   this._progressBar = L.progressOverlay(center, new L.point(150, 
25));
 
if (L.Browser.mobile) {
this._clipboardContainer = 
L.control.mobileInput().addTo(this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ashod Nakashian (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |3 ++-
 desktop/source/lib/init.cxx |   22 --
 include/LibreOfficeKit/LibreOfficeKit.h |3 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   10 +++---
 4 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit 6a2382c64f65d433d44ce74f936e42f744f04e21
Author: Ashod Nakashian 
AuthorDate: Thu Jan 24 06:51:46 2019 -0500
Commit: Michael Meeks 
CommitDate: Tue Apr 23 11:58:54 2019 +0200

LOK: support creating view with options

This adds a new API createViewWithOptions
that make createView similar to documentLoad,
which also has documentViewWithOptions version.
This is primarily to support setting per-view
language and similar settings.

Change-Id: I0ae5a5b2410cf9e053aee8f7c8a6204af9038a31
Reviewed-on: https://gerrit.libreoffice.org/68261
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/7
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index a688350cb386..a08d476a8bac 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2699,9 +2699,10 @@ void DesktopLOKTest::testABI()
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(45), offsetof(struct 
_LibreOfficeKitDocumentClass, getSignatureState));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(46), offsetof(struct 
_LibreOfficeKitDocumentClass, renderShapeSelection));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(47), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowGestureEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(48), offsetof(struct 
_LibreOfficeKitDocumentClass, createViewWithOptions));
 // Extending is fine, update this, and add new assert for the offsetof the
 // new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(48), sizeof(struct 
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(49), sizeof(struct 
_LibreOfficeKitDocumentClass));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0853678a0008..7fcf018813d4 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -783,6 +783,7 @@ static void doc_setClientZoom(LibreOfficeKitDocument* pThis,
 static void doc_setClientVisibleArea(LibreOfficeKitDocument* pThis, int nX, 
int nY, int nWidth, int nHeight);
 static void doc_setOutlineState(LibreOfficeKitDocument* pThis, bool bColumn, 
int nLevel, int nIndex, bool bHidden);
 static int doc_createView(LibreOfficeKitDocument* pThis);
+static int doc_createViewWithOptions(LibreOfficeKitDocument* pThis, const 
char* pOptions);
 static void doc_destroyView(LibreOfficeKitDocument* pThis, int nId);
 static void doc_setView(LibreOfficeKitDocument* pThis, int nId);
 static int doc_getView(LibreOfficeKitDocument* pThis);
@@ -891,6 +892,8 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
renderShapeSelection = doc_renderShapeSelection;
 m_pDocumentClass->postWindowGestureEvent = doc_postWindowGestureEvent;
 
+m_pDocumentClass->createViewWithOptions = doc_createViewWithOptions;
+
 gDocumentClass = m_pDocumentClass;
 }
 pClass = m_pDocumentClass.get();
@@ -1615,7 +1618,7 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 // 'Language=...' is an option that LOK consumes by itself, and does
 // not pass it as a parameter to the filter
 OUString aOptions = getUString(pOptions);
-OUString aLanguage = extractParameter(aOptions, "Language");
+const OUString aLanguage = extractParameter(aOptions, "Language");
 
 if (!aLanguage.isEmpty())
 {
@@ -3866,7 +3869,8 @@ static void doc_setOutlineState(LibreOfficeKitDocument* 
pThis, bool bColumn, int
 pDoc->setOutlineState(bColumn, nLevel, nIndex, bHidden);
 }
 
-static int doc_createView(SAL_UNUSED_PARAMETER LibreOfficeKitDocument* 
/*pThis*/)
+static int doc_createViewWithOptions(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*pThis*/,
+ const char* pOptions)
 {
 comphelper::ProfileZone aZone("doc_createView");
 
@@ -3874,9 +3878,23 @@ static int doc_createView(SAL_UNUSED_PARAMETER 
LibreOfficeKitDocument* /*pThis*/
 if (gImpl)
 gImpl->maLastExceptionMsg.clear();
 
+OUString aOptions = getUString(pOptions);
+const OUString aLanguage = extractParameter(aOptions, "Language");
+
+if (!aLanguage.isEmpty())
+{
+// Set the LOK language tag, used for dialog tunneling.
+comphelper::LibreOfficeKit::setLanguageTag(LanguageTag(aLanguage));
+}
+
 return SfxLokHelper::createView();
 }
 
+static int doc_createView(LibreOfficeKitDocument* pThis)
+{
+return doc_createViewWithOptions(pThi

Re: configure fails for lo 6.1.6 - Windows SDK... configure: error: Some (all?) Windows SDK files not found

[Christian Lohmaier]

Hi *,

On Sun, Apr 21, 2019 at 3:54 PM Oliver Brinzing  wrote:
>
> building LO master/6.2.3 works fine.
>
> now i tried to build LO 6.1.6 but failed during configure:
>
>  > checking for Windows SDK... configure: error: Some (all?) Windows SDK 
> files not found,
>  > please check if all needed parts of the  Windows SDK are installed.
>  > Error running configure at /cygdrive/d/sources/libo-61/autogen.sh line 289.
>
> Do i need to install a different Windows SDK ?

No, you should not need to install separate SDK, Visual Studio should
come with all files necessary.

Try adding --with-windows-skd=8.1 - that should work fine.

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

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

[Samuel Mehrbrodt (via logerrit)]

 sw/qa/extras/odfimport/data/tdf123968.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   17 +
 2 files changed, 17 insertions(+)

New commits:
commit 053b1417137b0cdec4e4fed7ae0c57cf67ff2698
Author: Samuel Mehrbrodt 
AuthorDate: Thu Apr 18 11:07:48 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Apr 23 11:01:16 2019 +0200

tdf#123968 Test that imported field is editable

Change-Id: I2dbcc6fa8ee9c469cfc038a2622962b8939ec174
Reviewed-on: https://gerrit.libreoffice.org/70921
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/qa/extras/odfimport/data/tdf123968.odt 
b/sw/qa/extras/odfimport/data/tdf123968.odt
new file mode 100644
index ..1c081619ea30
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf123968.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 0679815ba500..ac8d7aedb45f 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 typedef std::map > 
AllBordersMap;
 typedef std::pair > 
StringSequencePair;
@@ -930,6 +931,22 @@ DECLARE_ODFIMPORT_TEST(testTdf113289, "tdf113289.odt")
  getProperty(aPageStyle, 
"FootnoteLineStyle"));
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf123968, "tdf123968.odt")
+{
+// The test doc is special in that it starts with a table and it also has 
a header.
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+
+pWrtShell->SelAll();
+SwTextNode& rStart = 
dynamic_cast(pShellCursor->Start()->nNode.GetNode());
+
+// The field is now editable like any text, thus the field content "New 
value" shows up for the cursor.
+CPPUNIT_ASSERT_EQUAL(OUString("inputfield: " + 
OUStringLiteral1(CH_TXT_ATR_INPUTFIELDSTART)
+  + "New value" + 
OUStringLiteral1(CH_TXT_ATR_INPUTFIELDEND)),
+ rStart.GetText());
+}
 
 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 'libreoffice-6-2' - slideshow/source

[Miklos Vajna (via logerrit)]

 slideshow/source/engine/shapes/viewmediashape.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5c5eab3522368d6baa7ab6ef1b6c9f5eaaab4fad
Author: Miklos Vajna 
AuthorDate: Wed Apr 17 11:38:47 2019 +0200
Commit: Luboš Luňák 
CommitDate: Tue Apr 23 10:34:23 2019 +0200

tdf#124756 slideshow: avoid mbPaintDisabled for media windows

Commit 3e0092031b73bad107e3122d5d4be2f5bd487744 (tdf#112318 sd opengl:
fix lack of initial animation, 2019-04-05) enabled processing of idle
events between two updates of the slideshow to help OpenGL, which
uncovered a problem with media shapes.

On one hand,
slideshow::internal::ViewMediaShape::implInitializePlayerWindow() calls
EnablePaint(false) on the media window. OTOH,
vcl::Window::ImplCallPaint() handles mbPaintDisabled by invalidating the
relevant area of the window, which causes a paint<->invalidate loop.

Fix the problem by nominally still enabling paints on the media window:
nothing will change in practice (since the actual media overlay will be
on top of it), but this way the loop goes away.

mbPaintDisabled is handled like this since the initial import, the media
window flag was added much later, so it makes more sense to adapt the
later.

(cherry picked from commit d7f4f5650dd2c7fe1ccec50efd806e695b8bc18a)

Conflicts:
slideshow/source/engine/shapes/viewmediashape.cxx

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

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx 
b/slideshow/source/engine/shapes/viewmediashape.cxx
index f61c6dd598d9..84d7e363d339 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -445,7 +445,6 @@ namespace slideshow
 mpMediaWindow->SetBackground( COL_BLACK );
 mpMediaWindow->SetParentClipMode( 
ParentClipMode::NoClip );
 mpMediaWindow->EnableEraseBackground( false );
-mpMediaWindow->EnablePaint( false );
 mpMediaWindow->SetForwardKey( true );
 mpMediaWindow->SetMouseTransparent( true );
 mpMediaWindow->Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 vcl/win/gdi/winlayout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4657335fa5bcbe7980f229ca41ddd82d93c355eb
Author: Miklos Vajna 
AuthorDate: Thu Apr 18 18:03:36 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 10:26:16 2019 +0200

tdf#113076 vcl windows opengl: specific italic set font was clipped on ...

... right edge in presentation mode.

This seems to be a problem since commit
a51b7a1c3a7e7cf7b0c733e1dec40288278c1884 (tdf#103831, tdf#100986: Force
using GDI when needed, 2017-03-03), which blacklisted DirectWrite in the
OpenGL case for both vertical text and horizontally stretched text.

I tested that the overlapping characters problem from tdf#103831 is not
re-introduced, and switching to DW (in the horizontal stretching &&
OpenGL case) fixes the unwanted clipping of glyphs for the tdf#113076
bugdoc.

This also simplifies the situation, since the general rule since commit
d436065bc1c68fc2d90e73253d8c00503c72dfd0 (tdf#103725: Default to GDI
even with the new layout engine, 2016-11-15) is that non-OpenGL defaults
to GDI rendering and OpenGL defaults to DirectWrite rendering.

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

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 797ce2eb8ffc..b3fe0132b7df 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -458,12 +458,12 @@ void WinSalGraphics::DrawTextLayout(const 
GenericSalLayout& rLayout)
 
 const WinFontInstance* pWinFont = static_cast(&rLayout.GetFont());
 const HFONT hLayoutFont = pWinFont->GetHFONT();
+bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter;
 
 // Our DirectWrite renderer is incomplete, skip it for non-horizontal or
 // stretched text.
-bool bForceGDI = rLayout.GetOrientation() || pWinFont->hasHScale();
+bool bForceGDI = rLayout.GetOrientation() || (pWinFont->hasHScale() && 
!bUseOpenGL);
 
-bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter;
 if (!bUseOpenGL)
 {
 // no OpenGL, just classic rendering
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - common/Png.hpp

[Libreoffice Gerrit user]

 common/Png.hpp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit faa6ccffa50836496ab3a46166e8603c5dd2cd07
Author: Ashod Nakashian 
AuthorDate: Fri Apr 19 20:09:22 2019 -0400
Commit: Michael Meeks 
CommitDate: Tue Apr 23 10:18:09 2019 +0200

wsd: use fast deflate level for png

The default deflate level of 6 is quite slow
and the benefits are hardly worth the high
latency that users experience.

Tested on a writer document with some small
images and a few pages of text:

Level 4 gives virtually identical compression
ratio to level 6, but is between 5-10% faster.

Level 3 runs almost twice as fast as level 6,
but the output is typically 2-3x larger.

Perhaps this should be exposed via config
so it would be possible to reduce latency
due to compression when CPU is scarce but
network bandwidth ample, and vice versa.

Change-Id: Iba88eea8f180d11458b33c68389e797234df1a60
Reviewed-on: https://gerrit.libreoffice.org/71038
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/common/Png.hpp b/common/Png.hpp
index f682772f7..f622a589d 100644
--- a/common/Png.hpp
+++ b/common/Png.hpp
@@ -127,6 +127,12 @@ bool encodeSubBufferToPNG(unsigned char* pixmap, size_t 
startX, size_t startY,
 return false;
 }
 
+// Level 4 gives virtually identical compression
+// ratio to level 6, but is between 5-10% faster.
+// Level 3 runs almost twice as fast, but the
+// output is typically 2-3x larger.
+png_set_compression_level(png_ptr, 4);
+
 png_set_IHDR(png_ptr, info_ptr, width, height, 8, 
PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, 
PNG_FILTER_TYPE_DEFAULT);
 
 png_set_write_fn(png_ptr, &output, user_write_fn, user_flush_fn);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolkitconfig.xcu

[Libreoffice Gerrit user]

 loolkitconfig.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92562991bd5f8dcd821d9ed7e2d9003d2eac732a
Author: Andras Timar 
AuthorDate: Tue Apr 23 10:05:05 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Apr 23 10:05:05 2019 +0200

change default HelpRootURL to 'https://help.libreoffice.org/help.html?'

Change-Id: I6463ad84b5c0df2860504f4e51f87b5537107f42

diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index bbe1942d9..6ad397fc7 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -8,7 +8,7 @@
 11
 
 
-https://help.collaboraoffice.com/help.html?
+https://help.libreoffice.org/help.html?
 
 
 true
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 oox/source/ppt/pptshapegroupcontext.cxx |   26 --
 sd/qa/unit/data/pptx/tdf123684.pptx |binary
 sd/qa/unit/import-tests.cxx |   16 
 3 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 943a534ac7cb3df513583e226c986dafd8ba246b
Author: Miklos Vajna 
AuthorDate: Tue Apr 23 09:09:21 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 09:58:03 2019 +0200

tdf#123684 PPTX import: fix wrong background color for 

Regression from commit 59339dec1ce56213dc74a06af2f0d35ac1c534d7
(tdf#105150 PPTX import: try harder to handle ,
2017-01-06), the problem was that we gave a white solid fill to a shape
which is meant to be transparent.

Fix the problem by limiting the scope of the mentioned commit to solid
colors only, and also extend to code to look for background fill from
the masterpage as well. This allows not hardcoding the white solid fill
and leaves the fill style of shapes as transparent where the slide
background is a bitmap or other more complex fill type.

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

diff --git a/oox/source/ppt/pptshapegroupcontext.cxx 
b/oox/source/ppt/pptshapegroupcontext.cxx
index c2e5f2f2c9b4..6535e12d3f81 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -106,13 +106,27 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( 
sal_Int32 aElementToken
 oox::drawingml::FillPropertiesPtr pBackgroundPropertiesPtr = 
mpSlidePersistPtr->getBackgroundProperties();
 if (!pBackgroundPropertiesPtr)
 {
-// The shape wants a background, but the slide doesn't have
-// one: default to white.
-pBackgroundPropertiesPtr.reset(new 
oox::drawingml::FillProperties);
-pBackgroundPropertiesPtr->moFillType = XML_solidFill;
-pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFF);
+// The shape wants a background, but the slide doesn't 
have one.
+SlidePersistPtr pMaster = 
mpSlidePersistPtr->getMasterPersist();
+if (pMaster)
+{
+oox::drawingml::FillPropertiesPtr pMasterBackground
+= pMaster->getBackgroundProperties();
+if (pMasterBackground)
+{
+if (pMasterBackground->moFillType.has()
+&& pMasterBackground->moFillType.get() == 
XML_solidFill)
+{
+// Master has a solid background, use that.
+pBackgroundPropertiesPtr = pMasterBackground;
+}
+}
+}
+}
+if (pBackgroundPropertiesPtr)
+{
+
pShape->getFillProperties().assignUsed(*pBackgroundPropertiesPtr);
 }
-pShape->getFillProperties().assignUsed( 
*pBackgroundPropertiesPtr );
 }
 pShape->setModelId(rAttribs.getString( XML_modelId ).get());
 return new PPTShapeContext( *this, mpSlidePersistPtr, 
mpGroupShapePtr, pShape );
diff --git a/sd/qa/unit/data/pptx/tdf123684.pptx 
b/sd/qa/unit/data/pptx/tdf123684.pptx
new file mode 100644
index ..87243422753b
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf123684.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0e4ccf9a8d4e..48b061e7caa5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -169,6 +169,7 @@ public:
 void testTdf104445();
 void testTdf105150();
 void testTdf105150PPT();
+void testTdf123684();
 void testTdf100926();
 void testTdf89064();
 void testTdf108925();
@@ -259,6 +260,7 @@ public:
 CPPUNIT_TEST(testTdf104445);
 CPPUNIT_TEST(testTdf105150);
 CPPUNIT_TEST(testTdf105150PPT);
+CPPUNIT_TEST(testTdf123684);
 CPPUNIT_TEST(testTdf100926);
 CPPUNIT_TEST(testPatternImport);
 CPPUNIT_TEST(testTdf89064);
@@ -1772,6 +1774,20 @@ void SdImportTest::testTdf105150()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testTdf123684()
+{
+sd::DrawDocShellRef xDocShRef
+= 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf123684.pptx"), 
PPTX);
+const SdrPage* pPage = GetPage(1, xDocShRef);
+const SdrObject* pObj = pPage->GetObj(0);
+auto& rFillStyleItem
+= dynamic_cast(pObj->GetMergedItem(XATTR_FILLSTYLE));
+// Without the accompanying fix in place, this test would have failed with 
'Expected: 0; Actual:
+// 1', i.e. the shape's fill was FillStyle_SOLID

[Libreoffice-commits] core.git: helpcontent2

[himajin100000 (via logerrit)]

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

New commits:
commit 1ea226c6d247c349d87df3deb382052cd619e9bc
Author: himajin10 
AuthorDate: Fri Apr 19 23:16:08 2019 +0900
Commit: Gerrit Code Review 
CommitDate: Tue Apr 23 09:48:06 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - fix forgotten LANG->LANGUAGE

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

diff --git a/helpcontent2 b/helpcontent2
index 8a21dc1cc51f..5c561c2f3744 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8a21dc1cc51f0363b33e59b5c34c74d5c6737f1e
+Subproject commit 5c561c2f3744c5697ea6d25357f4223f0dbe977e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: CustomTarget_html.mk

[Libreoffice Gerrit user]

 CustomTarget_html.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c561c2f3744c5697ea6d25357f4223f0dbe977e
Author: himajin10 
AuthorDate: Fri Apr 19 23:16:08 2019 +0900
Commit: Stephan Bergmann 
CommitDate: Tue Apr 23 09:48:06 2019 +0200

fix forgotten LANG->LANGUAGE

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

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 42ff2afee..3b2c8982c 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -114,7 +114,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1)
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,xsltproc) \
-   --stringparam lang $(LANG) \
+   --stringparam lang $(LANGUAGE) \
--stringparam local $(if $(HELP_ONLINE),'no','yes') \
--stringparam module $(MODULE) \
--stringparam productname "$(PRODUCTNAME)" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 1589e54e807a31d9ee21dae52f25282b3a1ff7d6
Author: Andrea Gelmini 
AuthorDate: Tue Apr 16 13:54:48 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 23 09:20:15 2019 +0200

Fix typo

Change-Id: I9fa72190a843d1f229deec8dad7f8ef0d5dd5570
Reviewed-on: https://gerrit.libreoffice.org/71081
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx 
b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
index 0ffd29eb2e1c..612c32c810ea 100644
--- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx
@@ -180,7 +180,7 @@ bool VbaCommandBarHelper::hasToolbar( const OUString& 
sResourceUrl, const OUStri
 // return the resource url if found
 OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< 
css::container::XNameAccess >& xNameAccess, const OUString& sName )
 {
-// check if it is an buildin toolbar
+// check if it is a buildin toolbar
 OUString sResourceUrl = 
MSO2OOCommandbarHelper::getMSO2OOCommandbarHelper()->findBuildinToolbar( sName 
);
 if( !sResourceUrl.isEmpty() )
 return sResourceUrl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/filter/msfilter/svdfppt.hxx |2 +-
 sc/source/ui/inc/acredlin.hxx   |4 ++--
 sc/source/ui/miscdlgs/acredlin.cxx  |8 
 sd/source/filter/eppt/epptbase.hxx  |2 +-
 sd/source/filter/eppt/pptx-epptbase.cxx |4 ++--
 sd/source/filter/ppt/pptin.cxx  |2 +-
 svl/source/items/itempool.cxx   |6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 30eb1ba084468c15bb4dd3bba44c2668ddc94aad
Author: Andrea Gelmini 
AuthorDate: Mon Apr 22 11:33:56 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 23 09:20:00 2019 +0200

Fix typos in code

Change-Id: I5a39d89ad33d447f952d6c4c32923d387c47fd06
Reviewed-on: https://gerrit.libreoffice.org/71083
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 66be39501c79..b55458f94f6e 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1443,7 +1443,7 @@ enum class PptSlideLayout
 TOPROW2COLUMN  =  13,  // Body contains 2 rows, top row has 2 
columns
 FOUROBJECTS=  14,  // 4 objects
 BIGOBJECT  =  15,  // Big object
-BLANCSLIDE =  16,  // Blank slide
+BLANKSLIDE =  16,  // Blank slide
 TITLERIGHTBODYLEFT =  17,  // Vertical title on the right, body on the 
left
 TITLERIGHT2BODIESLEFT  =  18   // Vertical title on the right, body on the 
left split into 2 rows
 };
diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx
index 955a11be5983..fd8e19f8f24f 100644
--- a/sc/source/ui/inc/acredlin.hxx
+++ b/sc/source/ui/inc/acredlin.hxx
@@ -135,8 +135,8 @@ class ScAcceptChgDlg final : public SfxModelessDialog
 
 voidAppendChanges(const ScChangeTrack* pChanges,sal_uLong 
nStartAction, sal_uLong nEndAction);
 
-voidRemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction);
-voidUpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong 
nStartAction,sal_uLong nEndAction);
+voidRemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction);
+voidUpdateEntries(const ScChangeTrack* pChgTrack, sal_uLong 
nStartAction,sal_uLong nEndAction);
 
 voidUpdateView();
 voidClearView();
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index 3ce5f96c3653..3e39243c5210 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1437,7 +1437,7 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* 
pChanges,sal_uLong nStar
 }
 }
 
-void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction)
+void ScAcceptChgDlg::RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction)
 {
 
 pTheView->SetUpdateMode(false);
@@ -1481,7 +1481,7 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong 
nStartAction,sal_uLong nEndAction)
 
 }
 
-void ScAcceptChgDlg::UpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong 
nStartAction,sal_uLong nEndAction)
+void ScAcceptChgDlg::UpdateEntries(const ScChangeTrack* pChgTrack, sal_uLong 
nStartAction,sal_uLong nEndAction)
 {
 pTheView->SetUpdateMode(false);
 
@@ -1556,11 +1556,11 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, 
ScChangeTrack&, rChgTrack, void)
 
AppendChanges(&rChgTrack,nStartAction,nEndAction);
 break;
 case ScChangeTrackMsgType::Remove:
-RemoveEntrys(nStartAction,nEndAction);
+RemoveEntries(nStartAction,nEndAction);
 break;
 case ScChangeTrackMsgType::Parent:
 case ScChangeTrackMsgType::Change: //bNeedsUpdate=true;
-
UpdateEntrys(&rChgTrack,nStartAction,nEndAction);
+
UpdateEntries(&rChgTrack,nStartAction,nEndAction);
 break;
 default: assert(false); break;
 }
diff --git a/sd/source/filter/eppt/epptbase.hxx 
b/sd/source/filter/eppt/epptbase.hxx
index 2884953d77bb..39598f2780bc 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -69,7 +69,7 @@ enum class EppLayout
 TOPROW2COLUMN = 13, /* Body contains 2 rows, top row has 2 columns 
   */
 FOUROBJECTS   = 14, /* 4 objects   
   */
 BIGOBJECT = 15, /* Big object  
   */
-BLANCSLIDE= 16, /* Blank slide 
   */
+BLANKSLIDE= 16, /* Blank slide 

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

[Andrea Gelmini (via logerrit)]

 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a79bc4324427c79ed5b4dd7b8aba20e95d10be2
Author: Andrea Gelmini 
AuthorDate: Mon Apr 22 21:56:53 2019 +
Commit: Julien Nabet 
CommitDate: Tue Apr 23 09:20:54 2019 +0200

Fix typo

Change-Id: Ia2a03b59b177ca74c5726db568013949a4a1d1cb
Reviewed-on: https://gerrit.libreoffice.org/71082
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx 
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 8296554f5dc9..1435e12d9c9f 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -99,7 +99,7 @@ namespace drawinglayer
 {
 Primitive2DContainer aContent;
 
-// see if buffering is wanted. it is wanted, create buffered 
content in given resolution
+// see if buffering is wanted. If so, create buffered content in 
given resolution
 if(0 != mnDiscreteWidth && 0 != mnDiscreteHeight)
 {
 const geometry::ViewInformation2D aViewInformation2D;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-6' - external/libxslt

[Michael Stahl (via logerrit)]

 external/libxslt/UnpackedTarball_libxslt.mk   |1 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
++
 2 files changed, 121 insertions(+)

New commits:
commit d8a3a51c63b0350d4dc1956b38138eff982f45cc
Author: Michael Stahl 
AuthorDate: Wed Apr 17 14:50:10 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 09:15:06 2019 +0200

libxslt: add patch for CVE-2019-11068

Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4
Reviewed-on: https://gerrit.libreoffice.org/70879
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e)
Reviewed-on: https://gerrit.libreoffice.org/70894
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)
Reviewed-on: https://gerrit.libreoffice.org/71024
Reviewed-by: Andras Timar 
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index eae318ef74b9..beb591b8b2a8 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,6 +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 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
new file mode 100644
index ..260f35d1a35e
--- /dev/null
+++ b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
@@ -0,0 +1,120 @@
+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",
+-   URI);
++  if (res <= 0) {
++if (res == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsltLoadStyleDocument: read rights for %s denied\n",
++ URI);
+   return(NULL);
+   }
+ }
+diff --git a/libxslt/imports.c b/libxslt/imports.c
+index 874870cc..3783b247 100644
+--- a/libxslt/imports.c
 b/libxslt/imports.c
+@@ -130,10 +130,11 @@ xsltParseStylesheetImport(xsltStylesheetPtr style, 
xmlNodePtr cur) {
+   int secres;
+ 
+   secres = xsltCheckRead(sec, NULL, URI);
+-  if (secres == 0) {
+-  xsltTransformError(NULL, NULL, NULL,
+-   "xsl:import: read rights for %s denied\n",
+-   URI);
++  if (secres <= 0) {
++if (secres == 0)
++xsltTransformError(NULL, NULL, NULL,
++ "xsl:import: read rights for %s denied\n",
++ URI);
+   goto error;
+   }
+ }
+diff --git a/libxslt/transform.c b/libxslt/transform.c
+index 13793914..0636dbd0 100644
+--- a/libxslt/transform.c
 b/libxslt/transform.c
+@@ -3493,10 +3493,11 @@ xsltDocumentElem(xsltTransformContextPtr ctxt, 
xmlNodePtr node,
+  */
+ if (ctxt->sec != NULL) {
+   ret = xs

[Libreoffice-commits] online.git: gtk/README

[Libreoffice Gerrit user]

 gtk/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdc731a07d805b3c2e7aa4e2b45c22afc39a5761
Author: Miklos Vajna 
AuthorDate: Tue Apr 23 09:10:11 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Apr 23 09:10:18 2019 +0200

gtk: fix typo

Change-Id: Ib8bcf8b578f1d926f26a0ebae15cfa36e5d922d2

diff --git a/gtk/README b/gtk/README
index 576504df3..ae9528379 100644
--- a/gtk/README
+++ b/gtk/README
@@ -2,7 +2,7 @@ This is a GTK+ Webkit app that is intended to work similarly 
enough to
 the iOS app being developed in the "ios" folder, and the Android app
 being developed in the "android" folder, that (some kinds of) problems
 in them also show up in this app, and can be investigated by people
-with no Android, Mac, oriOS device.
+with no Android, Mac, or iOS device.
 
 How to build this:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 cui/inc/strings.hrc|1 +
 cui/source/options/personalization.cxx |   10 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 0d28abe085293604eb3127626da9c5a520b25c21
Author: Muhammet Kara 
AuthorDate: Sat Feb 16 20:35:28 2019 +0300
Commit: Muhammet Kara 
CommitDate: Tue Apr 23 09:08:04 2019 +0200

tdf#123228: Disable Firefox theme search

We can't use the MOZ API anymore.
Let's disable it instead of showing a broken
search window. Then we can spend some time on
moving on instead of answering the
-This is not working!- bug reports.

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

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6627ad93bc44..7c32af629907 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -368,6 +368,7 @@
 #define RID_SVXSTR_NORESULTS
NC_("RID_SVXSTR_NORESULTS", "No results found.")
 #define RID_SVXSTR_APPLYPERSONA 
NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
 #define RID_SVXSTR_INVALIDPERSONAURL
NC_("RID_SVXSTR_INVALIDPERSONAURL", "Please enter a valid theme address or a 
search term.")
+#define RID_SVXSTR_MOZAPIUNREACHABLE
NC_("RID_SVXSTR_MOZAPIUNREACHABLE", "The Mozilla Themes API is currently 
unavailable.")
 
 #define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
 #define RID_SVXSTR_TABLE_PRESET_ONLYOUTER   
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 7ba962d11eea..b1f9d3f38e4e 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -399,10 +399,14 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
vcl::Window *pParent, cons
 get( m_pAppliedThemeLabel, "applied_theme_link" );
 
 get( m_pOwnPersona, "own_persona" );
-m_pOwnPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
ForceSelect ) );
-
 get( m_pSelectPersona, "select_persona" );
-m_pSelectPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
SelectPersona ) );
+
+// Mozilla API and the Mozilla personas are no longer useful for us
+// We will probably remove this altogether before 6.3
+m_pSelectPersona->Disable();
+m_pOwnPersona->Disable();
+m_pSelectPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE 
) );
+m_pOwnPersona->SetQuickHelpText( CuiResId( RID_SVXSTR_MOZAPIUNREACHABLE ) 
);
 
 for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits