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

[Aron Budea]

 configure.ac |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 7455705517033acc24e91df0d5cf9a825f0562a0
Author: Aron Budea 
Date:   Sat Aug 12 07:07:02 2017 +0200

Add dlopen check again to fix build

That unneeded dlopen check isn't unneeded.
Regression from 4be7a6cb166161a5c981f706b460a191984a4c80

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

diff --git a/configure.ac b/configure.ac
index 8fbe8e9c..854d9152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,6 +253,12 @@ AS_IF([test `uname -s` = Linux],
   [AS_IF([test -n "$with_cppunit_libs"],
  [LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
 
+AS_IF([test `uname -s` != Darwin],
+  [AC_SEARCH_LIBS([dlopen],
+  [dl dld],
+  [],
+  [AC_MSG_ERROR([dlopen not found])])])
+
 AC_SEARCH_LIBS([png_create_write_struct],
[png],
[],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea]

 loleaflet/src/layer/marker/Annotation.js |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2d42ceb96ebc4b7edcb41a4d03947720785b0ded
Author: Aron Budea 
Date:   Wed Aug 9 02:35:45 2017 +0200

loleaflet: don't add reply on Cancel, don't leave empty box

Reply was added when clicking Cancel. This is a regression from
07607863925cf4fc2dbc91685d8f430f849c5535

Additionally, when focus was lost on an empty, initial commit,
an empty, defunct comment box remained until reload.

Change-Id: I49a5224ff70de65623496cfcba538acb6a8086f8
Reviewed-on: https://gerrit.libreoffice.org/40915
Reviewed-by: pranavk 
Tested-by: pranavk 
(cherry picked from commit a75b780b8aa05d3cf5b8ede6f9075ca06a9d5d28)
Reviewed-on: https://gerrit.libreoffice.org/41075

diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index e60c4379..a569dc33 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -217,6 +217,7 @@ L.Annotation = L.Layer.extend({
_onCancelClick: function (e) {
L.DomEvent.stopPropagation(e);
this._nodeModifyText.value = this._contentText.origText;
+   this._nodeReplyText.value = '';
this.show();
this._map.fire('AnnotationCancel', {annotation: this});
},
@@ -233,6 +234,10 @@ L.Annotation = L.Layer.extend({
if (this._contentText.origText !== this._nodeModifyText.value) {
this._onSaveComment(e);
}
+   else if (this._nodeModifyText.value == '') {
+   // Implies that this._contentText.origText == ''
+   this._onCancelClick(e);
+   }
},
 
_onLostFocusReply: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: UnoService in PyUNO for keyboard shortcuts in extensions: JobExecutor never called.

[jan d]

Hello,

Just for documenting it for people who might try this in the future: I
managed to create the UnoService and have it reaact to the shortcut.
It seems that services can only be created directly and in the scope of the
file/import that is run: Having it created inside a function did not work,
moving it out to the first level (in python this means: no indention) it
works. If someone knows why that is the case, I'd be ahppy if we could add
a sentence on it to the PyUno documentation or so.

Jan

On Fri, Aug 11, 2017 at 1:06 AM, jan d  wrote:

> Hi Miklos, Hi List,
>
> I did some changes and passed the class instead of the instance but it
> does not work either; looking at the print messages that I inserted it
> seems to be never initialized.
> I'll try to step through the TuesdayPrinter.py and see if that gives me
> any insights; if you have any other ideas,I'd be happy to hear what else
> could be wrong.
>
> Jan
>
>
> On Tue, Aug 8, 2017 at 9:30 AM, Miklos Vajna 
> wrote:
>
>> Hi,
>>
>> On Tue, Aug 08, 2017 at 09:21:36AM +0200, jan d 
>> wrote:
>> > POSSIBLE PROBLEM SOURCES:
>> > * I was unable to find the docuementation for
>> > g_ImplementationHelper.addImplementation e.g. if it takes a class or an
>> > instance. I tried with both (the inked example is an instance), non
>> worked.
>>
>> https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=
>> blob;f=TuesdayPython/TuesdayPrinter.py;hb=HEAD#l61
>>
>> I think this does something similar to your use-case, and there you can
>> see that addImplementation() takes a class, not an instance.
>>
>> Regards,
>>
>> Miklos
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tamás Zolnai]

 sd/CppunitTest_sd_activex_controls_tests.mk|  114 +
 sd/Module_sd.mk|1 
 sd/qa/unit/activex-controls-tests.cxx  | 1228 +
 sd/qa/unit/data/pptx/activex_checkbox.pptx |binary
 sd/qa/unit/data/pptx/activex_combobox.pptx |binary
 sd/qa/unit/data/pptx/activex_commandbutton.pptx|binary
 sd/qa/unit/data/pptx/activex_fontproperties.pptx   |binary
 sd/qa/unit/data/pptx/activex_label.pptx|binary
 sd/qa/unit/data/pptx/activex_listbox.pptx  |binary
 sd/qa/unit/data/pptx/activex_optionbutton.pptx |binary
 sd/qa/unit/data/pptx/activex_picture.pptx  |binary
 sd/qa/unit/data/pptx/activex_scrollbar.pptx|binary
 sd/qa/unit/data/pptx/activex_spinbutton.pptx   |binary
 sd/qa/unit/data/pptx/activex_textbox.pptx  |binary
 sd/qa/unit/data/pptx/activex_togglebutton.pptx |binary
 sd/qa/unit/data/pptx/control_background_color.pptx |binary
 sd/qa/unit/import-tests.cxx|   36 
 17 files changed, 1343 insertions(+), 36 deletions(-)

New commits:
commit 595cfbc432b8d4bef5d1a078beb389c3b49535cd
Author: Tamás Zolnai 
Date:   Sat Aug 12 04:05:33 2017 +0200

Add ActiveX control tests

Change-Id: I26e5ea3a5c3711139d88476b435a3a0b50dd9cb3
Reviewed-on: https://gerrit.libreoffice.org/41074
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sd/CppunitTest_sd_activex_controls_tests.mk 
b/sd/CppunitTest_sd_activex_controls_tests.mk
new file mode 100755
index ..2b42afc1087b
--- /dev/null
+++ b/sd/CppunitTest_sd_activex_controls_tests.mk
@@ -0,0 +1,114 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sd_activex_controls_tests))
+
+$(eval $(call gb_CppunitTest_use_externals,sd_activex_controls_tests,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_activex_controls_tests, \
+sd/qa/unit/activex-controls-tests \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sd_activex_controls_tests, \
+$(call gb_Helper_optional,AVMEDIA,avmedia) \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sd \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+test \
+tl \
+tk \
+ucbhelper \
+unotest \
+utl \
+vcl \
+xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sd_activex_controls_tests,\
+-I$(SRCDIR)/sd/source/ui/inc \
+-I$(SRCDIR)/sd/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sd_activex_controls_tests))
+
+$(eval $(call gb_CppunitTest_use_ure,sd_activex_controls_tests))
+$(eval $(call gb_CppunitTest_use_vcl,sd_activex_controls_tests))
+
+$(eval $(call gb_CppunitTest_use_components,sd_activex_controls_tests,\
+animations/source/animcore/animcore \
+basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+desktop/source/deployment/deployment \
+embeddedobj/util/embobj \
+emfio/emfio \
+filter/source/config/cache/filterconfig1 \
+filter/source/odfflatxml/odfflatxml \
+filter/source/svg/svgfilter \
+filter/source/xmlfilteradaptor/xmlfa \
+filter/source/xmlfilterdetect/xmlfd \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+sd/util/sd \
+sd/util/sdfilt \
+sd/util/sdd \
+$(if $(ENABLE_PDFIMPORT),sdext/source/pdfimport/pdfimport) \
+sfx2/util/sfx \
+sot/util/sot \
+svl/source/fsstor/fsstorage \
+svtools/util/svt \
+svx/util/svxcore \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/expand/ucpexpand1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/package/ucppkg1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+uui/util/uui \
+xmloff/util/xo \
+xmlsecurity/util/xmlsecurity \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sd_activex_controls_tests))
+
+# vim: set noet sw=4 ts=4:
\ No newline at end of file
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 27b8b37dc79d..8e2cb1122008 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_check_targets,sd,\

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

[pv2k]

 cui/source/tabpages/tpgradnt.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit bfdd81f72c817ad5cb3fb0ec8636f3a8f08e9170
Author: pv2k 
Date:   Wed Jun 14 22:26:13 2017 +0530

tdf#105966 Solved Increment:Automatic checkbox problem in Area->Gradient tab

Change-Id: I7025b63df830853867b1b6dd17b7985ec16be83b
Reviewed-on: https://gerrit.libreoffice.org/38882
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index aa58716c61cf..2e38b9db1db0 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -244,7 +244,8 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
 (sal_uInt16) m_pMtrCenterY->GetValue(),
 (sal_uInt16) m_pMtrBorder->GetValue(),
 (sal_uInt16) m_pMtrColorFrom->GetValue(),
-(sal_uInt16) m_pMtrColorTo->GetValue() ));
+(sal_uInt16) m_pMtrColorTo->GetValue(),
+(sal_uInt16) m_pMtrIncrement->GetValue() ));
 }
 
 sal_uInt16 nValue = 0;
@@ -340,7 +341,8 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void const * 
pControl )
   (sal_uInt16) m_pMtrCenterY->GetValue(),
   (sal_uInt16) m_pMtrBorder->GetValue(),
   (sal_uInt16) m_pMtrColorFrom->GetValue(),
-  (sal_uInt16) m_pMtrColorTo->GetValue() );
+  (sal_uInt16) m_pMtrColorTo->GetValue(),
+  (sal_uInt16) m_pMtrIncrement->GetValue() );
 
 // enable/disable controls
 if( pControl == m_pLbGradientType || pControl == this )
@@ -415,7 +417,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, 
Button*, void)
   (sal_uInt16) m_pMtrCenterY->GetValue(),
   (sal_uInt16) m_pMtrBorder->GetValue(),
   (sal_uInt16) m_pMtrColorFrom->GetValue(),
-  (sal_uInt16) m_pMtrColorTo->GetValue() );
+  (sal_uInt16) m_pMtrColorTo->GetValue(),
+  (sal_uInt16) m_pMtrIncrement->GetValue() );
 
 m_pGradientList->Insert(o3tl::make_unique(aXGradient, 
aName), nCount);
 
@@ -453,7 +456,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, 
Button*, void)
   (sal_uInt16) m_pMtrCenterY->GetValue(),
   (sal_uInt16) m_pMtrBorder->GetValue(),
   (sal_uInt16) m_pMtrColorFrom->GetValue(),
-  (sal_uInt16) m_pMtrColorTo->GetValue() );
+  (sal_uInt16) m_pMtrColorTo->GetValue(),
+  (sal_uInt16) m_pMtrIncrement->GetValue() );
 
 m_pGradientList->Replace(o3tl::make_unique(aXGradient, 
aName), nPos);
 
@@ -573,8 +577,8 @@ void SvxGradientTabPage::ChangeGradientHdl_Impl()
 if( pGradient )
 {
 css::awt::GradientStyle eXGS = pGradient->GetGradientStyle();
-sal_uInt16 nValue = static_cast( 
m_rOutAttrs.Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue();
-if(nValue == 0)
+sal_uInt16 nValue = pGradient->GetSteps();
+if( nValue == 0 )
 {
 m_pCbIncrement->SetState(TRISTATE_TRUE);
 m_pMtrIncrement->Disable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 filter/uiconfig/ui/pdfgeneralpage.ui   |1 -
 filter/uiconfig/ui/pdfsecuritypage.ui  |1 -
 filter/uiconfig/ui/pdfuserinterfacepage.ui |1 -
 filter/uiconfig/ui/pdfviewpage.ui  |1 -
 4 files changed, 4 deletions(-)

New commits:
commit 5f3baf45723a11987c0a0ddaa1ca1cebafcccde3
Author: Adolfo Jayme Barrientos 
Date:   Wed Oct 28 01:09:27 2015 -0600

tdf#95178 Homogeneous columns are a huge waste of space

This becomes a problem in other languages, such as German
and Spanish, which have longer strings.

A downside of this patch is that the options no longer look
aligned when you switch tabs.

Change-Id: Iffb49d5411cc655bd16b78a9470da7dc661077ca

diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui 
b/filter/uiconfig/ui/pdfgeneralpage.ui
index 554d736523af..cdf0040b45f9 100644
--- a/filter/uiconfig/ui/pdfgeneralpage.ui
+++ b/filter/uiconfig/ui/pdfgeneralpage.ui
@@ -14,7 +14,6 @@
 False
 6
 12
-True
 
   
 True
diff --git a/filter/uiconfig/ui/pdfsecuritypage.ui 
b/filter/uiconfig/ui/pdfsecuritypage.ui
index 4d9f73f5a5bc..97dedcb541c6 100644
--- a/filter/uiconfig/ui/pdfsecuritypage.ui
+++ b/filter/uiconfig/ui/pdfsecuritypage.ui
@@ -7,7 +7,6 @@
 False
 6
 12
-True
 
   
 True
diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui 
b/filter/uiconfig/ui/pdfuserinterfacepage.ui
index 199cf8e55d20..3e14c25b29e4 100644
--- a/filter/uiconfig/ui/pdfuserinterfacepage.ui
+++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui
@@ -21,7 +21,6 @@
 False
 12
 12
-True
 
   
 True
diff --git a/filter/uiconfig/ui/pdfviewpage.ui 
b/filter/uiconfig/ui/pdfviewpage.ui
index d6f6f24834b1..bede63216d34 100644
--- a/filter/uiconfig/ui/pdfviewpage.ui
+++ b/filter/uiconfig/ui/pdfviewpage.ui
@@ -21,7 +21,6 @@
 False
 6
 12
-True
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7b999fff4b38b92678ded2265cba9c275411b360
Author: Andrea Gelmini 
Date:   Fri Aug 11 14:57:49 2017 +0200

Removed duplicated include

Change-Id: I68286aaf7bce262cfc6d371490221e910a3ba7c6
Reviewed-on: https://gerrit.libreoffice.org/41040
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 689c00a6fc3e..32b87b2caff8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -62,7 +62,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 class Test : public SwModelTestBase
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - external/libepubgen writerperfect/Library_wpftwriter.mk writerperfect/source

[Miklos Vajna]

 external/libepubgen/libepubgen-epub3.patch.1 |  126 +++
 writerperfect/Library_wpftwriter.mk  |1 
 writerperfect/source/writer/exp/xmlimp.cxx   |3 
 writerperfect/source/writer/exp/xmlmetai.cxx |  111 +++
 writerperfect/source/writer/exp/xmlmetai.hxx |   40 
 5 files changed, 281 insertions(+)

New commits:
commit aa2265c511bcf704f116e71c3cd440e4fe133289
Author: Miklos Vajna 
Date:   Fri Aug 11 18:39:33 2017 +0200

EPUB export: improve metadata handling

Handle language and document modification date, these two were the
remaining ones where EPUB3 mandates a value.

With this, the default values are not used if the document has custom
values.

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

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 5739f189a6dc..9f3493908b4e 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -971,3 +971,100 @@ index 8017ffe..056c48c 100644
 -- 
 2.12.3
 
+From 14da42819f1f96b87b2337da395e5ad6639dcebe Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Fri, 11 Aug 2017 16:43:10 +0200
+Subject: [PATCH] EPUBGenerator: write language and modification date into
+ content.opf
+
+With this, all metadata which had a hardcoded value is now parsed and
+the old values are just defaults.
+---
+ src/lib/EPUBGenerator.cpp | 32 +---
+ 1 file changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
+index 056c48c..fc6c848 100644
+--- a/src/lib/EPUBGenerator.cpp
 b/src/lib/EPUBGenerator.cpp
+@@ -260,24 +260,34 @@ void EPUBGenerator::writeRoot()
+   sink.insertCharacters(title);
+   sink.closeElement("dc:title");
+ 
++  RVNGString language("en");
++  if (m_metadata["dc:language"] && 
!m_metadata["dc:language"]->getStr().empty())
++language = m_metadata["dc:language"]->getStr();
+   sink.openElement("dc:language");
+-  sink.insertCharacters("en");
++  sink.insertCharacters(language);
+   sink.closeElement("dc:language");
+ 
+-  time_t now = 0;
+-  time(&now);
+-  const struct tm *local = localtime(&now);
+-  if (m_version == 30 && local)
++  if (m_version == 30)
+   {
++RVNGString date;
++time_t now = 0;
++time(&now);
++const struct tm *local = localtime(&now);
++if (local)
++{
++  const int MAX_BUFFER = 1024;
++  char buffer[MAX_BUFFER];
++  strftime(&buffer[0], MAX_BUFFER-1, "%Y-%m-%dT%H:%M:%SZ", local);
++  date.append(buffer);
++}
++
++if (m_metadata["dc:date"] && !m_metadata["dc:date"]->getStr().empty())
++  date = m_metadata["dc:date"]->getStr();
++
+ RVNGPropertyList metaAttrs;
+ metaAttrs.insert("property", "dcterms:modified");
+ sink.openElement("meta", metaAttrs);
+-const int MAX_BUFFER = 1024;
+-char buffer[MAX_BUFFER];
+-strftime(&buffer[0], MAX_BUFFER-1, "%Y-%m-%dT%H:%M:%SZ", local);
+-RVNGString result;
+-result.append(buffer);
+-sink.insertCharacters(result);
++sink.insertCharacters(date);
+ sink.closeElement("meta");
+   }
+ 
+-- 
+2.12.3
+From c8cba54a7025ee0f1129233912f6e9ceda254c64 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Fri, 11 Aug 2017 17:40:10 +0200
+Subject: [PATCH] EPUB3: fix validation error with doc modified date format
+
+ERROR(RSC-005): test.epub/OEBPS/content.opf(2,420): Error while parsing file: 
dcterms:modified illegal syntax (expecting: 'CCYY-MM-DDThh:mm:ssZ')
+
+Both of them looked like XML date formats, but actually librevenge is
+more precise, so truncate it.
+---
+ src/lib/EPUBGenerator.cpp | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
+index fc6c848..4bffb8b 100644
+--- a/src/lib/EPUBGenerator.cpp
 b/src/lib/EPUBGenerator.cpp
+@@ -282,7 +282,11 @@ void EPUBGenerator::writeRoot()
+ }
+ 
+ if (m_metadata["dc:date"] && !m_metadata["dc:date"]->getStr().empty())
+-  date = m_metadata["dc:date"]->getStr();
++{
++  // Expecting CCYY-MM-DDThh:mm:ssZ, librevenge provides 
CCYY-MM-DDThh:mm:ss.s
++  date = std::string(m_metadata["dc:date"]->getStr().cstr()).substr(0, 
19).c_str();
++  date.append("Z");
++}
+ 
+ RVNGPropertyList metaAttrs;
+ metaAttrs.insert("property", "dcterms:modified");
+-- 
+2.12.3
+
diff --git a/writerperfect/source/writer/exp/xmlmetai.cxx 
b/writerperfect/source/writer/exp/xmlmetai.cxx
index c6251dccafff..cc8b37f43a0a 100644
--- a/writerperfect/source/writer/exp/xmlmetai.cxx
+++ b/writerperfect/source/writer/exp/xmlmetai.cxx
@@ -40,6 +40,50 @@ void XMLDcTitleContext::characters(const OUString &rChars)
 mrMeta.m_aPropertyList.insert("dc:title", 
librevenge::RVNGString(sCharU8.getSt

[Libreoffice-commits] core.git: 2 commits - basic/source compilerplugins/clang cui/source include/basic include/vcl sc/source solenv/CompilerTest_compilerplugins_clang.mk vcl/source

[Jochen Nitschke]

 basic/source/sbx/sbxvar.cxx  |   56 ---
 compilerplugins/clang/deadclass.cxx  |   74 
 compilerplugins/clang/test/deadclass.cxx |   14 +++
 cui/source/dialogs/SpellAttrib.cxx   |   36 -
 cui/source/dialogs/SpellAttrib.hxx   |   11 ---
 include/basic/sbx.hxx|   12 ---
 include/vcl/txtattr.hxx  |   16 
 sc/source/filter/inc/biffcodec.hxx   |   37 --
 sc/source/filter/oox/biffcodec.cxx   |   99 ---
 solenv/CompilerTest_compilerplugins_clang.mk |1 
 vcl/source/edit/textdoc.cxx  |   16 +---
 vcl/source/edit/txtattr.cxx  |   27 ---
 12 files changed, 98 insertions(+), 301 deletions(-)

New commits:
commit 7634b279a53e7212925566e0de25d721fa7598ac
Author: Jochen Nitschke 
Date:   Fri Aug 11 11:39:20 2017 +0200

vcl: use default copy-ctor for TextAttrib

Type of TextAttrib (mnWhich) never changes, const it up.
Derived classes can use implicit default copy-ctor.
No need to explicitly delete default-ctor if there is
a user provided ctor.
And no need to define a default override dtor here either.

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

diff --git a/cui/source/dialogs/SpellAttrib.cxx 
b/cui/source/dialogs/SpellAttrib.cxx
index b71449d98295..cc1b86c6a66a 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -32,18 +32,6 @@ SpellErrorAttrib::SpellErrorAttrib( const 
SpellErrorDescription& rDesc ) :
 }
 
 
-SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) :
-TextAttrib(TEXTATTR_SPELL_ERROR),
-m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription )
-{
-}
-
-
-SpellErrorAttrib::~SpellErrorAttrib()
-{
-}
-
-
 void SpellErrorAttrib::SetFont( vcl::Font&  ) const
 {
 //this attribute doesn't have a visual effect
@@ -70,18 +58,6 @@ SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) 
:
 }
 
 
-SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) :
-TextAttrib(TEXTATTR_SPELL_LANGUAGE),
-m_eLanguage(rAttr.m_eLanguage)
-{
-}
-
-
-SpellLanguageAttrib::~SpellLanguageAttrib()
-{
-}
-
-
 void SpellLanguageAttrib::SetFont( vcl::Font&  ) const
 {
 //no visual effect
@@ -108,18 +84,6 @@ SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& 
rCol) :
 }
 
 
-SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& 
rAttr ) :
-TextAttrib(TEXTATTR_SPELL_BACKGROUND),
-m_aBackgroundColor(rAttr.m_aBackgroundColor)
-{
-}
-
-
-SpellBackgroundAttrib::~SpellBackgroundAttrib()
-{
-}
-
-
 void SpellBackgroundAttrib::SetFont( vcl::Font& rFont ) const
 {
 rFont.SetFillColor(m_aBackgroundColor);
diff --git a/cui/source/dialogs/SpellAttrib.hxx 
b/cui/source/dialogs/SpellAttrib.hxx
index 3ce4048d4021..aabf466235c3 100644
--- a/cui/source/dialogs/SpellAttrib.hxx
+++ b/cui/source/dialogs/SpellAttrib.hxx
@@ -96,11 +96,8 @@ public:
 private:
 SpellErrorDescriptionm_aSpellErrorDescription;
 
-SpellErrorAttrib() = delete;
 public:
 SpellErrorAttrib( const SpellErrorDescription& );
-SpellErrorAttrib( const SpellErrorAttrib& rAttr );
-virtual ~SpellErrorAttrib() override;
 
 const SpellErrorDescription& GetErrorDescription() const { return 
m_aSpellErrorDescription; }
 
@@ -115,12 +112,8 @@ class SpellLanguageAttrib : public TextAttrib
 {
 LanguageType m_eLanguage;
 
-SpellLanguageAttrib() = delete;
-
 public:
 SpellLanguageAttrib(LanguageType eLanguage);
-SpellLanguageAttrib( const SpellLanguageAttrib& 
rAttr );
-virtual ~SpellLanguageAttrib() override;
 
 LanguageTypeGetLanguage() const {return m_eLanguage;}
 
@@ -134,12 +127,8 @@ class SpellBackgroundAttrib : public TextAttrib
 {
 Color   m_aBackgroundColor;
 
-SpellBackgroundAttrib() = delete;
-
 public:
 SpellBackgroundAttrib(const Color& rCol);
-SpellBackgroundAttrib( const 
SpellBackgroundAttrib& rAttr );
-virtual ~SpellBackgroundAttrib() override;
 
 virtual voidSetFont( vcl::Font& rFont ) const override;
 virtual TextAttrib* Clone() const override;
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index e446ee203563..8fadf98cc46f 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -39,11 +39,11 @@ namespace vcl { class Font; }
 class VCL_DLLPUBLIC TextAttrib
 {
 private:
-sal_uInt16  mnWhich;
+sal_uInt16 constmnWhich;
 
 protecte

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

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 21bf73a005f38fc4970ee916dce89ac05c60e729
Author: Caolán McNamara 
Date:   Fri Aug 11 13:10:29 2017 +0100

Resolves: tdf#111571 crash on restarting writer with modeless biblio dialog

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index e8d4ef2b492c..29e9e1f928ef 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1636,8 +1636,8 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* 
_pBindings,
 {
 Initialize(pInfo);
 SwWrtShell* pWrtShell = ::GetActiveWrtShell();
-OSL_ENSURE(pWrtShell, "No shell?");
-m_aContent.ReInitDlg(*pWrtShell);
+if (pWrtShell)
+m_aContent.ReInitDlg(*pWrtShell);
 }
 
 void SwAuthMarkFloatDlg::Activate()
___
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-1' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 71eb2f41c37ccc2a04ff2de5e7c16699e7d0d21e
Author: Christian Lohmaier 
Date:   Fri Aug 11 20:17:54 2017 +0200

bump product version to 5.4.1.1.0+

Change-Id: I0e1d8f711c827e3158582300a46db0a58bde3858

diff --git a/configure.ac b/configure.ac
index 33c4a62e7258..4cd0a4dc6d25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.4.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.1.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-5.4.1.1' created by Christian Lohmaier 
 at 2017-08-11 18:16 +

Tag libreoffice-5.4.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZjfSTAAoJEPQ0oe+v7q6jgowQAM/sAoVH3F1nm4crYf2qB0Fi
Gsn7WE2v/1JquFGMc1muBT+8Dcco9BPWU9kbyh+wi1QLySziGEsWwk6kdJhz2dqs
2dPr4oyT24is3vBkv2TMCfT+jjPlVKsvnVrGjW4UgDFPGHDPkyufkzfrHQkUoKG8
w1J67lNrJ9ZFa31jogic+gI12UXknjTCpOBAJfRxhmJF1SPTix5IcSbJ6LObtW67
8DXBzVE6lbW6CSCDCxiP13iUfSTe2w8/L00ccqLEezLOJFxFxr7JLAP/qQzEYoZz
r+Vmt5Y3i8kfIJHP5Q/wsEdO7clPX/IaOTIse9yvByzTxMPUTdgruoPur5V9SzZT
wCc9Ufp73xsamqQB+N0zSKjq9ATQ77HYrYoi8Q5wBbGaSwSsinN3LCvbxWdYTm3n
uFiC1jvpezpDLpO6zexVwNiD+9D9AxxXWkzx9owKYqS+i86/lGh+v62nfymfwQkt
Vma+9heN8g+0HhapQuxRjP/+20EybGC+gVIzQ5Z0+Jwifze4jJ0dIdJELtUmk9tk
VGa+wWJGndrRE+sONTjyym6N4XWm1NsJF0o90EBiyR4ueTGsX8kvcH7Bg9f6gwpg
jXgLQLWnQMEktK7o6QbAo54bVihFkbgr7LonDZb4yOZpcqosI0kfwkS14RkozRG1
WUVI7n2vtr+bXt1pdJhf
=OhdD
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-5.4.1.1' created by Christian Lohmaier 
 at 2017-08-11 18:16 +

Tag libreoffice-5.4.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZjfSXAAoJEPQ0oe+v7q6j9skQAMaFZ67PV4kmubohHDFJHipW
D5ZO+VbU2oVnH/xahtotpZvnJkAqAbweQ48elMH0w2hBu5p5rnI/pomaiWX4oyg3
bk+kj4IhPDYz4aQC24CPHA1SdLv0E4i19tE4+NykRUlXsdxNMuMVy4TZRJ9n8K4P
G8J+8e4JUHExdkuAnct8jjARMAYcWQIv1x+o2XNllPh/3KMWOfAWauUeEp+1tHTa
MKtARLlBE3AUhBXqbc3jc7PCQ1+ElEc3AVkwMu5DXDw0ic6ihK0FnU+DEd+ObYAG
nFqbNVAy6nKMAcf+4e1VTCUsN1qRBKsj/Xp2fPoZuqVc/oFGNWljo2y5U3d5WlkX
zCb7uNWD1PiZd2HLCVGkMgwThVW3XREfQ0494RT3PbqzipTvRMNA4a/OlBDvPwx/
NHYCYDDOjIhSW3GO/zIeUpeEdhd+N3OIiYj20QsPHZN7HUBhp6QW6wQu+uBa+9en
EClvbbfCdW/s02WJdSAV76d5uEKldbqjyIY5pN3+4K1CCnmNilpD+lukcMzwH4aj
z+ooueHugfBQMM11kPn9cEE54wmijkRhgniFVBLykNfuQBzrw/M8+jHhaO0xY9wC
s7MY79YQS53HfgcBEGgmSCfKWV0HsOmfI0kAt3Gfb65y87hlxJEECunirAw+rhfj
Lbx5jRFypU9gObLUygkw
=W+u9
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-5.4.1.1' created by Christian Lohmaier 
 at 2017-08-11 18:16 +

Tag libreoffice-5.4.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZjfSOAAoJEPQ0oe+v7q6jTxAQALIvBQdedzL646Oyv0SE9TEU
nQIqDpd7yr1IA8t7ygkkuS09PrWCc12WcvkH/oid4OcRtiDngHQS6edezJ2WVmiF
acE4MixV5mc7DxdIbpQNOlu6MD7IU7NV+Qsg/nDbERuPipTKaEpYQtQKyOCx3FRf
kGKhWGIS2lQtRMpnJw5NcIOhf+YWnSYy4nm/U/EBsdNUrs7BwNXVsjH8BRu1e5yQ
f5bAGxqpN22dZV5aeIKNSoIvF6KGg9p5cm9RTMmYJsUk7P+f4ILYw468JSE2XVHo
TMSgl/CY9TvvBEGvKhu1lFmv54tUEdjFd6UPQdyBlybrP3uMnRFwJze0GAexibq6
stVUAFcDGWYkUsZhVjyGoUQNRYtvd8F69eNHPIB2Vh/Q9NZS01zCkQhYeKiP9uRs
MK4kgqIIzXpjPOebfGbL7Ybn9M1kWzuDGNEMMP+UrLmm7W7KFg+xhntrHPYMHD2m
X7B6cU+no3/Fb/JGuLgDn+GUhTHKmt2liR7aCp3vdi8KBltYOAtuqtR++u5ZNvxR
61+94FhJP1348beURWobOSzPFu84d/JAe8bV8iC/6kFCVQyGQ6d0Ye56XG51N0Dg
E3c3k9iAugB9DepGQHF7wibyHdxoWf+DK+kcKdIvpiD8t6/7QhWoJX/BurWSTkG+
kH3yXql+yhC8/7JFwLjF
=8q0f
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.4.1.1'

[Christian Lohmaier]

Tag 'libreoffice-5.4.1.1' created by Christian Lohmaier 
 at 2017-08-11 18:16 +

Tag libreoffice-5.4.1.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJZjfSaAAoJEPQ0oe+v7q6jCfkQAMN6Htluer9qPWjfCbf3ZQFh
krgXGen1M4dA++d+jrcQ3a/vQZWBi2cCWzPqo3wQNOwIcWKZG2d3xqJ1QTA7Bc48
JsMo0GAZYS0yjxZ67jgs+hizT+KhUnwS06TG/T+1e5ye7l3GPlotSzE3qW/BkXu8
sAPf+Kz28J8bP57nah4585PLiAw8Dp1FnywEOGEqJPDJxNK4DnocgeIzwYSWbgdV
itDtkVDJY0dIvg039K8JOZE227U6JLTzTYZeThbxAd+tQI/X7PMNDWiMd564xsSu
ybqL5V9Hh5AllgDQTp8oc3bf9pt9QHYOk2bojRSMAaiHWVJBobVJ6v0DVpwNs2Sd
LYsI+1sdMfQ3EcP3MDagycOzbd3RTDyiledcLP8Yb0UdT84NtSM/y8fPSh1ZdPVt
1lXk+BMjvpiBruQCCL5aKlx83CMgWvTJFOu3oIUISnCuLsVLJvms4wTydR50b5IM
1LypYe7vDzafo1E8IdbOSqH0/79v5yZyrOPy41BB4WrvBBniFGwwno6QSwNvLuJr
xojUIYt8uHJljoP44R8LyqkRTQoD6ARLzrw8g5fN9CFTq9Vf68bsm34T8xPZGf+3
xAN1qIv2+vKOqAsKRivyxIsDeMeBL9x/F6z4vuHIDHyacEr29bmYm4CQ5ihzDGkA
15LY73+FqVmR2FYHriAW
=KzbW
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-4-1'

[Christian Lohmaier]

New branch 'libreoffice-5-4-1' available with the following commits:
commit 0171cb5b65edbdcfdc72b1e8d88d173eba5e1c34
Author: Christian Lohmaier 
Date:   Fri Aug 11 20:09:37 2017 +0200

Branch libreoffice-5-4-1

This is 'libreoffice-5-4-1' - the stable branch for the 5.4.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 5.4.x release,
please use the 'libreoffice-5-4' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I974a524603fbfce750704481f42bccfeeb6f9b34

___
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' - filter/source

[Samuel Mehrbrodt]

 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl |   30 -
 1 file changed, 7 insertions(+), 23 deletions(-)

New commits:
commit d8c4c6946e5dc3b1756294496e7fac1d343aadea
Author: Samuel Mehrbrodt 
Date:   Thu Aug 10 17:35:19 2017 +0200

tdf#111492 Honor ODF 1.2 style tab indentation in XHTML export

Change-Id: I9db61ed54b59b142d5198ec977044f7f52ba6b4d
Reviewed-on: https://gerrit.libreoffice.org/40981
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 46b4eb8b0e9325f8c29cd391baf9504bccee1837)
Reviewed-on: https://gerrit.libreoffice.org/41046
Reviewed-by: Christian Lohmaier 

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl 
b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index d638f6294ad9..124411bfa639 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -1273,32 +1273,16 @@

 

-   
-   
-   
+   
+   
 
-   
+   
+   

-   
-   
margin-right:
-   
-   
-   
-   cm;
-   
-   
-   
display:block;float:
-   
-   
-   
-   ;
-   
min-width:
-   
-   
-   
-   cm;
-   
+   
margin-right:0.64cm;



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

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

[Pranav Kant]

 kit/ChildSession.cpp  |7 --
 loleaflet/src/core/Socket.js  |  109 ++
 loleaflet/src/map/Map.js  |   23 ++-
 loleaflet/src/map/handler/Map.WOPI.js |   12 ++-
 wsd/DocumentBroker.cpp|6 +
 5 files changed, 93 insertions(+), 64 deletions(-)

New commits:
commit ef54b6ea167471ba5dc50947bc071a4c5f58c43f
Author: Pranav Kant 
Date:   Fri Aug 11 23:10:34 2017 +0530

wsd: Ignore useractive, userinactive when doc is not loaded

Sometimes client sends a userinactive message while the document is
already being loaded, which leads to the kit process skipping sending
the result of LOK callbacks to the client.

Handling this in child session is futile in the case when userinactive
message is sent when the document is being loaded, since kit process
handles the 'userinactive' message only after document is loaded (i.e
isLoaded() returns true). Moving this handling to DocumentBroker will
take care of both the cases - when 'userinactive' is sent before load
starts, and during load of the document.

Change-Id: I4ea3ac7b184d2ca373eb3ff4fb7b4ae394d454df

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 0a4a59e4..49cfde06 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -183,13 +183,6 @@ bool ChildSession::_handleInput(const char *buffer, int 
length)
 }
 else if (!_isDocLoaded)
 {
-// Be forgiving to these messages while we load.
-if (tokens[0] == "useractive" ||
-tokens[0] == "userinactive")
-{
-return true;
-}
-
 sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded");
 return false;
 }
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 84fddd68..f697c663 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1316,6 +1316,12 @@ bool DocumentBroker::forwardToChild(const std::string& 
viewId, const std::string
 {
 assertCorrectThread();
 
+// Ignore userinactive, useractive message until document is loaded
+if (!isLoaded() && (message == "userinactive" || message == "useractive"))
+{
+return true;
+}
+
 LOG_TRC("Forwarding payload to child [" << viewId << "]: " << message);
 
 std::string msg = "child-" + viewId + ' ' + message;
commit 8c74d4a38d0fc13e859ea0e936fca0102a0e9d0d
Author: Pranav Kant 
Date:   Fri Aug 11 22:32:34 2017 +0530

loleaflet: activate the inactivity timer after document load

The timer is cancelled right after 'statusindicator' is received, so a
document never really go to inactive mode after set inactivity time
period (unless user refocuses the document). Call _activate() to ensure
that timer is started after document is completely loaded.

Also timer shouldn't really start when the document is not yet loaded.

Change-Id: I58f5d7718c65cc37da9c3feb99ee6b16741a22a2

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 07b78e1c..600621e9 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -152,14 +152,16 @@ L.Map = L.Evented.extend({
}, this);
 
this.on('docloaded', function(e) {
-   if (e.status) {
+   this._docLoaded = e.status;
+   if (this._docLoaded) {
// so that dim timer starts from now()
this.lastActiveTime = Date.now();
if (!document.hasFocus()) {
this._deactivate();
+   } else {
+   this._activate();
}
}
-   this._docLoaded = e.status;
}, this);
},
 
@@ -906,7 +908,7 @@ L.Map = L.Evented.extend({
},
 
_startInactiveTimer: function () {
-   if (this._serverRecycling || this._documentIdle) {
+   if (this._serverRecycling || this._documentIdle || 
!this._docLoaded) {
return;
}
 
commit d0be89bffa339e6cefc88cd3ca56ccd86ec1f517
Author: Pranav Kant 
Date:   Fri Aug 11 21:39:12 2017 +0530

loleaflet: new event, docloaded, to sync. various things

First, use the docloaded event to see whether we should be dimming the
document (make it inactive) or not. There is no point in inactivating a
document before document has completely loaded; so don't start the timer
until after the document is completely loaded.

It turns out that we were only emitting the WOPI's App_LoadingStatus
with DocumentLoaded for the first document load, but not for subsequent
reconnections. The problem here was that doclayerinit event is only
emitted during first document load (when TileLayer is -actually-
initializ

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

[Julien Nabet]

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

New commits:
commit 84fc4dec5f419cbe30fa6ac4e228f083837f7887
Author: Julien Nabet 
Date:   Fri Aug 11 19:09:24 2017 +0200

Related tdf#111634: Multiple memory leaks in libmacabdrv1 (part2)

Delete "sub arrays" of headerNames which is macabfield **
before calling delete headerNames []

Change-Id: I11b6d5483ed91eb2805b68ace1b06eafd23b707d
Reviewed-on: https://gerrit.libreoffice.org/41054
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx 
b/connectivity/source/drivers/macab/MacabRecords.cxx
index d5e8d2c6f67f..ccc4dc3e8f6e 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -839,6 +839,8 @@ MacabHeader *MacabRecords::createHeaderForProperty(const 
ABPropertyType _propert
 {
 manageDuplicateHeaders(headerNames, length);
 MacabHeader *headerResult = new MacabHeader(length, headerNames);
+for(sal_Int32 i = 0; i < length; ++i)
+delete headerNames[i];
 delete [] headerNames;
 return headerResult;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sc/qa/unit/parallelism.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 65edadcc76969d58a8a4e7b889d7124d3274048b
Author: Miklos Vajna 
Date:   Fri Aug 11 18:35:07 2017 +0200

CppunitTest_sc_parallelism: fix loplugin:stringconcat warning

Change-Id: Ibab8db1c798312f34a5b8e0178b10c21299a5c7c

diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 4614827d04c8..43394468aca1 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -144,10 +144,10 @@ void ScParallelismTest::testSUMIFS()
 std::cerr << "A1=" << m_pDoc->GetValue(0, 0, 0) << std::endl;
 
 m_pDoc->GetFormula(5, 0, 0, sFormula);
-std::cerr << "E1=" << "\"" << sFormula << "\"=" << m_pDoc->GetValue(5, 0, 
0) << std::endl;
+std::cerr << "E1=\"" << sFormula << "\"=" << m_pDoc->GetValue(5, 0, 0) << 
std::endl;
 
 m_pDoc->GetFormula(6, 0, 0, sFormula);
-std::cerr << "F1=" << "\"" << sFormula << "\"=" << m_pDoc->GetValue(6, 0, 
0) << std::endl;
+std::cerr << "F1=\"" << sFormula << "\"=" << m_pDoc->GetValue(6, 0, 0) << 
std::endl;
 
 std::cerr << "  A,B,C  F  L,M" << std::endl;
 for (auto i = 1; i < 30; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Grzegorz Araminowicz]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |6 +-
 sd/qa/unit/data/pptx/smartart-text.pptx |binary
 sd/qa/unit/import-tests.cxx |   17 +
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 4b149e04ca37056642badab9d18c51857d52e946
Author: Grzegorz Araminowicz 
Date:   Wed Aug 9 12:27:36 2017 +0200

SmartArt: fix duplicated text

in some diagrams there are two shapes for the same node - tx and sp
sp should be just space, so remove text from it

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 79390b1a3792..c3cc7a0dc977 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -280,8 +280,12 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 }
 
 case XML_sp:
-// HACK. Handled one level higher. Or rather, planned to
+{
+// HACK: Handled one level higher. Or rather, planned to
+// HACK: text should appear only in tx node; we're assigning it 
earlier, so let's remove it here
+rShape->setTextBody(TextBodyPtr());
 break;
+}
 
 case XML_tx:
 {
diff --git a/sd/qa/unit/data/pptx/smartart-text.pptx 
b/sd/qa/unit/data/pptx/smartart-text.pptx
new file mode 100755
index ..9656e4fab64d
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-text.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 392369234d0a..ba1a44485f25 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -165,6 +165,7 @@ public:
 void testTdf109067();
 void testSmartArt1();
 void testSmartArtChildren();
+void testSmartArtText();
 void testTdf109223();
 void testActiveXCheckbox();
 void testTdf109187();
@@ -240,6 +241,7 @@ public:
 CPPUNIT_TEST(testTdf109067);
 CPPUNIT_TEST(testSmartArt1);
 CPPUNIT_TEST(testSmartArtChildren);
+CPPUNIT_TEST(testSmartArtText);
 CPPUNIT_TEST(testTdf109223);
 CPPUNIT_TEST(testActiveXCheckbox);
 CPPUNIT_TEST(testTdf109187);
@@ -2301,6 +2303,21 @@ void SdImportTest::testSmartArtChildren()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testSmartArtText()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-text.pptx"), 
PPTX);
+uno::Reference xShapeGroup(getShapeFromPage(0, 0, 
xDocShRef), uno::UNO_QUERY_THROW);
+uno::Reference xShapeGroup2(xShapeGroup->getByIndex(0), 
uno::UNO_QUERY_THROW);
+
+uno::Reference xText0(xShapeGroup2->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xText0->getString().isEmpty());
+
+uno::Reference xText1(xShapeGroup2->getByIndex(1), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("test"), xText1->getString());
+
+xDocShRef->DoClose();
+}
+
 void SdImportTest::testTdf109223()
 {
 // In the test document flipV attribute is defined for a group shape
___
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

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 87f31ec5a8fb968bde0ff1d1bd41324883b6e263
Author: Caolán McNamara 
Date:   Fri Aug 11 13:10:29 2017 +0100

Resolves: tdf#111571 crash on restarting writer with modeless biblio dialog

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index a4b817296e76..b266a1082554 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1633,8 +1633,8 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* 
_pBindings,
 {
 Initialize(pInfo);
 SwWrtShell* pWrtShell = ::GetActiveWrtShell();
-OSL_ENSURE(pWrtShell, "No shell?");
-m_aContent.ReInitDlg(*pWrtShell);
+if (pWrtShell)
+m_aContent.ReInitDlg(*pWrtShell);
 }
 
 void SwAuthMarkFloatDlg::Activate()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 sw/source/core/text/itrtxt.cxx   |4 +++-
 sw/source/core/text/pormulti.cxx |   23 +--
 2 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit c3579e74dec0db203566df1e356af9b06374ef9c
Author: Mark Hung 
Date:   Sun Jul 30 07:57:44 2017 +0800

tdf#89409 Render ruby inside the grid in standard mode.

In standard mode the text grids are rectangle and do not have
dedicated space for ruby text. The ruby text either overlap
with base text of the last line or clipped ( after scrolling ).
Move ruby text inside the grid in standard mode as if there
is no grid, and algin text to the center to keep the original
text-to-text alignment behavior.

Change-Id: Ia75ee016f9d492e4e73da6d7245aaeff40cbe1f3
Reviewed-on: https://gerrit.libreoffice.org/40632
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index c62265e093d8..093927bd49b8 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -231,7 +231,9 @@ sal_uInt16 SwTextCursor::AdjustBaseLine( const 
SwLineLayout& rLine,
 const sal_uInt16 nRubyHeight = pGrid->GetRubyHeight();
 const bool bRubyTop = ! pGrid->GetRubyTextBelow();
 
-if ( GetInfo().IsMulti() )
+if ( !pGrid->IsSquaredMode() )
+nOfst += ( rLine.Height() - nPorHeight ) / 2 + nPorAscent;
+else if ( GetInfo().IsMulti() )
 // we are inside the GetCharRect recursion for multi portions
 // we center the portion in its surrounding line
 nOfst = ( m_pCurr->Height() - nPorHeight ) / 2 + nPorAscent;
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 554dadf254f8..42fba70e6769 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1256,9 +1256,9 @@ void SwTextPainter::PaintMultiPortion( const SwRect 
&rPaint,
 SwTextGridItem const*const pGrid(GetGridItem(m_pFrame->FindPageFrame()));
 const bool bHasGrid = pGrid && GetInfo().SnapToGrid();
 sal_uInt16 nRubyHeight = 0;
-bool bRubyTop = false;
+bool bRubyTop = true;
 
-if ( bHasGrid )
+if ( bHasGrid && pGrid->IsSquaredMode() )
 {
 nRubyHeight = pGrid->GetRubyHeight();
 bRubyTop = ! pGrid->GetRubyTextBelow();
@@ -1273,7 +1273,8 @@ void SwTextPainter::PaintMultiPortion( const SwRect 
&rPaint,
 if ( bRubyInGrid )
 {
 GetInfo().SetSnapToGrid( ! bRubyTop );
-rMulti.Height( m_pCurr->Height() );
+if (pGrid->IsSquaredMode())
+rMulti.Height( m_pCurr->Height() );
 }
 
 SwLayoutModeModifier aLayoutModeModifier( *GetInfo().GetOut() );
@@ -1297,7 +1298,7 @@ void SwTextPainter::PaintMultiPortion( const SwRect 
&rPaint,
 GetInfo().DrawViewOpt( rMulti, POR_FLD );
 #endif
 
-if ( bRubyInGrid )
+if ( bRubyInGrid && pGrid->IsSquaredMode() )
 rMulti.Height( nOldHeight );
 
 // do we have to repaint a post it portion?
@@ -1394,7 +1395,7 @@ void SwTextPainter::PaintMultiPortion( const SwRect 
&rPaint,
 
 do
 {
-if ( bHasGrid )
+if ( bHasGrid && pGrid->IsSquaredMode() )
 {
 if( rMulti.HasRotation() )
 {
@@ -1524,16 +1525,18 @@ void SwTextPainter::PaintMultiPortion( const SwRect 
&rPaint,
 }
 else if ( bHasGrid && rMulti.IsRuby() )
 {
+GetInfo().SetSnapToGrid( bRubyTop );
 GetInfo().X( nTmpX );
-if ( bRubyTop )
+if (pGrid->IsSquaredMode() )
 {
-nOfst += nRubyHeight;
-GetInfo().SetSnapToGrid( true );
+if ( bRubyTop )
+nOfst += nRubyHeight;
+else
+nOfst += m_pCurr->Height() - nRubyHeight;
 }
 else
 {
-nOfst += m_pCurr->Height() - nRubyHeight;
-GetInfo().SetSnapToGrid( false );
+nOfst += rMulti.GetRoot().Height();
 }
 } else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/kde5' - 0 commits -

[Katarina Behrens]

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

[GSoC] QuarkXPress import, Week 10

[Alex P]

During this week I finished parsing of QXP 4.0 objects and implemented
output for new objects that were missing in 3.3: text paths, Bezier curves,
Bezier boxes.

Also I implemented parsing and output of arrows, dashes (except stripes and
bitmap frames), tabs, runaround (as far as it's supported in ODF: without
custom padding) in 3.3 and 4.0.

Tabs currently don't seem to work, could be a bug in libodf (they are
missing in odg output). Also runaround doesn't work in LO Draw, but it's
probably because it's not implemented there.

http://i.imgur.com/z83ezHK.png
http://i.imgur.com/rrX27EQ.png
http://i.imgur.com/r5FmqdV.png
http://i.imgur.com/Ji7V7EP.png
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: config_host/config_kde5.h.in config_host/config_vclplug.h.in config_host.mk.in configure.ac cui/Library_cui.mk RepositoryExternal.mk Repository.mk scp2/InstallScript_se

[Katarina Behrens]

 Repository.mk   |2 
 RepositoryExternal.mk   |   33 
 config_host.mk.in   |7 -
 config_host/config_kde5.h.in|   10 --
 config_host/config_vclplug.h.in |1 
 configure.ac|  156 
 cui/Library_cui.mk  |1 
 scp2/InstallScript_setup_osl.mk |2 
 scp2/Module_scp2.mk |2 
 9 files changed, 2 insertions(+), 212 deletions(-)

New commits:
commit 63767e542b91c8bb8d6347e46f2c52cc8bd2dc86
Author: Katarina Behrens 
Date:   Fri Aug 11 16:54:01 2017 +0200

Revert "Build with kde5, first stab"

this was meant to go to a feature branch *sigh it must be Friday

diff --git a/Repository.mk b/Repository.mk
index cb35e3f89e19..d133131551a0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -281,10 +281,8 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
$(if $(ENABLE_KDE4),kde4be1) \
-   $(if $(ENABLE_KDE5),kde5be1) \
$(if $(USING_X11), \
$(if $(ENABLE_KDE4),vclplug_kde4) \
-   $(if $(ENABLE_KDE5),vclplug_kde5) \
) \
 ))
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 38fe79a98907..44a89738fb74 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3034,39 +3034,6 @@ endef
 endif # ENABLE_KDE4
 
 
-ifeq ($(ENABLE_KDE5),TRUE)
-
-define gb_LinkTarget__use_kde5
-$(call gb_LinkTarget_set_include,$(1),\
-   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(KF5_CFLAGS \
-   $$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_add_defs,$(1),\
-   $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS))) 
\
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(KF5_LIBS) \
-)
-
-ifeq ($(COM),GCC)
-$(call gb_LinkTarget_add_cxxflags,$(1),\
-   -Wno-shadow \
-)
-endif
-
-endef
-
-else # !ENABLE_KDE5
-
-define gb_LinkTarget__use_kde5
-
-endef
-
-endif # ENABLE_KDE5
-
-
 # PYTHON
 # extra python_headers external because pyuno wrapper must not link python
 ifneq ($(SYSTEM_PYTHON),)
diff --git a/config_host.mk.in b/config_host.mk.in
index 24d9cc4f533a..75298b966716 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -139,7 +139,6 @@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
-export ENABLE_KDE5=@ENABLE_KDE5@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
@@ -295,11 +294,6 @@ export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
 export KDE4_GLIB_CFLAGS=$(gb_SPACE)@KDE4_GLIB_CFLAGS@
 export KDE4_GLIB_LIBS=$(gb_SPACE)@KDE4_GLIB_LIBS@
 export KDE4_HAVE_GLIB=@KDE4_HAVE_GLIB@
-export KF5_CFLAGS=$(gb_SPACE)@KF5_CFLAGS@
-export KF5_LIBS=$(gb_SPACE)@KF5_LIBS@
-export KF5_GLIB_CFLAGS=$(gb_SPACE)@KF5_GLIB_CFLAGS@
-export KF5_GLIB_LIBS=$(gb_SPACE)@KF5_GLIB_LIBS@
-export KF5_HAVE_GLIB=@KF5_HAVE_GLIB@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
@@ -387,7 +381,6 @@ export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
-export MOC5=@MOC5@
 export MPL_SUBSET=@MPL_SUBSET@
 export MSGFMT=@MSGFMT@
 export MSGUNIQ=@MSGUNIQ@
diff --git a/config_host/config_kde5.h.in b/config_host/config_kde5.h.in
deleted file mode 100644
index 01fa9d212789..
--- a/config_host/config_kde5.h.in
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-Settings for KDE5 integration.
-*/
-
-#ifndef CONFIG_KDE5_H
-#define CONFIG_KDE5_H
-
-#define KF5_HAVE_GLIB 0
-
-#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index b7b9624cdf79..510d0d25229c 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -9,6 +9,5 @@ Settings about which X11 desktops have support enabled.
 
 #define ENABLE_GTK 0
 #define ENABLE_KDE4 0
-#define ENABLE_KDE5 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index a14fded670a9..490d03e058cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,7 +660,6 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
-test_kde5=yes
 if test "$enable_fuzzers" != yes; then
 test_freetype=yes
 test_fontconfig=yes
@@ -742,7 +741,6 @@ freebsd*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
-test_kde5=yes
 test_freetype=yes
 AC_MSG_CHECKING([the FreeBSD operating system release])
 if test -n "$with_os_version"; then
@@ -771,7 +769,6 @@ freebsd*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
-test_kde5=yes
 test_freetype=yes
 PTHREAD_LIBS="-pthread -lpthread"
 _os=NetBSD
@@ -797,7 +794,6 @@ dragonfly*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=y

[Libreoffice-commits] core.git: config_host/config_kde5.h.in config_host/config_vclplug.h.in config_host.mk.in configure.ac cui/Library_cui.mk RepositoryExternal.mk Repository.mk scp2/InstallScript_se

[Katarina Behrens]

 Repository.mk   |2 
 RepositoryExternal.mk   |   33 
 config_host.mk.in   |7 +
 config_host/config_kde5.h.in|   10 ++
 config_host/config_vclplug.h.in |1 
 configure.ac|  156 
 cui/Library_cui.mk  |1 
 scp2/InstallScript_setup_osl.mk |2 
 scp2/Module_scp2.mk |2 
 9 files changed, 212 insertions(+), 2 deletions(-)

New commits:
commit 19805f85b35672e6d0ee16f8fb4b79a3e94fc05d
Author: Katarina Behrens 
Date:   Fri Aug 11 11:47:01 2017 +0200

Build with kde5, first stab

this is largely based on jmux's work

Change-Id: I5897f3ecb90f83a29e0824bfe7a0ea875347e360

diff --git a/Repository.mk b/Repository.mk
index d133131551a0..cb35e3f89e19 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -281,8 +281,10 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
$(if $(ENABLE_KDE4),kde4be1) \
+   $(if $(ENABLE_KDE5),kde5be1) \
$(if $(USING_X11), \
$(if $(ENABLE_KDE4),vclplug_kde4) \
+   $(if $(ENABLE_KDE5),vclplug_kde5) \
) \
 ))
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 44a89738fb74..38fe79a98907 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3034,6 +3034,39 @@ endef
 endif # ENABLE_KDE4
 
 
+ifeq ($(ENABLE_KDE5),TRUE)
+
+define gb_LinkTarget__use_kde5
+$(call gb_LinkTarget_set_include,$(1),\
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(KF5_CFLAGS \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_defs,$(1),\
+   $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF5_CFLAGS))) 
\
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(KF5_LIBS) \
+)
+
+ifeq ($(COM),GCC)
+$(call gb_LinkTarget_add_cxxflags,$(1),\
+   -Wno-shadow \
+)
+endif
+
+endef
+
+else # !ENABLE_KDE5
+
+define gb_LinkTarget__use_kde5
+
+endef
+
+endif # ENABLE_KDE5
+
+
 # PYTHON
 # extra python_headers external because pyuno wrapper must not link python
 ifneq ($(SYSTEM_PYTHON),)
diff --git a/config_host.mk.in b/config_host.mk.in
index 75298b966716..24d9cc4f533a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -139,6 +139,7 @@ export ENABLE_GTK_PRINT=@ENABLE_GTK_PRINT@
 export ENABLE_HEADLESS=@ENABLE_HEADLESS@
 export ENABLE_JAVA=@ENABLE_JAVA@
 export ENABLE_KDE4=@ENABLE_KDE4@
+export ENABLE_KDE5=@ENABLE_KDE5@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
@@ -294,6 +295,11 @@ export KDE4_LIBS=$(gb_SPACE)@KDE4_LIBS@
 export KDE4_GLIB_CFLAGS=$(gb_SPACE)@KDE4_GLIB_CFLAGS@
 export KDE4_GLIB_LIBS=$(gb_SPACE)@KDE4_GLIB_LIBS@
 export KDE4_HAVE_GLIB=@KDE4_HAVE_GLIB@
+export KF5_CFLAGS=$(gb_SPACE)@KF5_CFLAGS@
+export KF5_LIBS=$(gb_SPACE)@KF5_LIBS@
+export KF5_GLIB_CFLAGS=$(gb_SPACE)@KF5_GLIB_CFLAGS@
+export KF5_GLIB_LIBS=$(gb_SPACE)@KF5_GLIB_LIBS@
+export KF5_HAVE_GLIB=@KF5_HAVE_GLIB@
 export KRB5_LIBS=@KRB5_LIBS@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
@@ -381,6 +387,7 @@ export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
 export ML_EXE=@ML_EXE@
 export MOC4=@MOC4@
+export MOC5=@MOC5@
 export MPL_SUBSET=@MPL_SUBSET@
 export MSGFMT=@MSGFMT@
 export MSGUNIQ=@MSGUNIQ@
diff --git a/config_host/config_kde5.h.in b/config_host/config_kde5.h.in
new file mode 100644
index ..01fa9d212789
--- /dev/null
+++ b/config_host/config_kde5.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for KDE5 integration.
+*/
+
+#ifndef CONFIG_KDE5_H
+#define CONFIG_KDE5_H
+
+#define KF5_HAVE_GLIB 0
+
+#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 510d0d25229c..b7b9624cdf79 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -9,5 +9,6 @@ Settings about which X11 desktops have support enabled.
 
 #define ENABLE_GTK 0
 #define ENABLE_KDE4 0
+#define ENABLE_KDE5 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 490d03e058cd..a14fded670a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -660,6 +660,7 @@ linux-gnu*|k*bsd*-gnu*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
+test_kde5=yes
 if test "$enable_fuzzers" != yes; then
 test_freetype=yes
 test_fontconfig=yes
@@ -741,6 +742,7 @@ freebsd*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
+test_kde5=yes
 test_freetype=yes
 AC_MSG_CHECKING([the FreeBSD operating system release])
 if test -n "$with_os_version"; then
@@ -769,6 +771,7 @@ freebsd*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10=yes
 test_kde4=yes
+test_kde5=yes
 test_freetype=yes
 PTHREAD_LIBS="-pthread -lpthread"
 _os=NetBSD
@@ -794,6 +797,7 @@ dragonfly*)
 build_gstreamer_1_0=yes
 build_gstreamer_0_10

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

[Michael Stahl]

 sw/source/core/txtnode/ndtxt.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 6ff9371a30e972d3e9baad00b23e26cd8ff445dc
Author: Michael Stahl 
Date:   Fri Aug 11 10:58:43 2017 +0200

tdf#105705 sw: fix another case of bookmarks becoming un-sorted

The loop in SwTextNode::Update() that reassigns bookmark end positions
away from the node to a temporary SwIndexReg can stop prematurely in a
particular situation where there is a bookmark that is expanded and with
both mark positions at the critical "rPos" insertion position, and also
both their SwIndexes consecutive in the SwIndexReg::m_pFirst
linked-list.

What happens then is that the iteration gets to the first of the 2
consecutive positions of the bookmark, then calls GetMarkEnd() on the
mark, which happens to return the other position, which is already
stored in the "next" local variable.

That other position is then moved to aTmpIdxReg, and in the next loop
iteration GetNext() is null as it is the last one in aTmpIdxReg and the
loop terminates.

Thus various bookmark end positions don't get preserved, or the
bAtLeastOneExpandedBookmarkAtInsertionPosition doesn't get set, either
of which can cause the bookmark array to lose its sort order.

This was found playing around with Zotero 4.0.29.10, while switching
between different citation styles.

(regression from 6a5dbe73537642b06bcde782118a34b4593d17eb)

Change-Id: Ia35ce0656bcb2d6af7ea189458af3942ff83e4da
(cherry picked from commit f78aadea74b99ba71f930c7cf52352da9ee965e9)
Reviewed-on: https://gerrit.libreoffice.org/41015
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 2ae3720dd6ae..6f9092e9295d 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1088,6 +1088,10 @@ void SwTextNode::Update(
 if( this == &pEnd->nNode.GetNode() &&
 rPos.GetIndex() == rEndIdx.GetIndex() )
 {
+if (&rEndIdx == next) // nasty corner case:
+{   // don't switch to iterating aTmpIdxReg!
+next = rEndIdx.GetNext();
+}
 rEndIdx.Assign( &aTmpIdxReg, rEndIdx.GetIndex() );
 bAtLeastOneBookmarkMoved = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/CppunitTest_sc_parallelism.mk sc/inc sc/Module_sc.mk sc/qa sc/source

[Tor Lillqvist]

 sc/CppunitTest_sc_parallelism.mk  |  108 
 sc/Module_sc.mk   |1 
 sc/inc/formulagroup.hxx   |1 
 sc/qa/unit/parallelism.cxx|  181 ++
 sc/source/core/tool/formulagroup.cxx  |7 +
 sc/source/core/tool/formulalogger.cxx |4 
 6 files changed, 301 insertions(+), 1 deletion(-)

New commits:
commit 244f60531260cf6e88e764b5c271d5c9183b5d1a
Author: Tor Lillqvist 
Date:   Thu Aug 10 17:13:45 2017 +0300

Add a unit test to be used to test parallelised calculations in Calc

Currently only tests SUMIFS.

Yes, it would be nice if some of the already existing unit tests would
work for this need, too. But there are various reasons wny not. Also,
don't want to interfere in ongoing work by others.

Change-Id: Ie9008a4a1a8c26eff4f2ab0bc91294b2239f0ae1

diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk
new file mode 100644
index ..a411caee2ae2
--- /dev/null
+++ b/sc/CppunitTest_sc_parallelism.mk
@@ -0,0 +1,108 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_parallelism, \
+sc/qa/unit/parallelism \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sc_parallelism, \
+   boost_headers \
+$(call gb_Helper_optional,OPENCL,clew) \
+   mdds_headers \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \
+basegfx \
+comphelper \
+cppu \
+cppuhelper \
+drawinglayer \
+editeng \
+for \
+forui \
+i18nlangtag \
+msfilter \
+oox \
+sal \
+salhelper \
+sax \
+sc \
+scqahelper \
+sfx \
+sot \
+svl \
+svt \
+svx \
+svxcore \
+   test \
+tk \
+tl \
+ucbhelper \
+   unotest \
+utl \
+vcl \
+xo \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_parallelism,\
+-I$(SRCDIR)/sc/source/ui/inc \
+-I$(SRCDIR)/sc/source/core/inc \
+-I$(SRCDIR)/sc/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_parallelism))
+$(eval $(call gb_CppunitTest_use_vcl,sc_parallelism))
+
+$(eval $(call gb_CppunitTest_use_components,sc_parallelism,\
+basic/util/sb \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+dbaccess/util/dba \
+embeddedobj/util/embobj \
+eventattacher/source/evtatt \
+filter/source/config/cache/filterconfig1 \
+forms/util/frm \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/lng \
+oox/util/oox \
+package/source/xstor/xstor \
+package/util/package2 \
+sax/source/expatwrap/expwrap \
+scaddins/source/analysis/analysis \
+scaddins/source/datefunc/date \
+sc/util/sc \
+sc/util/scfilt \
+sfx2/util/sfx \
+sot/util/sot \
+svl/util/svl \
+svtools/util/svt \
+svx/util/svx \
+svx/util/svxcore \
+toolkit/util/tk \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+ucb/source/ucp/tdoc/ucptdoc1 \
+   uui/util/uui \
+unotools/util/utl \
+unoxml/source/rdf/unordf \
+unoxml/source/service/unoxml \
+xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_parallelism))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 9080ec3a4433..6a6a538d189c 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -96,6 +96,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_unoapi_6 \
JunitTest_sc_unoapi_7 \
CppunitTest_sc_opencl_test \
+   CppunitTest_sc_parallelism \
CppunitTest_sc_anchor_test \
CppunitTest_sc_annotationshapeobj \
CppunitTest_sc_outlineobj \
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index f51a592e0d60..a02157439448 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -138,6 +138,7 @@ public:
 static bool switchOpenCLDevice(const OUString& rDeviceId, bool 
bAutoSelect, bool bForceEvaluation = false);
 // This is intended to be called from opencl-test.cxx only
 static void enableOpenCL_UnitTestsOnly();
+static void disableOpenCL_UnitTestsOnly();
 static void getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int32& 
rPlatformId);
 #endif
 virtual ScMatrixRef inverseMatrix(const ScMatrix& rMat) = 0;
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
new file mode 100644
index ..4614827d04c8

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - download.lst external/python3

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit f18ea813967c1b35a8977bd193c19857f61f7a8c
Author: David Ostrovsky 
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41028

diff --git a/download.lst b/download.lst
index 2e22bd1101df..9faf3b465130 100644
--- a/download.lst
+++ b/download.lst
@@ -142,8 +142,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
 export PYTHON_TARBALL := Python-3.3.5.tgz
 else
-export PYTHON_MD5SUM := 6192f0e45f02575590760e68c621a488
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_MD5SUM := 2ed4802b7a2a7e40d2e797272bf388ec
+export PYTHON_TARBALL := Python-3.5.4.tgz
 endif
 
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index f84b98299b8c..20192af318bf 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1
index c4bc117f5558..beb6fe38882f 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.5.4-ssl.patch.1
@@ -1,11 +1,11 @@
 -*- Mode: diff -*-
 
-Tweak SSL build to find OpenSSL in solver & not build it itself in 
"ssl.vcproj" etc.
+Tweak SSL build to find OpenSSL in workdir & not build it itself in 
"ssl.vcproj" etc.
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-08-22 18:57:16.653719900 +0200
-+++ python3/PCbuild/pcbuild.sln2015-08-22 19:03:06.062853000 +0200
-@@ -64,10 +64,6 @@
+

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

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit a2762b96f605ab5a3269b37c3bee8e7917a9e111
Author: David Ostrovsky 
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944
Reviewed-on: https://gerrit.libreoffice.org/40944
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f)
Reviewed-on: https://gerrit.libreoffice.org/41026

diff --git a/download.lst b/download.lst
index d7f08d41fb2f..ba60f47751f1 100644
--- a/download.lst
+++ b/download.lst
@@ -193,8 +193,8 @@ export POPPLER_SHA256SUM := 
869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e851
 export POPPLER_TARBALL := poppler-0.56.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
+export PYTHON_TARBALL := Python-3.5.4.tgz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 915416f2c952..ce2087497db8 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1
index c4bc117f5558..beb6fe38882f 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.5.4-ssl.patch.1
@@ -1,11 +1,11 @@
 -*- 

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

[Tamás Zolnai]

 sw/source/filter/ww8/docxattributeoutput.cxx |   21 -
 sw/source/filter/ww8/docxattributeoutput.hxx |2 --
 2 files changed, 23 deletions(-)

New commits:
commit 50ce9e40148ad507e60e3deb4c1ac3b5b23cb5ff
Author: Tamás Zolnai 
Date:   Fri Aug 11 02:47:09 2017 +0200

m_pPostponedVMLDrawings is unused now

Change-Id: Iec685588ef7a1d5284072ebc8fcadc07dae67364
Reviewed-on: https://gerrit.libreoffice.org/40999
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index e6338d85ed7b..5d7490223eda 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1731,9 +1731,6 @@ void DocxAttributeOutput::StartRunProperties()
 assert( !m_pPostponedDiagrams );
 m_pPostponedDiagrams.reset(new std::list);
 
-assert( !m_pPostponedVMLDrawings );
-m_pPostponedVMLDrawings.reset(new std::list);
-
 assert(!m_pPostponedDMLDrawings);
 m_pPostponedDMLDrawings.reset(new std::list);
 
@@ -2042,7 +2039,6 @@ void DocxAttributeOutput::EndRunProperties( const 
SwRedlineData* pRedlineData )
 WritePostponedChart();
 
 //We need to write w:pict tag after the w:rPr.
-WritePostponedVMLDrawing();
 WritePostponedDMLDrawing();
 
 WritePostponedOLE();
@@ -4905,23 +4901,6 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, 
const Size& rSize, const S
 m_pSerializer->endElementNS( XML_w, XML_object );
 }
 
-/*
- * Write w:pict hierarchy  end element of w:rPr tag.
- */
-void DocxAttributeOutput::WritePostponedVMLDrawing()
-{
-if (!m_pPostponedVMLDrawings)
-return;
-
-for( std::list< PostponedDrawing >::iterator it = 
m_pPostponedVMLDrawings->begin();
- it != m_pPostponedVMLDrawings->end();
- ++it )
-{
-m_rExport.SdrExporter().writeVMLDrawing(it->object, *(it->frame), 
*(it->point));
-}
-m_pPostponedVMLDrawings.reset(nullptr);
-}
-
 void DocxAttributeOutput::WritePostponedCustomShape()
 {
 if (!m_pPostponedCustomShape)
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 49efe1d6c72d..8daa50aea34a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -700,7 +700,6 @@ private:
 void WritePostponedDiagram();
 void WritePostponedChart();
 void WritePostponedOLE();
-void WritePostponedVMLDrawing();
 void WritePostponedDMLDrawing();
 void WritePostponedCustomShape();
 
@@ -856,7 +855,6 @@ private:
 const SwFrameFormat* frame;
 const Point* point;
 };
-std::unique_ptr< std::list > m_pPostponedVMLDrawings;
 std::unique_ptr< std::list > m_pPostponedDMLDrawings;
 std::unique_ptr< std::list > m_pPostponedCustomShape;
 
___
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/unocore/unostyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1a3672d34030461f49610c47c0a1b4a9f9fd51ed
Author: Miklos Vajna 
Date:   Fri Aug 11 11:30:17 2017 +0200

sw: fix typo in SwXStyle::GetStyleProperty

OSL_ENSURE -> SAL_WARN_IF forgot to invert the condition in commit
6abe9cfa924236b9915888470723fec612e1a16d (refactor out to limit scope:
RES_PARATR_OUTLINELEVEL, 2016-03-11).

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

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index ebb2856bff32..d3764741486a 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2154,7 +2154,7 @@ template<>
 uno::Any SwXStyle::GetStyleProperty(const 
SfxItemPropertySimpleEntry&, const SfxItemPropertySet&, SwStyleBase_Impl& rBase)
 {
 PrepareStyleBase(rBase);
-SAL_WARN_IF(SfxStyleFamily::Para == GetFamily(), "sw.uno", "only paras");
+SAL_WARN_IF(SfxStyleFamily::Para != GetFamily(), "sw.uno", "only paras");
 return 
uno::makeAny(rBase.getNewBase()->GetCollection()->GetAttrOutlineLevel());
 }
 template<>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara]

 cui/source/customize/cfgutil.cxx |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 114d3b369ae765ce106ffebfeac4498598b6c6b7
Author: Muhammet Kara 
Date:   Fri Aug 11 12:36:52 2017 +0300

Remove useless if check

And the return in the default case, which could cause the UI element to
stop updating

Change-Id: I29d35818b015f71890f615a02ea215034c048326
Reviewed-on: https://gerrit.libreoffice.org/41020
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f69f184afed9..3c409e182ed2 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -865,14 +865,6 @@ void SfxConfigGroupListBox::GroupSelected()
 SfxGroupInfo_Impl *pInfo = 
static_cast(pEntry->GetUserData());
 pFunctionListBox->SetUpdateMode(false);
 pFunctionListBox->ClearAll();
-if ( pInfo->nKind != SfxCfgKind::GROUP_FUNCTION &&
- pInfo->nKind != SfxCfgKind::GROUP_ALLFUNCTIONS &&
- pInfo->nKind != SfxCfgKind::GROUP_SCRIPTCONTAINER &&
- pInfo->nKind != SfxCfgKind::GROUP_STYLES )
-{
-pFunctionListBox->SetUpdateMode(true);
-return;
-}
 
 switch ( pInfo->nKind )
 {
@@ -994,7 +986,9 @@ void SfxConfigGroupListBox::GroupSelected()
 }
 
 default:
-return;
+// Do nothing, the list box will stay empty
+SAL_INFO( "cui.customize", "Ignoring unexpected SfxCfgKind: " <<  
static_cast(pInfo->nKind) );
+break;
 }
 
 if ( pFunctionListBox->GetEntryCount() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 3 commits - vcl/source

[Stephan Bergmann]

 vcl/source/app/scheduler.cxx |   26 ++
 1 file changed, 6 insertions(+), 20 deletions(-)

New commits:
commit 2767a7effe575af03b71855b3d4b316a97e8be38
Author: Stephan Bergmann 
Date:   Wed Aug 9 12:14:28 2017 +0200

Rephrase SchedulerMutex::acquire so it would work for nLockCount=0

Change-Id: Ibd5f45b5829e51f872e90a4256ae875bc5d363d4

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index a3e4924b094d..6f3c4a4c8f35 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -121,12 +121,11 @@ void Scheduler::ImplDeInitScheduler()
 
 bool SchedulerMutex::acquire( sal_uInt32 nLockCount )
 {
-do {
+for (sal_uInt32 i = 0; i != nLockCount; ++i) {
 if ( !maMutex.acquire() )
 return false;
 ++mnLockDepth;
 }
-while ( --nLockCount );
 return true;
 }
 
commit 6a5d2dc840a3af73115fcecdc681d6f26dea5e77
Author: Stephan Bergmann 
Date:   Wed Aug 9 10:02:35 2017 +0200

Remove unnecessary, broken check for mnLockDepth != 0

If SchedulerMutex::release were ever called from a thread not having locked 
the
mutex, mnLockDepth would have an arbitrary value, not necessarily zero.  It 
is
clear that SchedulerMutex::release must only be called by a thread that has 
the
mutex locked, so the check was redundant.

Change-Id: I4969b8e6543657602494e333a6a3ea07d83267d1

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 419cdf23af1f..a3e4924b094d 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -132,14 +132,11 @@ bool SchedulerMutex::acquire( sal_uInt32 nLockCount )
 
 sal_uInt32 SchedulerMutex::release( bool bUnlockAll )
 {
-sal_uInt32 nLockCount = 0;
-if ( mnLockDepth )
-{
-nLockCount = bUnlockAll ? mnLockDepth : 1;
-mnLockDepth -= nLockCount;
-for (sal_uInt32 i = 0; i != nLockCount; ++i) {
-maMutex.release();
-}
+assert(mnLockDepth != 0);
+sal_uInt32 nLockCount = bUnlockAll ? mnLockDepth : 1;
+mnLockDepth -= nLockCount;
+for (sal_uInt32 i = 0; i != nLockCount; ++i) {
+maMutex.release();
 }
 return nLockCount;
 }
commit 1c6c1329df23d779c46b9928c3cd188c38686996
Author: Stephan Bergmann 
Date:   Wed Aug 9 08:46:13 2017 +0200

SchedulerMutex::release: don't read mnLockDepth with maMutex already 
unlocked

...another thread may already have called SchedulerMutex::acquire in 
between,
whose effect would then be canceled

Change-Id: Icddb6ea47144366c3a81bc83e3f9469b25a18c22

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index ccd127c08453..419cdf23af1f 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -135,19 +135,9 @@ sal_uInt32 SchedulerMutex::release( bool bUnlockAll )
 sal_uInt32 nLockCount = 0;
 if ( mnLockDepth )
 {
-if ( bUnlockAll )
-{
-nLockCount = mnLockDepth;
-do {
---mnLockDepth;
-maMutex.release();
-}
-while ( mnLockDepth );
-}
-else
-{
-nLockCount = 1;
---mnLockDepth;
+nLockCount = bUnlockAll ? mnLockDepth : 1;
+mnLockDepth -= nLockCount;
+for (sal_uInt32 i = 0; i != nLockCount; ++i) {
 maMutex.release();
 }
 }
___
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' - vcl/quartz

[Julien Nabet]

 vcl/quartz/salgdi.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1756d2145e7ab70f5bb32a8343f5b1e4869bd0ee
Author: Julien Nabet 
Date:   Tue Aug 8 18:55:17 2017 +0200

tdf#111497: fix leak in FindFontSubstitute with CFRelease

Change-Id: I9d7de52b4a1ee102b233b982e97ecbf731b476f2
Reviewed-on: https://gerrit.libreoffice.org/40895
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 986cd454b2a39ac380b137148f944c0d5ead2631)
Reviewed-on: https://gerrit.libreoffice.org/40896
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index b81528e78577..45a4f245e17c 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -93,6 +93,7 @@ bool 
CoreTextGlyphFallbackSubstititution::FindFontSubstitute(FontSelectPattern&
 rPattern.mpFontData = 
pSalData->mpFontList->GetFontDataFromId(reinterpret_cast(pDesc));
 
 CFRelease(pFallback);
+CFRelease(pDesc);
 }
 CFRelease(pStr);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da3d4d2160ee71ebef9aa42ad4b9f2af9da2ed02
Author: Caolán McNamara 
Date:   Fri Aug 11 13:10:29 2017 +0100

Resolves: tdf#111571 crash on restarting writer with modeless biblio dialog

Change-Id: I2663f84c28721f61c1ed7c8d92a228cafa8f1177
Reviewed-on: https://gerrit.libreoffice.org/41036
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 06eb81bbd41e..0e2296701967 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1666,8 +1666,8 @@ SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* 
_pBindings,
 {
 Initialize(pInfo);
 SwWrtShell* pWrtShell = ::GetActiveWrtShell();
-OSL_ENSURE(pWrtShell, "No shell?");
-m_aContent.ReInitDlg(*pWrtShell);
+if (pWrtShell)
+m_aContent.ReInitDlg(*pWrtShell);
 }
 
 void SwAuthMarkFloatDlg::Activate()
___
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' - icon-themes/sifr icon-themes/sifr_dark

[Yousuf Philips]

 0 files changed

New commits:
commit 1dfd3085ddbf3a8984c839477875de47cf99ea42
Author: Yousuf Philips 
Date:   Sat Jul 1 23:51:38 2017 +0400

tdf#106533 Correct insert index entry icon filename

Change-Id: I70ba9feb06056a7dbcf34ed1b533639be217833b
Reviewed-on: https://gerrit.libreoffice.org/39441
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 
(cherry picked from commit 37185c03e1d66c494b0da298b22aca557d8a3f3c)
Reviewed-on: https://gerrit.libreoffice.org/40369
Reviewed-by: Christian Lohmaier 

diff --git a/icon-themes/sifr/cmd/32/insertindexentry.png 
b/icon-themes/sifr/cmd/32/insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/insertindexentry.png
rename to icon-themes/sifr/cmd/32/insertindexesentry.png
diff --git a/icon-themes/sifr/cmd/lc_insertindexentry.png 
b/icon-themes/sifr/cmd/lc_insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr/cmd/lc_insertindexentry.png
rename to icon-themes/sifr/cmd/lc_insertindexesentry.png
diff --git a/icon-themes/sifr/cmd/sc_insertindexentry.png 
b/icon-themes/sifr/cmd/sc_insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr/cmd/sc_insertindexentry.png
rename to icon-themes/sifr/cmd/sc_insertindexesentry.png
diff --git a/icon-themes/sifr_dark/cmd/32/insertindexentry.png 
b/icon-themes/sifr_dark/cmd/32/insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr_dark/cmd/32/insertindexentry.png
rename to icon-themes/sifr_dark/cmd/32/insertindexesentry.png
diff --git a/icon-themes/sifr_dark/cmd/lc_insertindexentry.png 
b/icon-themes/sifr_dark/cmd/lc_insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr_dark/cmd/lc_insertindexentry.png
rename to icon-themes/sifr_dark/cmd/lc_insertindexesentry.png
diff --git a/icon-themes/sifr_dark/cmd/sc_insertindexentry.png 
b/icon-themes/sifr_dark/cmd/sc_insertindexesentry.png
similarity index 100%
rename from icon-themes/sifr_dark/cmd/sc_insertindexentry.png
rename to icon-themes/sifr_dark/cmd/sc_insertindexesentry.png
___
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' - sc/source

[Dennis Francis]

 sc/source/ui/app/inputwin.cxx |   55 +++---
 1 file changed, 36 insertions(+), 19 deletions(-)

New commits:
commit 0aaa81b2760dde7e84c85b8caacc20552910ffe9
Author: Dennis Francis 
Date:   Tue Jul 25 17:11:47 2017 +0530

tdf#71409: Pre-create sum/equal and ok/cancel buttons...

in the sc formula bar at the start instead of adding/
removing them to/from vcl ToolBox when required.
To maintain the functionality, do hide/show and
enable/disable the button pairs (sum/equal, ok/cancel)
during mode switch. This solves the excess a11y events
problem of tdf#71409 because this patch get rid of
the usages of vcl's Toolbox::Remove() and its accessibility
module dependencies which seems to be the root cause.

Change-Id: Ib953fb64d25a4b83018eca6a88223c7236c2f72e
Reviewed-on: https://gerrit.libreoffice.org/40479
Tested-by: Jenkins 
Reviewed-by: Dennis Francis 
(cherry picked from commit 561cae8e81913940e4af86901ec46a484669c597)
Reviewed-on: https://gerrit.libreoffice.org/40827
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 70957b3aa601..dcc5ce7ec654 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -190,8 +190,10 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, 
SfxBindings* pBind ) :
 InsertItem  (SID_INPUT_FUNCTION, 
Image(BitmapEx(RID_BMP_INPUT_FUNCTION)), ToolBoxItemBits::NONE, 2);
 InsertItem  (SID_INPUT_SUM,  Image(BitmapEx(RID_BMP_INPUT_SUM)), 
ToolBoxItemBits::NONE, 3);
 InsertItem  (SID_INPUT_EQUAL,Image(BitmapEx(RID_BMP_INPUT_EQUAL)), 
ToolBoxItemBits::NONE, 4);
-InsertSeparator (5);
-InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 6);
+InsertItem  (SID_INPUT_CANCEL,   
Image(BitmapEx(RID_BMP_INPUT_CANCEL)), ToolBoxItemBits::NONE, 5);
+InsertItem  (SID_INPUT_OK,   Image(BitmapEx(RID_BMP_INPUT_OK)), 
ToolBoxItemBits::NONE, 6);
+InsertSeparator (7);
+InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 8);
 
 aWndPos   ->SetQuickHelpText(ScResId(SCSTR_QHELP_POSWND));
 aWndPos   ->SetHelpId   (HID_INSWIN_POS);
@@ -208,6 +210,18 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, 
SfxBindings* pBind ) :
 SetItemText (SID_INPUT_EQUAL, aTextEqual);
 SetHelpId   (SID_INPUT_EQUAL, HID_INSWIN_FUNC);
 
+SetItemText ( SID_INPUT_CANCEL, aTextCancel );
+SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
+
+SetItemText ( SID_INPUT_OK, aTextOk );
+SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );
+
+EnableItem( SID_INPUT_CANCEL, false );
+EnableItem( SID_INPUT_OK, false );
+
+HideItem( SID_INPUT_CANCEL );
+HideItem( SID_INPUT_OK );
+
 SetHelpId( HID_SC_INPUTWIN ); // For the whole input row
 
 aWndPos   ->Show();
@@ -504,14 +518,16 @@ void ScInputWindow::SetOkCancelMode()
 
 if (!bIsOkCancelMode)
 {
-RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
-RemoveItem( 3 );
-InsertItem( SID_INPUT_CANCEL, Image(BitmapEx(RID_BMP_INPUT_CANCEL)), 
ToolBoxItemBits::NONE, 3 );
-InsertItem( SID_INPUT_OK, Image(BitmapEx(RID_BMP_INPUT_OK)), 
ToolBoxItemBits::NONE, 4 );
-SetItemText ( SID_INPUT_CANCEL, aTextCancel );
-SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
-SetItemText ( SID_INPUT_OK, aTextOk );
-SetHelpId   ( SID_INPUT_OK, HID_INSWIN_OK );
+EnableItem  ( SID_INPUT_SUM,   false );
+EnableItem  ( SID_INPUT_EQUAL, false );
+HideItem( SID_INPUT_SUM );
+HideItem( SID_INPUT_EQUAL );
+
+ShowItem( SID_INPUT_CANCEL, true );
+ShowItem( SID_INPUT_OK, true );
+EnableItem  ( SID_INPUT_CANCEL, true );
+EnableItem  ( SID_INPUT_OK, true );
+
 bIsOkCancelMode = true;
 }
 }
