[Libreoffice-commits] help.git: help3xsl/online_transform.xsl

[Olivier Hallot]

 help3xsl/online_transform.xsl |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6005c5c31ca8e9f9107c5c0e35858d27e4a55490
Author: Olivier Hallot 
Date:   Fri Sep 8 10:22:11 2017 -0300

Add better support for  in helponline

Insert a div around a code snippet and categorize for schema.org

Change-Id: I7d4c9e15fccbf7e48af3c2faca9ed61ae5279c79
Reviewed-on: https://gerrit.libreoffice.org/42105
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index c8be6611a..eebaced56 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -786,9 +786,13 @@

 
 
+
+http://schema.org/SoftwareSourceCode"; itemprop="codeSampleType" 
content="snippet">
+
+
 
 
-   http://schema.org/SoftwareSourceCode"; 
itemprop="codeSampleType" content="snippet">
+   
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit a45800f010f3e063c6f31426fcdba76aa5b43d3e
Author: Olivier Hallot 
Date:   Fri Sep 8 10:22:11 2017 -0300

Updated core
Project: help  6005c5c31ca8e9f9107c5c0e35858d27e4a55490

Add better support for  in helponline

Insert a div around a code snippet and categorize for schema.org

Change-Id: I7d4c9e15fccbf7e48af3c2faca9ed61ae5279c79
Reviewed-on: https://gerrit.libreoffice.org/42105
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 12ea42f942df..6005c5c31ca8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 12ea42f942dfdcc3aebf108e9190b2c5a8454313
+Subproject commit 6005c5c31ca8e9f9107c5c0e35858d27e4a55490
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

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

New commits:
commit fc674ad1b795d74a50cb792368ce7eaee74ca904
Author: Tamás Zolnai 
Date:   Fri Sep 8 03:34:26 2017 +0200

Avoid underflow of unsigned integer which leads a false error message

Change-Id: Ica65a96efe44fb46e25c224298aaff4cd7a40fa6
Reviewed-on: https://gerrit.libreoffice.org/42120
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 0643c2c2e890..89ac10dcd473 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -870,7 +870,7 @@ void ScDPOutput::CalcSizes()
 ++nPageSize;//  filter button above the page fields
 }
 
-if ( aStartPos.Col() + pRowFields.size() + nColCount - 1 > MAXCOL ||
+if ( aStartPos.Col() + static_cast(pRowFields.size()) + 
nColCount - 1 > MAXCOL ||
  aStartPos.Row() + nPageSize + nHeaderSize + pColFields.size() + 
nRowCount > MAXROW )
 {
 bSizeOverflow = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 fpicker/source/aqua/ControlHelper.mm |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3fa8ff7734541c8cb12a5e80b6770cbc7a9347f1
Author: Jan-Marek Glogowski 
Date:   Sat Sep 9 00:26:21 2017 +0200

tdf#112289 OSX fpicker: don't default to true

When LO requests a value for the currently unimplemented
GPG encryption checkbox, the Aqua file picker defaults to
a "uno::Any <<= true", which triggers the GPG key dialog.

This simply returns an empty uno::Any for values of unknown
controls, which is handled fine.

If something else relies on the current default value, it
must to be properly implemented.

Change-Id: I3637ca833d59e19416e25f3096bc90a756aa8840

diff --git a/fpicker/source/aqua/ControlHelper.mm 
b/fpicker/source/aqua/ControlHelper.mm
index f645d2a4aecd..d0568b9a5ea1 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -348,7 +348,6 @@ uno::Any ControlHelper::getValue( sal_Int16 nControlId, 
sal_Int16 nControlAction
 
 if( pControl == nil ) {
 SAL_INFO("fpicker.aqua","get value for unknown control " << 
nControlId);
-aRetval <<= true;
 } else {
 if( [pControl class] == [NSPopUpButton class] ) {
 aRetval = HandleGetListValue(pControl, nControlAction);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/source/edit/texteng.cxx  |2 +-
 vcl/source/edit/textview.cxx |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d918a8086af56d1869e465baae64d960e56066d1
Author: Michael Stahl 
Date:   Fri Sep 8 22:50:58 2017 +0200

tdf#108722 vcl: fix bugs in TextEngine with TEXTATTR_PROTECTED

1. If the cursor is at the end of the paragraph, attributes ending
   at that position are skipped in TextEngine::FindCharAttrib().
2. If a TEXTATTR_PROTECTED is found, TextView::KeyInput()
   retains the selection that was extended to cover the attribute
   after deleting the text, because it compares to the initial
   selection.

Why delete/backspace keys only work with the "gtk" vcl-plug
but not "gtk3", "gen" or "kde4" is a mystery to me.

Change-Id: Id7a6f298332f5a99454c793dd2dd6d424a975ad4

diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 12731dfc3305..f1f3a408afc1 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -1012,7 +1012,7 @@ const TextCharAttrib* TextEngine::FindCharAttrib( const 
TextPaM& rPaM, sal_uInt1
 {
 const TextCharAttrib* pAttr = nullptr;
 TextNode* pNode = mpDoc->GetNodes()[ rPaM.GetPara() ];
-if ( pNode && ( rPaM.GetIndex() < pNode->GetText().getLength() ) )
+if (pNode && (rPaM.GetIndex() <= pNode->GetText().getLength()))
 pAttr = pNode->GetCharAttribs().FindAttrib( nWhich, rPaM.GetIndex() );
 return pAttr;
 }
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 40e2a99caa23..b19ad1767043 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -596,10 +596,12 @@ bool TextView::KeyInput( const KeyEvent& rKeyEvent )
 if(pStartAttr && pStartAttr->GetStart() < 
mpImpl->maSelection.GetStart().GetIndex())
 {
 mpImpl->maSelection.GetStart().GetIndex() = 
pStartAttr->GetStart();
+aOldSel = mpImpl->maSelection; // update to 
deleted!
 }
 if(pEndAttr && pEndAttr->GetEnd() > 
mpImpl->maSelection.GetEnd().GetIndex())
 {
 mpImpl->maSelection.GetEnd().GetIndex() = 
pEndAttr->GetEnd();
+aOldSel = mpImpl->maSelection; // update to 
deleted!
 }
 }
 aCurSel = ImpDelete( nDel, nMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/column.hxx|3 ++-
 sc/inc/document.hxx  |6 +++---
 sc/inc/filterentries.hxx |   39 +++
 sc/inc/table.hxx |4 ++--
 sc/source/core/data/column3.cxx  |   32 +---
 sc/source/core/data/documen3.cxx |   15 ---
 sc/source/core/data/table3.cxx   |   13 -
 sc/source/ui/dbgui/filtdlg.cxx   |   24 
 sc/source/ui/dbgui/pfiltdlg.cxx  |9 -
 sc/source/ui/inc/filtdlg.hxx |4 ++--
 sc/source/ui/inc/pfiltdlg.hxx|3 ++-
 sc/source/ui/view/gridwin.cxx|   11 +--
 12 files changed, 100 insertions(+), 63 deletions(-)

New commits:
commit 9c1826d98065c30411cbf2e731560165ca2b7668
Author: Eike Rathke 
Date:   Fri Sep 8 19:06:41 2017 +0200

sc-perf: do not add a million empty filter entries just to sort and discard

Which can happen if an (anonymous) database range as filter range was 
selected
to span an entire column of which most (the tail) is empty cells. The 
entries
are processed to be unique anyway. This significantly shortens the time to
display the filter dialog.

Happened with attachment
http://bugs.documentfoundation.org/attachment.cgi?id=136074 of bug
https://bugs.documentfoundation.org/show_bug.cgi?id=112258

Change-Id: Ia169911d6f23611a3b3ecbf291757465f1998210
Reviewed-on: https://gerrit.libreoffice.org/42118
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b9b5b01f3fe2..6d2ac9e44cf1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -105,6 +105,7 @@ struct ScCellValue;
 class ScDocumentImport;
 class ScHint;
 enum class ScMF;
+struct ScFilterEntries;
 
 struct ScNeededSizeOptions
 {
@@ -522,7 +523,7 @@ public:
 
 void GetFilterEntries(
 sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW 
nEndRow,
-std::vector& rStrings, bool& rHasDates );
+ScFilterEntries& rFilterEntries );
 
 bool GetDataEntries( SCROW nRow, std::set& rStrings, bool 
bLimit ) const;
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e08378e2242c..a7b9fcdc4d17 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -199,6 +199,7 @@ enum class ScDBDataPortion;
 enum class ScSheetEventId;
 class BitmapEx;
 class ScColumnsRange;
+struct ScFilterEntries;
 
 namespace sc {
 
@@ -1900,12 +1901,11 @@ public:
  * database range that contains the specified cell position.
  */
 void  GetFilterEntries( SCCOL nCol, SCROW nRow,
-SCTAB nTab, 
std::vector& rStrings,
-bool& rHasDates);
+SCTAB nTab, ScFilterEntries& 
rFilterEntries );
 
 SC_DLLPUBLIC void GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW 
nEndRow,
 SCTAB nTab, bool bCaseSens,
-std::vector& 
rStrings, bool& rHasDates);
+ScFilterEntries& rFilterEntries );
 
 void  GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
   std::vector& rStrings, 
bool bLimit = false );
diff --git a/sc/inc/filterentries.hxx b/sc/inc/filterentries.hxx
new file mode 100644
index ..2a8dccd99cb3
--- /dev/null
+++ b/sc/inc/filterentries.hxx
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_INC_FILTERENTRIES_HXX
+#define SC_INC_FILTERENTRIES_HXX
+
+#include 
+#include "typedstrdata.hxx"
+#include 
+
+struct ScFilterEntries
+{
+std::vector maStrData;
+boolmbHasDates;
+boolmbHasEmpties;
+
+ScFilterEntries() : mbHasDates(false), mbHasEmpties(false) {}
+
+std::vector::iterator   begin() { return 
maStrData.begin(); }
+std::vector::iterator   end()   { return 
maStrData.end(); }
+std::vector::const_iterator begin() const   { return 
maStrData.begin(); }
+std::vector::const_iterator end()   const   { return 
maStrData.end(); }
+std::vector::size_type  size()  const   { return 
maStrData.size(); }
+  ScTypedStrData&   front() { return 
maStrData.front(); }
+const ScTypedStrData&   front() const   { return 
maStrData.front(); }
+boolempty() const   { return 
maStrData.empty(); }
+voidpush_back( const

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

[Michael Stahl]

 svl/source/items/poolitem.cxx  |2 ++
 sw/source/core/doc/tblafmt.cxx |4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 276536fc10368dbe7e16cf859b6da903cec6b8aa
Author: Michael Stahl 
Date:   Fri Sep 8 20:45:46 2017 +0200

svl: assert calls of SfxPoolItem::Create/Store

Change-Id: I2d92897d558ad0914e8bbc80b4dec72d0fd00629

diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index fb0ef21446d0..4fbd3c9f5fd6 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -57,6 +57,7 @@ bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
 
 SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
 {
+assert(!"this item is not serialisable");
 return Clone();
 }
 
@@ -69,6 +70,7 @@ sal_uInt16 SfxPoolItem::GetVersion( sal_uInt16 ) const
 
 SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
+assert(!"this item is not serialisable");
 return rStream;
 }
 
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 59afa9ac4f00..86a348f34612 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -998,7 +998,7 @@ bool SwTableAutoFormat::Load( SvStream& rStream, const 
SwAfVersions& rVersions )
 SfxPoolItem* pNew = nullptr;
 
 READ(m_aBreak, SvxFormatBreakItem, AUTOFORMAT_FILE_VERSION);
-READ(m_aPageDesc, SwFormatPageDesc, AUTOFORMAT_FILE_VERSION);
+//unimplementedREAD(m_aPageDesc, SwFormatPageDesc, 
AUTOFORMAT_FILE_VERSION);
 READ(m_aKeepWithNextPara, SvxFormatKeepItem, 
AUTOFORMAT_FILE_VERSION);
 
 rStream.ReadUInt16( m_aRepeatHeading ).ReadCharAsBool( 
m_bLayoutSplit ).ReadCharAsBool( m_bRowSplit ).ReadCharAsBool( 
m_bCollapsingBorders );
@@ -1043,7 +1043,7 @@ bool SwTableAutoFormat::Save( SvStream& rStream, 
sal_uInt16 fileVersion ) const
 WriterSpecificAutoFormatBlock block(rStream);
 
 m_aBreak.Store(rStream, m_aBreak.GetVersion(fileVersion));
-m_aPageDesc.Store(rStream, m_aPageDesc.GetVersion(fileVersion));
+//unimplementedm_aPageDesc.Store(rStream, 
m_aPageDesc.GetVersion(fileVersion));
 m_aKeepWithNextPara.Store(rStream, 
m_aKeepWithNextPara.GetVersion(fileVersion));
 rStream.WriteUInt16( m_aRepeatHeading ).WriteBool( m_bLayoutSplit 
).WriteBool( m_bRowSplit ).WriteBool( m_bCollapsingBorders );
 m_aShadow.Store(rStream, m_aShadow.GetVersion(fileVersion));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: make install

[Wols Lists]

On 06/09/17 19:45, Eike Rathke wrote:
> Hi Michael,
> 
> On Wednesday, 2017-09-06 16:26:09 +0200, Michael Stahl wrote:
> 
>> apparently you are trying to use "make install", which probably is
>> unused and unmaintained; maybe we should remove it.
> 
> make install works fine if one configures with --prefix=..., I use it
> regulary to create installations of builds and branches before I fool
> around in a tree. Something like
> 
> ./configure --prefix=$HOME/opt/$(basename `pwd`)
> 
And what about distros like gentoo? I don't know how portage does it,
but quite likely it uses "make install" to actually install its
applications, like libreoffice, after it's built them from source?
Portage, surely, is not supposed to use /opt?

And on another little point, aren't /usr/bin and /usr/sbin (along with
/sbin) deprecated? For some value of deprecated :-) As usual, things
move at a somewhat glacial pace, but I believe all binaries are
*supposed* to be installed or symlinked into /bin now, for the unified
root or whatever it's called.

sbin was originally meant for statically linked binaries, I believe.
Typically they were emergency rescue packages for root, hence that
transmogrifying into "packages for root" rather than "static packages".
And most of the directories in /usr being equivalents to those in /,
isn't /usr deprecated for the unified root?

Cheers,
Wol

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

Report for 09/07/2017

[namitha . ninan]

Hi Shinnok

As per our previous discussions, I have completed the make with
build-nocheck and it seems to have run without an issue. With this the
build issues appear to have been solved after running
./autogen.sh --without-java --without-doxygen --disable-cve-tests and make
build-nocheck. What would be the ideal procedure to proceed further ?

Regards
Namitha Ninan

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/main.js loleaflet/src

[Jan Holesovsky]

 loleaflet/main.js |3 ++-
 loleaflet/src/core/Socket.js  |6 +-
 loleaflet/src/layer/tile/TileLayer.js |7 ++-
 loleaflet/src/map/Map.js  |3 ++-
 loleaflet/src/map/handler/Map.FileInserter.js |6 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 2742357ff37e7526fd072441ee85cbeda3230f7f
Author: Jan Holesovsky 
Date:   Fri Sep 8 16:42:28 2017 +0200

HA: Pass WOPISrc= param in all the requests that need to...

...end up in the same loolwsd instance.

Change-Id: I69c4f5be0c0a6f4ffdec6dd571a5d62f2df4b1fb
Reviewed-on: https://gerrit.libreoffice.org/42112
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/loleaflet/main.js b/loleaflet/main.js
index 42660a13..ece21653 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -100,7 +100,7 @@ if (wopiSrc != '') {
docParams = wopiParams;
isWopi = true;
 } else {
-docURL = filePath;
+   docURL = filePath;
docParams = {};
 }
 