@@ -524,15 +540,16 @@ void ScInputWindow::SetSumAssignMode()
 
 if (bIsOkCancelMode)
 {
-// Remove SID_INPUT_CANCEL, and SID_INPUT_OK
-RemoveItem( 3 );
-RemoveItem( 3 );
-InsertItem( SID_INPUT_SUM,   Image(BitmapEx(RID_BMP_INPUT_SUM)),   
ToolBoxItemBits::NONE, 3 );
-InsertItem( SID_INPUT_EQUAL, Image(BitmapEx(RID_BMP_INPUT_EQUAL)), 
ToolBoxItemBits::NONE, 4 );
-SetItemText ( SID_INPUT_SUM,   aTextSum );
-SetHelpId   ( SID_INPUT_SUM,   HID_INSWIN_SUMME );
-SetItemText ( SID_INPUT_EQUAL, aTextEqual );
-SetHelpId   ( SID_INPUT_EQUAL, HID_INSWIN_FUNC );
+EnableItem  ( SID_INPUT_CANCEL, false );
+EnableItem  ( SID_INPUT_OK, false );
+HideItem( SID_INPUT_CANCEL );
+HideItem( SID_INPUT_OK );
+
+ShowItem( SID_INPUT_SUM,true );
+ShowItem( SID_INPUT_EQUAL,  true );
+EnableItem  ( SID_INPUT_SUM,true );
+EnableItem  ( SID_INPUT_EQUAL,  true );
+
   

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations

[Christian Lohmaier]

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

New commits:
commit e92122a1811599beffd3ca6223a1466727b7079a
Author: Christian Lohmaier 
Date:   Fri Aug 11 14:00:46 2017 +0200

Updated core
Project: translations  b15cfdea86ec3e5ddfcf3714c37da75e42012a93

update Slovenian file

Change-Id: I02aa9a8509c61fbdd5a81329f85c572673b18d44

diff --git a/translations b/translations
index f9619b996bb1..b15cfdea86ec 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f9619b996bb12965acf934c8d8debf24dc4ad1e3
+Subproject commit b15cfdea86ec3e5ddfcf3714c37da75e42012a93
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source codemaker/source comphelper/source configmgr/source connectivity/source cppuhelper/source cppu/source dbaccess/source desktop/source extensions/source for

[Noel Grandin]

 chart2/source/controller/dialogs/DialogModel.cxx|   11 -
 chart2/source/tools/InternalDataProvider.cxx|5 
 chart2/source/view/charttypes/VSeriesPlotter.cxx|3 
 codemaker/source/cppumaker/cpputype.cxx |   14 -
 codemaker/source/cppumaker/dependencies.cxx |3 
 codemaker/source/cppumaker/includes.cxx |3 
 codemaker/source/javamaker/classfile.cxx|   36 +---
 codemaker/source/javamaker/javatype.cxx |7 
 comphelper/source/misc/accessiblewrapper.cxx|3 
 configmgr/source/access.cxx |5 
 configmgr/source/components.cxx |3 
 configmgr/source/data.cxx   |5 
 configmgr/source/modifications.cxx  |3 
 connectivity/source/commontools/TTableHelper.cxx|2 
 connectivity/source/commontools/parameters.cxx  |4 
 connectivity/source/drivers/hsqldb/HStorageMap.cxx  |2 
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx   |2 
 connectivity/source/drivers/odbc/OConnection.cxx|2 
 connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx |5 
 connectivity/source/drivers/odbc/OResultSet.cxx |5 
 connectivity/source/drivers/odbc/OResultSetMetaData.cxx |2 
 cppu/source/uno/lbenv.cxx   |3 
 cppuhelper/source/component_context.cxx |4 
 cppuhelper/source/propertysetmixin.cxx  |5 
 cppuhelper/source/servicemanager.cxx|   14 -
 cppuhelper/source/unourl.cxx|5 
 dbaccess/source/core/dataaccess/connection.cxx  |5 
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |3 
 dbaccess/source/core/misc/DatabaseDataProvider.cxx  |2 
 dbaccess/source/ui/misc/WCopyTable.cxx  |7 
 dbaccess/source/ui/querydesign/QueryDesignView.cxx  |4 
 desktop/source/deployment/misc/dp_update.cxx|   10 -
 desktop/source/deployment/registry/dp_registry.cxx  |9 -
 extensions/source/config/ldap/ldapaccess.cxx|8 
 extensions/source/dbpilots/controlwizard.cxx|2 
 formula/source/ui/dlg/formula.cxx   |2 
 framework/source/services/ContextChangeEventMultiplexer.cxx |5 
 framework/source/uielement/toolbarmanager.cxx   |5 
 idlc/source/astinterface.cxx|   20 --
 include/oox/core/relations.hxx  |5 
 oox/source/core/relationshandler.cxx|2 
 reportdesign/source/filter/xml/xmlExport.cxx|4 
 sal/rtl/bootstrap.cxx   |3 
 sc/inc/reordermap.hxx   |8 
 sc/qa/unit/ucalc_formula.cxx|3 
 sc/source/core/data/conditio.cxx|6 
 sc/source/core/data/documen3.cxx|2 
 sc/source/core/data/dpgroup.cxx |3 
 sc/source/core/data/dpsave.cxx  |3 
 sc/source/core/data/dptabres.cxx|7 
 sc/source/core/data/mtvelements.cxx |6 
 sc/source/core/data/table3.cxx  |4 
 sc/source/core/tool/addincol.cxx|   30 +--
 sc/source/core/tool/formulagroup.cxx|3 
 sc/source/core/tool/reordermap.cxx  |   21 --
 sc/source/core/tool/tokenstringcontext.cxx  |6 
 sc/source/filter/excel/impop.cxx|3 
 sc/source/filter/excel/xichart.cxx  |3 
 sc/source/filter/lotus/op.cxx   |2 
 sc/source/filter/xml/editattributemap.cxx   |8 
 sc/source/filter/xml/xmlimprt.cxx   |5 
 sc/source/ui/dbgui/pvfundlg.cxx |3 
 sc/source/ui/docshell/externalrefmgr.cxx|   23 +-
 sc/source/ui/docshell/macromgr.cxx  |4 
 sc/source/ui/view/gridwin.cxx   |3 
 sc/source/ui/view/gridwin2.cxx  |8 
 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx   |   12 -
 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx  |7 
 sd/source/ui/to

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

[Jochen Nitschke]

 accessibility/source/extended/textwindowaccessibility.cxx |1 
 include/vcl/txtattr.hxx   |   19 
 vcl/source/edit/texteng.cxx   |   27 
 vcl/source/edit/textview.cxx  |   30 --
 vcl/source/edit/txtattr.cxx   |   29 -
 5 files changed, 3 insertions(+), 103 deletions(-)

New commits:
commit dd8a4001b8d5592a870f2036a4df3d005a7d
Author: Jochen Nitschke 
Date:   Fri Aug 11 10:30:04 2017 +0200

vcl: remove dead TextAttribHyperLink

couldn't even find a proper ctor beside copy-ctor

since commit e19c00ed76f5d46c3b88d2721b9ac84fcaaed97c
Date:   Wed Jul 13 13:30:48 2011 +0200
callcatcher: remove unused TextAttrib stuff

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

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index d74ee64fcc5d..dcf95d8211f6 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1056,7 +1056,6 @@ void Document::retrieveRunAttributesImpl(
 ::sal_uLong nNumber = static_cast< ::sal_uLong >( pParagraph->getNumber() 
);
 ::TextPaM aPaM( nNumber, Index );
 // XXX  numeric overflow
-// FIXME  TEXTATTR_HYPERLINK ignored:
 ::TextAttribFontColor const * pColor
   = static_cast< ::TextAttribFontColor const * >(
   m_rEngine.FindAttrib( aPaM, TEXTATTR_FONTCOLOR ) );
diff --git a/include/vcl/txtattr.hxx b/include/vcl/txtattr.hxx
index 97fd9034160d..e446ee203563 100644
--- a/include/vcl/txtattr.hxx
+++ b/include/vcl/txtattr.hxx
@@ -30,7 +30,6 @@
 namespace vcl { class Font; }
 
 #define TEXTATTR_FONTCOLOR  1
-#define TEXTATTR_HYPERLINK  2
 #define TEXTATTR_FONTWEIGHT 3
 
 #define TEXTATTR_USER_START 1000 //start id for user defined text attributes
@@ -95,24 +94,6 @@ public:
 FontWeight getFontWeight() const { return meWeight; }
 };
 
-
-class TextAttribHyperLink : public TextAttrib
-{
-private:
-OUStringmaURL;
-OUStringmaDescription;
-Color   maColor;
-
-public:
-TextAttribHyperLink( const TextAttribHyperLink& 
rAttr );
-virtual ~TextAttribHyperLink() override;
-
-const OUString& GetURL() const  { 
return maURL; }
-virtual voidSetFont( vcl::Font& rFont ) const override;
-virtual TextAttrib* Clone() const override;
-virtual booloperator==( const TextAttrib& rAttr ) const 
override;
-};
-
 class VCL_DLLPUBLIC TextAttribProtect : public TextAttrib
 {
 public:
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 188a3769f34e..769e2927d2ed 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -2495,31 +2495,8 @@ bool TextEngine::Write( SvStream& rOutput, const 
TextSelection* pSel, bool bHTML
 }
 else
 {
-sal_Int32 nTmpStart = nStartPos;
-sal_Int32 nTmpEnd;
-do
-{
-const TextCharAttrib* pAttr = 
pNode->GetCharAttribs().FindNextAttrib( TEXTATTR_HYPERLINK, nTmpStart, nEndPos 
);
-nTmpEnd = pAttr ? pAttr->GetStart() : nEndPos;
-
-// Text before Attribute
-aText.append( pNode->GetText().copy( nTmpStart, 
nTmpEnd-nTmpStart ) );
-
-if ( pAttr )
-{
-nTmpEnd = std::min( pAttr->GetEnd(), nEndPos );
-
-// e.g. http://www.mopo.de/";>Morgenpost
-aText.append( "( 
pAttr->GetAttr() ).GetURL() );
-aText.append( "\">" );
-nTmpStart = pAttr->GetStart();
-aText.append( pNode->GetText().copy( nTmpStart, 
nTmpEnd-nTmpStart ) );
-aText.append( "" );
-
-nTmpStart = pAttr->GetEnd();
-}
-} while ( nTmpEnd < nEndPos );
+// Text before Attribute
+aText.append( pNode->GetText().copy( nStartPos, 
nEndPos-nStartPos ) );
 }
 
 aText.append( "" );
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 366aa5bfaf6a..ae9fac5aba7f 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1038,9 +1038,6 @@ void TextView::Copy( css::uno::Reference< 
css::datatransfer::clipboard::XClipboa
 {
 TETextDataObject* pDataObj = new TETextDataObject( GetSelected() );
 
-if ( mpImpl->mpTextEngine->HasAttrib( TEXTATTR_HYPERLINK ) )  // then 
also as HTML
- 

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

[Caolán McNamara]

 configmgr/source/dconf.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e7c0bd4df01744a744847a94c7a04746787e5157
Author: Caolán McNamara 
Date:   Fri Aug 11 12:36:24 2017 +0100

error: ‘class configmgr::NodeMap’ has no member named ‘emplace’

Change-Id: I434739024afa97d05b5cf6e959973d845fdb2dfe

diff --git a/configmgr/source/dconf.cxx b/configmgr/source/dconf.cxx
index 35e626163fa3..2ba4d0c9b43c 100644
--- a/configmgr/source/dconf.cxx
+++ b/configmgr/source/dconf.cxx
@@ -1036,9 +1036,9 @@ void readDir(
 }
 } else if (replace) {
 members.erase(name);
-members.emplace( name, member));
+members.insert(NodeMap::value_type(name, member));
 } else if (insert) {
-members.emplace( name, member));
+members.insert(NodeMap::value_type(name, member));
 }
 }
 }
___
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 |   78 +++
 1 file changed, 78 insertions(+)

New commits:
commit 01fa5e8e8f0204447e5fa2e7849575ea89cd9b41
Author: Miklos Vajna 
Date:   Fri Aug 11 11:26:20 2017 +0200

EPUB export: write legacy ToC as well

Tolerated in EPUB3, and some readers not yet fully supporting EPUB3
(just EPUB2) actually need it.

Change-Id: I8b52d081a939c74052f3945cc21c834c2af8bb7d

diff --git a/external/libepubgen/libepubgen-epub3.patch.1 
b/external/libepubgen/libepubgen-epub3.patch.1
index 33a5982fcbdd..a41fce29acef 100644
--- a/external/libepubgen/libepubgen-epub3.patch.1
+++ b/external/libepubgen/libepubgen-epub3.patch.1
@@ -864,3 +864,81 @@ index 7b17304..be56cc7 100644
 -- 
 2.12.3
 
+From c30bc184c18837203e9f249386711e9cd616c9f0 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna 
+Date: Fri, 11 Aug 2017 10:50:47 +0200
+Subject: [PATCH] EPUB3: write the deprecated NCX navication as well
+
+
+"3.2 Navigation" says:
+
+   EPUB 3 Publications may include the EPUB 2 NCX for EPUB 2 Reading System
+   forward compatibility purposes.
+---
+ src/lib/EPUBGenerator.cpp | 18 +-
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lib/EPUBGenerator.cpp b/src/lib/EPUBGenerator.cpp
+index ca05ea7..8017ffe 100644
+--- a/src/lib/EPUBGenerator.cpp
 b/src/lib/EPUBGenerator.cpp