@@ -114,6 +114,7 @@ var map = L.map('map', {
documentContainer: 'document-container',
debug: debugMode,
wopi: isWopi,
+   wopiSrc: wopiSrc,
alwaysActive: alwaysActive,
idleTimeoutSecs: idleTimeoutSecs,  // Dim when user is idle.
outOfFocusTimeoutSecs: outOfFocusTimeoutSecs // Dim after switching 
tabs.
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 163dfd5c..bd2cdd58 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -22,7 +22,11 @@ L.Socket = L.Class.extend({
if (map.options.permission) {
map.options.docParams['permission'] = 
map.options.permission;
}
-   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws');
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
+   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws' + wopiSrc);
this.socket.onerror = L.bind(this._onSocketError, this);
this.socket.onclose = L.bind(this._onSocketClose, this);
this.socket.onopen = L.bind(this._onSocketOpen, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 187d26d1..1069e38b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -526,8 +526,13 @@ L.TileLayer = L.GridLayer.extend({
var command = this._map._socket.parseServerCmd(textMsg);
var parser = document.createElement('a');
parser.href = this._map.options.server;
+
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
var url = this._map.options.webserver + '/' + 
this._map.options.urlPrefix + '/' +
-   encodeURIComponent(this._map.options.doc) + '/' + 
command.jail + '/' + command.dir + '/' + command.name;
+   encodeURIComponent(this._map.options.doc) + '/' + 
command.jail + '/' + command.dir + '/' + command.name + wopiSrc;
 
this._map.hideBusy();
if (command.id === 'print') {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d4869820..6027e26a 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -18,7 +18,8 @@ L.Map = L.Evented.extend({
defaultZoom: 10,
tileWidthTwips: 3840,
tileHeightTwips: 3840,
-   urlPrefix: 'lool'
+   urlPrefix: 'lool',
+   wopiSrc: ''
},
 
lastActiveTime: Date.now(),
diff --git a/loleaflet/src/map/handler/Map.FileInserter.js 
b/loleaflet/src/map/handler/Map.FileInserter.js
index f6388dbb..7b6811b0 100644
--- a/loleaflet/src/map/handler/Map.FileInserter.js
+++ b/loleaflet/src/map/handler/Map.FileInserter.js
@@ -14,8 +14,12 @@ L.Map.FileInserter = L.Handler.extend({
this._toInsert = {};
var parser = document.createElement('a');
parser.href = map.options.server;
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
this._url = map.options.webserver + '/' + map.options.urlPrefix 
+
-   '/' + encodeURIComponent(map.options.doc) + 
'/insertfile';
+   '/' + encodeURIComp

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

[Stephan Bergmann]

 external/openldap/UnpackedTarball_openldap.mk |3 
 external/openldap/automake.patch  | 3654 ++
 2 files changed, 3657 insertions(+)

New commits:
commit 9e20ef275a9c2bbb9a817a752c6e8e50c69b01f8
Author: Stephan Bergmann 
Date:   Fri Sep 8 16:54:11 2017 +0200

external/openldap: Update config.{guess,sub}

...with versions of those files from the latest
.

The current versions failed for a Flathub aarch64 test build, see
.

Change-Id: I782371c88cf1c46bdee4f14a82b58f673f40e982
(cherry picked from commit 8d1c4032ed284e656300801b62c982e212315a07)
Reviewed-on: https://gerrit.libreoffice.org/42111
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index 44c192e65dab..74d6908b5623 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,openldap,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
+   external/openldap/automake.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openldap/automake.patch b/external/openldap/automake.patch
new file mode 100644
index ..6f2ebd6c0330
--- /dev/null
+++ b/external/openldap/automake.patch
@@ -0,0 +1,3654 @@
+--- build/config.guess
 build/config.guess
+@@ -1,15 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2010-09-24-OpenLDAP'
+-# $OpenLDAP$
++timestamp='2014-11-04'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -18,26 +15,22 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to  and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+ # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches to .
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -57,9 +50,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -93,7 +84,7 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' HUP INT TERM
++trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+@@ -107,7 +98,7 @@
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) 
&& exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT 
PIPE TERM ;
++trap "rm -f \$

[Libreoffice-commits] dev-tools.git: esc-reporting/qa-tools.py

[Xisco Fauli]

 esc-reporting/qa-tools.py |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 7aad56f56cc1450fa93d725527915a89e801e528
Author: Xisco Fauli 
Date:   Fri Sep 8 20:19:52 2017 +0200

QA tools: warn about assigned bugs inactive for more than 3 months

diff --git a/esc-reporting/qa-tools.py b/esc-reporting/qa-tools.py
index b6a859f..c9f2073 100755
--- a/esc-reporting/qa-tools.py
+++ b/esc-reporting/qa-tools.py
@@ -24,6 +24,8 @@ lastAction = '30d'
 
 untouchedPeriod = '365d'
 
+inactiveAssigned = '90d'
+
 targets_list = ['5.3.6', '5.4.1']
 
 periods_list = ['30d', '60d', '90d', '180d']
@@ -348,6 +350,7 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 backPortAdded = False
 backPortAddedMail = ""
 bResolved = False
+lastAssignedEmail = ""
 for action in row['history']:
 actionMail = action['who']
 actionDate = datetime.datetime.strptime(action['when'], 
"%Y-%m-%dT%H:%M:%SZ")
@@ -400,6 +403,9 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 addedStatus = change['added']
 removedStatus = change['removed']
 
+if rowStatus == 'ASSIGNED' and addedStatus == 
'ASSIGNED':
+lastAssignedEmail = actionMail
+
 if actionDate >= cfg[reportPeriod] and not bResolved 
and isClosed(addedStatus) and isClosed(row['status']):
 bResolved = True
 week = str(actionDate.year) + '-' + 
str(actionDate.strftime("%V"))
@@ -682,6 +688,13 @@ def analyze_bugzilla(statList, bugzillaData, cfg):
 lResults['fixBugPing'][0].append(rowId)
 lResults['fixBugPing'][1].append('')
 
+if rowStatus == 'ASSIGNED' and 
datetime.datetime.strptime(row['last_change_time'], "%Y-%m-%dT%H:%M:%SZ") < 
cfg['inactiveAssigned'] and \
+'easyHack' not in row['keywords']:
+if 'inactiveAssigned' not in lResults:
+lResults['inactiveAssigned'] = [[],[]]
+lResults['inactiveAssigned'][0].append(rowId)
+lResults['inactiveAssigned'][1].append(lastAssignedEmail)
+
 for dKey, dValue in lResults.items():
 if dValue:
 print('\n=== ' + dKey + ' ===')
@@ -1130,6 +1143,7 @@ def runCfg(homeDir):
 cfg[lastAction] = cfg['todayDate'] - datetime.timedelta(days= 
int(lastAction[:-1]))
 cfg['diffAction'] = cfg['todayDate'] - datetime.timedelta(days= 
(int(lastAction[:-1]) + int(reportPeriod[:-1])))
 cfg['untouchedPeriod'] = cfg['todayDate'] - datetime.timedelta(days= 
int(untouchedPeriod[:-1]))
+cfg['inactiveAssigned'] = cfg['todayDate'] - datetime.timedelta(days= 
int(inactiveAssigned[:-1]))
 
 for period in periods_list:
 cfg[period] = cfg['todayDate'] - datetime.timedelta(days= 
int(period[:-1]))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 basctl/source/basicide/basidesh.cxx   |8 +-
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx  |   18 ++---
 basegfx/source/polygon/b2dpolygontools.cxx|   20 ++
 basegfx/source/polygon/b2dpolygontriangulator.cxx |2 
 basegfx/source/polygon/b2dpolypolygoncutter.cxx   |4 -
 basegfx/source/polygon/b2dtrapezoid.cxx   |   67 +-
 basegfx/source/range/b2drangeclipper.cxx  |   20 ++
 basegfx/source/raster/rasterconvert3d.cxx |   20 +++---
 basegfx/source/tools/unotools.cxx |8 +-
 basic/source/basmgr/basmgr.cxx|   18 ++---
 basic/source/classes/sb.cxx   |6 -
 basic/source/classes/sbunoobj.cxx |4 -
 basic/source/runtime/runtime.cxx  |4 -
 binaryurp/source/bridge.cxx   |   10 +--
 binaryurp/source/bridgefactory.cxx|3 
 binaryurp/source/incomingrequest.cxx  |5 -
 binaryurp/source/proxy.cxx|   10 +--
 binaryurp/source/writer.cxx   |7 --
 18 files changed, 104 insertions(+), 130 deletions(-)

New commits:
commit 84cbd6a5434e119613d677370e7657ea77cd7767
Author: Noel Grandin 
Date:   Fri Sep 8 16:55:09 2017 +0200

clang-tidy modernize-use-emplace in b*

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

diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 8ef3742d6222..9464c03e5da0 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -314,7 +314,7 @@ void Shell::onDocumentClosed( const ScriptDocument& 
_rDocument )
 pWin->BasicStopped();
 }
 else
-aDeleteVec.push_back( pWin );
+aDeleteVec.emplace_back(pWin );
 }
 }
 // delete windows outside main loop so we don't invalidate the original 
iterator
@@ -557,7 +557,7 @@ void Shell::CheckWindows()
 {
 BaseWindow* pWin = it->second;
 if ( pWin->GetStatus() & BASWIN_TOBEKILLED )
-aDeleteVec.push_back( pWin );
+aDeleteVec.emplace_back(pWin );
 }
 for ( VclPtr const & pWin : aDeleteVec )
 {
@@ -579,7 +579,7 @@ void Shell::RemoveWindows( const ScriptDocument& rDocument, 
const OUString& rLib
 {
 BaseWindow* pWin = it->second;
 if ( pWin->IsDocument( rDocument ) && pWin->GetLibName() == rLibName )
-aDeleteVec.push_back( pWin );
+aDeleteVec.emplace_back(pWin );
 }
 for ( VclPtr const & pWin : aDeleteVec )
 {
@@ -612,7 +612,7 @@ void Shell::UpdateWindows()
 // Window is frozen at first, later the windows should be 
changed
 // anyway to be marked as hidden instead of being deleted.
 if ( !(pWin->GetStatus() & ( BASWIN_TOBEKILLED | 
BASWIN_RUNNINGBASIC | BASWIN_SUSPENDED ) ) )
-aDeleteVec.push_back( pWin );
+aDeleteVec.emplace_back(pWin );
 }
 }
 for ( auto it = aDeleteVec.begin(); it != aDeleteVec.end(); ++it )
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx 
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 74f60b17a59d..6f164d2965ec 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -189,7 +189,7 @@ namespace basegfx
 const temporaryPoint& rTempPoint = rPointVector[a];
 const double 
fCutPosInPolygon((double)rTempPoint.getIndex() + rTempPoint.getCut());
 const double fRelativeCutPos(fCutPosInPolygon / 
(double)nEdgeCount);
-
rTempPoints.push_back(temporaryPoint(rTempPoint.getPoint(), nInd, 
fRelativeCutPos));
+rTempPoints.emplace_back(rTempPoint.getPoint(), nInd, 
fRelativeCutPos);
 }
 }
 }
@@ -251,8 +251,8 @@ namespace basegfx
 // add a cut point to each list. The lists may 
be the same for
 // self intersections.
 const B2DPoint aCutPoint(interpolate(rCurrA, 
rNextA, fCut));
-
rTempPointsA.push_back(temporaryPoint(aCutPoint, nIndA, fCut));
-
rTempPointsB.push_back(temporaryPoint(aCutPoint, nIndB, fCut2));
+rTempPointsA.emplace_back(aCutPoint, nIndA, 
fCut);
+rTempPointsB.emplace_back(aCutPoint, nIndB, 
fCut2);
 }
 }
 }
@@ -340,13 +340,13 @@ namespace basegfx
 // by outer methods and would 
just produce a double point
 

[Libreoffice-commits] libcdr.git: 2 commits - configure.ac src/conv

[David Tardon]

 configure.ac  |   28 ++--
 src/conv/raw/Makefile.am  |2 ++
 src/conv/svg/Makefile.am  |2 ++
 src/conv/text/Makefile.am |2 ++
 4 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit d6b3911a7145c3712fb2a21347d9057fb9204c49
Author: David Tardon 
Date:   Fri Sep 8 19:26:16 2017 +0200

assume modern enough ICU is available

Change-Id: Id1699583cf123ac48e9fdb93ff0e9fd64201633e

diff --git a/configure.ac b/configure.ac
index 79573ae..0286ae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,21 +111,7 @@ AC_SUBST(ZLIB_LIBS)
 # 
 # Find icu
 # 
-AS_IF([test "${ICU_CFLAGS+set}" = set],[
-   ICU_CFLAGS_overriden=yes],[
-   ICU_CFLAGS_overriden=no])
-PKG_CHECK_MODULES([ICU],[icu-i18n],[
-   AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
-   ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n 
--variable=CXXFLAGS`"])
-   ], [
-   AC_PATH_PROG([ICU_CONFIG],[icu-config])
-   AC_MSG_CHECKING([ICU installation])
-   AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
-   ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
-   ICU_LIBS=`${ICU_CONFIG} --ldflags`
-   AC_MSG_RESULT([found])],[
-   AC_MSG_ERROR([libicu config program icu-config not found])])]
-)
+PKG_CHECK_MODULES([ICU], [icu-i18n])
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 024ab8d..7fd9bd2 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -13,6 +13,7 @@ cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
 
 cdr2raw_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@@ -25,6 +26,7 @@ cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
 
 cmx2raw_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index e1a9d73..57ad634 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -12,6 +12,7 @@ cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
 
 cdr2xhtml_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@CDR2XHTML_WIN32_RESOURCE@ 
@@ -23,6 +24,7 @@ cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
 
 cmx2xhtml_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index f52e6bb..5618cdc 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -13,6 +13,7 @@ cdr2text_DEPENDENCIES = @CDR2TEXT_WIN32_RESOURCE@
 
 cdr2text_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@@ -25,6 +26,7 @@ cmx2text_DEPENDENCIES = @CMX2TEXT_WIN32_RESOURCE@
 
 cmx2text_LDADD = \
../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la \
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
commit 5c877eb154c80585ed09d7614964c3ae1c931004
Author: David Tardon 
Date:   Fri Sep 8 19:29:08 2017 +0200

tests need librevenge-stream too

Change-Id: I3e5ddf2c19f27fe3201952d3ea2b732e4ebeda09

diff --git a/configure.ac b/configure.ac
index 39770dd..79573ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ AC_ARG_ENABLE([tools],
[enable_tools=yes]
 )
 AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"])
+AS_IF([test "x$enable_tools" = "xyes"], [need_stream=yes; need_generators=yes])
 
 # ===
 # Fuzzers
@@ -68,17 +69,21 @@ AC_ARG_ENABLE([fuzzers],
[enable_fuzzers=no]
 )
 AM_CONDITIONAL(BUILD_FUZZERS, [test "x$enable_fuzzers" = "xyes"])
+AS_IF([test "x$enable_fuzzers" = "xyes"], [need_stream=yes; 
need_generators=yes])
 
-AS_IF([test "x$enable_tools" = "xyes" -o "x$enable_fuzzers" = "xyes"], [
+AS_IF([test "x$need_stream" = "xyes"], [
PKG_CHECK_MODULES([REVENGE_STREAM],[
librevenge-stream-0.0
])
+])
+AC_SUBST([REVENGE_STREAM_CFLAGS])
+AC_SUBST([REVENGE_STREAM_LIBS])
+
+AS_IF([test "x$need_generators" = "xyes"], [
PKG_CHECK_MODULES([REVENGE_GENERATORS],[
librevenge-generators-0.0
])
 ])
-AC_SUBST([REVENGE_STREAM_CFLAGS])
-AC_SUBST([REVENGE_STREAM_LIBS])
 AC_SUBST([REVENGE_GENERATORS_CFLAGS])
 AC_SUBST([REVENGE_GENERATORS_LIBS])
 
@@ -325,6 +330,7 @@ AS_IF([test "x$enable_tests" = "xyes"],

[Libreoffice-commits] libmspub.git: configure.ac src/conv

[David Tardon]

 configure.ac |   16 +---
 src/conv/raw/Makefile.am |1 +
 src/conv/svg/Makefile.am |1 +
 3 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit e0e504e866a875d77eacf7f4e42a2c9da13b2993
Author: David Tardon 
Date:   Fri Sep 8 19:34:30 2017 +0200

assume modern enough ICU is available

Change-Id: I89e778d035103b2d5c60f80f379406d3ca391722

diff --git a/configure.ac b/configure.ac
index c058bca..42b8ffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,21 +106,7 @@ AC_CHECK_HEADERS(
 # 
 # Find icu
 # 
-AS_IF([test "${ICU_CFLAGS+set}" = set],[
-   ICU_CFLAGS_overriden=yes],[
-   ICU_CFLAGS_overriden=no])
-PKG_CHECK_MODULES([ICU],[icu-i18n],[
-   AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
-   ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n 
--variable=CXXFLAGS`"])
-   ], [
-   AC_PATH_PROG([ICU_CONFIG],[icu-config])
-   AC_MSG_CHECKING([ICU installation])
-   AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
-   ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
-   ICU_LIBS=`${ICU_CONFIG} --ldflags`
-   AC_MSG_RESULT([found])],[
-   AC_MSG_ERROR([libicu config program icu-config not found])])]
-)
+PKG_CHECK_MODULES([ICU], [icu-i18n])
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 1184461..5fbafa6 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -10,6 +10,7 @@ pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@
 
 pub2raw_LDADD = \

$(top_builddir)/src/lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la 
\
+   $(ICU_LIBS) \
$(REVENGE_GENERATORS_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 07fe792..2127256 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -9,6 +9,7 @@ pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@
 
 pub2xhtml_LDADD = \

$(top_builddir)/src/lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la 
\
+   $(ICU_LIBS) \
$(REVENGE_LIBS) \
$(REVENGE_STREAM_LIBS) \
@PUB2XHTML_WIN32_RESOURCE@ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py esc-reporting/esc-report.py

[Xisco Fauli]

 esc-reporting/esc-analyze.py |4 +++-
 esc-reporting/esc-report.py  |7 +--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e9f5ef47fc6529aab821f0413fb0dfce16355e7e
Author: Xisco Fauli 
Date:   Fri Sep 8 19:26:46 2017 +0200

Add android to the unconfirmed list

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index fbe22fe..b9f2bab 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -231,7 +231,7 @@ def util_create_statList():
 'needsUXEval' : 0,
 'topicUI': 0},
  'qa': {'unconfirmed': {'count': 0, 'documentation': 0, 
'enhancement': 0, 'needsUXEval': 0,
-'haveBacktrace': 0, 
'needsDevAdvice': 0}},
+ 'haveBacktrace': 0, 'needsDevAdvice': 0, 'android': 
0}},
  'easyhacks' : {'needsDevEval': 0,  'needsUXEval': 0, 
'cleanup_comments': 0,
 'total': 0, 'assigned': 0,
'open': 0},
  'esc': {}},
@@ -469,6 +469,8 @@ def analyze_qa():
 statList['data']['qa']['unconfirmed']['enhancement'] += 1
   if row['component'] == 'Documentation':
 statList['data']['qa']['unconfirmed']['documentation'] += 1
+  if row['component'] == 'Android app' or row['component'] == 'Android 
Viewer':
+statList['data']['qa']['unconfirmed']['android'] += 1
 
 util_build_period_stat(creationDate, email, 'qa', 'owner')
 
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 61d229a..5850bd6 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -547,7 +547,8 @@ def report_qa():
 "+ needsUXEval: {} ({:+d})\n" \
 "+ haveBackTrace: {} ({:+d})\n" \
 "+ needsDevAdvice: {} ({:+d})\n" \
-"+ documentation:  {} ({:+d})\n".format(
+"+ documentation:  {} ({:+d})\n" \
+"+ android:  {} ({:+d})\n".format(
 statList['data']['qa']['unconfirmed']['count'],
 statList['diff']['qa']['unconfirmed']['count'],
 statList['data']['qa']['unconfirmed']['enhancement'],
@@ -559,7 +560,9 @@ def report_qa():
 statList['data']['qa']['unconfirmed']['needsDevAdvice'],
 statList['diff']['qa']['unconfirmed']['needsDevAdvice'],
 statList['data']['qa']['unconfirmed']['documentation'],
-statList['diff']['qa']['unconfirmed']['documentation'])
+statList['diff']['qa']['unconfirmed']['documentation'],
+statList['data']['qa']['unconfirmed']['android'],
+statList['diff']['qa']['unconfirmed']['android'])
 print(text, file=fp)
 print(text, file=fpESC)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 external/libepubgen/libepubgen-epub3.patch.1 |   59 +++
 1 file changed, 59 insertions(+)

New commits:
commit 44786fad67cf48f6091e868cf0476e754650d385
Author: Miklos Vajna 
Date:   Fri Sep 8 17:57:23 2017 +0200