+@@ -56,8 +56,7 @@ void EPUBGenerator::startDocument(const RVNGPropertyList 
&props)
+ 
+   if (m_version == 30)
+ m_manifest.insert(EPUBPath("OEBPS/toc.xhtml"), "application/xhtml+xml", 
"toc.xhtml", "nav");
+-  else
+-m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", 
"toc.ncx", "");
++  m_manifest.insert(EPUBPath("OEBPS/toc.ncx"), "application/x-dtbncx+xml", 
"toc.ncx", "");
+   m_manifest.insert(m_stylesheetPath, "text/css", "stylesheet.css", "");
+ }
+ 
+@@ -147,10 +146,10 @@ void EPUBGenerator::writeContainer()
+ 
+ void EPUBGenerator::writeNavigation()
+ {
+-  EPUBXMLSink sink;
+-
+   if (m_version == 30)
+   {
++EPUBXMLSink sink;
++
+ const EPUBPath path("OEBPS/toc.xhtml");
+ RVNGPropertyList htmlAttrs;
+ htmlAttrs.insert("xmlns", "http://www.w3.org/1999/xhtml";);
+@@ -174,10 +173,10 @@ void EPUBGenerator::writeNavigation()
+ sink.closeElement("html");
+ 
+ sink.writeTo(*m_package, path.str().c_str());
+-
+-return;
+   }
+ 
++  EPUBXMLSink sink;
++
+   const EPUBPath path("OEBPS/toc.ncx");
+   RVNGPropertyList ncxAttrs;
+   ncxAttrs.insert("xmlns", "http://www.daisy.org/z3986/2005/ncx/";);
+@@ -198,7 +197,9 @@ void EPUBGenerator::writeNavigation()
+   sink.closeElement("docTitle");
+ 
+   sink.openElement("navMap");
+-  m_htmlManager.writeTocTo(sink, path, m_version);
++  // In case of EPUB3 the (deprecated, but valid) EPUB2 markup is wanted, so
++  // the version is unconditional here.
++  m_htmlManager.writeTocTo(sink, path, /*version=*/20);
+   sink.closeElement("navMap");
+ 
+   sink.closeElement("ncx");
+@@ -284,8 +285,7 @@ void EPUBGenerator::writeRoot()
+   sink.closeElement("manifest");
+ 
+   RVNGPropertyList spineAttrs;
+-  if (m_version == 20)
+-spineAttrs.insert("toc", "toc.ncx");
++  spineAttrs.insert("toc", "toc.ncx");
+ 
+   sink.openElement("spine", spineAttrs);
+   m_htmlManager.writeSpineTo(sink);
+-- 
+2.12.3
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - vcl/win

[Armin Le Grand]

 vcl/win/app/saltimer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e406eca0b2df9f04093d858e5fb1c995d35e77f
Author: Armin Le Grand 
Date:   Fri Aug 11 13:01:47 2017 +0200

Corrected call to ImplSalStartTimer for Win-only code

Change-Id: If0a4452daf7346697bbe12842b33a62910e3e96c

diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx
index 04448e7f88d8..5dc1bfca1165 100644
--- a/vcl/win/app/saltimer.cxx
+++ b/vcl/win/app/saltimer.cxx
@@ -95,7 +95,7 @@ void WinSalTimer::Start( sal_uLong nMS )
 SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!");
 }
 else
-ImplSalStartTimer( nMS, FALSE );
+ImplSalStartTimer( nMS );
 }
 
 void WinSalTimer::Stop()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/source/tabpages/backgrnd.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a162b21c2b393534a9f6433c9b2b674aaaecf1a7
Author: Caolán McNamara 
Date:   Fri Aug 11 11:51:09 2017 +0100

improve scoping a little

Change-Id: Ie2e86852f7c4754070d3eb7e8981d674f04a6d80

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 87aa1afad9f1..b3684632209e 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -594,11 +594,11 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* 
rCoreSet )
 sal_uInt16 nWhich = GetWhich( nSlot );
 
 const SfxPoolItem* pOld = GetOldItem( *rCoreSet, nSlot );
-SfxItemState eOldItemState = rCoreSet->GetItemState(nSlot, false);
-const SfxItemSet& rOldSet = GetItemSet();
-
-if ( pOld )
+if (pOld)
 {
+SfxItemState eOldItemState = rCoreSet->GetItemState(nSlot, false);
+const SfxItemSet& rOldSet = GetItemSet();
+
 const SvxBrushItem& rOldItem= static_cast(*pOld);
 SvxGraphicPosition  eOldPos = rOldItem.GetGraphicPos();
 const bool  bIsBrush= ( drawing::FillStyle_SOLID == 
lcl_getFillStyle(m_pLbSelect) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Gabor Kelemen]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   20 -
 1 file changed, 20 deletions(-)

New commits:
commit 884be65e0edafe5f3433ef8ff0e6d30ced7c1a46
Author: Gabor Kelemen 
Date:   Mon Aug 7 22:21:16 2017 +0200

Drop Java Applet security setting key

Its last code pieces using it were dropped in 2011:

https://cgit.freedesktop.org/libreoffice/core/commit/?id=a564531ea35bd859a74703a4330ba4149295d0cc

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index a94ba7cc81bd..602439d47394 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3638,26 +3638,6 @@
 
   
 
-
-  
-Contains Java related settings.
-  
-  
-
-  Contains Applet related settings.
-
-
-  
-  
-  
-  
-Enables/disables Java applets in Office documents.
-Enable Applets
-  
-  false
-
-  
-
 
   
 Specifies the options related to the vectorization of
___
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' - sw/qa sw/source

[Szymon Kłos]

 sw/qa/extras/uiwriter/data/watermark-position.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   79 ++
 sw/source/core/edit/edfcol.cxx|   22 ++
 3 files changed, 101 insertions(+)

New commits:
commit e0ac06d9c6325447253c819573dfe41eb627617d
Author: Szymon Kłos 
Date:   Sun Aug 6 16:22:38 2017 +0200

tdf#108494 fix regression

* correct watermark position
* insert also on left and right pages if headers are different

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

diff --git a/sw/qa/extras/uiwriter/data/watermark-position.odt 
b/sw/qa/extras/uiwriter/data/watermark-position.odt
new file mode 100755
index ..53ff24781682
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/watermark-position.odt 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 90b54c38d19d..8495768570e1 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -84,6 +85,7 @@
 #include "com/sun/star/text/TextMarkupType.hpp"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -102,6 +104,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
 
@@ -124,6 +127,7 @@ public:
 void testDOTMAutoText();
 void testDOCXAutoTextGallery();
 void testWatermarkDOCX();
+void testWatermarkPosition();
 void testTdf67238();
 void testFdo75110();
 void testFdo75898();
@@ -248,6 +252,7 @@ public:
 CPPUNIT_TEST(testDOTMAutoText);
 CPPUNIT_TEST(testDOCXAutoTextGallery);
 CPPUNIT_TEST(testWatermarkDOCX);
+CPPUNIT_TEST(testWatermarkPosition);
 CPPUNIT_TEST(testTdf67238);
 CPPUNIT_TEST(testFdo75110);
 CPPUNIT_TEST(testFdo75898);
@@ -844,6 +849,80 @@ void SwUiWriterTest::testWatermarkDOCX()
 CPPUNIT_ASSERT_EQUAL((sal_Int16)50, pWatermark->GetTransparency());
 }
 
+void SwUiWriterTest::testWatermarkPosition()
+{
+// tdf#108494 Watermark inserted in the document with page break was 
outside the first page
+const int aPagesInDocument = 2;
+const int aAdditionalPagesCount[] = {0, 0,1, 1,5, 
5,   20,20 };
+const bool aChangeHeader[]= { true, false, true, false, true, 
false, true, false };
+
+for (unsigned long i = 0; i < sizeof(aAdditionalPagesCount) / sizeof(int); 
++i)
+{
+int aPages = aPagesInDocument + aAdditionalPagesCount[i];
+
+// Empty document with one Page Break
+SwDoc* pDoc = createDoc("watermark-position.odt");
+SwEditShell* pEditShell = pDoc->GetEditShell();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+const OUString rPageStyleName = "Default Style";
+uno::Reference xModel = 
pDoc->GetDocShell()->GetBaseModel();
+uno::Reference 
xStyleFamiliesSupplier(xModel, uno::UNO_QUERY);
+uno::Reference 
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xStyleFamily(xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY);
+uno::Reference 
xPageStyle(xStyleFamily->getByName(rPageStyleName), uno::UNO_QUERY);
+
+// 1. Add additional page breaks
+for (int j = 0; j < aAdditionalPagesCount[i]; ++j)
+pWrtShell->InsertPageBreak();
+
+// 2. Change header state (On, Off, On)
+if (aChangeHeader[i])
+{
+SwPageDesc aDesc(pDoc->GetPageDesc(0));
+SwFrameFormat& rMaster = aDesc.GetMaster();
+rMaster.SetFormatAttr(SwFormatHeader(true));
+pDoc->ChgPageDesc(0, aDesc);
+
+aDesc = pDoc->GetPageDesc(0);
+SwFrameFormat& rMaster2 = aDesc.GetMaster();
+rMaster2.SetFormatAttr(SwFormatHeader(false));
+pDoc->ChgPageDesc(0, aDesc);
+
+aDesc = pDoc->GetPageDesc(0);
+SwFrameFormat& rMaster3 = aDesc.GetMaster();
+rMaster3.SetFormatAttr(SwFormatHeader(true));
+pDoc->ChgPageDesc(0, aDesc);
+}
+
+// 3. Insert Watermark
+SfxWatermarkItem aWatermark;
+aWatermark.SetText("Watermark");
+aWatermark.SetFont("DejaVu Sans");
+
+pEditShell->SetWatermark(aWatermark);
+
+uno::Reference xShape(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape.is());
+
+SdrPage* pPage = 
pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+
+// Get Watermark object
+SdrObject* pObject = pPage->GetObj(0);
+pObject->RecalcBoundRect();
+const Rectangle& rRect = pObject->GetSnapRect();
+Size rSize = pPage->GetSize();
+
+// Page break, calculate height of a page
+ 

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

[David Ostrovsky]

 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|4 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |7 +
 external/python3/python-3.5.4-ssl.patch.1  |   83 +++--
 4 files changed, 52 insertions(+), 46 deletions(-)

New commits:
commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f
Author: David Ostrovsky 
Date:   Thu Aug 10 00:18:12 2017 +0200

python3: upgrade to release 3.5.4

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

diff --git a/download.lst b/download.lst
index 8e926aada0db..724524a1ddd0 100644
--- a/download.lst
+++ b/download.lst
@@ -197,8 +197,8 @@ export POPPLER_SHA256SUM := 
0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae
 export POPPLER_TARBALL := poppler-0.57.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
d8890b84d773cd7059e597dbefa510340de8336ec9b9e9032bf030f19291565a
-export PYTHON_TARBALL := Python-3.5.3.tgz
+export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
+export PYTHON_TARBALL := Python-3.5.4.tgz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 915416f2c952..ce2087497db8 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
$(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \
external/python3/python-3.3.0-darwin.patch.1 \
-   external/python3/python-3.3.0-ssl.patch.1 \
-   external/python3/python-3.3.0-msvc-disable.patch.1 \
+   external/python3/python-3.5.4-ssl.patch.1 \
+   external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 
b/external/python3/python-3.5.4-msvc-disable.patch.1
similarity index 95%
rename from external/python3/python-3.3.0-msvc-disable.patch.1
rename to external/python3/python-3.5.4-msvc-disable.patch.1
index c571c5c4e878..54b2a5f46540 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.5.4-msvc-disable.patch.1
@@ -1,8 +1,8 @@
 Disable some stuff LO does not need, especially stuff with external 
dependencies
 
 diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
 python3.orig/PCbuild/pcbuild.sln   2015-07-26 17:43:52.262528695 +0200
-+++ python3/PCbuild/pcbuild.sln2015-07-26 18:00:18.438594901 +0200
+--- python3.orig/PCbuild/pcbuild.sln   2017-08-10 00:04:44.359879894 +0200
 python3/PCbuild/pcbuild.sln2017-08-10 00:13:51.179873748 +0200
 @@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", 
"pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
@@ -45,7 +45,7 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", 
"_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C8}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", 
"python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-@@ -58,12 +58,6 @@
+@@ -80,12 +64,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", 
"_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
  EndProject
@@ -58,3 +58,4 @@ diff -ru python3.orig/PCbuild/pcbuild.sln 
python3/PCbuild/pcbuild.sln
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", 
"pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}"
  EndProject
  Global
+Only in python3/PCbuild: pcbuild.sln~
diff --git a/external/python3/python-3.3.0-ssl.patch.1 
b/external/python3/python-3.5.4-ssl.patch.1
similarity index 80%
rename from external/python3/python-3.3.0-ssl.patch.1
rename to external/python3/python-3.5.4-ssl.patch.1
index c4bc117f5558..beb6fe38882f 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.5.4-ssl.patch.1
@@ -1,11 +1,11 @@
 -*- Mode: diff -*-
 
-Tweak SSL build to find OpenSSL in solver & not build it itself in 
"ssl.vcproj" etc.
+Tweak SSL build to fin

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

[Pranav Kant]

 sd/source/ui/view/drviews2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c9ff6f8f9c7f94070bef0909636f0ec91d9baaf7
Author: Pranav Kant 
Date:   Tue Aug 1 16:37:52 2017 +0530

tdf#110743: Use page position to insert master page, not id

Fallback from c454fbb9b62164d5f047990ae63522c9fb932086

Change-Id: I8835f1a23feeb12d77963e621e8d9d59568420f2
(cherry picked from commit f4e5940abbbaa3c2747108b0954e8912d164f3e5)
Reviewed-on: https://gerrit.libreoffice.org/40633
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d2a5a202890e..2ebcb3230611 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -356,7 +356,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 xMasterPagesSupplier->getMasterPages());
 if (xMasterPages.is())
 {
-sal_uInt16 nIndex = GetCurPageId();
+sal_uInt16 nIndex = GetCurPagePos() + 1;
 xMasterPages->insertNewByIndex (nIndex);
 
 // Create shapes for the default layout.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 editeng/source/editeng/impedit.cxx |2 +-
 editeng/source/editeng/impedit.hxx |2 +-
 include/editeng/editview.hxx   |2 +-
 include/svx/svdedxv.hxx|2 +-
 svx/source/svdraw/svdedxv.cxx  |6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5f740414d37729b293709a70619caab39a02eb7a
Author: Andrea Gelmini 
Date:   Fri Aug 11 11:23:37 2017 +0200

Fix typos

Change-Id: Ia36c8abe91e8c2ac46498e88def59a9887711ba1
Reviewed-on: https://gerrit.libreoffice.org/41014
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index aa2a257c5343..b670682104f4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -207,7 +207,7 @@ void ImpEditView::SelectionChanged()
 // This can be safely assumed due to the EditView only being capable of 
painting the
 // selection in XOR until today.
 // This also means that all places calling DrawSelectionXOR are thoroughly 
weighted
-// and choosen to make this fragile XOR-paint water-proof and thus contain some
+// and chosen to make this fragile XOR-paint water-proof and thus contain some
 // information in this sense.
 // Someone thankfully expanded it to collect the SelectionRectangles when 
called with
 // the Region*, see GetSelectionRectangles below.
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 3c1d2e78a0c6..9bcab368ee80 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -262,7 +262,7 @@ private:
 // and the direct repaint of the Window-plugged EditView will be 
suppressed.
 // Instead, a consumer that has registered using a EditViewCallbacks
 // incarnation has to handle that. Used e.g. to represent the edited text
-// in Draw/Impres in an OverlayObject which avoids evtl. expensive full
+// in Draw/Impress in an OverlayObject which avoids evtl. expensive full
 // repaints of the EditView(s)
 const EditViewCallbacks* mpEditViewCallbacks;
 
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 84e41d4af2f2..79af335b3db4 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -81,7 +81,7 @@ enum class ScrollRangeCheck
 };
 
 // Helper class that allows to set a callback at the EditView. When
-// set, Invalidates and repains are suppressed at the EditView, but
+// set, Invalidates and repaints are suppressed at the EditView, but
 // EditViewInvalidate() will be triggered to allow the consumer to
 // react itself as needed.
 // Also Selection visualization is suppressed and EditViewSelectionChange
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 6cfb22128e08..b55385e77d17 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SdrObjEditView: public SdrGlueEditView, 
public EditViewCallb
 virtual void EditViewSelectionChange() const override;
 
 // The OverlayObjects used for visualizing active TextEdit (currently
-// using TextEditOverlayObject, but not limitied to it
+// using TextEditOverlayObject, but not limited to it
 sdr::overlay::OverlayObjectList   maTEOverlayGroup;
 
 protected:
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 7cd8dc363b4b..57b80c89b002 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -367,7 +367,7 @@ namespace
 and thus avoiding potentially expensive repaints by using the
 automatically buffered Overlay mechanism.
 
-It buffers as amuch as possible locally and *only* triggers a real
+It buffers as much as possible locally and *only* triggers a real
 change (see call to objectChange()) when really needed.
  */
 class TextEditOverlayObject : public sdr::overlay::OverlayObject
@@ -531,7 +531,7 @@ namespace
 
 // active Outliner is always in unified oriented coordinate system 
(currently)
 // so just translate to TopLeft of visible Range. Keep in mind 
that top-left
-// depends on vertical text and top-to-bottom text attribures
+// depends on vertical text and top-to-bottom text attributes
 const tools::Rectangle aVisArea(mrOutlinerView.GetVisArea());
 const bool bVerticalWriting(pSdrOutliner->IsVertical());
 const bool bTopToBottom(pSdrOutliner->IsTopToBottom());
@@ -655,7 +655,7 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& 
rPaintWindow) const
 {
 // adapt all TextEditOverlayObject(s), so call EditViewInvalidate()
 // to update accordingly (will update selection, too). Suppress new
-// stuff when LibreOficeKit is active
+// stuff when LibreOfficeKit is active
 EditViewInvalidate();
 }
 else
___
Libr

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - cui/source cui/uiconfig

[Caolán McNamara]

 cui/source/dialogs/insdlg.cxx  |   16 
 cui/source/inc/insdlg.hxx  |1 
 cui/uiconfig/ui/insertoleobject.ui |  131 -
 3 files changed, 90 insertions(+), 58 deletions(-)

New commits:
commit e5fc1a94cda3abc2c450a7e9385e186151a2727b
Author: Caolán McNamara 
Date:   Tue May 9 13:27:06 2017 +0100

Resolves: tdf#62702 allow ole objects to be inserted as icons

under windows on "create new", "further objects" you get the
native windows insert object dialog which has the "Display As Icon"
option, but on Linux etc (or using our own dialog) there isn't that
option

so add a "Display as icon" checkbox in our own dialog and generate
an icon through SvFileInformationManager::GetImage

Change-Id: I0a400189031900bd1e387465ec4ba57847cb5394
(cherry picked from commit f505f95d466d4d3348f41dfd93e5c243d15c6c71)
Reviewed-on: https://gerrit.libreoffice.org/41021
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 47af4955c749..ac404bbf9513 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -34,6 +34,7 @@
 
 #include "insdlg.hxx"
 #include 
+#include 
 #include 
 
 #include 
@@ -164,6 +165,7 @@ SvInsertOleDlg::SvInsertOleDlg
 get(m_pEdFilepath, "urled");
 get(m_pBtnFilepath, "urlbtn");
 get(m_pCbFilelink, "linktofile");
+get(m_pCbAsIcon, "asicon");
 m_pLbObjecttype->SetDoubleClickHdl( LINK( this, SvInsertOleDlg, 
DoubleClickHdl ) );
 m_pBtnFilepath->SetClickHdl( LINK( this, SvInsertOleDlg, BrowseHdl ) );
 Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
@@ -188,6 +190,7 @@ void SvInsertOleDlg::dispose()
 m_pEdFilepath.clear();
 m_pBtnFilepath.clear();
 m_pCbFilelink.clear();
+m_pCbAsIcon.clear();
 InsertObjectDialog_Impl::dispose();
 }
 