EPUB export: avoid writing image/x-vclgraphic to the output file

The spec has a fixed list of allowed MIME types.

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

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 8e62660ea566..0fdf0c72f070 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -1935,3 +1935,62 @@ index aa09332..ed968bf 100644
 -- 
 2.12.3
 
+From 7cf3c6541a61f9d74cd51fb2a01344df783cb26d Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Fri, 8 Sep 2017 16:25:36 +0200
+Subject: [PATCH] EPUBTextGenerator: ignore invalid media types
+
+This assumes there is no image type that is valid in EPUB2, but not in
+EPUB3.
+---
+ src/lib/EPUBTextGenerator.cpp  | 26 +-
+ src/test/EPUBTextGeneratorTest.cpp | 23 +++
+ 2 files changed, 48 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/EPUBTextGenerator.cpp b/src/lib/EPUBTextGenerator.cpp
+index 0f7f1e0..1bd1e16 100644
+--- a/src/lib/EPUBTextGenerator.cpp
 b/src/lib/EPUBTextGenerator.cpp
+@@ -595,6 +595,27 @@ void EPUBTextGenerator::closeFrame()
+   m_impl->getHtml()->closeFrame();
+ }
+ 
++/// Checks if the media type is an EPUB 3 Core Media Type or not.
++static bool isValidMimeType(const RVNGString& mediaType)
++{
++  // Defined at .
++  static char const *(types[])=
++  {
++"image/gif",
++"image/png",
++"image/jpeg",
++"image/svg+xml"
++  };
++
++  for (const auto& i : types)
++  {
++if (mediaType == i)
++  return true;
++  }
++
++  return false;
++}
++
+ void EPUBTextGenerator::insertBinaryObject(const librevenge::RVNGPropertyList 
&propList)
+ {
+   if (m_impl->getSplitGuard().splitOnSize())
+@@ -607,7 +628,10 @@ void EPUBTextGenerator::insertBinaryObject(const 
librevenge::RVNGPropertyList &p
+   for (RVNGPropertyList::Iter iter(propList); !iter.last(); iter.next())
+   {
+ if (RVNGString("librevenge:mime-type") == iter.key())
+-  mimetype.reset(iter()->clone());
++{
++  if (isValidMimeType(iter()->getStr()))
++mimetype.reset(iter()->clone());
++}
+ else if (RVNGString("office:binary-data") == iter.key())
+   data.reset(iter()->clone());
+ else
+-- 
+2.12.3
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/Library_wpftwriter.mk writerperfect/qa writerperfect/source

[Miklos Vajna]

 writerperfect/Library_wpftwriter.mk   |1 
 writerperfect/qa/unit/EPUBExportTest.cxx  |   11 +++
 writerperfect/qa/unit/data/writer/epubexport/section.fodt |   12 +++
 writerperfect/source/writer/exp/XMLSectionContext.cxx |   45 ++
 writerperfect/source/writer/exp/XMLSectionContext.hxx |   36 +++
 writerperfect/source/writer/exp/xmltbli.cxx   |7 --
 writerperfect/source/writer/exp/xmltext.cxx   |   12 +++
 writerperfect/source/writer/exp/xmltext.hxx   |3 
 8 files changed, 120 insertions(+), 7 deletions(-)

New commits:
commit 6e260dbebc91f137d6f797dd10d64e53a063dc0b
Author: Miklos Vajna 
Date:   Fri Sep 8 15:39:14 2017 +0200

EPUB export: handle section content

Just the minimum so content is not completely ignored on export.

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

diff --git a/writerperfect/Library_wpftwriter.mk 
b/writerperfect/Library_wpftwriter.mk
index 67c1d999f887..826ffe600e12 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/StarOfficeWriterImportFilter \
writerperfect/source/writer/WordPerfectImportFilter \
writerperfect/source/writer/exp/XMLBase64ImportContext \
+   writerperfect/source/writer/exp/XMLSectionContext \
writerperfect/source/writer/exp/XMLTextFrameContext \
writerperfect/source/writer/exp/txtparai \
writerperfect/source/writer/exp/txtstyli \
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 06278d19eb81..706536c9423a 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -65,6 +65,7 @@ public:
 void testLineBreak();
 void testEscape();
 void testParaCharProps();
+void testSection();
 
 CPPUNIT_TEST_SUITE(EPUBExportTest);
 CPPUNIT_TEST(testOutlineLevel);
@@ -81,6 +82,7 @@ public:
 CPPUNIT_TEST(testLineBreak);
 CPPUNIT_TEST(testEscape);
 CPPUNIT_TEST(testParaCharProps);
+CPPUNIT_TEST(testSection);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -362,6 +364,15 @@ void EPUBExportTest::testParaCharProps()
 assertCss(aCssDoc, aMiddle, "  font-weight: bold;");
 }
 
+void EPUBExportTest::testSection()
+{
+createDoc("section.fodt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// This was "After.", i.e. in-section content was ignored.
+assertXPathContent(mpXmlDoc, "//xhtml:p[2]/xhtml:span", "In section.");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git a/writerperfect/qa/unit/data/writer/epubexport/section.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/section.fodt
new file mode 100644
index ..84fb6d2ae940
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/section.fodt
@@ -0,0 +1,12 @@
+
+
+  
+
+  Before.
+  
+In section.
+  
+  After.
+
+  
+
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx 
b/writerperfect/source/writer/exp/XMLSectionContext.cxx
new file mode 100644
index ..ba6e1a7944f7
--- /dev/null
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "XMLSectionContext.hxx"
+
+#include "xmlimp.hxx"
+#include "xmltext.hxx"
+
+using namespace com::sun::star;
+
+namespace writerperfect
+{
+namespace exp
+{
+
+XMLSectionContext::XMLSectionContext(XMLImport &rImport)
+: XMLImportContext(rImport)
+{
+}
+
+XMLImportContext *XMLSectionContext::CreateChildContext(const OUString &rName, 
const css::uno::Reference &/*xAttribs*/)
+{
+return CreateTextChildContext(mrImport, rName);
+}
+
+void XMLSectionContext::startElement(const OUString &/*rName*/, const 
css::uno::Reference &/*xAttribs*/)
+{
+mrImport.GetGenerator().openSection(librevenge::RVNGPropertyList());
+}
+
+void XMLSectionContext::endElement(const OUString &/*rName*/)
+{
+mrImport.GetGenerator().closeSection();
+}
+
+} // namespace exp
+} // namespace writerperfect
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.hxx 
b/writerperfect/source/writer/exp/XMLSectionContext.hxx
new file mode 100644
index ..5aa49a444a9a
--- /dev/null
+++ b/writerperfect/source/writer/exp/XMLSectionContext.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-wi

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-report.py

[Xisco Fauli]

 esc-reporting/esc-report.py |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 75071ef3aa7cc9fa9e4cd18e79405c78b2db24cd
Author: Xisco Fauli 
Date:   Fri Sep 8 19:17:41 2017 +0200

Just print 10 names

diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index f951e02..61d229a 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -243,15 +243,15 @@ def report_esc_prototype():
 txt =  '  {:+d}  {:+d} ({:+d}) overall)\n  many thanks to the top 
bug squashers:\n'.format(
 x1, -x2, -x3, x4, x1 - x3, x2 - x4)
 x = statList['escList']['QAstat']['top15_squashers']
-for name, count in [(k, x[k]) for k in sorted(x, key=x.get, reverse=True)]:
+for name, count in [(k, x[k]) for k in sorted(x, key=x.get, 
reverse=True)][0:10]:
   txt += '   {:<23} {}\n'.format(name, count)
 txt += '\n+ top 10 bugs reporters:\n'
 x = statList['escList']['QAstat']['top15_reporters']
-for name, count in [(k, x[k]) for k in sorted(x, key=x.get, reverse=True)]:
+for name, count in [(k, x[k]) for k in sorted(x, key=x.get, 
reverse=True)][0:10]:
   txt += '   {:<23} {}\n'.format(name, count)
 txt += '\n+ top 10 bugs fixers:\n'
 x = statList['escList']['QAstat']['top15_fixers']
-for name, count in [(k, x[k]) for k in sorted(x, key=x.get, reverse=True)]:
+for name, count in [(k, x[k]) for k in sorted(x, key=x.get, 
reverse=True)][0:10]:
   txt += '   {:<23} {}\n'.format(name, count)
 escPrototype = escPrototype.replace('$', txt)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: 2 commits - configure.ac

[David Tardon]

 configure.ac |   18 ++
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 0089be571831d162c6460aea7be2003822bdc91d
Author: David Tardon 
Date:   Fri Sep 8 19:13:06 2017 +0200

tests need librevenge-stream

Change-Id: I54aad8e63223f9dd40e2a8a9a60c887b65dc5f56

diff --git a/configure.ac b/configure.ac
index 70b9e9f..e4751ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
 AC_SUBST([CPPUNIT_CFLAGS])
 AC_SUBST([CPPUNIT_LIBS])
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
-AS_IF([test "x$enable_tests" = "xyes"], [need_generators=yes])
+AS_IF([test "x$enable_tests" = "xyes"], [need_stream=yes])
 
 AS_IF([test "x$need_stream" = "xyes"], [
PKG_CHECK_MODULES([REVENGE_STREAM],[
commit 7eeb092a87c3e233769aa292e9d012aff06c1927
Author: David Tardon 
Date:   Fri Sep 8 19:12:22 2017 +0200

assume modern enough ICU is available

Change-Id: I07a995aaa13af07f44642afd38d711555d23c37b

diff --git a/configure.ac b/configure.ac
index b635e1c..70b9e9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,21 +61,7 @@ PKG_CHECK_MODULES([LIBXML],[
 # 
 # Find icu
 # 
-AS_IF([test "${ICU_CFLAGS+set}" = set],[
-   ICU_CFLAGS_overriden=yes],[
-   ICU_CFLAGS_overriden=no])
-PKG_CHECK_MODULES([ICU],[icu-i18n],[
-   AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
-   ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n 
--variable=CXXFLAGS`"])
-   ], [
-   AC_PATH_PROG([ICU_CONFIG],[icu-config])
-   AC_MSG_CHECKING([ICU installation])
-   AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
-   ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
-   ICU_LIBS=`${ICU_CONFIG} --ldflags`
-   AC_MSG_RESULT([found])],[
-   AC_MSG_ERROR([libicu config program icu-config not found])])]
-)
+PKG_CHECK_MODULES([ICU], [icu-uc])
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: README.md

[Jan-Marek Glogowski]

 README.md |   27 +++
 1 file changed, 27 insertions(+)

New commits:
commit 1079893be5593268eff0867be87b0291546d88c7
Author: Jan-Marek Glogowski 
Date:   Thu Sep 7 12:09:25 2017 +0200

Document baselines

Change-Id: I32c8b027abec13805fcb4fc244c7eca00e0c6fee
Reviewed-on: https://gerrit.libreoffice.org/42072
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/README.md b/README.md
index b376110858e9..0c29c3ed06a9 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,33 @@ to compile and build your code, it avoids any arbitrary 
limitations of
 our scripting APIs, and in general is far more simple and intuitive -
 if you are a reasonably able C++ programmer.
 
+## The build chain and runtime baselines
+
+These are the current minimal operating system and compiler versions to
+run and compile LibreOffice, also used by the TDF builds:
+
+* Windows:
+ * Runtime: Windows 7
+ * Build: Cygwin + Visual Studio 2015 Update 3
+* macOS:
+ * Runtime: 10.9
+ * Build: 10.11 + Xcode 8
+* Linux:
+ * Runtime: RHEL 6 or CentOS 6
+ * Build: GCC 4.8.1 or Clang
+
+If you want to use Clang with the LibreOffice compiler plugins, the minimal
+version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
+headers, you have to compile your own Clang to use them on macOS.
+
+You can find the TDF configure switches in the distro-configs/ directory.
+
+To setup your initial build environment on Windows and macOS, we provide
+the LibreOffice Development Environment
+([LODE](https://wiki.documentfoundation.org/Development/lode)) scripts.
+
+For more information see the build instructions for your platform in the
+[TDF wiki](https://wiki.documentfoundation.org/Development).
 
 ## The important bits of code
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/scheduler-fixes' - 34 commits - android/Bootstrap android/.gitignore android/README android/source basic/source bridges/source canvas/Library_canva

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 4b6a472c71ef2420aceee0a9b09b09e811e4734b
Author: Jan-Marek Glogowski 
Date:   Tue Sep 5 18:54:49 2017 +0200

OSX revert fix for i#90083

Part of commit d6f7c94e5c27ba02ff5c3229760c9808cc9b5bea

At least on my current OSX box application based window switching
"just works" "out of the box", even without the code.

With the replacement of the list with a set, the result is a little
bit unexpected and as all the code has a comment "FIXME: lousy
workaround", my fix is simply to drop it.

Change-Id: I456503a74d8cddbd1e81b4a826b94381b424c78c

diff --git a/vcl/inc/osx/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index c899ffce59d1..39bd3170abaf 100644
--- a/vcl/inc/osx/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -61,8 +61,6 @@ class AquaSalFrame;
 #endif
 -(BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: 
(BOOL)bWinVisible;
 -(void)setDockIconClickHandler: (NSObject*)pHandler;
--(void)cycleFrameForward: (AquaSalFrame*)pCurFrame;
--(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame;
 @end
 
 #endif // INCLUDED_VCL_INC_OSX_VCLNSAPP_H
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 535286e698a6..337e92d4f0fe 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -136,24 +136,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 }
 }
 
-// #i90083# handle frame switching
-// FIXME: lousy workaround
-if( (nModMask & (NSControlKeyMask|NSAlternateKeyMask)) == 0 )
-{
-if( [[pEvent characters] isEqualToString: @"<"] ||
-[[pEvent characters] isEqualToString: @"~"] )
-{
-[self cycleFrameForward: pFrame];
-return;
-}
-else if( [[pEvent characters] isEqualToString: @">"] ||
- [[pEvent characters] isEqualToString: @"`"] )
-{
-[self cycleFrameBackward: pFrame];
-return;
-}
-}
-
 // get information whether the event was handled; keyDown returns 
nothing
 GetSalData()->maKeyEventAnswer[ pEvent ] = false;
 bool bHandled = false;
@@ -245,77 +227,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 [super sendEvent: pEvent];
 }
 
--(void)cycleFrameForward: (AquaSalFrame*)pCurFrame
-{
-// find current frame in list
-auto &rFrames( GetSalData()->mpFirstInstance->getFrames() );
-auto it = rFrames.find( pCurFrame );
-if( it != rFrames.end() )
-{
-++it;
-// now find the next frame (or end)
-for( ; it != rFrames.end(); ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-// cycle around, find the next up to pCurFrame
-for( it = rFrames.begin(); *it != pCurFrame; ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-}
-}
-
-template< class Iterator >
-std::reverse_iterator make_reverse_iterator( Iterator i )
-{
-return std::reverse_iterator(i);
-}
-
--(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame
-{
-// do the same as cycleFrameForward only with a reverse iterator
-
-// find current frame in list
-auto &rFrames( GetSalData()->mpFirstInstance->getFrames() );
-auto search_it = rFrames.find( pCurFrame );
-if( search_it != rFrames.end() )
-{
-auto it = ::make_reverse_iterator( search_it );
-++it;
-// now find the next frame (or end)
-for( ; it != rFrames.rend(); ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-// cycle around, find the next up to pCurFrame
-for( it = rFrames.rbegin(); *it != pCurFrame; ++it )
-{
-auto pFrame = static_cast( *it );
-if( pFrame->mpDockMenuEntry != nullptr && pFrame->mbShown )
-{
-[pFrame->getNSWindow() makeKeyAndOrderFront: NSApp];
-return;
-}
-}
-}
-}
-
 -(NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
 (void)sender;
commit a28607714a4c6c1a8bdcd460b197a2a42384acfe
Author: Jan-Marek Glogowski 
Date:   Mon Sep 4 17:40:13 2017 +0200

Unify SalUserEvent handling

Change-Id: I188b567e44fd79c162b2d9cabbd771d1f66c7dc4

diff --git a/vcl/Library_vcl.

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

[Miklos Vajna]

 test/source/xmltesttools.cxx  |1 
 writerperfect/qa/unit/EPUBExportTest.cxx  |   21 ++
 writerperfect/qa/unit/data/writer/epubexport/para-char-props.fodt |   16 ++
 writerperfect/source/writer/exp/txtparai.cxx  |   79 
++
 writerperfect/source/writer/exp/txtparai.hxx  |4 
 5 files changed, 87 insertions(+), 34 deletions(-)

New commits:
commit 687fdc5750ac756f157c663197b998eb471612ef
Author: Miklos Vajna 
Date:   Fri Sep 8 15:55:03 2017 +0200

EPUB export: inherit text properties in spans from paragraph

This is similar to nested spans, but here the outer element is a
paragraph.

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

diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 04e90f3cbd7e..659af490f053 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -64,6 +64,7 @@ void XmlTestTools::registerNamespaces(xmlXPathContextPtr& 
/*pXmlXpathCtx*/)
 
 OUString XmlTestTools::getXPath(xmlDocPtr pXmlDoc, const OString& rXPath, 
const OString& rAttribute)
 {
+CPPUNIT_ASSERT(pXmlDoc);
 xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
 xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
 CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("In <" + OString(pXmlDoc->name) + ">, 
XPath '" + rXPath + "' number of nodes is incorrect").getStr(),
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 10fd5eb5a94a..06278d19eb81 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -64,6 +64,7 @@ public:
 void testNestedSpan();
 void testLineBreak();
 void testEscape();
+void testParaCharProps();
 
 CPPUNIT_TEST_SUITE(EPUBExportTest);
 CPPUNIT_TEST(testOutlineLevel);
@@ -79,6 +80,7 @@ public:
 CPPUNIT_TEST(testNestedSpan);
 CPPUNIT_TEST(testLineBreak);
 CPPUNIT_TEST(testEscape);
+CPPUNIT_TEST(testParaCharProps);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -327,9 +329,9 @@ void EPUBExportTest::testLineBreak()
 
 mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
 // This was 0, line break was not handled.
-assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:br", 1);
+assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span/xhtml:br", 1);
 // This was 0, line break inside span was not handled.
-assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:br", 1);
+assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span/xhtml:br", 1);
 }
 
 void EPUBExportTest::testEscape()
@@ -345,6 +347,21 @@ void EPUBExportTest::testEscape()
 assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[3]", "\t");
 }
 
+void EPUBExportTest::testParaCharProps()
+{
+createDoc("para-char-props.fodt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// Check formatting of the middle span.
+OString aMiddle = getXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]", 
"class").toUtf8();
+std::map< OString, std::vector > aCssDoc;
+parseCssExport("OEBPS/styles/stylesheet.css", aCssDoc);
+assertCss(aCssDoc, aMiddle, "  font-style: italic;");
+// Direct para formatting was lost, only direct char formatting was
+// written, so this failed.
+assertCss(aCssDoc, aMiddle, "  font-weight: bold;");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git a/writerperfect/qa/unit/data/writer/epubexport/para-char-props.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/para-char-props.fodt
new file mode 100644
index ..67fe02db2bc5
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/para-char-props.fodt
@@ -0,0 +1,16 @@
+
+
+  
+
+  
+
+
+  
+
+  
+  
+
+  abc
+
+  
+
diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
index e660a34b1e30..8e19475b65fe 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -74,7 +74,7 @@ namespace exp
 class XMLSpanContext : public XMLImportContext
 {
 public:
-XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropertyList 
*pPropertyList);
+XMLSpanContext(XMLImport &rImport, const librevenge::RVNGPropertyList 
&rPropertyList);
 
 XMLImportContext *CreateChildContext(const OUString &rName, const 
css::uno::Reference &xAttribs) override;
 
@@ -85,14 +85,11 @@ private:
 librevenge::RVNGPropertyList m_aPropertyList;
 };
 
-XMLSpanContext::XMLSpanContext(XMLImport &rImport, const 
librevenge::RVNGPropertyList *pPropertyList)
+XMLSpanContext::XMLSpanContext(XMLImport &rImport, const 
librevenge::RVNGPropertyList &rPropertyList)
 : XMLImportContext(rImport)
 {
-if (!pPropertyList)
-return;
-
-// Inherit properties from parent span.

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

[Jan Holesovsky]

 loleaflet/main.js |3 ++-
 loleaflet/src/core/Socket.js  |6 +-
 loleaflet/src/layer/tile/TileLayer.js |7 ++-
 loleaflet/src/map/Map.js  |3 ++-
 loleaflet/src/map/handler/Map.FileInserter.js |6 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit c5fc1594e1295b2bfb7484aaebe025774e2117ce
Author: Jan Holesovsky 
Date:   Fri Sep 8 16:42:28 2017 +0200

HA: Pass WOPISrc= param in all the requests that need to...

...end up in the same loolwsd instance.

Change-Id: I69c4f5be0c0a6f4ffdec6dd571a5d62f2df4b1fb

diff --git a/loleaflet/main.js b/loleaflet/main.js
index 42660a13..ece21653 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -100,7 +100,7 @@ if (wopiSrc != '') {
docParams = wopiParams;
isWopi = true;
 } else {
-docURL = filePath;
+   docURL = filePath;
docParams = {};
 }
 
@@ -114,6 +114,7 @@ var map = L.map('map', {
documentContainer: 'document-container',
debug: debugMode,
wopi: isWopi,
+   wopiSrc: wopiSrc,
alwaysActive: alwaysActive,
idleTimeoutSecs: idleTimeoutSecs,  // Dim when user is idle.
outOfFocusTimeoutSecs: outOfFocusTimeoutSecs // Dim after switching 
tabs.
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index fbdfd340..4614a00d 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -22,7 +22,11 @@ L.Socket = L.Class.extend({
if (map.options.permission) {
map.options.docParams['permission'] = 
map.options.permission;
}
-   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws');
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
+   this.socket = new WebSocket(map.options.server + 
'/lool/' + encodeURIComponent(map.options.doc + '?' + 
$.param(map.options.docParams)) + '/ws' + wopiSrc);
this.socket.onerror = L.bind(this._onSocketError, this);
this.socket.onclose = L.bind(this._onSocketClose, this);
this.socket.onopen = L.bind(this._onSocketOpen, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index aed686f4..d5ffef57 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -537,8 +537,13 @@ L.TileLayer = L.GridLayer.extend({
var command = this._map._socket.parseServerCmd(textMsg);
var parser = document.createElement('a');
parser.href = this._map.options.server;
+
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
var url = this._map.options.webserver + '/' + 
this._map.options.urlPrefix + '/' +
-   encodeURIComponent(this._map.options.doc) + '/' + 
command.jail + '/' + command.dir + '/' + command.name;
+   encodeURIComponent(this._map.options.doc) + '/' + 
command.jail + '/' + command.dir + '/' + command.name + wopiSrc;
 
this._map.hideBusy();
if (command.id === 'print') {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index fca9e8c6..d66d75f4 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -18,7 +18,8 @@ L.Map = L.Evented.extend({
defaultZoom: 10,
tileWidthTwips: 3840,
tileHeightTwips: 3840,
-   urlPrefix: 'lool'
+   urlPrefix: 'lool',
+   wopiSrc: ''
},
 
lastActiveTime: Date.now(),
diff --git a/loleaflet/src/map/handler/Map.FileInserter.js 
b/loleaflet/src/map/handler/Map.FileInserter.js
index f6388dbb..7b6811b0 100644
--- a/loleaflet/src/map/handler/Map.FileInserter.js
+++ b/loleaflet/src/map/handler/Map.FileInserter.js
@@ -14,8 +14,12 @@ L.Map.FileInserter = L.Handler.extend({
this._toInsert = {};
var parser = document.createElement('a');
parser.href = map.options.server;
+   var wopiSrc = '';
+   if (map.options.wopiSrc != '') {
+   wopiSrc = '?WOPISrc=' + map.options.wopiSrc;
+   }
this._url = map.options.webserver + '/' + map.options.urlPrefix 
+
-   '/' + encodeURIComponent(map.options.doc) + 
'/insertfile';
+   '/' + encodeURIComponent(map.options.doc) + 
'/insertfile' + wopiSrc;
},
 
addHooks: function () {

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

[Stephan Bergmann]

 external/openldap/UnpackedTarball_openldap.mk |3 
 external/openldap/automake.patch  | 3654 ++
 2 files changed, 3657 insertions(+)

New commits:
commit 8d1c4032ed284e656300801b62c982e212315a07
Author: Stephan Bergmann 
Date:   Fri Sep 8 16:54:11 2017 +0200

external/openldap: Update config.{guess,sub}

...with versions of those files from the latest
.

The current versions failed for a Flathub aarch64 test build, see
.

Change-Id: I782371c88cf1c46bdee4f14a82b58f673f40e982

diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index 44c192e65dab..74d6908b5623 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -11,8 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,openldap,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
+   external/openldap/automake.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openldap/automake.patch b/external/openldap/automake.patch
new file mode 100644
index ..6f2ebd6c0330
--- /dev/null
+++ b/external/openldap/automake.patch
@@ -0,0 +1,3654 @@
+--- build/config.guess
 build/config.guess
+@@ -1,15 +1,12 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+-#   Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+-timestamp='2010-09-24-OpenLDAP'
+-# $OpenLDAP$
++timestamp='2014-11-04'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
++# the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful, but
+@@ -18,26 +15,22 @@
+ # General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see .
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-
+-# Originally written by Per Bothner.  Please send patches (context
+-# diff format) to  and include a ChangeLog
+-# entry.
++# the same distribution terms that you use for the rest of that
++# program.  This Exception is an additional permission under section 7
++# of the GNU General Public License, version 3 ("GPLv3").
+ #
+-# This script attempts to guess a canonical system name similar to
+-# config.sub.  If it succeeds, it prints the system name on stdout, and
+-# exits with 0.  Otherwise, it exits with 1.
++# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+ #
+ # You can get the latest version of this script from:
+ # 
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++#
++# Please send patches to .
++
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -57,9 +50,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+-Software Foundation, Inc.
++Copyright 1992-2014 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -93,7 +84,7 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' HUP INT TERM
++trap 'exit 1' 1 2 15
+ 
+ # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+ # compiler to aid in system detection is discouraged as it requires
+@@ -107,7 +98,7 @@
+ 
+ set_cc_for_build='
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) 
&& exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT 
PIPE TERM ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 
15 ;
+ : ${TMPDIR=/tmp} ;
+  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n 
"$tmp" && test 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - javaunohelper/com

[Damjan Jovanovic]

 javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2d382cef5450cf1593322184649257d3666cbbd8
Author: Damjan Jovanovic 
Date:   Fri Sep 8 02:17:19 2017 +

Fix a locking bug in our Java ComponentBase class, where after the 
transition

to disposed, the relevant variables (bDisposed and bInDispose) are written 
to
outside a synchronized block.

The equivalent C++ implementation in main/cppuhelper/source/implbase.cxx,
method WeakComponentImplHelperBase::dispose(), already does this.

Patch by: me

diff --git a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java 
b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
index 12e408fb09f1..2c2a3ed42c60 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java
@@ -92,8 +92,11 @@ public class ComponentBase extends WeakBase implements 
XComponent
 {
 // finally makes sure that the  flags are set even if a 
RuntimeException is thrown.
 // That ensures that this function is only called once.
-bDisposed= true;
-bInDispose= false;
+synchronized (this)
+{
+bDisposed= true;
+bInDispose= false;
+}
 }
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 extensions/source/scanner/sane.cxx |2 +-
 sd/source/ui/slidesorter/view/SlsTheme.cxx |8 
 svx/source/dialog/swframeposstrings.cxx|2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2687a5aca143c53c364cb44993ca601b8dd1c65e
Author: Noel Grandin 
Date:   Fri Sep 8 13:43:16 2017 +0200

-Werror,-Wtautological-compare with latest clang

Change-Id: I073f1893b759f8d31a24187f542b031b86dc4b8a
error: comparison of unsigned enum expression >= 0 is always true
[-Werror,-Wtautological-compare]
Reviewed-on: https://gerrit.libreoffice.org/42103
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/extensions/source/scanner/sane.cxx 
b/extensions/source/scanner/sane.cxx
index db8ef50d186c..80b6bb30f5c9 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -623,7 +623,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
   "SANE_FRAME_RED", "SANE_FRAME_GREEN",
   "SANE_FRAME_BLUE", "Unknown !!!" };
 fprintf( stderr, "Parameters for frame %d:\n", nStream );
-if( aParams.format < 0 || aParams.format > 4 )
+if( aParams.format > 4 )
 aParams.format = (SANE_Frame)5;
 fprintf( stderr, "format:   %s\n", ppFormats[ 
(int)aParams.format ] );
 fprintf( stderr, "last_frame:   %s\n", aParams.last_frame ? 
"TRUE" : "FALSE" );
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx 
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index dd5c0e164d9f..4ff6c44c6e20 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -162,7 +162,7 @@ std::shared_ptr Theme::GetFont (
 
 ColorData Theme::GetColor (const ColorType eType)
 {
-if (eType>=0 && sal_uInt32(eType)=0 && size_t(eType)=0 && size_t(eType)=0 && size_t(eType)= 0 && eId < STR_MAX, "invalid StringId");
-if(!(eId >= 0 && eId < STR_MAX))
+if(!(eId < STR_MAX))
 eId = LEFT;
 return SvxResId(RID_SVXSW_FRAMEPOSITIONS[eId]);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svx/svddrag.hxx|   53 -
 svx/source/svdraw/svddrag.cxx  |   37 ++--
 svx/source/svdraw/svdocirc.cxx |2 -
 svx/source/svdraw/svdopath.cxx |4 +--
 4 files changed, 42 insertions(+), 54 deletions(-)

New commits:
commit 030273e2e28ef9c4d2118ca3851c64498dfe000a
Author: Noel Grandin 
Date:   Fri Sep 8 13:30:05 2017 +0200

clean up SdrDragStat

- some light formatting in the header file
- change aPnts from std::vector to std::vector, no point
in dynamically allocating a small value class
- rename aPnts -> mvPnts
- use std::unique_ptr for userdata
- rename pUser to mpUserData
- change some methods protected->private, since nothing external is
using them

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

diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 608d32bfdfbd..4766863a045d 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 // Status information for specialized object dragging. In order for the model
@@ -47,7 +48,7 @@ protected:
 SdrHdl*  pHdl;  // The Handle for the User
 SdrView* pView;
 SdrPageView* pPageView;
-std::vector aPnts; // All previous Points: [0]=Start, 
[Count()-2]=Prev
+std::vector mvPnts; // All previous Points: [0]=Start, 
[Count()-2]=Prev
 Point aRef1; // Referencepoint: Resize fixed point, (axis of 
rotation,
 Point aRef2; // axis of reflection, ...)
 Point aPos0; // Position at the last Event
@@ -72,26 +73,25 @@ protected:
 bool  bOrtho8;
 
 SdrDragMethod* pDragMethod;
+std::unique_ptr  mpUserData; // Userdata
 
-protected:
 void Clear(bool bLeaveOne);
-Point& Pnt(sal_uIntPtr nNum)   { return 
*aPnts[nNum]; }
-//public:
-SdrDragStatUserData*pUser; // Userdata
+protected:
+Point&   Pnt(sal_uIntPtr nNum)   { return mvPnts[nNum]; }
 public:
-SdrDragStat(): aPnts()   { pUser=nullptr; Reset(); 
}
-~SdrDragStat()   { Clear(false); }
+SdrDragStat(){ Reset(); }
+~SdrDragStat();
 void Reset();
 SdrView* GetView() const { return pView; }
 void SetView(SdrView* pV){ pView=pV; }
 SdrPageView* GetPageView() const { return pPageView; }
 void SetPageView(SdrPageView* pPV)   { pPageView=pPV; }
-const Point& GetPoint(sal_uIntPtr nNum) const{ return *aPnts[nNum]; }
-sal_uIntPtrGetPointCount() const   { return aPnts.size(); }
+const Point& GetPoint(sal_uIntPtr nNum) const{ return mvPnts[nNum]; }
+sal_uIntPtr  GetPointCount() const   { return mvPnts.size(); }
 const Point& GetStart() const{ return GetPoint(0); }
 Point&   Start() { return Pnt(0); }
 const Point& GetPrev() const { return 
GetPoint(GetPointCount()-(GetPointCount()>=2 ? 2:1)); }
-Point& Prev(){ return 
Pnt(GetPointCount()-(GetPointCount()>=2 ? 2:1)); }
+Point&   Prev()  { return 
Pnt(GetPointCount()-(GetPointCount()>=2 ? 2:1)); }
 const Point& GetPos0() const { return aPos0;  }
 const Point& GetNow() const  { return 
GetPoint(GetPointCount()-1); }
 Point&   Now()   { return 
Pnt(GetPointCount()-1); }
@@ -103,8 +103,8 @@ public:
 Point&   Ref2()  { return aRef2;  }
 constSdrHdl* GetHdl() const  { return pHdl;   }
 void SetHdl(SdrHdl* pH)  { pHdl=pH;   }
-SdrDragStatUserData* GetUser() const { return pUser;  }
-void SetUser(SdrDragStatUserData* pU){ pUser=pU; }
+SdrDragStatUserData* GetUser() const { return 
mpUserData.get();  }
+void SetUser(std::unique_ptr pU) { mpUserData 
= std::move(pU); }
 bool IsShown() const { return bShown; }
 void SetShown(bool bOn)  { bShown=bOn; }
 
@@ -143,25 +143,24 @@ public:
 bool IsMouseDown() const  { return !bMouseIsUp; }
 void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; }
 
-static Point KorregPos(const Point& rNow, const Point& rPrev);
-void  Reset(const Point& rPnt);
-void  NextMove(const Point& rPnt);
-void  NextPoint();
-void  PrevPoint();
-bool CheckMinMoved(const Point& rPnt);
-long  GetDX() const { return 
GetNow().X(

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkdata.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 64c51f83fde713c7887fee608e35d6fb7492a064
Author: Caolán McNamara 
Date:   Thu Sep 7 16:47:04 2017 +0100

tdf#110737 set user-events to a lower priority than system redraw

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

diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index f59034a50657..559819aab026 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -831,7 +831,10 @@ void GtkData::PostUserEvent()
 else // nothing pending anyway
 {
 m_pUserEvent = g_idle_source_new();
-g_source_set_priority (m_pUserEvent, G_PRIORITY_HIGH);
+// tdf#110737 set user-events to a lower priority than system redraw
+// events, which is G_PRIORITY_HIGH_IDLE + 20, so presentations
+// queue-redraw has a chance to be fulfilled
+g_source_set_priority (m_pUserEvent,  G_PRIORITY_HIGH_IDLE + 30);
 g_source_set_can_recurse (m_pUserEvent, TRUE);
 g_source_set_callback (m_pUserEvent, call_userEventFn,
static_cast(this), nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/libepubgen writerperfect/qa writerperfect/source

[Miklos Vajna]

 external/libepubgen/libepubgen-epub3.patch.1 |   29 +
 writerperfect/qa/unit/EPUBExportTest.cxx |   15 
 writerperfect/qa/unit/data/writer/epubexport/escape.fodt |   16 +
 writerperfect/source/writer/exp/txtparai.cxx |   46 +++
 4 files changed, 106 insertions(+)

New commits:
commit a27eb931c22313d4dd5c73b35358c0532d20b79e
Author: Miklos Vajna 
Date:   Fri Sep 8 12:02:51 2017 +0200

EPUB export: fix double escaped NBSP

The EPUB package interface already XML-escapes characters, avoid a double
escape.

And once that works, handle NBSP/tabs.

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

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 0415bf340e78..8e62660ea566 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -1906,3 +1906,32 @@ index 1661064..3340643 100644
 -- 
 2.12.3
 
+From bce7c05a18a4c5089d5ac77bc61b9f6978e7224b Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Fri, 8 Sep 2017 11:21:32 +0200
+Subject: [PATCH] EPUBHTMLGenerator: write un-escaped NBSP
+
+Package implementations are supposed to take care of escaping, like it
+was already a requirement for normal text.
+---
+ src/lib/EPUBHTMLGenerator.cpp  |  3 ++-
+ src/test/EPUBTextGeneratorTest.cpp | 18 ++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/EPUBHTMLGenerator.cpp b/src/lib/EPUBHTMLGenerator.cpp
+index aa09332..ed968bf 100644
+--- a/src/lib/EPUBHTMLGenerator.cpp
 b/src/lib/EPUBHTMLGenerator.cpp
+@@ -681,7 +681,8 @@ void EPUBHTMLGenerator::insertSpace()
+ {
+   if (m_impl->m_ignore)
+ return;
+-  m_impl->output().insertCharacters(" ");
++  // NBSP.
++  m_impl->output().insertCharacters("\xc2\xa0");
+ }
+ 
+ void EPUBHTMLGenerator::openOrderedListLevel(const RVNGPropertyList &propList)
+-- 
+2.12.3
+
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 0d869737fc8e..10fd5eb5a94a 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -63,6 +63,7 @@ public:
 void testNamedStyleInheritance();
 void testNestedSpan();
 void testLineBreak();
+void testEscape();
 
 CPPUNIT_TEST_SUITE(EPUBExportTest);
 CPPUNIT_TEST(testOutlineLevel);
@@ -77,6 +78,7 @@ public:
 CPPUNIT_TEST(testNamedStyleInheritance);
 CPPUNIT_TEST(testNestedSpan);
 CPPUNIT_TEST(testLineBreak);
+CPPUNIT_TEST(testEscape);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -330,6 +332,19 @@ void EPUBExportTest::testLineBreak()
 assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:br", 1);
 }
 
+void EPUBExportTest::testEscape()
+{
+createDoc("escape.fodt", {});
+
+mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+// This was lost.
+assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[1]", 
OUString::fromUtf8("\xc2\xa0"));
+// Make sure escaping happens only once.
+assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[2]", "a&b");
+// This was also lost.
+assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[3]", "\t");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
 
 }
diff --git a/writerperfect/qa/unit/data/writer/epubexport/escape.fodt 
b/writerperfect/qa/unit/data/writer/epubexport/escape.fodt
new file mode 100644
index ..8d23fb36ef1d
--- /dev/null
+++ b/writerperfect/qa/unit/data/writer/epubexport/escape.fodt
@@ -0,0 +1,16 @@
+
+http://openoffice.org/2009/office"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+  
+
+  
+
+
+  
+
+  
+  
+
+  a&b
+
+  
+
diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
index b085537cf106..e660a34b1e30 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -152,6 +152,48 @@ void XMLLineBreakContext::startElement(const OUString 
&/*rName*/, const css::uno
 mrImport.GetGenerator().insertLineBreak();
 }
 
+/// Handler for .
+class XMLSpaceContext : public XMLImportContext
+{
+public:
+XMLSpaceContext(XMLImport &rImport);
+
+void SAL_CALL startElement(const OUString &rName, const 
css::uno::Reference &xAttribs) override;
+};
+
+XMLSpaceContext::XMLSpaceContext(XMLImport &rImport)
+: XMLImportContext(rImport)
+{
+}
+
+void XMLSpaceContext::startElement(const OUString &/*rName*/, const 
css::uno::Reference &/*xAttribs*/)
+{
+mrImport.GetGenerator().openSpan(librevenge::RVNGPropertyList());
+mrImport.GetGenerator().insertSpace();
+mrImport.GetGenerator().closeSpan();
+}
+
+/// Handler for .
+class XMLTabContext : public XMLImportContext
+{
+public:
+XMLTabContext(XML

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

[Eike Rathke]

 sc/source/ui/cctrl/checklistmenu.cxx |   25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit 9c34c9c2409a8f09c3373d314ef7872d7c2aee92
Author: Eike Rathke 
Date:   Fri Sep 8 13:41:52 2017 +0200

Inspecting children is only necessary if parent is selected

Change-Id: I9980bef27442504f59f5a85e655a761c5d35a012

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 74c5f6df301a..d2c16a98ebc5 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1649,20 +1649,23 @@ void ScCheckListBox::GetRecursiveChecked( 
SvTreeListEntry* pEntry, std::unordere
 rLabel = GetEntryText(pEntry);
 else
 rLabel = GetEntryText(pEntry) + ";" + rLabel;
-}
 
-if (pEntry->HasChildren())
-{
-const SvTreeListEntries& rChildren = pEntry->GetChildEntries();
-for (auto& rChild : rChildren)
+// Prerequisite: the selection mechanism guarantees that if a child is
+// selected then also the parent is selected, so we only have to
+// inspect the children in case the parent is selected.
+if (pEntry->HasChildren())
 {
-OUString aLabel = rLabel;
-GetRecursiveChecked( rChild.get(), vOut, aLabel);
-if (!aLabel.isEmpty() && aLabel != rLabel)
-vOut.insert( aLabel);
+const SvTreeListEntries& rChildren = pEntry->GetChildEntries();
+for (auto& rChild : rChildren)
+{
+OUString aLabel = rLabel;
+GetRecursiveChecked( rChild.get(), vOut, aLabel);
+if (!aLabel.isEmpty() && aLabel != rLabel)
+vOut.insert( aLabel);
+}
+// Let the caller not add the parent alone.
+rLabel.clear();
 }
-// Let the caller not add the parent alone.
-rLabel.clear();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/borderline3' - drawinglayer/CppunitTest_drawinglayer_border.mk drawinglayer/qa drawinglayer/source include/drawinglayer svx/source sw/source

[Armin Le Grand]

 drawinglayer/CppunitTest_drawinglayer_border.mk|1 
 drawinglayer/qa/unit/border.cxx|  105 +
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx  |  434 +++-
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx |  124 --
 svx/source/dialog/framelink.cxx|  703 +++--
 svx/source/dialog/framelinkarray.cxx   |   10 
 sw/source/core/layout/paintfrm.cxx |  187 +--
 7 files changed, 572 insertions(+), 992 deletions(-)

New commits:
commit bbdcbceed51c08c0f4f1653a4af225d2231cf462
Author: Armin Le Grand 
Date:   Fri Sep 8 13:39:29 2017 +0200

borderline: Adapted BorderLinePrimitive2D and usages

Big changes to BorderLinePrimitive2D and BorderLine, freeing
it from one/three entries, going to a free definition using
gaps with width but without color. Adapted usages and creation,
not yet tested much

Change-Id: Ic1255a790401901c3166d200205bc23322b37185

diff --git a/drawinglayer/CppunitTest_drawinglayer_border.mk 
b/drawinglayer/CppunitTest_drawinglayer_border.mk
index 194c86a6e8ca..fa2f715590cd 100644
--- a/drawinglayer/CppunitTest_drawinglayer_border.mk
+++ b/drawinglayer/CppunitTest_drawinglayer_border.mk
@@ -25,6 +25,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,drawinglayer_border, \
test \
tl \
unotest \
+   svt \
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,drawinglayer_border,\
diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx
index a070f9cdff24..e56a40dac379 100644
--- a/drawinglayer/qa/unit/border.cxx
+++ b/drawinglayer/qa/unit/border.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -49,7 +50,7 @@ void DrawinglayerBorderTest::testDoubleDecompositionSolid()
 // 1.47 pixels is 0.03cm at 130% zoom and 96 DPI.
 basegfx::B2DPoint aStart(0, 20);
 basegfx::B2DPoint aEnd(100, 20);
-double fLeftWidth = 1.47;
+double const fLeftWidth = 1.47;
 double const fDistance = 1.47;
 double const fRightWidth = 1.47;
 double const fExtendLeftStart = 0;
@@ -58,30 +59,39 @@ void DrawinglayerBorderTest::testDoubleDecompositionSolid()
 double const fExtendRightEnd = 0;
 basegfx::BColor aColorRight;
 basegfx::BColor aColorLeft;
-basegfx::BColor aColorGap;
-bool const bHasGapColor = false;
-SvxBorderLineStyle const nStyle = SvxBorderLineStyle::DOUBLE;
+const std::vector 
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
+const drawinglayer::attribute::StrokeAttribute aStrokeAttribute(aDashing);
+std::vector< drawinglayer::primitive2d::BorderLine > aBorderlines;
+
+aBorderlines.push_back(
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(
+aColorLeft,
+fLeftWidth),
+fExtendLeftStart,
+fExtendLeftStart,
+fExtendLeftEnd,
+fExtendLeftEnd));
+
+aBorderlines.push_back(
+drawinglayer::primitive2d::BorderLine(fDistance));
+
+aBorderlines.push_back(
+drawinglayer::primitive2d::BorderLine(
+drawinglayer::attribute::LineAttribute(
+aColorRight,
+fRightWidth),
+fExtendRightStart,
+fExtendRightStart,
+fExtendRightEnd,
+fExtendRightEnd));
+
 rtl::Reference aBorder(
 new drawinglayer::primitive2d::BorderLinePrimitive2D(
 aStart,
 aEnd,
-drawinglayer::primitive2d::BorderLine(
-fLeftWidth,
-aColorLeft,
-drawinglayer::primitive2d::BorderLineExtend(
-fExtendLeftStart,
-fExtendLeftEnd)),
-drawinglayer::primitive2d::BorderLine(
-fDistance,
-aColorGap),
-drawinglayer::primitive2d::BorderLine(
-fRightWidth,
-aColorRight,
-drawinglayer::primitive2d::BorderLineExtend(
-fExtendRightStart,
-fExtendRightEnd)),
-bHasGapColor,
-nStyle));
+aBorderlines,
+aStrokeAttribute));
 
 // Decompose it into polygons.
 drawinglayer::geometry::ViewInformation2D aView;
@@ -126,33 +136,42 @@ void DrawinglayerBorderTest::testDoublePixelProcessing()
 double const fExtendRightEnd = 0;
 basegfx::BColor aColorRight;
 basegfx::BColor aColorLeft;
-basegfx::BColor aColorGap;
-bool const bHasGapColor = false;
-SvxBorderLineStyle const nStyle = SvxBorderLineStyle::DOUBLE;
-rtl::Reference xBorder(
+const std::vector 
aDashing(svtools::GetLineDashing(SvxBorderLineStyle::DOUBLE, 10.0));
+const drawinglayer::attribute::StrokeAttribute aStrokeAttribute(aDashing);
+std::vector< drawinglayer::primitive2d::

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

[Takeshi Abe]

 include/svx/svddrag.hxx   |1 +
 svx/source/svdraw/svddrag.cxx |2 ++
 2 files changed, 3 insertions(+)

New commits:
commit ecc64b73cf554a772a3e2eb987b83b6e8245266f
Author: Takeshi Abe 
Date:   Fri Sep 8 18:28:29 2017 +0900

svx: Make SdrDragStatUserData's dtor pure virtual

to clarify that it is an abstract base class, and to avoid memleak
when deleting derived instance as pUser in SdrDragStat::Clear().

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

diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 6764e71b0cf7..608d32bfdfbd 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -39,6 +39,7 @@ class SdrDragMethod;
 
 struct SVX_DLLPUBLIC SdrDragStatUserData
 {
+virtual ~SdrDragStatUserData() = 0;
 };
 
 class SVX_DLLPUBLIC SdrDragStat {
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index d527c9865d8e..f9d943f009c5 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -20,6 +20,8 @@
 #include 
 #include 
 
+SdrDragStatUserData::~SdrDragStatUserData() = default;
+
 void SdrDragStat::Clear(bool bLeaveOne)
 {
 while (!aPnts.empty()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/qa sw/source

[Tamás Zolnai]

 sw/qa/extras/ooxmlexport/data/tdf112169.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |5 +
 sw/source/filter/ww8/ww8atr.cxx |4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9b3e2486d8e96b6fdd844fbdb5fa59c7782e82ee
Author: Tamás Zolnai 
Date:   Sun Sep 3 14:56:48 2017 +0200

tdf#112169: Crash while saving character background color to DOCX

Reviewed-on: https://gerrit.libreoffice.org/41857
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 242688f3b4fc7228637837e0f4fec3da71ac2710)

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf112169.odt 
b/sw/qa/extras/ooxmlexport/data/tdf112169.odt
new file mode 100755
index ..51bb97f2e1e8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf112169.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 1925600de5e9..0fb8fb5cee88 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -274,6 +274,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107684, "tdf107684.odt")
 assertXPath(pXmlDoc, 
"//w:style[@w:styleId='Heading1']/w:pPr/w:outlineLvl", 1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(tdf112169, "tdf112169.odt")
+{
+// LO crashed while export because of chararacter background color handling
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 1e0b84710215..3f01f95fc36d 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5172,8 +5172,10 @@ void AttributeOutputBase::CharBackgroundBase( const 
SvxBrushItem& rBrush )
 bool bHasShadingMarker = false;
 
 // Check shading marker
+const SfxPoolItem* pItem = GetExport().HasItem(RES_CHRATR_GRABBAG);
+if( pItem )
 {
-const SfxGrabBagItem& aGrabBag = static_cast< const SfxGrabBagItem& >( 
GetExport().GetItem( RES_CHRATR_GRABBAG ) );
+const SfxGrabBagItem aGrabBag = static_cast< const SfxGrabBagItem& 
>(*pItem);
 const std::map& rMap = aGrabBag.GetGrabBag();
 auto aIterator = rMap.find("CharShadingMarker");
 if( aIterator != rMap.end() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/cctrl/checklistmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd5ac4c4f5de9ef475156dafcba1b37a56b5cb8d
Author: Eike Rathke 
Date:   Fri Sep 8 13:13:54 2017 +0200

If children then insert only if a child is selected, tdf#112258 follow-up

Otherwise the chain down to the parent would be pickable, though in 
practice it
doesn't have a consequence as only leaves are picked. However, inserting to 
the
set can be avoided.

Change-Id: I6a6b63b2d7c031a2dd13d8cc7d98f15e1f946298

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index e4f04da83504..74c5f6df301a 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1658,7 +1658,7 @@ void ScCheckListBox::GetRecursiveChecked( 
SvTreeListEntry* pEntry, std::unordere
 {
 OUString aLabel = rLabel;
 GetRecursiveChecked( rChild.get(), vOut, aLabel);
-if (!aLabel.isEmpty())
+if (!aLabel.isEmpty() && aLabel != rLabel)
 vOut.insert( aLabel);
 }
 // Let the caller not add the parent alone.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

mac os build hung

[Norbert Thiebaud]

a slave bot got hung in libtest_chart2 somewhere in some opencl code:


Sampling process 11291 for 3 seconds with 1 millisecond of run time
between samples
Sampling completed, processing symbols...
Analysis of sampling cppunittester (pid 11291) every 1 millisecond
Process: cppunittester [11291]
Path:
/Users/tdf/lode/jenkins/workspace/lo_tb_master_mac_dbg/workdir/LinkTarget/Executable/cppunittester
Load Address:0x10c3f2000
Identifier:  cppunittester
Version: 0
Code Type:   X86-64
Parent Process:  ??? [1]

Date/Time:   2017-09-08 05:47:08.774 -0500
Launch Time: 2017-09-07 16:02:40.215 -0500
OS Version:  Mac OS X 10.12.6 (16G29)
Report Version:  7
Analysis Tool:   /usr/bin/sample


Call graph:
2013 Thread_216247   DispatchQueue_1: com.apple.main-thread  (serial)
+ 2013 start  (in libdyld.dylib) + 1  [0x7fffb1449235]
+   2013 main  (in cppunittester) + 39  [0x10c3f37f7]  cppunittester.cxx:373
+ 2013 sal_main()  (in cppunittester) + 3769  [0x10c3f46c9]
cppunittester.cxx:466
+   2013 (anonymous namespace)::ProtectedFixtureFunctor::run()
const  (in cppunittester) + 2890  [0x10c3f5b2a]  cppunittester.cxx:316
+ 2013 CppUnit::TestRunner::run(CppUnit::TestResult&,
std::__1::basic_string,
std::__1::allocator > const&)  (in libcppunit-1.14.0.dylib) +
104  [0x10c5c0e88]  TestRunner.cpp:96
+   2013 CppUnit::TestResult::runTest(CppUnit::Test*)  (in
libcppunit-1.14.0.dylib) + 82  [0x10c5b40a2]  TestResult.cpp:149
+ 2013
CppUnit::TestRunner::WrappingSuite::run(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 78  [0x10c5c0bae]  TestRunner.cpp:47
+   2013
CppUnit::TestComposite::run(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 90  [0x10c598c4a]  TestComposite.cpp:23
+ 2013
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 125  [0x10c598dcd]  TestComposite.cpp:64
+   2013
CppUnit::TestComposite::run(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 90  [0x10c598c4a]  TestComposite.cpp:23
+ 2013
CppUnit::TestComposite::doRunChildTests(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 125  [0x10c598dcd]  TestComposite.cpp:64
+   2013
CppUnit::TestCase::run(CppUnit::TestResult*)  (in
libcppunit-1.14.0.dylib) + 739  [0x10c598013]  TestCase.cpp:91
+ 2013
CppUnit::TestResult::protect(CppUnit::Functor const&, CppUnit::Test*,
std::__1::basic_string,
std::__1::allocator > const&)  (in libcppunit-1.14.0.dylib) + 99
 [0x10c5b4543]  TestResult.cpp:182
+   2013
CppUnit::ProtectorChain::protect(CppUnit::Functor const&,
CppUnit::ProtectorContext const&)  (in libcppunit-1.14.0.dylib) + 1346
 [0x10c5829b2]  ProtectorChain.cpp:86
+ 2013
CppUnit::ProtectorChain::ProtectFunctor::operator()() const  (in
libcppunit-1.14.0.dylib) + 40  [0x10c58e718]  ProtectorChain.cpp:20
+   2013
CppUnit::DefaultProtector::protect(CppUnit::Functor const&,
CppUnit::ProtectorContext const&)  (in libcppunit-1.14.0.dylib) + 79
[0x10c5645ef]  DefaultProtector.cpp:15
+ 2013
CppUnit::ProtectorChain::ProtectFunctor::operator()() const  (in
libcppunit-1.14.0.dylib) + 40  [0x10c58e718]  ProtectorChain.cpp:20
+   2013 (anonymous
namespace)::Prot::protect(CppUnit::Functor const&,
CppUnit::ProtectorContext const&)  (in unoexceptionprotector.dylib) +
79  [0x10c79bf7f]  unoexceptionprotector.cxx:63
+ 2013
CppUnit::ProtectorChain::ProtectFunctor::operator()() const  (in
libcppunit-1.14.0.dylib) + 40  [0x10c58e718]  ProtectorChain.cpp:20
+   2013 (anonymous
namespace)::Prot::protect(CppUnit::Functor const&,
CppUnit::ProtectorContext const&)  (in unobootstrapprotector.dylib) +
33  [0x10ceda9d1]  unobootstrapprotector.cxx:89
+ 2013
CppUnit::ProtectorChain::ProtectFunctor::operator()() const  (in
libcppunit-1.14.0.dylib) + 40  [0x10c58e718]  ProtectorChain.cpp:20
+   2013 (anonymous
namespace)::Protector::protect(CppUnit::Functor const&,
CppUnit::ProtectorContext const&)  (in libvclbootstrapprotector.dylib)
+ 33  [0x10d83fd31]  vclbootstrapprotector.cxx:39
+ 2013
CppUnit::TestCaseMethodFunctor::operator()() const  (in
libcppunit-1.14.0.dylib) + 110  [0x10c59871e]  TestCase.cpp:32
+   2013
CppUnit::TestCaller::runTest()  (in
libtest_chart2_import.dylib) + 25  [0x11717d409]  TestCaller.h:175
+ 2013
std::__1::function::operator()() const  (in
libtest_chart2_import.dylib) + 126  [0x11717ea6e]  functional:1817

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/qa

[Stephan Bergmann]

 sd/qa/unit/import-tests.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit dc2bcaa3967095044f025855ec95436d501554f2
Author: Stephan Bergmann 
Date:   Fri Sep 8 10:44:03 2017 +0200

Disable test on Linux x86 that makes plain 'make' fail due to -mpfmath=387

...rounding issues, and thus caused LO Flathub builds to fail, see
.

Change-Id: I91e8662e0a85b4ed8b16719eed4ade3397edfa0c
(cherry picked from commit c799497959f82c84ddaf032b096d1a3f8d6e2bcd)
Conflicts:
sd/qa/unit/import-tests.cxx
Reviewed-on: https://gerrit.libreoffice.org/42093
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index cf7fd53f731c..fd3b5721af27 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -288,7 +288,14 @@ void SdImportTest::testDocumentLayout()
 { "tdf90403.pptx", "xml/tdf90403_", PPTX, -1 },
 { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX },
 { "tdf92001.odp", "xml/tdf92001_", ODP, PPTX },
+// GCC -mpfmath=387 rounding issues in lclPushMarkerProperties
+// (oox/source/drawingml/lineproperties.cxx); see mail sub-thread starting at
+//  "Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods:
+// fails with Assertion" for how "-mfpmath=sse -msse2" would fix that:
+#if !(defined LINUX && defined X86)
 { "tdf100491.pptx", "xml/tdf100491_", PPTX, -1 },
+#endif
 // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/poppler

[David Tardon]

 download.lst  |4 +-
 external/poppler/0001-Fix-building-with-old-clang.patch.1 |   25 +
 external/poppler/UnpackedTarball_poppler.mk   |1 
 external/poppler/ubsan.patch.0|   26 +++---
 4 files changed, 42 insertions(+), 14 deletions(-)

New commits:
commit 1c983335116a6f09cabf0b3eae7f5195341e
Author: David Tardon 
Date:   Thu Sep 7 15:50:09 2017 +0200

upload poppler 0.59.0

Change-Id: I21dfa3aa04bd960cb2fb87a53213ae4bbd510a24
Reviewed-on: https://gerrit.libreoffice.org/42061
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index 6e78918b3f06..e3bb5d884e4b 100644
--- a/download.lst
+++ b/download.lst
@@ -193,8 +193,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export PNG_SHA256SUM := 
267c33270cc599d3929207869f698798f1df143aa5f9597b007c14353666
 export PNG_TARBALL := libpng-1.6.30.tar.xz
-export POPPLER_SHA256SUM := 
0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
-export POPPLER_TARBALL := poppler-0.57.0.tar.xz
+export POPPLER_SHA256SUM := 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
+export POPPLER_TARBALL := poppler-0.59.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
diff --git a/external/poppler/0001-Fix-building-with-old-clang.patch.1 
b/external/poppler/0001-Fix-building-with-old-clang.patch.1
new file mode 100644
index ..dcddd11d2967
--- /dev/null
+++ b/external/poppler/0001-Fix-building-with-old-clang.patch.1
@@ -0,0 +1,25 @@
+From dd80c182cbcb188af0dd590f222ba9bbb31e3fb7 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Mon, 4 Sep 2017 19:36:06 +0200
+Subject: [PATCH] Fix building with old clang
+
+---
+ poppler/StructElement.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/poppler/StructElement.cc b/poppler/StructElement.cc
+index 0fbd336a..451213f8 100644
+--- a/poppler/StructElement.cc
 b/poppler/StructElement.cc
+@@ -248,6 +248,8 @@ struct AttributeMapEntry {
+ };
+ 
+ struct AttributeDefaults {
++  AttributeDefaults() {}; // needed to support old clang
++
+   Object Inline  = Object(objName, "Inline");
+   Object LrTb = Object(objName, "LrTb");
+   Object Normal = Object(objName, "Normal");
+-- 
+2.13.5
+
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 8c87693b82ec..fc62974521fa 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-mac-fake.patch.1 \
external/poppler/ubsan.patch.0 \
external/poppler/poppler-libjpeg.patch.1 \
+   external/poppler/0001-Fix-building-with-old-clang.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/poppler/ubsan.patch.0 b/external/poppler/ubsan.patch.0
index e0bf164ce7fc..f6e4667dc133 100644
--- a/external/poppler/ubsan.patch.0
+++ b/external/poppler/ubsan.patch.0
@@ -9,7 +9,7 @@
  {
doc = docA;
xref = doc->getXRef();
-   aobj->copy(&obj);
+   obj = aobj->copy();
 -  Dict* dict = obj.getDict();
ref.num = ref.gen = 0;
type = ty;
@@ -23,9 +23,9 @@
 +void FormField::init(std::set *usedParents)
 +{
 +  Dict* dict = obj.getDict();
-   Object obj1;
//childs
-   if (dict->lookup("Kids", &obj1)->isArray()) {
+   Object obj1 = dict->lookup("Kids");
+   if (obj1.isArray()) {
 @@ -803,9 +806,15 @@
  //
  // FormFieldButton
@@ -80,14 +80,16 @@
numChoices = 0;
choices = NULL;
editedChoice = NULL;
-@@ -1379,9 +1400,15 @@
+@@ -1379,11 +1400,17 @@
  //
  // FormFieldSignature
  //
 -FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref& 
ref, FormField *parent, std::set *usedParents)
--  : FormField(docA, dict, ref, parent, usedParents, formSignature)
+-  : FormField(docA, dict, ref, parent, usedParents, formSignature),
 +FormFieldSignature::FormFieldSignature(PDFDoc *docA, Object *dict, const Ref& 
ref, FormField *parent)
-+  : FormField(docA, dict, ref, parent, formSignature)
++  : FormField(docA, dict, ref, parent, formSignature),
+ signature_type(adbe_pkcs7_detached),
+ signature(nullptr), signature_info(nullptr)
  {
 +}
 +
@@ -99,9 +101,9 @@
  
signature_info = new SignatureInfo();
 @@ -1691,15 +1718,15 @@
- FormField *field;
  
-

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

[Jan Holesovsky]

 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77b56b3bf670f6ea8dd98bbdbc4b45e0a5aa5dca
Author: Jan Holesovsky 
Date:   Fri Sep 8 12:22:29 2017 +0200

Actually this would be better as SAL_WARN.

Change-Id: I11c92f451ec5dcc77a7dadb948c61680c3cce444

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 2129b7f6bcaa..51c70d4b40d1 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -938,7 +938,7 @@ void PowerPointExport::WriteAnimationAttributeName(const 
FSHelperPtr& pFS, const
 }
 else
 {
-SAL_INFO("sd.eppt", "unhandled animation attribute name: " << 
rAttributeName);
+SAL_WARN("sd.eppt", "unhandled animation attribute name: " << 
rAttributeName);
 }
 
 pFS->endElementNS(XML_p, XML_attrNameLst);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/qa/extras/ww8export/ww8export2.cxx |5 +
 sw/source/filter/ww8/wrtww8.cxx   |9 +
 2 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 3c29b0ad690c77b2ec9189981da73ffaa717e30c
Author: Justin Luth 
Date:   Mon Aug 28 22:30:32 2017 -0400

tdf#112074 doc export: re-calculate indent for RTL table

In MSO tables, the only side that can have an indent is the
logical left orientation. In right-to-left tables, the indent
is measured from the physical right margin. So, we need to
re-calculate LO's physical LEFT_AND_WIDTH indent to measure
the distance from the right margin to the table.

Importing already expects this recalculated indent.

Change-Id: I9b8b7078aea8b7800cd31fbc11e2f27bd051be7d
Reviewed-on: https://gerrit.libreoffice.org/41666
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 632922f82a98..71587864e6cd 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -204,10 +204,7 @@ 
DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, "tdf112074_RTLtableJ
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left writing mode", 
text::WritingMode2::RL_TB, getProperty(xTable, "WritingMode"));
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::LEFT_AND_WIDTH, getProperty(xTable, 
"HoriOrient"));
-if ( !mbExported )
-{
-CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty(xTable, 
"LeftMargin") > 3000);
-}
+CPPUNIT_ASSERT_MESSAGE("Table Indent", getProperty(xTable, 
"LeftMargin") > 3000);
 }
 
 DECLARE_WW8EXPORT_TEST(testTdf104805, "tdf104805.doc")
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 13fa1c56272f..3b065c030afd 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2359,6 +2359,15 @@ void WW8AttributeOutput::TableDefinition( 
ww8::WW8TableNodeInfoInner::Pointer_t
 nTableOffset = rHori.GetPos();
 const SvxLRSpaceItem& rLRSp = pFormat->GetLRSpace();
 nTableOffset += rLRSp.GetLeft();
+
+// convert offset to be measured from right margin in 
right-to-left tables
+if ( nTableOffset && m_rWW8Export.TrueFrameDirection(*pFormat) 
== SvxFrameDirection::Horizontal_RL_TB )
+{
+SwTwips nLeftPageMargin, nRightPageMargin;
+const SwTwips nPageSize = 
m_rWW8Export.CurrentPageWidth(nLeftPageMargin, nRightPageMargin);
+const SwTwips nTableWidth = 
pFormat->GetFrameSize().GetWidth();
+nTableOffset = nPageSize - nLeftPageMargin - 
nRightPageMargin - nTableWidth - nTableOffset;
+}
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/qa sw/source

[Justin Luth]

 sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt |binary
 sw/qa/extras/odfexport/odfexport.cxx |6 ++
 sw/source/core/unocore/unostyle.cxx  |7 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit db7a015c86248bd2a3d090240f9360f84b3bec8c
Author: Justin Luth 
Date:   Thu Aug 24 15:48:29 2017 -0400

tdf#111891 unostyle: use default handler for non-page style

LO 5.1 commit 664197d95becd516c3dac25a50439078ba61e051
introduced a handler for RES_TEXT_VERT_ADJUST to handle
page styles, but that meant that the default handler
was no longer called for frames (the only other item
currently using RES_TEXT_VERT_ADJUST).

Change-Id: I33827160fe64dc4cc2107afc26f7ac2e698007e1
Reviewed-on: https://gerrit.libreoffice.org/41538
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
(cherry picked from commit 10dc371d31f003ac3ed9b89ca1db95d36603603f)
Reviewed-on: https://gerrit.libreoffice.org/41910
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 461aa995d75f031209711feda9d785d915c42dd2)
Reviewed-on: https://gerrit.libreoffice.org/42082

diff --git a/sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt 
b/sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt
new file mode 100644
index ..8fcf98a6272b
Binary files /dev/null and 
b/sw/qa/extras/odfexport/data/tdf111891_frameVertStyle.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index e513aaa68fd0..19f1695e025f 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -758,6 +758,12 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, 
"textframe-vertadjust.odt")
 CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, 
getProperty(xFrame, "TextVerticalAdjust"));
 }
 
+DECLARE_ODFEXPORT_TEST(testTdf111891_frameVertStyle, 
"tdf111891_frameVertStyle.odt")
+{
+uno::Reference xFrame(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, 
getProperty(xFrame, "TextVerticalAdjust"));
+}
+
 DECLARE_ODFEXPORT_TEST(testShapeRelsize, "shape-relsize.odt")
 {
 uno::Reference xShape = getShape(1);
diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index ad6dd78b687e..db6fc57152c3 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1803,8 +1803,13 @@ void SwXStyle::SetPropertyValue(const 
SfxItemPropertySimpleEntry&
 }
 }
 template<>
-void SwXStyle::SetPropertyValue(const 
SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, const uno::Any& rValue, 
SwStyleBase_Impl& o_rStyleBase)
+void SwXStyle::SetPropertyValue(const 
SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, const 
uno::Any& rValue, SwStyleBase_Impl& o_rStyleBase)
 {
+if(m_rEntry.m_eFamily != SfxStyleFamily::Page)
+{
+SetPropertyValue(rEntry, rPropSet, rValue, o_rStyleBase);
+return;
+}
 if(!m_pDoc || !rValue.has() || 
!o_rStyleBase.GetOldPageDesc())
 return;
 SwPageDesc* pPageDesc = 
m_pDoc->FindPageDesc(o_rStyleBase.GetOldPageDesc()->GetName());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/source/core/layout/paintfrm.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7117e92448ea328bd4798e873a2faecda748a369
Author: Justin Luth 
Date:   Wed Aug 30 18:08:15 2017 -0400

tdf#104602: don't re-draw page background when bOnlyTextBackground

In 2014 Writer gained support for Paragraph and PageStyle DrawingLayer
FillAttributes, it changed some behaviour with PaintBackground,
so that compat setting BACKGROUND_PARA_OVER_DRAWINGS now overwrote
the entire "hell" layer as the page background was re-applied.

Only DOCX uses this 2012 compatibility setting.

Change-Id: I69517efb7d82acd719d6a27a09ba61554dbf1ec9
Reviewed-on: https://gerrit.libreoffice.org/41744
Reviewed-by: Justin Luth 
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit de0993097cad2fd5819f8bea5ff53cddce7cde41)
Reviewed-on: https://gerrit.libreoffice.org/41902

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 008e26f9efef..61a818d415e1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6557,7 +6557,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const 
SwPageFrame *pPage,
 if( IsTextFrame() || IsSctFrame() )
 aPaintRect = UnionFrame( true );
 
-if ( aPaintRect.IsOver( rRect ) )
+if ( (!bOnlyTextBackground || IsTextFrame()) && aPaintRect.IsOver( rRect ) 
)
 {
 if ( bBack || bPageFrame || !bLowerMode )
 {
@@ -6651,7 +6651,6 @@ void SwFrame::PaintBackground( const SwRect &rRect, const 
SwPageFrame *pPage,
 // background transparency have to be considered
 // Set missing 5th parameter to the default value 
GRFNUM_NO
 // - see declaration in /core/inc/frmtool.hxx.
-if (IsTextFrame() || !bOnlyTextBackground)
 ::DrawGraphic(
 pItem,
 pOut,
@@ -6696,7 +6695,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const 
SwPageFrame *pPage,
 if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) ||
  aFrameRect.IsOver( aRect ) )
 pFrame->PaintBackground( aRect, pPage, rTmpAttrs, bLowMode,
-   bLowerBorder );
+   bLowerBorder, bOnlyTextBackground );
 if ( bLowerBorder )
 pFrame->PaintBorder( aBorderRect, pPage, rTmpAttrs );
 }
___
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-5.3' - sd/qa sd/source

[Jan Holesovsky]

 sd/qa/unit/data/pptx/tdf112280.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   15 +
 sd/source/filter/eppt/pptx-epptooxml.cxx |   84 +++
 3 files changed, 89 insertions(+), 10 deletions(-)

New commits:
commit 38aa31db63b950f11af3feccb889ab34b6a6099f
Author: Jan Holesovsky 
Date:   Thu Sep 7 19:26:07 2017 +0200

tdf#112280: Export spin animation in PPTX.

Contains also:

tdf#112280: Unit test.

Change-Id: I9f13bbc2bd3a3de582491ea5b2ad16535589420a
Reviewed-on: https://gerrit.libreoffice.org/42079
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sd/qa/unit/data/pptx/tdf112280.pptx 
b/sd/qa/unit/data/pptx/tdf112280.pptx
new file mode 100644
index ..39c2aa4cb1b8
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf112280.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 5586564a33e5..531f97b153c9 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -106,6 +106,7 @@ public:
 void testTdf105739();
 void testTdf111518();
 void testTdf106867();
+void testTdf112280();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -135,6 +136,7 @@ public:
 CPPUNIT_TEST(testTdf105739);
 CPPUNIT_TEST(testTdf111518);
 CPPUNIT_TEST(testTdf106867);
+CPPUNIT_TEST(testTdf112280);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -840,6 +842,19 @@ void SdOOXMLExportTest2::testTdf106867()
 "spid", "42");
 }
 
+void SdOOXMLExportTest2::testTdf112280()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112280.pptx"), 
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+// check the animRot value
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent, 
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animRot",
+"by", "2160");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index d4d8fe6908b4..7557a73e5a4d 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -41,12 +41,14 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -912,6 +914,16 @@ void PowerPointExport::WriteAnimationAttributeName( const 
FSHelperPtr& pFS, cons
 pFS->writeEscaped("ppt_y");
 pFS->endElementNS(XML_p, XML_attrName);
 }
+else if (rAttributeName == "Rotate")
+{
+pFS->startElementNS(XML_p, XML_attrName, FSEND);
+pFS->writeEscaped("r");
+pFS->endElementNS(XML_p, XML_attrName);
+}
+else
+{
+SAL_INFO("sd.eppt", "unhandled animation attribute name: " << 
rAttributeName);
+}
 
 pFS->endElementNS( XML_p, XML_attrNameLst );
 }
@@ -973,27 +985,62 @@ void PowerPointExport::WriteAnimationNodeAnimate( const 
FSHelperPtr& pFS, const
 }
 }
 
-OUString aPath;
 if (nXmlNodeType == XML_animMotion)
 {
-Reference rMotion(rXNode, UNO_QUERY);
-if (rMotion.is())
-rMotion->getPath() >>= aPath;
-}
+OUString aPath;
+Reference xMotion(rXNode, UNO_QUERY);
+if (xMotion.is())
+xMotion->getPath() >>= aPath;
 
-if (aPath.isEmpty())
+pFS->startElementNS(XML_p, nXmlNodeType,
+XML_path, OUStringToOString(aPath, 
RTL_TEXTENCODING_UTF8),
+FSEND);
+}
+else if (nXmlNodeType == XML_animRot)
 {
+// when const char* is nullptr, the attribute is completely omitted in 
the output
+const char* pBy = nullptr;
+const char* pFrom = nullptr;
+const char* pTo = nullptr;
+OString aBy, aFrom, aTo;
+
+Reference xTransform(rXNode, UNO_QUERY);
+if (xTransform.is())
+{
+double value;
+if (xTransform->getBy() >>= value)
+{
+aBy = OString::number(static_cast(value * PER_DEGREE));
+pBy = aBy.getStr();
+}
+
+if (xTransform->getFrom() >>= value)
+{
+aFrom = OString::number(static_cast(value * PER_DEGREE));
+pFrom = aFrom.getStr();
+}
+
+if (xTransform->getTo() >>= value)
+{
+aTo = OString::number(static_cast(value * PER_DEGREE));
+pTo = aTo.getStr();
+}
+}
+
 pFS->startElementNS(XML_p, nXmlNodeType,
-XML_calcmode, pCalcMode,
- 

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

[Noel Grandin]

 sc/source/ui/dbgui/pfiltdlg.cxx |   18 +++---
 sc/source/ui/inc/pfiltdlg.hxx   |5 -
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit f120e21012d1fcdaf9862d3818a43f37d3d0fb0b
Author: Noel Grandin 
Date:   Fri Sep 8 10:54:30 2017 +0200

convert pEntryLists to std::arrayhttps://gerrit.libreoffice.org/42094
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index aab52b766df9..4b28bd0c202d 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -74,9 +74,6 @@ ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, 
const SfxItemSet& rArgS
 get(m_pBtnUnique, "unique");
 get(m_pFtDbArea, "dbarea");
 
-for (sal_uInt16 i=0; i<=MAXCOL; i++)
-pEntryLists[i] = nullptr;
-
 Init( rArgSet );
 }
 
@@ -87,8 +84,7 @@ ScPivotFilterDlg::~ScPivotFilterDlg()
 
 void ScPivotFilterDlg::dispose()
 {
-for (sal_uInt16 i=0; i<=MAXCOL; i++)
-delete pEntryLists[i];
+for (auto& a : m_pEntryLists) a.reset();
 
 delete pOutItem;
 m_pLbField1.clear();
@@ -305,7 +301,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
 if ( pDoc && nFieldSelPos )
 {
 SCCOL nColumn = theQueryData.nCol1 + 
static_cast(nFieldSelPos) - 1;
-if (!pEntryLists[nColumn])
+if (!m_pEntryLists[nColumn])
 {
 WaitObject aWaiter( this );
 
@@ -315,12 +311,12 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
 nFirstRow++;
 bool bHasDates = false;
 bool bCaseSens = m_pBtnCase->IsChecked();
-pEntryLists[nColumn] = new std::vector;
+m_pEntryLists[nColumn].reset( new std::vector 
);
 pDoc->GetFilterEntriesArea(
-nColumn, nFirstRow, nLastRow, nTab, bCaseSens, 
*pEntryLists[nColumn], bHasDates);
+nColumn, nFirstRow, nLastRow, nTab, bCaseSens, 
*m_pEntryLists[nColumn], bHasDates);
 }
 
-std::vector* pColl = pEntryLists[nColumn];
+std::vector* pColl = m_pEntryLists[nColumn].get();
 std::vector::const_iterator it = pColl->begin(), 
itEnd = pColl->end();
 for (; it != itEnd; ++it)
 {
@@ -522,8 +518,8 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, Button*, pBox, 
void )
 
 if (pBox == m_pBtnCase)// value lists
 {
-for (sal_uInt16 i=0; i<=MAXCOL; i++)
-DELETEZ( pEntryLists[i] );
+for (auto& a : m_pEntryLists)
+a.reset();
 
 OUString aCurVal1 = m_pEdVal1->GetText();
 OUString aCurVal2 = m_pEdVal2->GetText();
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index d54468a15870..74df89df5bc0 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -28,6 +28,9 @@
 #include 
 #include "address.hxx"
 #include "queryparam.hxx"
+#include 
+#include 
+#include 
 
 class ScViewData;
 class ScDocument;
@@ -78,7 +81,7 @@ private:
 VclPtraFieldLbArr[3];
 VclPtraCondLbArr[3];
 
-std::vector* pEntryLists[MAXCOLCOUNT];
+std::array>, MAXCOLCOUNT> 
m_pEntryLists;
 
 private:
 voidInit( const SfxItemSet& rArgSet );
___
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-5.3' - 8 commits - external/libwpd sax/source sc/qa sc/source sd/source sw/qa sw/source vcl/source xmloff/source

[Dennis Francis]

 external/libwpd/UnpackedTarball_libwpd.mk |1 
 external/libwpd/libwpd-tdf112269.patch.1  |   42 
++
 sax/source/expatwrap/sax_expat.cxx|   15 ++-
 sc/qa/unit/data/xlsm/tdf111974.xlsm   |binary
 sc/qa/unit/subsequent_filters-test.cxx|   10 ++
 sc/source/filter/oox/workbookfragment.cxx |2 
 sd/source/ui/view/sdview4.cxx |8 +
 sw/qa/core/data/odt/fail/c2dfc5bd-8366-40e7-b862-55e13fdc52dc.odt |binary
 sw/qa/core/data/odt/fail/tdf102018.odt|binary
 sw/source/core/text/frmform.cxx   |   15 ++-
 sw/source/filter/xml/xmltbli.cxx  |2 
 vcl/source/font/fontmetric.cxx|   25 +++--
 xmloff/source/text/txtparai.cxx   |   11 ++
 13 files changed, 106 insertions(+), 25 deletions(-)

New commits:
commit 5f85c70dc299ee27d5d94d6bb3eaabf0aba5fa58
Author: Dennis Francis 
Date:   Thu Aug 31 14:22:15 2017 +0530

tdf#111974: Ensure sufficient space for all sheets in FormulaBuffer...

and not just for the number of sheet fragments. This is important
because we changed the internal storage of FormulaBuffer from based
on std::map to std::vector in d17a83fa549f828f29e6939b16ba8b568a75f95e

Added simple unit test that loads the bugdoc in
subsequent_filters-test.cxx

Reviewed-on: https://gerrit.libreoffice.org/41792
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
(cherry picked from commit 20169423d492b58ab93fb0e8e9d2918c0baebc92)

Reviewed-on: https://gerrit.libreoffice.org/41841
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

 Conflicts:
sc/qa/unit/subsequent_filters-test.cxx

Backported.

Change-Id: I7320dd537266e540d585d3fccfbb8665bba457c7
Reviewed-on: https://gerrit.libreoffice.org/42057
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
(cherry picked from commit 500b5727fd5902b7d14c6e707c2ad3d2b227bb1a)

diff --git a/sc/qa/unit/data/xlsm/tdf111974.xlsm 
b/sc/qa/unit/data/xlsm/tdf111974.xlsm
new file mode 100644
index ..bb6ac6d0a2d3
Binary files /dev/null and b/sc/qa/unit/data/xlsm/tdf111974.xlsm differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 5c5e730ef591..b53803c4e425 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -241,6 +241,7 @@ public:
 void testTdf100458();
 void testTdf100709XLSX();
 void testTdf97598XLSX();
+void testTdf111974XLSM();
 
 CPPUNIT_TEST_SUITE(ScFiltersTest);
 CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -359,6 +360,7 @@ public:
 CPPUNIT_TEST(testTdf100458);
 CPPUNIT_TEST(testTdf100709XLSX);
 CPPUNIT_TEST(testTdf97598XLSX);
+CPPUNIT_TEST(testTdf111974XLSM);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -3778,6 +3780,14 @@ void ScFiltersTest::testColumnStyle2XLSX()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf111974XLSM()
+{
+// Would crash without the fix on loading
+ScDocShellRef xDocSh = loadDoc("tdf111974.", FORMAT_XLSM);
+CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is());
+xDocSh->DoClose();
+}
+
 void ScFiltersTest::testBnc762542()
 {
 ScDocShellRef xDocSh = loadDoc("bnc762542.", FORMAT_XLSX);
diff --git a/sc/source/filter/oox/workbookfragment.cxx 
b/sc/source/filter/oox/workbookfragment.cxx
index 53ae02fc26b9..37e196aae1d5 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -452,7 +452,7 @@ void WorkbookFragment::finalizeImport()
 }
 
 // setup structure sizes for the number of sheets
-getFormulaBuffer().SetSheetCount( aSheetFragments.size() );
+getFormulaBuffer().SetSheetCount( nWorksheetCount );
 
 // create all database ranges and defined names, in that order
 getTables().finalizeImport();
commit 2b94af6b30700434b82eaaa0a49e35f42b32fa4b
Author: Caolán McNamara 
Date:   Thu Sep 7 13:37:30 2017 +0100

Resolves: tdf#112269 libwpd fix

Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
Reviewed-on: https://gerrit.libreoffice.org/42056
Tested-by: Jenkins 
Reviewed-by: David Tardon 
(cherry picked from commit 05da1c67e49a2d758799db735a826c4d292fea44)

diff --git a/external/libwpd/UnpackedTarball_libwpd.mk 
b/external/libwpd/UnpackedTarball_libwpd.mk
index 7fb7c3b2181d..495824d804b5 100644
--- a/external/libwpd/UnpackedTarball_libwpd.mk
+++ b/external/libwpd/UnpackedTarball_libwpd.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\
external/libwpd/libwpd-vs2013.patch.1 \
$(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \
+

[Libreoffice-commits] core.git: cui/source dbaccess/source extensions/source filter/source forms/source include/sfx2 include/svx reportdesign/source sc/source sd/source sfx2/source starmath/source svx

[Caolán McNamara]

 cui/source/customize/acccfg.cxx  |2 
 cui/source/customize/cfg.cxx |2 
 cui/source/dialogs/cuigaldlg.cxx |2 
 cui/source/dialogs/insdlg.cxx|3 -
 cui/source/options/doclinkdialog.cxx |4 -
 cui/source/options/optinet2.cxx  |2 
 cui/source/options/optjava.cxx   |2 
 cui/source/tabpages/backgrnd.cxx |2 
 cui/source/tabpages/numpages.cxx |5 -
 cui/source/tabpages/tpbitmap.cxx |2 
 cui/source/tabpages/tpline.cxx   |2 
 cui/source/tabpages/tplnedef.cxx |8 +-
 cui/source/tabpages/tplneend.cxx |5 +
 dbaccess/source/ui/dlg/ConnectionHelper.cxx  |   18 +++---
 dbaccess/source/ui/dlg/generalpage.cxx   |2 
 extensions/source/dbpilots/commonpagesdbp.cxx|3 -
 extensions/source/propctrlr/formcomponenthandler.cxx |   10 +--
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |6 +-
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx|3 -
 filter/source/xsltdialog/xmlfiltertestdialog.cxx |6 +-
 forms/source/component/ImageControl.cxx  |5 +
 include/sfx2/docinsert.hxx   |3 -
 include/sfx2/filedlghelper.hxx   |   55 +--
 include/sfx2/opengrf.hxx |4 -
 include/svx/graphichelper.hxx|4 -
 reportdesign/source/ui/report/ReportController.cxx   |2 
 sc/source/ui/docshell/docsh4.cxx |6 +-
 sc/source/ui/drawfunc/chartsh.cxx|4 +
 sc/source/ui/drawfunc/fuins1.cxx |4 -
 sc/source/ui/drawfunc/graphsh.cxx|9 +--
 sc/source/ui/miscdlgs/dataproviderdlg.cxx|2 
 sc/source/ui/miscdlgs/datastreamdlg.cxx  |2 
 sc/source/ui/miscdlgs/instbdlg.cxx   |2 
 sc/source/ui/miscdlgs/linkarea.cxx   |2 
 sc/source/ui/view/tabvwshb.cxx   |3 -
 sd/source/ui/animations/CustomAnimationDialog.cxx|2 
 sd/source/ui/animations/SlideTransitionPane.cxx  |2 
 sd/source/ui/dlg/PhotoAlbumDialog.cxx|2 
 sd/source/ui/dlg/filedlg.cxx |   10 +--
 sd/source/ui/dlg/tpaction.cxx|5 +
 sd/source/ui/func/fuinsert.cxx   |5 +
 sd/source/ui/func/fuinsfil.cxx   |2 
 sd/source/ui/func/fupage.cxx |4 -
 sd/source/ui/inc/filedlg.hxx |2 
 sd/source/ui/view/drviews2.cxx   |6 +-
 sfx2/source/appl/fileobj.cxx |4 -
 sfx2/source/appl/lnkbase2.cxx|2 
 sfx2/source/appl/opengrf.cxx |   14 +---
 sfx2/source/appl/shutdownicon.cxx|2 
 sfx2/source/dialog/filedlghelper.cxx |5 +
 sfx2/source/dialog/filedlgimpl.hxx   |4 -
 sfx2/source/doc/docinsert.cxx|9 +--
 sfx2/source/doc/templatedlg.cxx  |2 
 starmath/source/view.cxx |2 
 svx/source/core/graphichelper.cxx|8 +-
 svx/source/dialog/imapdlg.cxx|6 +-
 svx/source/form/datanavi.cxx |3 -
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx|2 
 sw/inc/dbmgr.hxx |2 
 sw/source/ui/chrdlg/chardlg.cxx  |3 -
 sw/source/ui/dbui/addresslistdialog.cxx  |2 
 sw/source/ui/dbui/createaddresslistdialog.cxx|3 -
 sw/source/ui/dbui/mmdocselectpage.cxx|3 -
 sw/source/ui/dbui/mmresultdialogs.cxx|4 -
 sw/source/ui/dialog/uiregionsw.cxx   |5 -
 sw/source/ui/envelp/mailmrge.cxx |2 
 sw/source/ui/fldui/changedb.cxx  |2 
 sw/source/ui/fldui/flddb.cxx |2 
 sw/source/ui/fldui/javaedit.cxx  |2 
 sw/source/ui/frmdlg/frmpage.cxx  |5 +
 sw/source/ui/index/cnttab.cxx|   11 ++-
 sw/source/ui/misc/glossary.cxx   |3 -
 sw/source/uibase/app/docsh2.cxx  |   10 ++-
 sw/source/uibase/dbui/dbmgr.cxx  |4 -
 sw/source/uibase/dbui/mailmergehelper.cxx|4 -
 sw/source/uibase/docvw/romenu.cxx|4 -
 sw/source/uibase/inc/mailmergehelper.hxx |2 
 sw/source/uibase/shells/drawsh.cxx   |4 -
 sw/source/uibase/shells/grfsh.cxx|4 -
 sw/sour

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

[YiiChang Yen]

 loleaflet/dist/toolbar/toolbar.js |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 488c2e98f3bcf0812df45df5651ced0891020fac
Author: YiiChang Yen 
Date:   Mon Sep 4 14:00:05 2017 +0800

loleaflet: Sortting font-select list localelly

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

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 6810034a..a2c5065e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1384,7 +1384,9 @@ function updateCommandValues() {
data = data.concat(Object.keys(commandValues));
}
$('.fonts-select').select2({
-   data: data,
+   data: data.sort(function (a, b) {  // also 
sort(localely)
+   return a.localeCompare(b);
+   }),
placeholder: _('Font')
});
$('.fonts-select').on('select2:select', onFontSelect);
___
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]

 sw/source/core/layout/layact.cxx |   23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit bb2258f7e4bcf078810cf1e40fdec2f17576c3b2
Author: Miklos Vajna 
Date:   Fri Sep 8 09:12:19 2017 +0200

sw: inline trivial IS_FLYS macro

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

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index f7f03d1f9bae..c6f8f1023788 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -61,7 +61,6 @@
 
 // SwLayAction static stuff
 
-#define IS_FLYS (pPage->GetSortedObjs())
 #define IS_INVAFLY (pPage->IsInvalidFly())
 
 // Save some typing work to avoid accessing destroyed pages.
@@ -519,12 +518,12 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 XCHECKPAGE;
 
 while ( !IsInterrupt() && !IsNextCycle() &&
-((IS_FLYS && IS_INVAFLY) || pPage->IsInvalid()) )
+((pPage->GetSortedObjs() && IS_INVAFLY) || 
pPage->IsInvalid()) )
 {
 unlockPositionOfObjects( pPage );
 
 SwObjectFormatter::FormatObjsAtFrame( *pPage, *pPage, this );
-if ( !IS_FLYS )
+if ( !pPage->GetSortedObjs() )
 {
 // If there are no (more) Flys, the flags are superfluous.
 pPage->ValidateFlyLayout();
@@ -533,7 +532,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 // change condition
 while ( !IsInterrupt() && !IsNextCycle() &&
 ( pPage->IsInvalid() ||
-  (IS_FLYS && IS_INVAFLY) ) )
+  (pPage->GetSortedObjs() && IS_INVAFLY) ) )
 {
 PROTOCOL( pPage, PROT::FileInit, DbgAction::NONE, nullptr)
 XCHECKPAGE;
@@ -558,7 +557,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 // change condition
 if ( !IsNextCycle() &&
  ( pPage->IsInvalidContent() ||
-   (IS_FLYS && IS_INVAFLY) ) )
+   (pPage->GetSortedObjs() && IS_INVAFLY) ) )
 {
 pPage->ValidateFlyInCnt();
 pPage->ValidateContent();
@@ -584,7 +583,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 
 // A previous page may be invalid again.
 XCHECKPAGE;
-if ( !IS_FLYS )
+if ( !pPage->GetSortedObjs() )
 {
 // If there are no (more) Flys, the flags are superfluous.
 pPage->ValidateFlyLayout();
@@ -624,7 +623,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 
 // Continue to the next invalid page
 while ( pPage && !pPage->IsInvalid() &&
-(!IS_FLYS || !IS_INVAFLY) )
+(!pPage->GetSortedObjs() || !IS_INVAFLY) )
 {
 pPage = static_cast(pPage->GetNext());
 }
@@ -703,7 +702,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 const int nLoopControlMax = 20;
 
 // special case: interrupt content formatting
-// conditions are incorrect (macros IS_FLYS and IS_INVAFLY only
+// conditions are incorrect (macro IS_INVAFLY only
 //works for ) and are too strict.
 // adjust interrupt formatting to normal page formatting - see 
above.
 while ( ( mbFormatContentOnInterrupt &&
@@ -816,7 +815,7 @@ bool SwLayAction::TurboAction_( const SwContentFrame *pCnt )
 return false;
 }
 
-if ( pPage->IsInvalidLayout() || (IS_FLYS && IS_INVAFLY) )
+if ( pPage->IsInvalidLayout() || (pPage->GetSortedObjs() && 
IS_INVAFLY) )
 return false;
 }
 if ( !pPage )
@@ -1655,7 +1654,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage 
)
 if ( ( IsInterrupt() && !mbFormatContentOnInterrupt ) ||
  ( !bBrowse && pPage->IsInvalidLayout() ) ||
  // consider interrupt formatting
- ( IS_FLYS && IS_INVAFLY && !mbFormatContentOnInterrupt )
+ ( pPage->GetSortedObjs() && IS_INVAFLY && 
!mbFormatContentOnInterrupt )
)
 return false;
 }
@@ -1703,7 +1702,7 @@ bool SwLayAction::FormatContent( const SwPageFrame *pPage 
)
 nBottom, pContent 
);
 if ( !pTmp )
 {
-if ( (!(IS_FLYS && IS_INVAFLY) ||
+if ( (

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

[Stephan Bergmann]

 sd/qa/unit/import-tests.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c799497959f82c84ddaf032b096d1a3f8d6e2bcd
Author: Stephan Bergmann 
Date:   Fri Sep 8 10:44:03 2017 +0200

Disable test on Linux x86 that makes plain 'make' fail due to -mpfmath=387

...rounding issues, and thus caused LO Flathub builds to fail, see
.

Change-Id: I91e8662e0a85b4ed8b16719eed4ade3397edfa0c

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 5ef57288efcd..735f9f4153a5 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -289,7 +289,14 @@ void SdImportTest::testDocumentLayout()
 { "tdf90403.pptx", "xml/tdf90403_", PPTX, -1 },
 { "tdf90338.odp", "xml/tdf90338_", ODP, PPTX },
 { "tdf92001.odp", "xml/tdf92001_", ODP, PPTX },
+// GCC -mpfmath=387 rounding issues in lclPushMarkerProperties
+// (oox/source/drawingml/lineproperties.cxx); see mail sub-thread starting at
+//  "Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods:
+// fails with Assertion" for how "-mfpmath=sse -msse2" would fix that:
+#if !(defined LINUX && defined X86)
 { "tdf100491.pptx", "xml/tdf100491_", PPTX, -1 },
+#endif
 { "tdf109317.pptx", "xml/tdf109317_", PPTX, ODP},
 // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkdata.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9ca0f91b02822a5c0b28a651f82821cd11d9f6ed
Author: Caolán McNamara 
Date:   Thu Sep 7 16:47:04 2017 +0100

tdf#110737 set user-events to a lower priority than system redraw

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

diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index 29937ef036b2..efa2e7fa3cf6 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -826,7 +826,10 @@ void GtkData::PostUserEvent()
 else // nothing pending anyway
 {
 m_pUserEvent = g_idle_source_new();
-g_source_set_priority (m_pUserEvent, G_PRIORITY_HIGH);
+// tdf#110737 set user-events to a lower priority than system redraw
+// events, which is G_PRIORITY_HIGH_IDLE + 20, so presentations
+// queue-redraw has a chance to be fulfilled
+g_source_set_priority (m_pUserEvent,  G_PRIORITY_HIGH_IDLE + 30);
 g_source_set_can_recurse (m_pUserEvent, TRUE);
 g_source_set_callback (m_pUserEvent, call_userEventFn,
static_cast(this), nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/sfx2/dinfdlg.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 7b9cb381702a408c3cf54bfaa1f8a7b2c30882a7
Author: Noel Grandin 
Date:   Fri Sep 8 08:58:55 2017 +0200

loplugin:unusedmethods

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

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 4353f27ca3b9..e708d0cf8927 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -448,8 +448,6 @@ public:
 css::uno::Sequence< css::beans::PropertyValue >
 GetCustomProperties() const;
 voidSetRemovedHdl( const Link& rLink ) { 
m_aRemovedHdl = rLink; }
-
-voidupdateLineWidth();
 };
 
 // class CustomPropertiesControl -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/unusedfields.readonly.results  |  120 ++-
 compilerplugins/clang/unusedfields.untouched.results |6 
 compilerplugins/clang/unusedfields.writeonly.results |  114 +-
 include/sfx2/dinfdlg.hxx |1 
 sfx2/source/dialog/dinfdlg.cxx   |7 -
 5 files changed, 24 insertions(+), 224 deletions(-)

New commits:
commit a84026031db35e9388c76c3b365a23e6bf1ed3e6
Author: Noel Grandin 
Date:   Fri Sep 8 08:47:32 2017 +0200

loplugin:unusedfields

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

diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index 37414f470ef2..994ad7918e69 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -238,7 +238,7 @@ filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:143
 XMLFilterSettingsDialog maModuleOpt class SvtModuleOptions
 framework/inc/dispatch/dispatchprovider.hxx:81
 framework::DispatchProvider m_aProtocolHandlerCache class 
framework::HandlerCache
-framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:185
+framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx:184
 (anonymous namespace)::ModuleUIConfigurationManager::UIElementType 
aElementsHashMap (anonymous 
namespace)::ModuleUIConfigurationManager::UIElementDataHashMap
 framework/source/uiconfiguration/uiconfigurationmanager.cxx:165
 (anonymous namespace)::UIConfigurationManager::UIElementType 
aElementsHashMap (anonymous 
namespace)::UIConfigurationManager::UIElementDataHashMap
@@ -264,13 +264,13 @@ include/drawinglayer/primitive2d/textlayoutdevice.hxx:61
 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class 
SolarMutexGuard
 include/editeng/brushitem.hxx:52
 SvxBrushItem maSecOptions class SvtSecurityOptions
-include/filter/msfilter/svdfppt.hxx:690
+include/filter/msfilter/svdfppt.hxx:712
 PPTExtParaSheet aExtParaLevel struct PPTExtParaLevel [5]
-include/filter/msfilter/svdfppt.hxx:864
+include/filter/msfilter/svdfppt.hxx:886
 ImplPPTParaPropSet nDontKnow1 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:865
+include/filter/msfilter/svdfppt.hxx:887
 ImplPPTParaPropSet nDontKnow2 sal_uInt32
-include/filter/msfilter/svdfppt.hxx:866
+include/filter/msfilter/svdfppt.hxx:888
 ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16
 include/LibreOfficeKit/LibreOfficeKitGtk.h:33
 _LOKDocView aDrawingArea GtkDrawingArea
@@ -382,8 +382,8 @@ linguistic/source/dlistimp.hxx:56
 DicList aOpt class LinguOptions
 oox/qa/token/tokenmap-test.cxx:34
 oox::TokenmapTest tokenMap class oox::TokenMap
-opencl/source/openclwrapper.cxx:302
-opencl::(anonymous namespace)::OpenCLEnv mpOclCmdQueue cl_command_queue [1]
+opencl/source/openclwrapper.cxx:306
+openclwrapper::(anonymous namespace)::OpenCLEnv mpOclCmdQueue 
cl_command_queue [1]
 pyuno/source/module/pyuno_impl.hxx:226
 pyuno::(anonymous) ob_base PyObject
 pyuno/source/module/pyuno_impl.hxx:313
@@ -430,8 +430,6 @@ sc/inc/compiler.hxx:128
 ScRawToken::(anonymous) table struct (anonymous struct at 
/home/noel/libo3/sc/inc/compiler.hxx:125:9)
 sc/inc/compiler.hxx:133
 ScRawToken::(anonymous) pMat class ScMatrix *
-sc/inc/datamapper.hxx:65
-sc::ExternalDataSource mnUpdateFrequency double
 sc/inc/dpresfilter.hxx:64
 ScDPResultTree::DimensionNode maChildMembersValueNames 
ScDPResultTree::MembersType
 sc/inc/dpresfilter.hxx:65
@@ -460,94 +458,6 @@ sc/source/filter/inc/stylesbuffer.hxx:677
 oox::xls::Dxf mxProtection std::shared_ptr
 sc/source/filter/inc/xltracer.hxx:82
 XclTracer mbEnabled _Bool
-sc/source/filter/xml/xmlimprt.hxx:604
-ScXMLImport pCondFormatsTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:605
-ScXMLImport pCondFormatTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:606
-ScXMLImport pCondFormatAttrMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:607
-ScXMLImport pCondDateAttrMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:608
-ScXMLImport pConditionAttrMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:609
-ScXMLImport pColorScaleTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:610
-ScXMLImport pColorScaleEntryAttrTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:611
-ScXMLImport pDataBarTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:612
-ScXMLImport pDataBarAttrMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:613
-ScXMLImport pFormattingEntryAttrMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:616
-ScXMLImport pTableAttrTokenMap class SvXMLTokenMap *
-sc/source/filter/xml/xmlimprt.hxx:622
-ScXMLImport pDetectiveE

[Libreoffice-commits] core.git: basic/source include/vbahelper oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sc/Library_vbaobj.mk sc/source vbahelper/source

[Tamas Bunth]

 basic/source/runtime/runtime.cxx|2 -
 include/vbahelper/vbashape.hxx  |2 +
 oovbaapi/UnoApi_oovbaapi.mk |2 +
 oovbaapi/ooo/vba/msforms/XLine.idl  |   41 +++
 oovbaapi/ooo/vba/msforms/XOval.idl  |   41 +++
 sc/Library_vbaobj.mk|2 +
 sc/source/ui/vba/vbaapplication.cxx |   21 ++--
 sc/source/ui/vba/vbalineshape.cxx   |   34 +
 sc/source/ui/vba/vbalineshape.hxx   |   37 
 sc/source/ui/vba/vbaovalshape.cxx   |   34 +
 sc/source/ui/vba/vbaovalshape.hxx   |   37 
 vbahelper/source/vbahelper/vbashape.cxx |   42 
 12 files changed, 292 insertions(+), 3 deletions(-)

New commits:
commit 8e8c789742874ac823e68f6154050c64b6fc5b85
Author: Tamas Bunth 
Date:   Thu Sep 7 22:00:01 2017 +0200

oovbaapi: create XOval and XLine shape types

This is needed in order to make "TypeOf myLine Is Line" or similar
expressions return the expected "true" value.

The implementation of the basic interpreter of TypeOf uses XTypeProvider
to determine the type of an object by getting the last part of the type
name. E.g. "ooo:vba::msforms::XLine" is determined as a "Line". That's
why I created the XLine and XOval blank classes.

TypeOf doc:

https://docs.microsoft.com/en-us/dotnet/visual-basic/language-reference/operators/typeof-operator

Change-Id: Ia49cc92d672e30d0126f02d61a55a956ac1425f0
Reviewed-on: https://gerrit.libreoffice.org/42083
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 5d9764fa7581..032e4d85128b 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -3174,7 +3174,7 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& 
refVal,
 t = pProp->getRealType();
 }
 }
-if( t == SbxOBJECT )
+if( t == SbxOBJECT || bVBAEnabled )
 {
 SbxObject* pObj = dynamic_cast(pVal);
 if (!pObj)
diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx
index 17f459fa4ad6..dfc6973cbcb7 100644
--- a/include/vbahelper/vbashape.hxx
+++ b/include/vbahelper/vbashape.hxx
@@ -84,6 +84,8 @@ public:
 /// @throws css::uno::RuntimeException
 static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape 
>& rShape );
 
+static sal_Int32 getAutoShapeType( const css::uno::Reference< 
css::drawing::XShape >& rShape );
+
 // Attributes
 virtual OUString SAL_CALL getName() override;
 virtual void SAL_CALL setName( const OUString& _name ) override;
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index d99d7c3772d9..f977f44d0b08 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -530,10 +530,12 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/msforms,\
XGroupBox \
XImage \
XLabel \
+   XLine \
XLineFormat \
XListBox \
XMultiPage \
XNewFont \
+   XOval \
XPages \
XPictureFormat \
XProgressBar \
diff --git a/oovbaapi/ooo/vba/msforms/XLine.idl 
b/oovbaapi/ooo/vba/msforms/XLine.idl
new file mode 100644
index ..18cd4be551ea
--- /dev/null
+++ b/oovbaapi/ooo/vba/msforms/XLine.idl
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __ooo_vba_msforms_XLineShape_idl__
+#define __ooo_vba_msforms_XLineShape_idl__
+
+#include 
+
+module ooo {  module vba { module msforms {
+
+/*
+ * This class stub is created in order to make "TypeOf myShape Is Line" 
expression
+ * return true. It is determined using XTypeProvider::getTypes(), which is
+ * implemented automatically based on the name of the class.
+ */
+interface XLine: com::sun::star::uno::XInterface
+{
+
+
+};
+
+}; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oovbaapi/ooo/vba/

[Libreoffice-commits] core.git: compilerplugins/clang cui/source editeng/source include/editeng include/svl include/vcl sd/source svl/source toolkit/source vcl/source

[Noel Grandin]

 compilerplugins/clang/constantparam.booleans.results |  384 +---
 compilerplugins/clang/constantparam.constructors.results |  140 +---
 compilerplugins/clang/constantparam.numbers.results  |  446 +++
 cui/source/customize/CommandCategoryListBox.cxx  |4 
 cui/source/inc/CommandCategoryListBox.hxx|2 
 editeng/source/editeng/eerdll.cxx|2 
 editeng/source/items/textitem.cxx|3 
 include/editeng/charsetcoloritem.hxx |3 
 include/svl/itempool.hxx |2 
 include/svl/macitem.hxx  |2 
 include/vcl/texteng.hxx  |2 
 sd/source/ui/app/optsitem.cxx|   10 
 sd/source/ui/inc/optsitem.hxx|2 
 svl/source/items/itempool.cxx|4 
 svl/source/items/macitem.cxx |6 
 toolkit/source/awt/vclxtoolkit.cxx   |9 
 vcl/source/edit/texteng.cxx  |   52 -
 17 files changed, 482 insertions(+), 591 deletions(-)

New commits:
commit 2e0a25ce2b87d3a4bbf944025fc3720933fb391d
Author: Noel Grandin 
Date:   Fri Sep 8 08:31:42 2017 +0200

loplugin:constantparam

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

diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index 53652d8c3136..ee4452d710c9 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -10,7 +10,7 @@ basctl/source/inc/scriptdocument.hxx:89
 void basctl::ScriptDocument::ScriptDocument(enum 
basctl::ScriptDocument::SpecialDocument)
 enum basctl::ScriptDocument::SpecialDocument _eType
 0
-basegfx/source/polygon/b2dpolygon.cxx:60
+basegfx/source/polygon/b2dpolygon.cxx:59
 void CoordinateDataArray2D::CoordinateDataArray2D(unsigned int)
 unsigned int nCount
 0
@@ -50,7 +50,7 @@ chart2/source/controller/dialogs/DialogModel.cxx:188
 struct (anonymous namespace)::lcl_DataSeriesContainerAppend & (anonymous 
namespace)::lcl_DataSeriesContainerAppend::operator++(int)
 int 
 0
-chart2/source/controller/dialogs/DialogModel.cxx:250
+chart2/source/controller/dialogs/DialogModel.cxx:247
 struct (anonymous namespace)::lcl_RolesWithRangeAppend & (anonymous 
namespace)::lcl_RolesWithRangeAppend::operator++(int)
 int 
 0
@@ -218,10 +218,6 @@ desktop/source/deployment/gui/dp_gui_theextmgr.hxx:92
 void dp_gui::TheExtensionManager::ToTop(enum ToTopFlags)
 enum ToTopFlags nFlags
 1
-desktop/source/deployment/manager/dp_commandenvironments.hxx:40
-void dp_manager::BaseCommandEnv::handle_(_Bool,_Bool,const class 
com::sun::star::uno::Reference 
&)
-_Bool abort
-0
 editeng/source/editeng/editstt2.hxx:29
 void InternalEditStatus::TurnOnFlags(enum EEControlBits)
 enum EEControlBits nFlags
@@ -230,7 +226,7 @@ editeng/source/editeng/editstt2.hxx:32
 void InternalEditStatus::TurnOffFlags(enum EEControlBits)
 enum EEControlBits nFlags
 1
-editeng/source/editeng/impedit.hxx:820
+editeng/source/editeng/impedit.hxx:842
 unsigned short ImpEditEngine::GetLineHeight(int,int)
 int nLine
 0
@@ -306,10 +302,6 @@ formula/source/ui/dlg/structpg.hxx:89
 class SvTreeListEntry * formula::StructPage::InsertEntry(const class 
rtl::OUString &,class SvTreeListEntry *,unsigned short,unsigned long,const 
class formula::IFormulaToken *)
 unsigned long nPos
 0
-framework/inc/dispatch/closedispatcher.hxx:183
-_Bool framework::CloseDispatcher::implts_prepareFrameForClosing(const 
class com::sun::star::uno::Reference 
&,_Bool,_Bool,_Bool &)
-_Bool bAllowSuspend
-1
 framework/inc/uielement/uicommanddescription.hxx:85
 void framework::UICommandDescription::UICommandDescription(const class 
com::sun::star::uno::Reference 
&,_Bool)
 _Bool 
@@ -326,11 +318,11 @@ hwpfilter/source/hfont.h:63
 const char * HWPFont::GetFontName(int,int)
 int lang
 0
-hwpfilter/source/hwpfile.h:149
+hwpfilter/source/hwpfile.h:150
 void HWPFile::Read4b(void *,unsigned long)
 unsigned long nmemb
 1
-i18npool/source/localedata/LocaleNode.hxx:116
+i18npool/source/localedata/LocaleNode.hxx:117
 class rtl::OUString LocaleNode::writeParameterCheckLen(const class 
OFileWriter &,const char *,const char *,int,int) const
 int nMinLen
 1
@@ -462,6 +454,10 @@ include/editeng/boxitem.hxx:115
 _Bool SvxBoxItem::HasBorder(_Bool) const
 _Bool bTreatPaddingAsBorder
 1
+include/editeng/charsetcoloritem.hxx:38
+void SvxCharSetColorItem::SvxCharSetColorItem(const class Color &,const 
unsigned short,const unsigned short)
+cons