@@ -328,6 +331,19 @@ short SvInsertOleDlg::Execute()
 aErr = aErr.replaceFirst( "%", aFileName );
 ScopedVclPtrInstance(this, aErr)->Execute();
 }
+else
+{
+if (m_pCbAsIcon->IsChecked())
+{
+//something nice here I guess would be to write the 
filename into
+//the image with this icon above it
+Image aImage = SvFileInformationManager::GetImage(aURL, 
true);
+SvMemoryStream aTemp;
+WriteDIBBitmapEx(aImage.GetBitmapEx(), aTemp);
+m_aIconMetaFile = Sequence(static_cast(aTemp.GetData()), aTemp.Seek(STREAM_SEEK_TO_END));
+m_aIconMediaType = 
"application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"";
+}
+}
 }
 }
 
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index cd6a45a507ab..4b4277495004 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -64,6 +64,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
 VclPtr m_pEdFilepath;
 VclPtr m_pBtnFilepath;
 VclPtr m_pCbFilelink;
+VclPtr m_pCbAsIcon;
 const SvObjectServerList* m_pServers;
 
 css::uno::Sequence< sal_Int8 > m_aIconMetaFile;
diff --git a/cui/uiconfig/ui/insertoleobject.ui 
b/cui/uiconfig/ui/insertoleobject.ui
index 5ddf229e6d9d..1aaeecb9319a 100644
--- a/cui/uiconfig/ui/insertoleobject.ui
+++ b/cui/uiconfig/ui/insertoleobject.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -12,6 +12,63 @@
 False
 vertical
 12
+
+  
+False
+end
+
+  
+gtk-ok
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+
+  
+gtk-cancel
+True
+True
+True
+True
+  
+  
+False
+True
+1
+  
+
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+True
+  
+
+  
+  
+False
+True
+end
+1
+  
+
 
   
 400
@@ -162,6 +219,21 @@
 1
   
 
+
+  
+Display 
as icon
+True
+True
+False
+

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

[Varun Dhall]

 include/svx/SmartTagItem.hxx |2 
 include/svx/chrtitem.hxx |2 
 include/svx/e3ditem.hxx  |2 
 include/svx/galleryitem.hxx  |3 
 include/svx/grfcrop.hxx  |2 
 include/svx/hlnkitem.hxx |3 
 include/svx/numinf.hxx   |2 
 include/svx/sdasaitm.hxx |3 
 include/svx/sdasitm.hxx  |3 
 include/svx/sdtfchim.hxx |3 
 include/svx/sxfiitm.hxx  |3 
 include/svx/sxsiitm.hxx  |2 
 include/svx/viewlayoutitem.hxx   |2 
 include/svx/zoomslideritem.hxx   |2 
 svx/source/form/fmitems.cxx  |   14 ---
 svx/source/inc/fmitems.hxx   |2 
 svx/source/items/SmartTagItem.cxx|   12 --
 svx/source/items/chrtitem.cxx|   13 --
 svx/source/items/customshapeitem.cxx |   10 --
 svx/source/items/e3ditem.cxx |   24 -
 svx/source/items/galleryitem.cxx |   10 --
 svx/source/items/grfitem.cxx |   39 
 svx/source/items/hlnkitem.cxx|  162 ---
 svx/source/items/numinf.cxx  |   14 ---
 svx/source/items/viewlayoutitem.cxx  |   12 --
 svx/source/items/zoomslideritem.cxx  |   12 --
 svx/source/svdraw/svdattr.cxx|   82 -
 27 files changed, 440 deletions(-)

New commits:
commit 8b3fcb6a4f80e803586120535768745f6637b34d
Author: Varun Dhall 
Date:   Fri Aug 11 10:01:25 2017 +0530

Removing unused SfxItemPool serialisation from svx

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

diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index ed59088a8194..162f5bb47404 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -66,8 +66,6 @@ public:
 // "purely virtual methods" from the SfxPoolItem
 virtual bool operator==( const SfxPoolItem& ) const override;
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; // 
leer
-virtual SvStream&Store(SvStream &, sal_uInt16 nItemVersion) const 
override; // leer
 virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
 
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index dc28dd52cd16..b7b311b50d6c 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -161,8 +161,6 @@ public:
 
 virtual bool operator == (const SfxPoolItem&) const override;
 virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
-virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const 
override;
-virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const 
override;
 
 double GetValue() const { return fVal; }
 };
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 66565e27d264..57ccdb1f581e 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -37,8 +37,6 @@ public:
 
 virtual booloperator==( const SfxPoolItem& ) const override;
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual SfxPoolItem*Create(SvStream &, sal_uInt16 nVersion) const 
override;
-virtual SvStream&   Store(SvStream &, sal_uInt16 nItemVersion ) const 
override;
 
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index db76b18f8150..e3d9cc80c9c2 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -61,9 +61,6 @@ public:
 // bridge to UNO
 virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId 
= 0 ) const override;
 virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
-// not implemented
-virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
-virtual SvStream&Store(SvStream &, sal_uInt16 nItemVersion) const 
override;
 };
 
 #endif
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 2c57b4375df2..96fc7d5c802f 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -38,8 +38,6 @@ public:
 
 // "pure virtual methods" from SfxPoolItem
 virtual booloperator==( const SfxPoolItem& ) const 
override;
-virtual SfxPoolItem*Create(SvStream &, sal_uInt16 nVer) const 
override;
-virtual SvStream&   Store(SvStream &, sal_uInt16 nIVer) const 
override;
 virtual bool GetPresentation( Sf

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

[Caolán McNamara]

 hwpfilter/source/drawing.h  |2 --
 hwpfilter/source/hiodev.cxx |3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6ca0958555f24e2a384740669adceb6cf3c7e3b8
Author: Caolán McNamara 
Date:   Thu Aug 10 16:56:13 2017 +0100

ofz#2899 increment pos before check, like all the other cases

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

diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 1967ddffed1c..52a67be5365d 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -318,8 +318,6 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, 
unsigned short * link_info)
 
 static HWPDrawingObject *LoadDrawingObject(void)
 {
-fprintf(stderr, "LoadDrawingObject\n");
-
 HWPDrawingObject *hdo, *head, *prev;
 
 unsigned short link_info;
diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx
index 45ccb987bcd5..da02aadc800e 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -308,9 +308,10 @@ bool HMemIODev::setCompressed(bool )
 
 bool HMemIODev::read1b(unsigned char &out)
 {
+++pos;
 if (pos <= length)
 {
-out = ptr[pos++];
+out = ptr[pos - 1];
 return true;
 }
 return false;
___
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' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/drawing.h  |2 --
 hwpfilter/source/hiodev.cxx |3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1d2276429aac4975bde6cc2573cf944253cc4e4b
Author: Caolán McNamara 
Date:   Thu Aug 10 16:56:13 2017 +0100

ofz#2899 increment pos before check, like all the other cases

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

diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 1967ddffed1c..52a67be5365d 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -318,8 +318,6 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, 
unsigned short * link_info)
 
 static HWPDrawingObject *LoadDrawingObject(void)
 {
-fprintf(stderr, "LoadDrawingObject\n");
-
 HWPDrawingObject *hdo, *head, *prev;
 
 unsigned short link_info;
diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx
index cab73a626b8f..4d9fdce9196c 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -305,9 +305,10 @@ bool HMemIODev::setCompressed(bool )
 
 bool HMemIODev::read1b(unsigned char &out)
 {
+++pos;
 if (pos <= length)
 {
-out = ptr[pos++];
+out = ptr[pos - 1];
 return true;
 }
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/txtnode/ndtxt.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f78aadea74b99ba71f930c7cf52352da9ee965e9
Author: Michael Stahl 
Date:   Fri Aug 11 10:58:43 2017 +0200

tdf#105705 sw: fix another case of bookmarks becoming un-sorted

The loop in SwTextNode::Update() that reassigns bookmark end positions
away from the node to a temporary SwIndexReg can stop prematurely in a
particular situation where there is a bookmark that is expanded and with
both mark positions at the critical "rPos" insertion position, and also
both their SwIndexes consecutive in the SwIndexReg::m_pFirst
linked-list.

What happens then is that the iteration gets to the first of the 2
consecutive positions of the bookmark, then calls GetMarkEnd() on the
mark, which happens to return the other position, which is already
stored in the "next" local variable.

That other position is then moved to aTmpIdxReg, and in the next loop
iteration GetNext() is null as it is the last one in aTmpIdxReg and the
loop terminates.

Thus various bookmark end positions don't get preserved, or the
bAtLeastOneExpandedBookmarkAtInsertionPosition doesn't get set, either
of which can cause the bookmark array to lose its sort order.

This was found playing around with Zotero 4.0.29.10, while switching
between different citation styles.

(regression from 6a5dbe73537642b06bcde782118a34b4593d17eb)

Change-Id: Ia35ce0656bcb2d6af7ea189458af3942ff83e4da

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 4f4d9a3dccf8..7c9ba03d4895 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1087,6 +1087,10 @@ void SwTextNode::Update(
 if( this == &pEnd->nNode.GetNode() &&
 rPos.GetIndex() == rEndIdx.GetIndex() )
 {
+if (&rEndIdx == next) // nasty corner case:
+{   // don't switch to iterating aTmpIdxReg!
+next = rEndIdx.GetNext();
+}
 rEndIdx.Assign( &aTmpIdxReg, rEndIdx.GetIndex() );
 bAtLeastOneBookmarkMoved = true;
 }
___
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' - 12 commits - cui/source extensions/source external/curl filter/source hwpfilter/source sal/textenc sc/qa svl/source sw/source vcl/sou

[Stephan Bergmann]

 cui/source/tabpages/bbdlg.cxx |2 -
 extensions/source/update/check/download.cxx   |2 +
 external/curl/ExternalProject_curl.mk |   13 ---
 external/curl/UnpackedTarball_curl.mk |1 
 external/curl/curl-msvc-disable-protocols.patch.1 |   24 +
 filter/source/graphicfilter/itiff/itiff.cxx   |9 ++---
 hwpfilter/source/hwpread.cxx  |7 
 sal/textenc/tcvtkr6.tab   |4 +-
 sc/qa/unit/data/slk/pass/numfmt-2.slk |1 
 sc/qa/unit/data/slk/pass/numfmt.slk   |2 +
 svl/source/numbers/zforscan.cxx   |   38 --
 sw/source/core/docnode/ndnotxt.cxx|   18 +-
 sw/source/filter/ww8/ww8scan.cxx  |2 -
 vcl/source/filter/jpeg/jpegc.cxx  |6 +--
 vcl/source/gdi/graph.cxx  |   24 +++--
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx   |2 -
 16 files changed, 96 insertions(+), 59 deletions(-)

New commits:
commit 34d1d02d6972367247bf0ac3c622ac8dd2650fe4
Author: Stephan Bergmann 
Date:   Thu Aug 10 11:25:14 2017 +0200

tdf#109177: Fix expected type of Orientation attr

Regression introduced with 7e781aa15ab8c6bb727ccf290db7768bc9ba6245 "Clean 
up
uses of Any::getValue() in xmlscript"

Change-Id: I66df1c5aacab1d697438c57418c9100f9dba627a
(cherry picked from commit 1fc6b2f745300eae03373a1beb5d5ff79cf7de10)
Reviewed-on: https://gerrit.libreoffice.org/40956
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit 4b2dcb3eb74038f6e4c25cc1f1ee4ef2f0d25e11)

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index b352053c8ee6..43c0db80ad8e 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -861,7 +861,7 @@ void ElementDescriptor::readOrientationAttr( OUString const 
& rPropName, OUStrin
 if (beans::PropertyState_DEFAULT_VALUE != _xPropState->getPropertyState( 
rPropName ))
 {
 Any a( _xProps->getPropertyValue( rPropName ) );
-if (auto n = o3tl::tryAccess(a))
+if (auto n = o3tl::tryAccess(a))
 {
 switch (*n)
 {
commit 1422b89e076fec84cab9a732648833ce03f09caa
Author: Michael Stahl 
Date:   Wed Aug 9 17:38:14 2017 +0200

desktop,extensions: updater: only allow redirects to HTTP/HTTPS

Configure curl to prevent redirects to other protocols.

Change-Id: Ied73b3d9a062ea6e0a1d594f4c12162dffd6c4a7
(cherry picked from commit bd60bbfbdfbeb2687297e4512ddbea62a394ae67)
Reviewed-on: https://gerrit.libreoffice.org/40940
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 3dceaeee4ff511f4c4b67846bdc5b87fda4a3633)

diff --git a/extensions/source/update/check/download.cxx 
b/extensions/source/update/check/download.cxx
index 43320b51fbdc..3a822dd81c87 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -238,6 +238,8 @@ bool curl_run(const OUString& rURL, OutData& out, const 
OString& aProxyHost, sal
 
 // enable redirection
 curl_easy_setopt(pCURL, CURLOPT_FOLLOWLOCATION, 1);
+// only allow redirect to http:// and https://
+curl_easy_setopt(pCURL, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | 
CURLPROTO_HTTPS);
 
 // write function
 curl_easy_setopt(pCURL, CURLOPT_WRITEDATA, &out);
commit 0e1a0b99565cc6b9cf63802e5a3ae26de67bdc5b
Author: Michael Stahl 
Date:   Wed Aug 9 16:52:18 2017 +0200

curl: disable protocols nobody needs in MSVC build

These are disabled via configure on other platforms.

Change-Id: I4e27865396f3817ceb5645ab8589c21fdaa5afab
(cherry picked from commit 152a1d279cbc81e7b5f076a2c4b20c12c6929ce6)
Reviewed-on: https://gerrit.libreoffice.org/40939
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 34b0c0a07acf8dda6941260c750a171bee6e90dc)

diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index 536474d4a30b..51e67dc56a0e 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
+   external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1 
b/external/curl/curl-msvc-disable-protocols.patch.1
new file mode 100644
index ..38ff5ccb5ac0
--- /dev/null
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@

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

[Akshay Deep]

 cui/uiconfig/ui/specialcharacters.ui |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 469369b391c805938c46206286d11b45cd65b0ae
Author: Akshay Deep 
Date:   Wed Aug 9 16:46:55 2017 +0530

tdf#109216 - Alignment/spacing at the new controls in the special characters

Change-Id: I7c07750e131060fb8ba796e7dcdc5f5bafcb1d74
Reviewed-on: https://gerrit.libreoffice.org/40916
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/cui/uiconfig/ui/specialcharacters.ui 
b/cui/uiconfig/ui/specialcharacters.ui
index f210b8a25551..b5d2abc7abf0 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -77,7 +77,7 @@
 False
 True
 True
-6
+12
 12
 
   
@@ -275,7 +275,7 @@
 True
 True
 Maximum Limit: 16 
Characters
-center
+end
   
   
 0
@@ -314,7 +314,7 @@
 True
 False
 vertical
-12
+6
 
   
 True
@@ -545,7 +545,7 @@
 False
 4
 vertical
-12
+6
 
   
 True
___
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

[Szymon Kłos]

 sw/qa/extras/uiwriter/data/watermark-position.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   79 ++
 sw/source/core/edit/edfcol.cxx|   22 ++
 3 files changed, 101 insertions(+)

New commits:
commit 19b0171bbb6c2bcdab998b74a212dc68b1884e84
Author: Szymon Kłos 
Date:   Sun Aug 6 16:22:38 2017 +0200

tdf#108494 fix regression

* correct watermark position
* insert also on left and right pages if headers are different

Change-Id: Ibacfa6ea14bd8e9c1fd0d0b15de020b30d0a109f
Reviewed-on: https://gerrit.libreoffice.org/40891
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/sw/qa/extras/uiwriter/data/watermark-position.odt 
b/sw/qa/extras/uiwriter/data/watermark-position.odt
new file mode 100755
index ..53ff24781682
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/watermark-position.odt 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0d9a988559c2..68e96977139a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -86,6 +87,7 @@
 #include "com/sun/star/text/TextMarkupType.hpp"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -107,6 +109,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static const char* const DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
 
@@ -129,6 +132,7 @@ public:
 void testDOTMAutoText();
 void testDOCXAutoTextGallery();
 void testWatermarkDOCX();
+void testWatermarkPosition();
 void testTdf67238();
 void testFdo75110();
 void testFdo75898();
@@ -279,6 +283,7 @@ public:
 CPPUNIT_TEST(testDOTMAutoText);
 CPPUNIT_TEST(testDOCXAutoTextGallery);
 CPPUNIT_TEST(testWatermarkDOCX);
+CPPUNIT_TEST(testWatermarkPosition);
 CPPUNIT_TEST(testTdf67238);
 CPPUNIT_TEST(testFdo75110);
 CPPUNIT_TEST(testFdo75898);
@@ -901,6 +906,80 @@ void SwUiWriterTest::testWatermarkDOCX()
 CPPUNIT_ASSERT_EQUAL((sal_Int16)50, pWatermark->GetTransparency());
 }
 
+void SwUiWriterTest::testWatermarkPosition()
+{
+// tdf#108494 Watermark inserted in the document with page break was 
outside the first page
+const int aPagesInDocument = 2;
+const int aAdditionalPagesCount[] = {0, 0,1, 1,5, 
5,   20,20 };
+const bool aChangeHeader[]= { true, false, true, false, true, 
false, true, false };
+
+for (unsigned long i = 0; i < sizeof(aAdditionalPagesCount) / sizeof(int); 
++i)
+{
+int aPages = aPagesInDocument + aAdditionalPagesCount[i];
+
+// Empty document with one Page Break
+SwDoc* pDoc = createDoc("watermark-position.odt");
+SwEditShell* pEditShell = pDoc->GetEditShell();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+const OUString rPageStyleName = "Default Style";
+uno::Reference xModel = 
pDoc->GetDocShell()->GetBaseModel();
+uno::Reference 
xStyleFamiliesSupplier(xModel, uno::UNO_QUERY);
+uno::Reference 
xStyleFamilies(xStyleFamiliesSupplier->getStyleFamilies(), uno::UNO_QUERY);
+uno::Reference 
xStyleFamily(xStyleFamilies->getByName("PageStyles"), uno::UNO_QUERY);
+uno::Reference 
xPageStyle(xStyleFamily->getByName(rPageStyleName), uno::UNO_QUERY);
+
+// 1. Add additional page breaks
+for (int j = 0; j < aAdditionalPagesCount[i]; ++j)
+pWrtShell->InsertPageBreak();
+
+// 2. Change header state (On, Off, On)
+if (aChangeHeader[i])
+{
+SwPageDesc aDesc(pDoc->GetPageDesc(0));
+SwFrameFormat& rMaster = aDesc.GetMaster();
+rMaster.SetFormatAttr(SwFormatHeader(true));
+pDoc->ChgPageDesc(0, aDesc);
+
+aDesc = pDoc->GetPageDesc(0);
+SwFrameFormat& rMaster2 = aDesc.GetMaster();
+rMaster2.SetFormatAttr(SwFormatHeader(false));
+pDoc->ChgPageDesc(0, aDesc);
+
+aDesc = pDoc->GetPageDesc(0);
+SwFrameFormat& rMaster3 = aDesc.GetMaster();
+rMaster3.SetFormatAttr(SwFormatHeader(true));
+pDoc->ChgPageDesc(0, aDesc);
+}
+
+// 3. Insert Watermark
+SfxWatermarkItem aWatermark;
+aWatermark.SetText("Watermark");
+aWatermark.SetFont("DejaVu Sans");
+
+pEditShell->SetWatermark(aWatermark);
+
+uno::Reference xShape(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShape.is());
+
+SdrPage* pPage = 
pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+
+// Get Watermark object
+SdrObject* pObject = pPage->GetObj(0);
+pObject->RecalcBoundRect();
+const tools::Rectangle& rRect = pObject->GetSnapRect();
+Size rSize = pPage->GetSize();
+
+// Page break, calculate height 

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

[Miklos Vajna]

 sw/source/filter/ww8/docxsdrexport.hxx   |4 -
 sw/source/filter/ww8/rtfattributeoutput.cxx  |   16 ++--
 sw/source/filter/ww8/rtfattributeoutput.hxx  |4 -
 sw/source/filter/ww8/rtfexport.cxx   |4 -
 writerperfect/Library_wpftwriter.mk  |3 
 writerperfect/source/writer/exp/txtparai.cxx |   50 ++
 writerperfect/source/writer/exp/txtparai.hxx |   38 ++
 writerperfect/source/writer/exp/xmlictxt.cxx |   66 ++
 writerperfect/source/writer/exp/xmlictxt.hxx |   56 
 writerperfect/source/writer/exp/xmlimp.cxx   |   94 ++-
 writerperfect/source/writer/exp/xmlimp.hxx   |   14 +++-
 writerperfect/source/writer/exp/xmltext.cxx  |   36 ++
 writerperfect/source/writer/exp/xmltext.hxx  |   34 +
 13 files changed, 387 insertions(+), 32 deletions(-)

New commits:
commit 9456afaa5aa12926b1aa6b74ece1654d47e1c650
Author: Miklos Vajna 
Date:   Fri Aug 11 09:11:22 2017 +0200

EPUB export: rework to use context classes

Before writerperfect::exp::XMLImport grows into a God object. Also, if
I'm at it, recurse into text:h to include heading text.

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

diff --git a/writerperfect/Library_wpftwriter.mk 
b/writerperfect/Library_wpftwriter.mk
index 953f00c3e0d9..cf567b0af9f8 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -75,7 +75,10 @@ $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
writerperfect/source/writer/PagesImportFilter \
writerperfect/source/writer/StarOfficeWriterImportFilter \
writerperfect/source/writer/WordPerfectImportFilter \
+   writerperfect/source/writer/exp/txtparai \
+   writerperfect/source/writer/exp/xmlictxt \
writerperfect/source/writer/exp/xmlimp \
+   writerperfect/source/writer/exp/xmltext \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/writerperfect/source/writer/exp/txtparai.cxx 
b/writerperfect/source/writer/exp/txtparai.cxx
new file mode 100644
index ..9507ceb759b9
--- /dev/null
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -0,0 +1,50 @@
+/* -*- 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 "txtparai.hxx"
+
+#include "xmlimp.hxx"
+
+using namespace com::sun::star;
+
+namespace writerperfect
+{
+namespace exp
+{
+
+XMLParaContext::XMLParaContext(XMLImport &rImport)
+: XMLImportContext(rImport)
+{
+}
+
+XMLImportContext *XMLParaContext::CreateChildContext(const OUString 
&/*rName*/, const css::uno::Reference 
&/*xAttribs*/)
+{
+return nullptr;
+}
+
+void XMLParaContext::startElement(const OUString &/*rName*/, const 
css::uno::Reference &/*xAttribs*/)
+{
+mrImport.GetGenerator().openParagraph(librevenge::RVNGPropertyList());
+}
+
+void XMLParaContext::endElement(const OUString &/*rName*/)
+{
+mrImport.GetGenerator().closeParagraph();
+}
+
+void XMLParaContext::characters(const OUString &rChars)
+{
+OString sCharU8 = OUStringToOString(rChars, RTL_TEXTENCODING_UTF8);
+
mrImport.GetGenerator().insertText(librevenge::RVNGString(sCharU8.getStr()));
+}
+
+} // namespace exp
+} // namespace writerperfect
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/txtparai.hxx 
b/writerperfect/source/writer/exp/txtparai.hxx
new file mode 100644
index ..6c9f23b6cf37
--- /dev/null
+++ b/writerperfect/source/writer/exp/txtparai.hxx
@@ -0,0 +1,38 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_EXP_TXTPARAI_HXX
+#define INCLUDED_WRITERPERFECT_SOURCE_WRITER_EXP_TXTPARAI_HXX
+
+#include "xmlictxt.hxx"
+
+namespace writerperfect
+{
+namespace exp
+{
+
+/// Handler for /.
+class XMLParaContext : public XMLImportContext
+{
+public:
+XMLParaContext(XMLImport &rImport);
+
+XMLImportContext *CreateChildContext(const OUString &rName, const 
css::uno::Reference &/*xAttribs*/) override;
+
+void SAL_CALL startElement(const OUString &rName, const 
css::uno::Reference &xAttribs) override;
+void SAL_CALL endElement(const OUString &rName) override;
+void SAL_CALL characters(const OUString &rChars) override;
+};
+
+} // namespace exp
+} // namespace writerperfect
+
+#en

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

[Aron Budea]

 loleaflet/src/layer/marker/Annotation.js |5 +
 1 file changed, 5 insertions(+)

New commits:
commit a75b780b8aa05d3cf5b8ede6f9075ca06a9d5d28
Author: Aron Budea 
Date:   Wed Aug 9 02:35:45 2017 +0200

loleaflet: don't add reply on Cancel, don't leave empty box

Reply was added when clicking Cancel. This is a regression from
07607863925cf4fc2dbc91685d8f430f849c5535

Additionally, when focus was lost on an empty, initial commit,
an empty, defunct comment box remained until reload.

Change-Id: I49a5224ff70de65623496cfcba538acb6a8086f8
Reviewed-on: https://gerrit.libreoffice.org/40915
Reviewed-by: pranavk 
Tested-by: pranavk 

diff --git a/loleaflet/src/layer/marker/Annotation.js 
b/loleaflet/src/layer/marker/Annotation.js
index e60c4379..a569dc33 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -217,6 +217,7 @@ L.Annotation = L.Layer.extend({
_onCancelClick: function (e) {
L.DomEvent.stopPropagation(e);
this._nodeModifyText.value = this._contentText.origText;
+   this._nodeReplyText.value = '';
this.show();
this._map.fire('AnnotationCancel', {annotation: this});
},
@@ -233,6 +234,10 @@ L.Annotation = L.Layer.extend({
if (this._contentText.origText !== this._nodeModifyText.value) {
this._onSaveComment(e);
}
+   else if (this._nodeModifyText.value == '') {
+   // Implies that this._contentText.origText == ''
+   this._onCancelClick(e);
+   }
},
 
_onLostFocusReply: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 hwpfilter/source/drawing.h |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e33184e40a8bc9790cb57a15ecc9cbc6d2b4f782
Author: Caolán McNamara 
Date:   Fri Aug 11 08:45:16 2017 +0100

ofz#2906: direct-leak

Change-Id: I61323f36922842ddc45b2a63a9ba7334c847a8fd

diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index a69ecf4878c5..4f990b0de813 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -690,6 +690,9 @@ HWPDrawingObject::~HWPDrawingObject()
 if (next)
 delete next;
 
+if (property.pPara)
+FreeParaList(property.pPara);
+
 HWPDOFunc(this, OBJFUNC_FREE, nullptr, 0);
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 sax/source/fastparser/fastparser.cxx |  135 ---
 1 file changed, 135 deletions(-)

New commits:
commit 840a97f98f03491256a93d95e6614d41cdcddbcf
Author: Thorsten Behrens 
Date:   Fri Aug 11 00:10:30 2017 +0200

sax parser: remove long-disabled code

Entity ref and decl was disabled since 2014, let's remove it now.

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

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 4cdd3b034962..8188724a91d9 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -238,13 +238,6 @@ public:
 void callbackEndElement();
 void callbackCharacters( const xmlChar* s, int nLen );
 void callbackProcessingInstruction( const xmlChar *target, const xmlChar 
*data );
-#if 0
-bool callbackExternalEntityRef( XML_Parser parser, const xmlChar 
*openEntityNames, const xmlChar *base, const xmlChar *systemId, const xmlChar 
*publicId);
-void callbackEntityDecl(const xmlChar *entityName, int is_parameter_entity,
-const xmlChar *value, int value_length, const xmlChar *base,
-const xmlChar *systemId, const xmlChar *publicId,
-const xmlChar *notationName);
-#endif
 
 void pushEntity( const Entity& rEntity );
 void popEntity();
@@ -268,9 +261,6 @@ private:
 void DefineNamespace( const OString& rPrefix, const OUString& namespaceURL 
);
 
 private:
-#if 0
-FastSaxParser* mpFront;
-#endif
 osl::Mutex maMutex; ///< Protecting whole parseStream() execution
 ::rtl::Reference< FastLocatorImpl > mxDocumentLocator;
 NamespaceMapmaNamespaceMap;
@@ -334,24 +324,6 @@ static void call_callbackProcessingInstruction( void 
*userData, const xmlChar *t
 pFastParser->callbackProcessingInstruction( target, data );
 }
 
-#if 0
-static void call_callbackEntityDecl(void *userData, const xmlChar *entityName,
-int is_parameter_entity, const xmlChar *value, int value_length,
-const xmlChar *base, const xmlChar *systemId,
-const xmlChar *publicId, const xmlChar *notationName)
-{
-FastSaxParserImpl* pFastParser = 
reinterpret_cast(userData);
-pFastParser->callbackEntityDecl(entityName, is_parameter_entity, value,
-value_length, base, systemId, publicId, notationName);
-}
-
-static int call_callbackExternalEntityRef( XML_Parser parser,
-const xmlChar *openEntityNames, const xmlChar *base, const xmlChar 
*systemId, const xmlChar *publicId )
-{
-FastSaxParserImpl* pFastParser = reinterpret_cast( 
XML_GetUserData( parser ) );
-return pFastParser->callbackExternalEntityRef( parser, openEntityNames, 
base, systemId, publicId );
-}
-#endif
 }
 
 class FastLocatorImpl : public WeakImplHelper< XLocator >
@@ -651,9 +623,6 @@ void Entity::saveException( const Any & e )
 namespace sax_fastparser {
 
 FastSaxParserImpl::FastSaxParserImpl() :
-#if 0
-mpFront(pFront),
-#endif
 m_bIgnoreMissingNSDecl(false),
 mpTop(nullptr)
 {
@@ -1040,10 +1009,6 @@ void FastSaxParserImpl::parse()
 callbacks.characters = call_callbackCharacters;
 callbacks.processingInstruction = call_callbackProcessingInstruction;
 callbacks.initialized = XML_SAX2_MAGIC;
-#if 0
-XML_SetEntityDeclHandler(entity.mpParser, call_callbackEntityDecl);
-XML_SetExternalEntityRefHandler( entity.mpParser, 
call_callbackExternalEntityRef );
-#endif
 int nRead = 0;
 do
 {
@@ -1305,106 +1270,6 @@ void FastSaxParserImpl::callbackProcessingInstruction( 
const xmlChar *target, co
 rEntity.processingInstruction( rEvent.msNamespace, 
rEvent.msElementName );
 }
 
-#if 0
-void FastSaxParserImpl::callbackEntityDecl(
-SAL_UNUSED_PARAMETER const xmlChar * /*entityName*/,
-SAL_UNUSED_PARAMETER int /*is_parameter_entity*/,
-const xmlChar *value, SAL_UNUSED_PARAMETER int /*value_length*/,
-SAL_UNUSED_PARAMETER const xmlChar * /*base*/,
-SAL_UNUSED_PARAMETER const xmlChar * /*systemId*/,
-SAL_UNUSED_PARAMETER const xmlChar * /*publicId*/,
-SAL_UNUSED_PARAMETER const xmlChar * /*notationName*/)
-{
-if (value) { // value != 0 means internal entity
-SAL_INFO("sax", "FastSaxParser: internal entity declaration, 
stopping");
-XML_StopParser(getEntity().mpParser, XML_FALSE);
-getEntity().saveException( SAXParseException(
-"FastSaxParser: internal entity declaration, stopping",
-static_cast(mpFront), Any(),
-mxDocumentLocator->getPublicId(),
-mxDocumentLocator->getSystemId(),
-mxDocumentLocator->getLineNumber(),
-mxDocumentLocator->getColumnNumber() ) );
-} else {
-SAL_INFO("sax", "FastSaxParser: ignoring external entity declaration");
-}
-}
-
-bool FastSaxParserImpl::callbackExter

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

[Yousuf Philips]

 vcl/source/app/IconThemeInfo.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 4c60c80ab768f466f54507277861396151249e89
Author: Yousuf Philips 
Date:   Mon Jun 5 17:28:14 2017 +0400

Correct icon size assignment

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

diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 9dac8f81b913..b3f6d9a40a33 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -67,17 +67,14 @@ IconThemeInfo::IconThemeInfo(const OUString& urlToFile)
 /*static*/ Size
 IconThemeInfo::SizeByThemeName(const OUString& themeName)
 {
-if (themeName == "tango") {
-return Size( 24, 24 );
-}
-else if (themeName == "crystal") {
+if (themeName == "crystal") {
 return Size( 22, 22 );
 }
 else if (themeName == "galaxy") {
-return Size( 22, 22 );
+return Size( 26, 26 );
 }
 else {
-return Size( 26, 26 );
+return Size( 24, 24 );
 }
 }
 
___
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' - sfx2/source

[Julien Nabet]

 sfx2/source/control/templatelocalview.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 08ae774fe92f0576691c9b0177fef45d18fd77b3
Author: Julien Nabet 
Date:   Thu Aug 10 21:06:43 2017 +0200

tdf#111567: fix memleak in TemplateLocalView::insertItems

Clearing mItemList at the begin of insertItems is a bad idea
because it prevents ImplDeleteItems (called by updateItems,
itself called at the end of insertItems) from clearing
correctly mItemList
See comments from bugtracker for more info

(Thank you Alex for the precious info attached with memleak reports! :-))

Change-Id: I04976dbb065d1369562649fc97c33f7fd599b107
Reviewed-on: https://gerrit.libreoffice.org/40995
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit 05a338159761e012c2c8779f8927b0d709b4416f)
Reviewed-on: https://gerrit.libreoffice.org/41002
Reviewed-by: Noel Grandin 

diff --git a/sfx2/source/control/templatelocalview.cxx 
b/sfx2/source/control/templatelocalview.cxx
index 6c5881422b15..2168cdd9ac59 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -777,8 +777,6 @@ bool TemplateLocalView::renameItem(ThumbnailViewItem* 
pItem, const OUString& sNe
 
 void TemplateLocalView::insertItems(const std::vector 
&rTemplates, bool isRegionSelected, bool bShowCategoryInTooltip)
 {
-mItemList.clear();
-
 std::vector aItems(rTemplates.size());
 for (size_t i = 0, n = rTemplates.size(); i < n; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/uiconfig/swriter/ui/converttexttable.ui |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit e2e71dd7f7e5cdc525c59aeb5f26a93663a444f0
Author: Caolán McNamara 
Date:   Thu Aug 10 08:47:29 2017 +0100

tweak string convert table dialog to load the same with native gtk builder

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

diff --git a/sw/uiconfig/swriter/ui/converttexttable.ui 
b/sw/uiconfig/swriter/ui/converttexttable.ui
index 79802c1d3d5a..03f0b1b0ecc0 100644
--- a/sw/uiconfig/swriter/ui/converttexttable.ui
+++ b/sw/uiconfig/swriter/ui/converttexttable.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -13,6 +13,7 @@
 False
 6
 Convert Table to 
Text
+True
 dialog
 
   
@@ -28,6 +29,7 @@
 gtk-ok
 True
 True
+True
 True
 True
 True
@@ -152,7 +154,7 @@
 end
 0
 True
-other
+tabs
   
   
 1
@@ -169,7 +171,7 @@
 end
 0
 True
-semicolons
+tabs
   
   
 0
@@ -188,7 +190,6 @@
 0
 True
 True
-paragraph
   
   
 0
@@ -402,9 +403,9 @@
   
 
 
-  ok
-  cancel
-  help
+  ok
+  cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits