[Libreoffice-commits] core.git: vcl/vcl.common.component

[Stephan Bergmann]

 vcl/vcl.common.component |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76850fcd99d7a9f62c7a95e22bf83e814e07af7a
Author: Stephan Bergmann 
Date:   Mon Mar 12 18:18:10 2018 +0100

prefix is unused when all implementations have constructors

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

diff --git a/vcl/vcl.common.component b/vcl/vcl.common.component
index d5f7829242ac..77fbf38a1973 100644
--- a/vcl/vcl.common.component
+++ b/vcl/vcl.common.component
@@ -18,7 +18,7 @@
 -->
 
 http://openoffice.org/2010/uno-components";>
+xmlns="http://openoffice.org/2010/uno-components";>
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsprm.cxx |8 
 writerfilter/source/rtftok/rtfsprm.hxx |   15 +++
 2 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 80f9383f1adf3a42c22765c7c8bee8e705e39d0b
Author: Miklos Vajna 
Date:   Tue Mar 13 22:12:05 2018 +0100

boost::intrusive_ptr->tools::SvRef

To avoid semi-manual refcount handling.

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

diff --git a/writerfilter/source/rtftok/rtfsprm.cxx 
b/writerfilter/source/rtftok/rtfsprm.cxx
index e021feee623c..271ad821cef3 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -273,9 +273,9 @@ bool RTFSprms::equals(RTFValue& rOther)
 
 void RTFSprms::ensureCopyBeforeWrite()
 {
-if (m_pSprms->m_nRefCount > 1)
+if (m_pSprms->GetRefCount() > 1)
 {
-boost::intrusive_ptr pClone(new RTFSprmsImpl);
+tools::SvRef pClone(new RTFSprmsImpl);
 for (auto& rSprm : *m_pSprms)
 pClone->push_back(
 std::make_pair(rSprm.first, 
RTFValue::Pointer_t(rSprm.second->Clone(;
@@ -294,10 +294,10 @@ RTFSprms::RTFSprms(const RTFSprms& rSprms) { *this = 
rSprms; }
 
 void RTFSprms::clear()
 {
-if (m_pSprms->m_nRefCount == 1)
+if (m_pSprms->GetRefCount() == 1)
 return m_pSprms->clear();
 
-m_pSprms.reset(new RTFSprmsImpl);
+m_pSprms = tools::SvRef(new RTFSprmsImpl);
 }
 
 } // namespace rtftok
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx 
b/writerfilter/source/rtftok/rtfsprm.hxx
index 7839682343b8..bb9228074277 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -14,7 +14,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include "rtfvalue.hxx"
 
 namespace writerfilter
@@ -24,19 +24,10 @@ namespace rtftok
 using RTFSprmsImplBase = std::vector>;
 
 /// The payload of RTFSprms which is only copied on write.
-class RTFSprmsImpl : public RTFSprmsImplBase
+class RTFSprmsImpl : public RTFSprmsImplBase, public SvRefBase
 {
-public:
-sal_Int32 m_nRefCount = 0;
 };
 
-inline void intrusive_ptr_add_ref(RTFSprmsImpl* p) { ++(p->m_nRefCount); }
-inline void intrusive_ptr_release(RTFSprmsImpl* p)
-{
-if (!--(p->m_nRefCount))
-delete p;
-}
-
 enum class RTFOverwrite
 {
 YES, ///< Yes, if an existing key is found, overwrite it.
@@ -75,7 +66,7 @@ public:
 
 private:
 void ensureCopyBeforeWrite();
-boost::intrusive_ptr m_pSprms;
+tools::SvRef m_pSprms;
 };
 
 /// RTF keyword with a parameter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 xmloff/qa/unit/uxmloff.cxx  |  136 
 xmloff/source/core/xmlimp.cxx   |2 
 xmloff/source/meta/xmlmetai.cxx |   19 +++--
 3 files changed, 148 insertions(+), 9 deletions(-)

New commits:
commit 0d6ffe118fd1d03e22fcda2f06d49b4c932d2018
Author: Michael Stahl 
Date:   Mon Mar 12 20:03:34 2018 +0100

xmloff: ODF import: improve meta:generator checks

Instead of a hard-coded check for (effectively) one project name
"LibreOffice" (which is build-time configurable), check for the string
"LibreOffice_project", which has been produced hard-coded ever since
LO 3.3.0.

This now recognises additional downstreams "LibreOffice_Vanilla"
and "Collabora_Office", and also historic "BrOffice".

An important point here is that the build-time configurable version
numbers of any downstream that retains the hard-coded
"LibreOffice_project" *MUST* be the same as the upstream's at least
in their major and minor versions (micro and further digits are
currently not used), and that such downstreams don't backport
changes with ODF export compatibility impact further than upstream.

Add a unit test too, with a representative sample of 4372 distinct
generators in bugzilla attachments.

This revealed that StarOffice 6 and AOO 4.0.1 were falling through
the cracks and not recognised, so fix that too.

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

diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx
index bb4a15cc8852..71a1b371f006 100644
--- a/xmloff/qa/unit/uxmloff.cxx
+++ b/xmloff/qa/unit/uxmloff.cxx
@@ -10,6 +10,12 @@
 #include 
 #include 
 
+#include 
+
+#include 
+
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -30,9 +36,11 @@ public:
 virtual void tearDown() override;
 
 void testAutoStylePool();
+void testMetaGenerator();
 
 CPPUNIT_TEST_SUITE(Test);
 CPPUNIT_TEST(testAutoStylePool);
+CPPUNIT_TEST(testMetaGenerator);
 CPPUNIT_TEST_SUITE_END();
 private:
 SvXMLExport *pExport;
@@ -87,6 +95,134 @@ void Test::testAutoStylePool()
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "same style not found", aName, aSameName );
 }
 
+void Test::testMetaGenerator()
+{
+comphelper::PropertyMapEntry const aInfoMap[] = {
+{ OUString("BuildId"), 0, ::cppu::UnoType::get(), 
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ OUString(), 0, css::uno::Type(), 0, 0 }
+};
+uno::Reference const xInfoSet(
+comphelper::GenericPropertySet_CreateInstance(
+new comphelper::PropertySetInfo(aInfoMap)));
+
+struct {
+char const*const generator;
+char const*const buildId;
+sal_uInt16 const result;
+} const tests [] = {
+// foreign
+{ "AbiWord/2.8.6 (unix, gtk)", "", SvXMLImport::ProductVersionUnknown 
},
+{ "Aspose.Words for Java 13.10.0.0", "", 
SvXMLImport::ProductVersionUnknown },
+{ "CIB jsmerge 1.0.0", "", SvXMLImport::ProductVersionUnknown },
+{ "Calligra/2.4.3", "", SvXMLImport::ProductVersionUnknown },
+{ "CocoaODFWriter/1339", "", SvXMLImport::ProductVersionUnknown },
+{ "KOffice/1.4.1", "", SvXMLImport::ProductVersionUnknown },
+{ "KPresenter 1.3", "", SvXMLImport::ProductVersionUnknown },
+{ "KSpread 1.3.2", "", SvXMLImport::ProductVersionUnknown },
+{ "Lotus Symphony/1.2.0_20081023.1730/Win32", "", 
SvXMLImport::ProductVersionUnknown },
+{ "Microsoft Excel Online", "", SvXMLImport::ProductVersionUnknown },
+{ "MicrosoftOffice/12.0 MicrosoftExcel/CalculationVersion-4518", "", 
SvXMLImport::ProductVersionUnknown },
+{ "MicrosoftOffice/15.0 MicrosoftWord", "", 
SvXMLImport::ProductVersionUnknown },
+{ "ODF Converter v1.0.0", "", SvXMLImport::ProductVersionUnknown },
+{ "ODF::lpOD 1.121", "", SvXMLImport::ProductVersionUnknown },
+{ "ODFDOM/0.6.1$Build-1", "", SvXMLImport::ProductVersionUnknown },
+{ "ODFPY/0.9.6", "", SvXMLImport::ProductVersionUnknown },
+{ "OpenXML/ODF Translator Command Line Tool 3.0 2.0.0", "", 
SvXMLImport::ProductVersionUnknown },
+{ "Org-7.8.03/Emacs-24.0.93.1", "", SvXMLImport::ProductVersionUnknown 
},
+{ "TeX4ht from eqns_long.tex, options: xhtml,ooffice,refcaption", "", 
SvXMLImport::ProductVersionUnknown },
+{ "TextMaker", "", SvXMLImport::ProductVersionUnknown },
+{ "docbook2odf generator (http://open.comsultia.com/docbook2odf/)", 
"", SvXMLImport::ProductVersionUnknown },
+{ "fig2sxd", "", SvXMLImport::ProductVersionUnknown },
+{ "gnumeric/1.10.9", "", SvXMLImport::ProductVersionUnknown },
+{ "libodfgen/0.1.6", "", SvXMLImport::ProductVersionUnknown },
+
+// OOo 1.x
+{ "StarSuite 6.0 (Linux)", "645$8687", SvXMLImport::OOo_1x },
+{ "

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

[Michael Stahl]

 sd/qa/unit/data/unknown-attribute.fodp |   26 ++
 sd/qa/unit/export-tests.cxx|   26 ++
 xmloff/source/core/xmlictxt.cxx|2 ++
 xmloff/source/core/xmlimp.cxx  |   22 +++---
 4 files changed, 73 insertions(+), 3 deletions(-)

New commits:
commit dab0220f91bcd2dab85309c14bcd10c27639544d
Author: Michael Stahl 
Date:   Thu Mar 1 13:10:40 2018 +0100

tdf#115429 xmloff: ODF import: fix handling of unknown attributes

... in SvXMLLegacyToFastDocHandler::startElement(), so that it does not
create invalid "-1" tokens that end up stored as empty-string
attribute names in SvXMLAttrCollection and ultimately exported
as invalid XML.

One surprising aspect is that the maNamespaceURL in struct
UnknownAttribute stores the namespace prefix in the libreoffice-5-4
branch, as it lacks commit bb59a80ee6000d3922fa95262f67e291fd9d8ee2.

The attributes are read and converted again in
SvXMLImportContext::startUnknownElement().

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

diff --git a/sd/qa/unit/data/unknown-attribute.fodp 
b/sd/qa/unit/data/unknown-attribute.fodp
new file mode 100644
index ..3aa39b10
--- /dev/null
+++ b/sd/qa/unit/data/unknown-attribute.fodp
@@ -0,0 +1,26 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.presentation">
+  
+
+  
+  
+
+
+  http://example.com/"; foo:non-existent-att="bar"
+/>
+
+
+  
+  
+
+
+  
+
+  
+
+
+  
+
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 10590131e939..294312f3c2a4 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -87,6 +87,7 @@ public:
 void testTdf97630();
 void testSwappedOutImageExport();
 void testOOoXMLAnimations();
+void testUnknownAttributes();
 void testTdf80020();
 void testLinkedGraphicRT();
 void testImageWithSpecialID();
@@ -107,6 +108,7 @@ public:
 CPPUNIT_TEST(testTdf97630);
 CPPUNIT_TEST(testSwappedOutImageExport);
 CPPUNIT_TEST(testOOoXMLAnimations);
+CPPUNIT_TEST(testUnknownAttributes);
 CPPUNIT_TEST(testTdf80020);
 CPPUNIT_TEST(testLinkedGraphicRT);
 CPPUNIT_TEST(testImageWithSpecialID);
@@ -138,6 +140,8 @@ public:
 { "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
 { "xlink", "http://www.w3c.org/1999/xlink"; },
 { "loext", 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" },
+// user-defined
+{ "foo", "http://example.com/"; },
 };
 for (size_t i = 0; i < SAL_N_ELEMENTS(namespaces); ++i)
 {
@@ -458,6 +462,28 @@ void SdExportTest::testOOoXMLAnimations()
 assertXPath(pXmlDoc, "//anim:par", 223);
 }
 
+void SdExportTest::testUnknownAttributes()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/unknown-attribute.fodp"), 
FODP);
+
+uno::Reference xComponent(xDocShRef->GetModel(), 
uno::UNO_QUERY);
+uno::Reference xStorable(xCompone

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 18 commits - dbaccess/source desktop/source filter/CppunitTest_filter_textfilterdetect.mk filter/Module_filter.mk filter/qa filter/s

[Miklos Vajna]

 dbaccess/source/ui/misc/controllerframe.cxx   |2 
 dbaccess/source/ui/misc/databaseobjectview.cxx|2 
 desktop/source/app/app.cxx|4 
 filter/CppunitTest_filter_textfilterdetect.mk |   46 
 filter/Module_filter.mk   |1 
 filter/qa/unit/data/tdf114428.xhtml   |9 +
 filter/qa/unit/textfilterdetect.cxx   |   63 +++
 filter/source/config/fragments/types/generic_HTML.xcu |2 
 filter/source/textfilterdetect/filterdetect.cxx   |   24 +++-
 framework/inc/classes/taskcreator.hxx |3 
 framework/source/classes/taskcreator.cxx  |   10 +
 framework/source/helper/tagwindowasmodified.cxx   |4 
 framework/source/loadenv/loadenv.cxx  |4 
 framework/source/services/desktop.cxx |4 
 framework/source/services/frame.cxx   |   23 +++-
 framework/source/services/taskcreatorsrv.cxx  |   11 +-
 include/sfx2/docfile.hxx  |2 
 include/sfx2/sfxsids.hrc  |4 
 include/svtools/htmlkywd.hxx  |4 
 include/toolkit/awt/vclxwindow.hxx|   17 +++
 include/tools/wintypes.hxx|4 
 include/vcl/window.hxx|   22 +++-
 package/inc/ZipPackage.hxx|1 
 package/source/xstor/xfactory.cxx |7 +
 package/source/xstor/xstorage.cxx |4 
 package/source/zippackage/ZipPackage.cxx  |4 
 sfx2/sdi/sfx.sdi  |4 
 sfx2/source/appl/appuno.cxx   |2 
 sfx2/source/doc/docfile.cxx   |   96 +-
 sfx2/source/doc/guisaveas.cxx |3 
 sfx2/source/doc/objstor.cxx   |   19 +++
 sfx2/source/doc/sfxbasemodel.cxx  |3 
 svtools/CppunitTest_svtools_html.mk   |1 
 svtools/qa/unit/testHtmlReader.cxx|   70 +
 svtools/source/control/toolbarmenu.cxx|2 
 svtools/source/svhtml/parhtml.cxx |3 
 svtools/source/uno/popupwindowcontroller.cxx  |3 
 sw/inc/doc.hxx|   11 +-
 sw/qa/extras/htmlexport/data/hello.html   |8 +
 sw/qa/extras/htmlexport/htmlexport.cxx|   38 +++
 sw/source/core/doc/docnew.cxx |4 
 sw/source/core/docnode/ndtbl.cxx  |   10 +
 sw/source/core/unocore/unostyle.cxx   |3 
 sw/source/filter/html/htmlflywriter.cxx   |   20 +--
 sw/source/filter/html/wrthtml.cxx |   15 ++
 sw/source/filter/html/wrthtml.hxx |2 
 sw/source/uibase/app/docstyle.cxx |   23 ++--
 toolkit/source/controls/unocontrol.cxx|   55 +++---
 vcl/inc/unx/genpspgraphics.h  |5 
 vcl/inc/unx/glyphcache.hxx|1 
 vcl/inc/unx/gtk/gtkframe.hxx  |1 
 vcl/inc/unx/i18n_cb.hxx   |2 
 vcl/inc/unx/i18n_xkb.hxx  |3 
 vcl/inc/unx/printergfx.hxx|1 
 vcl/inc/unx/saldisp.hxx   |3 
 vcl/inc/unx/salframe.h|3 
 vcl/inc/window.h  |4 
 vcl/qa/cppunit/wmf/wmfimporttest.cxx  |4 
 vcl/source/filter/wmf/enhwmf.cxx  |   10 +
 vcl/source/filter/wmf/winmtf.hxx  |5 
 vcl/source/filter/wmf/winwmf.cxx  |   11 --
 vcl/source/fontsubset/cff.cxx |   78 --
 vcl/source/gdi/pdfwriter_impl.cxx |8 -
 vcl/source/gdi/pdfwriter_impl.hxx |2 
 vcl/source/gdi/pngread.cxx|4 
 vcl/source/window/dockmgr.cxx |   15 --
 vcl/source/window/menubarwindow.cxx   |1 
 vcl/source/window/menubarwindow.hxx   |3 
 vcl/source/window/menufloatingwindow.cxx  |1 
 vcl/source/window/menufloatingwindow.hxx  |1 
 vcl/source/window/mouse.cxx   |3 
 vcl/source/window/toolbox.cxx |4 
 vcl/source/window/window.cxx  |   11 --
 vcl/source/window/window2.cxx |4 
 vcl/source/window/winproc.cxx |1 
 vcl/unx/generic/app/i18n_cb.cxx   |1 
 vcl/unx/generic/app/i18n_ic.cxx   |1 
 vcl/unx/generic/app/i1

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/sw/res/sidebar/pageproppanel/column1_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column2_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column3_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_1_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_2_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_3_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_left_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_right_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/columnleft_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/columnright_24x24.png
|binary
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column1_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column2_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column3_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column_L_1_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column_L_2_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column_L_3_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column_L_left_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/column_L_right_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/columnleft_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/columnright_24x24.svg
|1 +
 20 files changed, 10 insertions(+)

New commits:
commit dc68ba9b48d9bc9668329700de686f98e07acc4a
Author: andreas kainz 
Date:   Wed Mar 14 09:31:03 2018 +0100

Colibre icons: add column pageproppanel icons

Change-Id: I3a05c1b0172ba2c3d3becc5dbca7d7cc2d3f8567
Reviewed-on: https://gerrit.libreoffice.org/51258
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column1_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column1_24x24.png
new file mode 100644
index ..3205ac055bad
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column1_24x24.png differ
diff --git a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column2_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column2_24x24.png
new file mode 100644
index ..71d40f891fd7
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column2_24x24.png differ
diff --git a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column3_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column3_24x24.png
new file mode 100644
index ..81c0eb0e980f
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column3_24x24.png differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_1_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_1_24x24.png
new file mode 100644
index ..bd110212aea5
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_1_24x24.png differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_2_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_2_24x24.png
new file mode 100644
index ..2dcf93a3d96a
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_2_24x24.png differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_3_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_3_24x24.png
new file mode 100644
index ..3152f9ebd083
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_3_24x24.png differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_left_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_left_24x24.png
new file mode 100644
index ..67a013929558
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_left_24x24.png 
differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_right_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_right_24x24.png
new file mode 100644
index ..339990c14dbc
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/column_L_right_24x24.png 
differ
diff --git 
a/icon-themes/colibre/sw/res/sidebar/pageproppanel/columnleft_24x24.png 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/columnleft_24x24.png
new file mode 100644
index ..4a0a2f85676d
Binary files /dev/null and 
b/icon-themes/colibre/sw/res/sidebar/pageproppanel/columnleft_2

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

[Takeshi Abe]

 officecfg/registry/data/org/openoffice/VCL.xcu |2 -
 unotools/source/config/fontcfg.cxx |   28 -
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit bba299d8146a07af6833620784ac5b697b0f7e84
Author: Takeshi Abe 
Date:   Sat Mar 3 09:24:55 2018 +0900

tdf#114751 Update the default UI fonts for Japanese locale

- give priority to IPA P Gothic and Noto Sans CJK JP
- for Windows, try Yu Gothic UI first, then Meiryo UI
- look for Hiragino Kaku Gothic ProN/Pro on macOS

Thanks to Jun Nogata and AWASHIRO Ikuya for their suggestions.
This addresses only part of the issue; another incoming change
will take care of the rest.

Change-Id: I1491ba63e1447d3b9086dfcfdf3981bee6282661
Reviewed-on: https://gerrit.libreoffice.org/50515
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 91526d120ee2..44af4ffdc891 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -238,7 +238,7 @@
 HG ゴシックB Sun;HG-GothicB Sun;HG ゴシックB;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Kochi Gothic;UmePlus Gothic;Gothic
   
   
-HG PゴシックB Sun;Osaka;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;HG-GothicB;UmePlus P Gothic;HG Mincho Light 
J;標準;TLPゴシック;LXゴシック;HGPGothicB;IPA Pゴシック;東風ゴシック;さざなみゴシック;Kochi 
Gothic;Gothic;Gnu-Unifont
+IPA Pゴシック;IPA P Gothic;Noto Sans CJK JP;Yu Gothic UI;Meiryo 
UI;ヒラギノ角ゴ ProN;Hiragino Kaku Gothic ProN;ヒラギノ角ゴ Pro;Hiragino Kaku Gothic 
Pro
   
   
 
hgmincholightj;cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced
diff --git a/unotools/source/config/fontcfg.cxx 
b/unotools/source/config/fontcfg.cxx
index 0ffc882342e7..be09dc493eec 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -247,8 +247,6 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( 
const LanguageTag& rLan
 #define FALLBACKFONT_UI_SANS_ARABIC "Tahoma;Traditional Arabic;Simplified 
Arabic;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;clearlyU;Interface 
User;Arial Unicode MS;Lucida Sans Unicode;WarpSans;Geneva;MS Sans 
Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface
 System;Sans Serif"
 #define FALLBACKFONT_UI_SANS_THAI "OONaksit;Tahoma;Lucidasans;Arial 
Unicode MS"
 #define FALLBACKFONT_UI_SANS_KOREAN 
"SunGulim;BaekmukGulim;Gulim;Roundgothic;Arial Unicode MS;Lucida Sans 
Unicode;gnu-unifont;Andale Sans UI"
-#define FALLBACKFONT_UI_SANS_JAPANESE1 "HG-GothicB-Sun;Andale Sans UI;HG 
MhinchoLightJ"
-#define FALLBACKFONT_UI_SANS_JAPANESE2 "Kochi Gothic;Gothic"
 #define FALLBACKFONT_UI_SANS_CHINSIM "Andale Sans UI;Arial Unicode 
MS;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Lucida Sans 
Unicode;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;"
 #define FALLBACKFONT_UI_SANS_CHINTRD "Andale Sans UI;Arial Unicode MS;AR 
PL Mingti2L Big5;AR PL KaitiM Big5;Kai;PMingLiU;MingLiU;Ming;Lucida Sans 
Unicode;gnu-unifont;Interface User;"
 
@@ -290,32 +288,6 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( 
const LanguageTag& rLan
 {
 return OUString(FALLBACKFONT_UI_SANS_LATIN2);
 }
-else if ( aLanguage == "ja" )
-{
-// we need localized names for japanese fonts
-const sal_Unicode aMSGothic[] = { 0xFF2D, 0xFF33, ' ', 0x30B4, 0x30B7, 
0x30C3, 0x30AF, 0 };
-const sal_Unicode aMSPGothic[] = { 0xFF2D, 0xFF33, ' ', 0xFF30, 
0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 };
-const sal_Unicode aTLPGothic[] = { 0x0054, 0x004C, 0x0050, 0x30B4, 
0x30B7, 0x30C3, 0x30AF, 0 };
-const sal_Unicode aLXGothic[] = { 0x004C, 0x0058, 0x30B4, 0x30B7, 
0x30C3, 0x30AF, 0 };
-const sal_Unicode aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 
0x30C3, 0x30AF, 0 };
-
-OUStringBuffer aFallBackJapaneseLocalized;
-aFallBackJapaneseLocalized.append("MS UI Gothic;");
-aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE1);
-aFallBackJapaneseLocalized.append(aMSPGothic);
-aFallBackJapaneseLocalized.append(';');
-aFallBackJapaneseLocalized.append(aMSGothic);
-aFallBackJapaneseLocalized.append(';');
-aFallBackJapaneseLocalized.append(aTLPGothic);
-aFallBackJapaneseLocalized.append(';');
-aFallBackJapaneseLocalized.append(aLXGothic);
-aFallBackJapaneseLocalized.append(';');
-aFallBackJapaneseLocalized.append(aKochiGothic);
-aFallBackJapaneseLocalized.append(';');
-aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE2);
-
-return aFallBackJapaneseLocalized.makeStringAndClear();
-}
 else
 {
 Lo

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

[Olivier Hallot]

 helpcontent2 |2 +-
 sfx2/source/appl/sfxhelp.cxx |   20 
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 0e7992d7b2e08afe11288aeb7d5444b5394e7079
Author: Olivier Hallot 
Date:   Mon Mar 12 08:34:35 2018 -0300

Updated core
Project: help  770c0c1746b5c0b94dc07d5f1d6c2c04802c8540

tdf#116296 remove produt version from help path

Part two.
Part 1 is in sfx2 module

Remove product version from offline help path but keep
in online help.

Product version is kept for online because a help server can have more
than one helponline version.

Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d
Reviewed-on: https://gerrit.libreoffice.org/51126
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index 05d4e9fb4712..770c0c1746b5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 05d4e9fb471224b6adbc174ecb7968ffa29d4a56
+Subproject commit 770c0c1746b5c0b94dc07d5f1d6c2c04802c8540
commit 9f72889643afb8596affeb5ba66a564f4368fab9
Author: Olivier Hallot 
Date:   Mon Mar 12 07:41:02 2018 -0300

tdf#116296 remove produt version from help path

Part one.
Part 2 is in helpcontent2 module

Remove product version from offline help path but keep
in online help.

Test for existence of old offline help is done now
checking the presence of the file help//err.html

Test for new (html) offline help is done now checking
the existence of the folder help//text

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

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index fcf8c320397c..d924f81e4b2e 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -154,7 +154,7 @@ bool impl_checkHelpLocalePath(OUString const & rpPath)
 }
 
 /// Check for built-in help
-/// Check if help//lang folder exist
+/// Check if help//err.html file exist
 bool impl_hasHelpInstalled()
 {
 if (comphelper::LibreOfficeKit::isActive())
@@ -168,15 +168,19 @@ bool impl_hasHelpInstalled()
 aLocaleStr = HelpLocaleString();
 }
 
-OUString helpRootURL = getHelpRootURL() + "/" + aLocaleStr;
+OUString helpRootURL = getHelpRootURL() + "/" + aLocaleStr + "/err.html";
+bool bOK = false;
+osl::DirectoryItem directoryItem;
+if(osl::DirectoryItem::get(helpRootURL, directoryItem) == 
osl::FileBase::E_None){
+bOK=true;
+}
 
-bool bOK = impl_checkHelpLocalePath( helpRootURL );
+SAL_INFO( "sfx.appl", "Checking old help installed " << bOK);
 return bOK;
 }
 
-
 /// Check for html built-in help
-/// Check if help/productversion/lang folder exist
+/// Check if help/lang/text folder exist. Only html has it.
 bool impl_hasHTMLHelpInstalled()
 {
 if (comphelper::LibreOfficeKit::isActive())
@@ -190,9 +194,9 @@ bool impl_hasHTMLHelpInstalled()
 aLocaleStr = HelpLocaleString();
 }
 
-OUString helpRootURL = getHelpRootURL() + "/" + 
utl::ConfigManager::getProductVersion() + "/" + aLocaleStr;
-
+OUString helpRootURL = getHelpRootURL() + "/" + aLocaleStr + "/text";
 bool bOK = impl_checkHelpLocalePath( helpRootURL );
+SAL_INFO( "sfx.appl", "Checking new help (html) installed " << bOK);
 return bOK;
 }
 
@@ -691,7 +695,7 @@ static bool impl_showOfflineHelp( const OUString& rURL )
 OUString aBaseInstallPath = getHelpRootURL();
 OUString const aInternal( "vnd.sun.star.help://"  );
 
-OUString aHelpLink( aBaseInstallPath + "/" + 
utl::ConfigManager::getProductVersion() + "/index.html?" );
+OUString aHelpLink( aBaseInstallPath + "/index.html?" );
 aHelpLink += rURL.copy( aInternal.getLength() );
 aHelpLink = aHelpLink.replaceAll("%2F","/").replaceAll("%3A",":");
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: CustomTarget_html.mk GeneratedPackage_html_media.mk GeneratedPackage_html.mk help3xsl/get_bookmark.xsl help3xsl/get_tree.xsl help3xsl/online_transform.xsl Package_html.

[Olivier Hallot]

 CustomTarget_html.mk   |2 
 GeneratedPackage_html.mk   |2 
 GeneratedPackage_html_media.mk |8 -
 Package_html.mk|4 
 Package_html_static.mk |4 
 help3xsl/get_bookmark.xsl  |   10 +-
 help3xsl/get_tree.xsl  |   33 +++---
 help3xsl/online_transform.xsl  |  201 +
 8 files changed, 141 insertions(+), 123 deletions(-)

New commits:
commit 770c0c1746b5c0b94dc07d5f1d6c2c04802c8540
Author: Olivier Hallot 
Date:   Mon Mar 12 08:34:35 2018 -0300

tdf#116296 remove produt version from help path

Part two.
Part 1 is in sfx2 module

Remove product version from offline help path but keep
in online help.

Product version is kept for online because a help server can have more
than one helponline version.

Change-Id: I1d4ba12a7d6472defd4210c79349e35ccaf32d8d
Reviewed-on: https://gerrit.libreoffice.org/51126
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index ae56ebd07..8b6325a3e 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -75,6 +75,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/contents.part : \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam lang $(LANG) \
+   --stringparam local $(if $(HELP_ONLINE),'no','yes') \
--stringparam productversion $(PRODUCTVERSION) \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/get_tree.xsl \
@@ -159,6 +160,7 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/bookmarks.part : \
$(call 
gb_ExternalExecutable_get_command,xsltproc) \
--stringparam app $(APP) \
--stringparam Language $(HELP_LANG) \
+   --stringparam local $(if 
$(HELP_ONLINE),'no','yes') \
--stringparam productversion 
$(PRODUCTVERSION) \

$(SRCDIR)/helpcontent2/help3xsl/get_bookmark.xsl \
$$xhp \
diff --git a/GeneratedPackage_html.mk b/GeneratedPackage_html.mk
index 9f7786e4c..36b4e6edf 100644
--- a/GeneratedPackage_html.mk
+++ b/GeneratedPackage_html.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_GeneratedPackage_GeneratedPackage,helpcontent2_html,$(call gb_C
 $(eval $(call 
gb_GeneratedPackage_use_customtarget,helpcontent2_html,helpcontent2/help3xsl))
 
 $(eval $(foreach lang,$(gb_HELP_LANGS),\
-   $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/$(lang)/text,$(lang)/text)
 \
+$(call 
gb_GeneratedPackage_add_dir,helpcontent2_html,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 $(HELP_ONLINE),$(PRODUCTVERSION),)/$(lang)/text,$(lang)/text) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/GeneratedPackage_html_media.mk b/GeneratedPackage_html_media.mk
index bb4075851..cfc526b4e 100644
--- a/GeneratedPackage_html_media.mk
+++ b/GeneratedPackage_html_media.mk
@@ -9,10 +9,10 @@
 #
 $(eval $(call 
gb_GeneratedPackage_GeneratedPackage,helpcontent2_html_media,$(SRCDIR)))
 
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/icon-themes,icon-themes/galaxy))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 $(HELP_ONLINE),$(PRODUCTVERSION),)/media/icon-themes,icon-themes/galaxy))
 
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/helpimg,helpcontent2/source/media/helpimg))
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/navigation,helpcontent2/source/media/navigation))
-$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(PRODUCTVERSION)/media/screenshots,helpcontent2/source/media/screenshots))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/helpimg,helpcontent2/source/media/helpimg))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/navigation,helpcontent2/source/media/navigation))
+$(eval $(call 
gb_GeneratedPackage_add_dir,helpcontent2_html_media,$(INSTROOT)/$(LIBO_SHARE_HELP_FOLDER)/$(if
 
$(HELP_ONLINE),$(PRODUCTVERSION),)/media/screenshots,helpcontent2/source/media/screenshots))
 
 # vim: set noet sw=4 ts=4:
diff --git a/Package_html.mk b/Package_html.mk
index aed4b7674..680b6829c 100644
--

[Libreoffice-commits] core.git: icon-themes/colibre

[andreas kainz]

 icon-themes/colibre/links.txt | 1368 ++
 1 file changed, 1368 insertions(+)

New commits:
commit 1008cd6b0aa96cfbb2a681a055380b54c3d53bf5
Author: andreas kainz 
Date:   Wed Mar 14 00:49:19 2018 +0100

Colibre icons: add links.txt file

Change-Id: Ib64bac119e463b56a8cb86a2dcd77c9f07699844
Reviewed-on: https://gerrit.libreoffice.org/51252
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
new file mode 100644
index ..fec4087c693d
--- /dev/null
+++ b/icon-themes/colibre/links.txt
@@ -0,0 +1,1368 @@
+# avmedia
+# ==
+avmedia/res/av02048.png cmd/sc_open.png
+avmedia/res/av02049.png cmd/sc_runbasic.png
+avmedia/res/av02050.png cmd/sc_mediapause.png
+avmedia/res/av02051.png cmd/sc_basicstop.png
+avmedia/res/av02052.png cmd/sc_mediarepeat.png
+avmedia/res/av02053.png cmd/sc_ok.png
+avmedia/res/av02054.png cmd/sc_mediamute.png
+avmedia/res/avl02048.png cmd/lc_open.png
+avmedia/res/avl02049.png cmd/lc_runbasic.png
+avmedia/res/avl02050.png cmd/lc_mediapause.png
+avmedia/res/avl02051.png cmd/lc_basicstop.png
+avmedia/res/avl02052.png cmd/lc_mediarepeat.png
+avmedia/res/avl02053.png cmd/lc_ok.png
+avmedia/res/avl02054.png cmd/lc_mediamute.png
+
+# chart2
+# ==
+chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png
+chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png
+chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png
+chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png
+chart2/res/dataeditor_icon05.png cmd/sc_insertcellsright.png
+chart2/res/dataeditor_icon06.png cmd/sc_insertcellsdown.png
+chart2/res/dataeditor_icon07.png cmd/sc_insertcolumnsafter.png
+chart2/res/selectrange.png formula/res/refinp1.png
+
+# cmd
+# ==
+
+# Add
+cmd/lc_adddatefield.png cmd/lc_datefield.png
+cmd/lc_addons.png cmd/lc_insertplugin.png
+cmd/lc_addprintarea.png cmd/lc_inserttable.png
+cmd/lc_addtable.png cmd/lc_inserttable.png
+cmd/sc_adddatefield.png cmd/sc_datefield.png
+cmd/sc_addons.png cmd/sc_insertplugin.png
+cmd/sc_addprintarea.png cmd/sc_inserttable.png
+cmd/sc_addtable.png cmd/sc_inserttable.png
+
+# Insert
+cmd/lc_insobjctrl.png cmd/lc_newdoc.png
+cmd/lc_insert.png cmd/lc_togglesheetgrid.png
+cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
+cmd/lc_insertcurrencyfield.png cmd/lc_formattedfield.png
+cmd/lc_insertdatefield.png cmd/lc_datefield.png
+cmd/lc_insert.png cmd/lc_togglesheetgrid.png
+cmd/lc_insertauthorfield.png cmd/lc_dbviewaliases.png
+cmd/lc_insertedit.png cmd/lc_edit.png
+cmd/lc_insertfield.png cmd/lc_addfield.png
+cmd/lc_insertctrl.png cmd/lc_inserttable.png
+cmd/lc_insertfilecontrol.png cmd/lc_open.png
+cmd/lc_insertformattedfield.png cmd/lc_formattedfield.png
+cmd/lc_insertformcheck.png cmd/lc_checkbox.png
+cmd/lc_insertformcombo.png cmd/lc_combobox.png
+cmd/lc_insertformlist.png cmd/lc_listbox.png
+cmd/lc_insertformradio.png cmd/lc_radiobutton.png
+cmd/lc_insertformula.png cmd/lc_dbviewfunctions.png
+cmd/lc_insertformvscroll.png cmd/lc_scrollbar.png
+cmd/lc_insertframeinteract.png cmd/lc_insertframe.png
+cmd/lc_insertframeinteractnocolumns.png cmd/lc_insertframe.png
+cmd/lc_insertobjectchart.png cmd/lc_drawchart.png
+cmd/lc_insertnumericfield.png cmd/lc_numberformatstandard.png
+cmd/lc_numericfield.png cmd/lc_numberformatstandard.png
+cmd/lc_insertlistbox.png cmd/lc_listbox.png
+cmd/lc_inserttextframe.png cmd/lc_insertframe.png
+cmd/lc_insertobjectstarmath.png cmd/lc_insertmath.png
+cmd/lc_insertpatternfield.png cmd/lc_patternfield.png
+cmd/lc_insertpushbutton.png cmd/lc_pushbutton.png
+cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
+cmd/lc_insertspreadsheet.png cmd/lc_togglesheetgrid.png
+cmd/lc_inserttimefield.png cmd/lc_timefield.png
+
+cmd/sc_insobjctrl.png cmd/sc_newdoc.png
+cmd/sc_insert.png cmd/sc_togglesheetgrid.png
+cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png
+cmd/sc_insertcurrencyfield.png cmd/sc_formattedfield.png
+cmd/sc_insertdatefield.png cmd/sc_datefield.png
+cmd/sc_insertauthorfield.png cmd/sc_dbviewaliases.png
+cmd/sc_insertedit.png cmd/sc_text.png
+cmd/sc_insertfield.png cmd/sc_addfield.png
+cmd/sc_insertctrl.png cmd/sc_inserttable.png
+cmd/sc_insertfilecontrol.png cmd/sc_open.png
+cmd/sc_insertformattedfield.png cmd/sc_formattedfield.png
+cmd/sc_insertformcheck.png cmd/sc_checkbox.png
+cmd/sc_insertformcombo.png cmd/sc_combobox.png
+cmd/sc_insertformlist.png cmd/sc_listbox.png
+cmd/sc_insertformradio.png cmd/sc_radiobutton.png
+cmd/sc_insertformspin.png cmd/sc_spinbutton.png
+cmd/sc_insertformula.png cmd/sc_dbviewfunctions.png
+cmd/sc_insertformvscroll.png cmd/sc_scrollbar.png
+cmd/sc_insertframeinteract.png cmd/sc_insertframe.png
+cmd/sc_insertframeinteractnocolumns.png cmd/sc_insertframe.png
+cmd/sc_insertgraphic.png cmd/sc_gallery.png
+cmd/sc_insertimagecontrol.png cmd/sc_drawc

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

[Vasily Melenchuk]

 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |6 +-
 vcl/headless/svpgdi.cxx  |   31 ---
 2 files changed, 4 insertions(+), 33 deletions(-)

New commits:
commit ae11dec72099fafc807d13b7169bd3177e9d539f
Author: Vasily Melenchuk 
Date:   Tue Mar 6 16:23:40 2018 +0300

tdf#115297: 1bit images displaying fixed (again)

Previous fix 25cd843664919974f0d21ca7a0b02cc43e9eeabb like any
other before it have some regressions, so reverted.

The root of most problems: fix for tdf#104141
d148340babf6c973f7d463909d7a51e16c953248, where mask drawing
was implemented in bitmap drawing code.

So instead of guessing for type of bitmap, mask is drawn with
DrawBitmapEx resolving all known problems (tdf#114726, tdf#115297,
tdf#113918 and tdf#104141).

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

diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx 
b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 2d9f1612b1f0..ba5cc8441122 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -271,7 +271,8 @@ namespace drawinglayer
 }
 else
 {
-
maVirtualDeviceMask->DrawBitmap(rAnimBitmap.aPosPix, aMask);
+BitmapEx aExpandVisibilityMask = 
BitmapEx(aMask, aMask);
+
maVirtualDeviceMask->DrawBitmapEx(rAnimBitmap.aPosPix, aExpandVisibilityMask);
 }
 
 break;
@@ -279,7 +280,8 @@ namespace drawinglayer
 case Disposal::Previous:
 {
 
maVirtualDevice->DrawBitmapEx(rAnimBitmap.aPosPix, rAnimBitmap.aBmpEx);
-
maVirtualDeviceMask->DrawBitmap(rAnimBitmap.aPosPix, 
rAnimBitmap.aBmpEx.GetMask());
+BitmapEx aExpandVisibilityMask = 
BitmapEx(rAnimBitmap.aBmpEx.GetMask(), rAnimBitmap.aBmpEx.GetMask());
+
maVirtualDeviceMask->DrawBitmapEx(rAnimBitmap.aPosPix, aExpandVisibilityMask);
 break;
 }
 }
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 3618a185ce12..2d9694cc7a88 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1200,39 +1200,8 @@ void SvpSalGraphics::copyBits( const SalTwoRect& rTR,
 cairo_surface_destroy(pCopy);
 }
 
-namespace
-{
-bool isBlackWhite(const SalBitmap& rBitmap)
-{
-const SvpSalBitmap& rSrcBmp = static_cast(rBitmap);
-const BitmapBuffer * pSourceBuffer = rSrcBmp.GetBuffer();
-const BitmapPalette & rPalette = pSourceBuffer->maPalette;
-
-return (
-rPalette.GetEntryCount() < 2 ||
-
-(rPalette.GetEntryCount() == 2 &&
-rPalette[0] == COL_BLACK &&
-rPalette[1] == COL_WHITE ) ||
-
-(rPalette.GetEntryCount() == 2 &&
-rPalette[1] == COL_BLACK &&
-rPalette[0] == COL_WHITE )
-);
-}
-}
-
 void SvpSalGraphics::drawBitmap(const SalTwoRect& rTR, const SalBitmap& 
rSourceBitmap)
 {
-if (rSourceBitmap.GetBitCount() == 1 && isBlackWhite(rSourceBitmap))
-{
-// This way we draw only monochrome b/w bitmaps
-MaskHelper aMask(rSourceBitmap);
-cairo_surface_t* source = aMask.getMask();
-copySource(rTR, source);
-return;
-}
-
 SourceHelper aSurface(rSourceBitmap);
 cairo_surface_t* source = aSurface.getSurface();
 copySource(rTR, source);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 859b7b09f5b1330b7135744795c578358736ded3
Author: Pranav Kant 
Date:   Wed Mar 14 14:50:58 2018 +0530

lokdialog: debug red-colored boundary for last painted region

Easier to see what's going on inside the LOK dialog.

Change-Id: I59974200af3d2356b7c27eb3dd4032a59c00dbed
Reviewed-on: https://gerrit.libreoffice.org/51263
Tested-by: Jenkins 
Reviewed-by: pranavk 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index 75c4bae71df5..1d7a2482c069 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -117,7 +117,13 @@ gtv_lok_dialog_draw(GtkWidget* pDialogDrawingArea, 
cairo_t* pCairo, gpointer)
 cairo_surface_mark_dirty(pSurface);
 
 cairo_set_source_surface(pCairo, pSurface, aRect.x, aRect.y);
+// paint the dialog image
 cairo_paint(pCairo);
+
+// debug red-colored border around the painted region
+cairo_set_source_rgb(pCairo, 1.0, 0, 0);
+cairo_rectangle(pCairo, aRect.x, aRect.y, nWidth, nHeight);
+cairo_stroke(pCairo);
 }
 
 static gboolean
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[László Németh]

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

New commits:
commit a7bb853b348cc5ebe4ccdb07d1ee0fc38de21e7a
Author: László Németh 
Date:   Tue Mar 13 15:55:34 2018 +0100

Updated core
Project: dictionaries  3bc3ffdb0b622cc07b5d959225a9f2223afdf145

Hungarian grammar checking rules v1.6.3

Change-Id: I2c898690f12edc0ad4c83dc6395813e21a724f64
Reviewed-on: https://gerrit.libreoffice.org/51227
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index d8d241188c19..3bc3ffdb0b62 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d8d241188c1914d5e031948111bfb80f8642607f
+Subproject commit 3bc3ffdb0b622cc07b5d959225a9f2223afdf145
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/04060105.xhp |   26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 781da1e8175459f27cca84bed2ca209b3e030067
Author: Olivier Hallot 
Date:   Mon Mar 12 18:37:52 2018 -0300

tdf#99611 improve function AND() documentation

Added details on handling non logical arguments in
Calc logical functions.

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

diff --git a/source/text/scalc/01/04060105.xhp 
b/source/text/scalc/01/04060105.xhp
index 6a5b3032d..983053c99 100644
--- a/source/text/scalc/01/04060105.xhp
+++ b/source/text/scalc/01/04060105.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
   
  Logical Functions
@@ -32,8 +32,26 @@
   functions; logical functions
 
 Logical 
Functions
-  This category contains the 
Logical functions. 
+  This category contains the 
Logical functions.
 
+Handling non-logical arguments in logical functions
+
+
+Zero (0) is equivalent to FALSE and all other numbers are 
equivalent to TRUE.
+
+
+Empty cells and text in cells are ignored.
+
+
+A #VALUE error is raised if all arguments are 
ignored.
+
+
+A #VALUE error is raised if one argument is direct text (not 
text in a cell).
+
+
+Errors as argument lead to an error.
+
+
   
  
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 9f16845d48a3f84871625b185bf88e43f69a4707
Author: Olivier Hallot 
Date:   Mon Mar 12 18:37:52 2018 -0300

Updated core
Project: help  781da1e8175459f27cca84bed2ca209b3e030067

tdf#99611 improve function AND() documentation

Added details on handling non logical arguments in
Calc logical functions.

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

diff --git a/helpcontent2 b/helpcontent2
index 770c0c1746b5..781da1e81754 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 770c0c1746b5c0b94dc07d5f1d6c2c04802c8540
+Subproject commit 781da1e8175459f27cca84bed2ca209b3e030067
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/core/layout/pagedesc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c71aff0473b50a5d777cb0b426445c219370b86e
Author: Stephan Bergmann 
Date:   Wed Mar 14 11:53:37 2018 +0100

Missing intialization of SwPageDesc::m_pTextFormatColl

...in efcb9a7078e08a367816b825d14419ddf351ff3e "use sw::WriterMultiListener
instead of SwDepend in SwPageDesc", causing

> /sw/source/core/layout/pagedesc.cxx:198:74: runtime error: upcast of 
misaligned address 0xbebebebebebebebe for type 'SwTextFormatColl', which 
requires 8 byte alignment
> 0xbebebebebebebebe: note: pointer points here
> 
> #0 0x2b06bea9116b in SwPageDesc::GetRegisterFormatColl() const 
/sw/source/core/layout/pagedesc.cxx:198:74

during e.g. CppunitTest_sw_odfimport of ASan+UBSan builds.

Change-Id: If50a920ca5dafdce6c1a3e2fbf540488685e641a

diff --git a/sw/source/core/layout/pagedesc.cxx 
b/sw/source/core/layout/pagedesc.cxx
index b1b1927f2418..b1348a7001cd 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -46,6 +46,7 @@ SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat 
*pFormat, SwDoc *con
 , m_FirstMaster( pDoc->GetAttrPool(), rName, pFormat )
 , m_FirstLeft( pDoc->GetAttrPool(), rName, pFormat )
 , m_aDepends(*this)
+, m_pTextFormatColl(nullptr)
 , m_pFollow( this )
 , m_nRegHeight( 0 )
 , m_nRegAscent( 0 )
___
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' - loolwsd.spec.in

[Andras Timar]

 loolwsd.spec.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 29d9c26260a1187f202563b95e359e75911d70e2
Author: Andras Timar 
Date:   Wed Mar 14 12:16:38 2018 +0100

fix Poco dependency on SUSE

Change-Id: Ia6a00ff7abcdc56497902aff432c91178d0916d5

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 223e6b56e..d3d9746d6 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -60,12 +60,12 @@ Requires:   atk avahi-glib avahi-libs bzip2-libs cairo 
cups-libs dbus-glib d
 # loolwsd dependencies
 Requires(post): libcap-progs
 Requires:   libcap2 libpng12-0 %{fillup_prereq}
-Requires:   libPocoCrypto49 >= 1.7.9 libPocoFoundation49 >= 1.7.9 
libPocoJSON49 >= 1.7.9 libPocoNet49 >= 1.7.9 libPocoNetSSL49 >= 1.7.9 
libPocoUtil49 >= 1.7.9 libPocoXML49 >= 1.7.9
 %endif
 
 %if 0%{?suse_version} >= 1300
 Requires:   systemd
 Requires:   libopenssl1_0_0 libpcre1 libz1
+Requires:   libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 
libPocoJSON60 >= 1.9.0 libPocoNet60 >= 1.9.0 libPocoNetSSL60 >= 1.9.0 
libPocoUtil60 >= 1.9.0 libPocoXML60 >= 1.9.0
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
 # cd /opt/collaboraoffice5.3/program ; for i in soffice.bin *.so ;do ldd $i | 
grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs 
rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
 Requires:   Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib 
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1 
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6 
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3 
libXrender1 libxshmfence1 libXxf86vm1
@@ -74,6 +74,7 @@ Requires:   Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 
cups-libs dbus-1-glib fo
 # SLES11SP4
 %if 0%{?suse_version} == 1110
 Requires:   libattr libopenssl0_9_8 pcre zlib
+Requires:   libPocoCrypto49 >= 1.7.9 libPocoFoundation49 >= 1.7.9 
libPocoJSON49 >= 1.7.9 libPocoNet49 >= 1.7.9 libPocoNetSSL49 >= 1.7.9 
libPocoUtil49 >= 1.7.9 libPocoXML49 >= 1.7.9
 Requires:   cairo cups-libs dbus-1 dbus-1-glib fontconfig freetype2 glibc 
keyutils-libs krb5 libcom_err2 libdrm libexpat1 libgcc_s1 libgio-2_0-0 
libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgstinterfaces-0_10-0 
libgstreamer-0_10-0 libgthread-2_0-0 libopenssl0_9_8 libpixman-1-0 libpng12-0 
libselinux1 libstdc++6 libuuid1 Mesa pcre xorg-x11-libICE xorg-x11-libs 
xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libxcb xorg-x11-libXext 
xorg-x11-libXfixes xorg-x11-libXrender zlib
 %endif
 %if 0%{?name_suffix:1}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 include/comphelper/windowsdebugoutput.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4fa902d1c16ddafbe1e3dbf396c96487fdef3ddc
Author: Tor Lillqvist 
Date:   Wed Mar 14 13:58:41 2018 +0200

Add IMarshal2 to IIDs recognized

Change-Id: Ib5a1daff3a136c05374f10b7ca138c14492d

diff --git a/include/comphelper/windowsdebugoutput.hxx 
b/include/comphelper/windowsdebugoutput.hxx
index ac8f0be943f2..da5acbb5a8d9 100644
--- a/include/comphelper/windowsdebugoutput.hxx
+++ b/include/comphelper/windowsdebugoutput.hxx
@@ -84,6 +84,8 @@ inline std::basic_ostream& 
operator<<(std::basic_ostreamhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorImport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e1030d3e044d7754dc3a0a2a0af289ff5e434a
Author: Noel Grandin 
Date:   Tue Mar 6 15:18:53 2018 +0200

tdf#115432 footnote separator position wrong (2nd attempt)

the first attempt (d4a8d91abd40dee7f7bd739a678a502a6e34cb59)
incorrectly changed the type of a UNO property defined in a
published IDL file.

Change-Id: I75bc75dead0954d1faa6dfb6adab9f4c42c67cfc
Reviewed-on: https://gerrit.libreoffice.org/50827
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 1163bcd5da3063e7e988ebf49d9b60dfd6f6c703)
Reviewed-on: https://gerrit.libreoffice.org/50898
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index c9a7bfb2dd07..546e5bdec4e4 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -159,7 +159,7 @@ void XMLFootnoteSeparatorImport::StartElement(
 sal_Int32 nIndex;
 
 nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_ADJUST);
-XMLPropertyState aLineAdjust( nIndex, uno::Any(eLineAdjust));
+XMLPropertyState aLineAdjust( nIndex, uno::Any(sal_Int16(eLineAdjust)) );
 rProperties.push_back(aLineAdjust);
 
 nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_COLOR);
___
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-6' - xmloff/source

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorExport.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 30e3c1c571f3a545143adaceb91102b7d6e329a3
Author: Noel Grandin 
Date:   Wed Mar 7 17:32:40 2018 +0200

tdf#115432 footnote separator position wrong (3rd attempt)

My second attempt in

   commit dedf5e4f9000e271683dea9a0488e1b45b91176c
   "tdf#115432 footnote separator position wrong (2nd attempt)"

managed to lose part of the change because of incorrect rebasing.

Change-Id: I7b18f3e1602c617d1cb414ef0eb2ee456aeb58ee
Reviewed-on: https://gerrit.libreoffice.org/50901
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit dcd95c6fff548c7ac46688244e44b95464fb297d)
Reviewed-on: https://gerrit.libreoffice.org/50912
(cherry picked from commit 95bf328d76352c4a2745ece21ccf99ac41693fb8)
Reviewed-on: https://gerrit.libreoffice.org/50917
Reviewed-by: Noel Grandin 
(cherry picked from commit 4ecd9b10345d5cc89692592a9180999550e9c019)
Reviewed-on: https://gerrit.libreoffice.org/50929
Reviewed-by: Christian Lohmaier 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 74ca184edcfc..a4ca43a68dd6 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -75,8 +75,12 @@ void XMLFootnoteSeparatorExport::exportXML(
 switch (rMapper->GetEntryContextId(rState.mnIndex))
 {
 case CTF_PM_FTN_LINE_ADJUST:
-rState.maValue >>= eLineAdjust;
+{
+sal_Int16 nTmp;
+if (rState.maValue >>= nTmp)
+eLineAdjust = static_cast(nTmp);
 break;
+}
 case CTF_PM_FTN_LINE_COLOR:
 rState.maValue >>= nLineColor;
 break;
___
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

[Miklos Vajna]

 sw/qa/extras/htmlexport/data/reqif-p.xhtml |1 +
 sw/qa/extras/htmlexport/htmlexport.cxx |3 +++
 sw/source/filter/html/htmlatr.cxx  |2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0efb6a1a3525a402ab28083181fc39b75f7ef556
Author: Miklos Vajna 
Date:   Wed Mar 14 12:00:19 2018 +0100

sw XHTML export: fix handling of character styles

Namespace prefix was missing here.

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

diff --git a/sw/qa/extras/htmlexport/data/reqif-p.xhtml 
b/sw/qa/extras/htmlexport/data/reqif-p.xhtml
index e5484ee79483..315a4db80918 100644
--- a/sw/qa/extras/htmlexport/data/reqif-p.xhtml
+++ b/sw/qa/extras/htmlexport/data/reqif-p.xhtml
@@ -2,3 +2,4 @@
 in 
table
 http://libreoffice.org/";>http://libreoffice.org
 u
+s
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index b2a4348d3890..b23f196a5251 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -357,6 +357,9 @@ DECLARE_HTMLEXPORT_TEST(testReqIfParagraph, "reqif-p.xhtml")
 
 // This was "" instead of CSS.
 CPPUNIT_ASSERT(aStream.indexOf(", namespace prefix was missing.
+CPPUNIT_ASSERT(aStream.indexOf("") != -1);
 }
 
 DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOleData, "reqif-ole-data.xhtml")
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 835fb25d6a99..b148cf181237 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3049,7 +3049,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, 
const SfxPoolItem& rHt )
 
 if( rHTMLWrt.m_bTagOn )
 {
-OString sOut = "<";
+OString sOut = "<" + rHTMLWrt.GetNamespace();
 if( !pFormatInfo->aToken.isEmpty() )
 sOut += pFormatInfo->aToken;
 else
___
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-6' - canvas/source

[Michael Stahl]

 canvas/source/vcl/canvashelper_texturefill.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f7fa0cc2ff64b81d96b160584a534f2f91e8a15
Author: Michael Stahl 
Date:   Wed Mar 7 12:21:45 2018 +0100

VCL canvas: fix clipping of gradients (related: tdf#115142)

When using the presenter console, the secondary screen has
a small view of the current slide, which is called a "Pane" in sdext.

Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
the full-screen VCL canvas and has a MergeViewState() to intersect
the clip region.

The VCL canvas has a bug in its gradientFill() implemenation where it
overrides the existing clip on the OutputDevice instead of intersecting
it.

This properly fixes the bug that was wrongly and badly attempted
to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff
(cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551)
Reviewed-on: https://gerrit.libreoffice.org/50888
Tested-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit c59c43ecfb7b858557c82bb3733ba72f0f23d3df)
Reviewed-on: https://gerrit.libreoffice.org/50931
Reviewed-by: Christian Lohmaier 
Reviewed-by: Mike Kaganski 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 61a8eaa5cb75..cfb1e4f6bb7a 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -604,7 +604,7 @@ namespace vclcanvas
 const vcl::Region aPolyClipRegion( rPoly );
 
 rOutDev.Push( PushFlags::CLIPREGION );
-rOutDev.SetClipRegion( aPolyClipRegion );
+rOutDev.IntersectClipRegion( aPolyClipRegion );
 
 doGradientFill( rOutDev,
 rValues,
___
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-6' - slideshow/source

[Michael Stahl]

 slideshow/source/engine/shapes/drawshape.cxx |   23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit da85e5327844ec525e08fbb012389b8e90744bcf
Author: Michael Stahl 
Date:   Wed Mar 7 12:35:23 2018 +0100

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

This is bogus as it actually does scaling and not clipping, and the
actual clipping bug is in the VCL canvas, see following commit.

Also should fix tdf#115652 and tdf#116196.

Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882
(cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac)
Reviewed-on: https://gerrit.libreoffice.org/50887
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit cbc114a8d86d94743562c2eec7a8eef23d2d2297)
Reviewed-on: https://gerrit.libreoffice.org/50930
Reviewed-by: Christian Lohmaier 
Reviewed-by: Mike Kaganski 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index b1dc56b62741..98f1cae40ac7 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -134,26 +134,11 @@ namespace slideshow
 
 ViewShape::RenderArgs DrawShape::getViewRenderArgs() const
 {
-uno::Reference const xPropSet(mxPage,
-uno::UNO_QUERY_THROW);
-sal_Int32 nWidth = 0;
-sal_Int32 nHeight = 0;
-xPropSet->getPropertyValue("Width") >>= nWidth;
-xPropSet->getPropertyValue("Height") >>= nHeight;
-basegfx::B2DRectangle slideRect(0, 0, nWidth, nHeight);
-basegfx::B2DRectangle origBounds(maBounds);
-origBounds.intersect(slideRect);
-basegfx::B2DRectangle updateBounds(getUpdateArea());
-updateBounds.intersect(slideRect);
-basegfx::B2DRectangle bounds(getBounds());
-bounds.intersect(slideRect);
-basegfx::B2DRectangle unitBounds(getActualUnitShapeBounds());
-unitBounds.intersect(slideRect);
 return ViewShape::RenderArgs(
-origBounds,
-updateBounds,
-bounds,
-unitBounds,
+maBounds,
+getUpdateArea(),
+getBounds(),
+getActualUnitShapeBounds(),
 mpAttributeLayer,
 maSubsetting.getActiveSubsets(),
 mnPriority);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/oox/helper/graphichelper.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f95afd856d087b5475d67d104a4aa7d85cf32413
Author: Noel Grandin 
Date:   Wed Mar 14 09:57:44 2018 +0200

loplugin:unusedfields

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

diff --git a/include/oox/helper/graphichelper.hxx 
b/include/oox/helper/graphichelper.hxx
index 39471442..0f277ca98fd0 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -130,7 +130,6 @@ public:
 
 
 private:
-typedef ::std::deque< css::uno::Reference< css::graphic::XGraphicObject > 
> GraphicObjectDeque;
 typedef ::std::map< OUString, css::uno::Reference< css::graphic::XGraphic 
> > EmbeddedGraphicMap;
 
 css::uno::Reference< css::uno::XComponentContext > mxContext;
@@ -139,7 +138,6 @@ private:
 css::awt::DeviceInfo maDeviceInfo; ///< Current output device info.
 ::std::map< sal_Int32, ::Color >  maSystemPalette;  ///< Maps system 
colors (XML tokens) to RGB color values.
 StorageRef  mxStorage;  ///< Storage containing 
embedded graphics.
-mutable GraphicObjectDeque maGraphicObjects;///< Caches all created 
graphic objects to keep them alive.
 mutable EmbeddedGraphicMap maEmbeddedGraphics;  ///< Maps all embedded 
graphics by their storage path.
 double  mfPixelPerHmmX; ///< Number of screen 
pixels per 1/100 mm in X direction.
 double  mfPixelPerHmmY; ///< Number of screen 
pixels per 1/100 mm in Y direction.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: canvas/source compilerplugins/clang cppcanvas/Library_cppcanvas.mk cppcanvas/source include/canvas include/vcl include/xmloff solenv/clang-format vcl/source

[Noel Grandin]

 canvas/source/tools/canvastools.cxx   |   10 
 compilerplugins/clang/unusedmethods.py|3 
 cppcanvas/Library_cppcanvas.mk|1 
 cppcanvas/source/inc/canvasgraphichelper.hxx  |1 
 cppcanvas/source/wrapper/implcanvas.cxx   |1 
 cppcanvas/source/wrapper/implfont.cxx |   62 -
 cppcanvas/source/wrapper/implfont.hxx |   58 -
 include/canvas/base/bufferedgraphicdevicebase.hxx |5 
 include/canvas/base/canvascustomspritehelper.hxx  |   55 
 include/canvas/canvastools.hxx|3 
 include/canvas/spriteredrawmanager.hxx|8 
 include/vcl/BitmapTools.hxx   |7 
 include/xmloff/xmlimp.hxx |4 
 solenv/clang-format/blacklist |1 
 vcl/source/bitmap/BitmapTools.cxx |  245 --
 15 files changed, 464 deletions(-)

New commits:
commit 1b61d0417bf46896ef1f1bd1e1a8209588fc157a
Author: Noel Grandin 
Date:   Wed Mar 14 08:54:55 2018 +0200

loplugin:unusedmethods

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

diff --git a/canvas/source/tools/canvastools.cxx 
b/canvas/source/tools/canvastools.cxx
index 10d109f5a52c..d7a4ca991517 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -888,16 +888,6 @@ namespace canvas
 return aLayout;
 }
 
-::Color stdIntSequenceToColor( const uno::Sequence& rColor )
-{
-#ifdef OSL_BIGENDIAN
-const sal_Int8* pCols( rColor.getConstArray() );
-return ::Color( pCols[3], pCols[0], pCols[1], pCols[2] );
-#else
-return ::Color( *reinterpret_cast< const ::sal_uInt32* 
>(rColor.getConstArray()) );
-#endif
-}
-
 uno::Sequence colorToStdIntSequence( const ::Color& rColor )
 {
 uno::Sequence aRet(4);
diff --git a/compilerplugins/clang/unusedmethods.py 
b/compilerplugins/clang/unusedmethods.py
index 1c080b64dd45..68f2fba6bed8 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -133,9 +133,6 @@ for d in definitionSet:
 # alone if the other one is in use.
 if d[1] == "begin() const" or d[1] == "begin()" or d[1] == "end()" or d[1] 
== "end() const":
 continue
-# There is lots of macro magic going on in SRCDIR/include/sax/fshelper.hxx 
that should be using C++11 varargs templates
-if d[1].startswith("sax_fastparser::FastSerializerHelper::"):
-   continue
 # used by Windows build
 if any(x in d[1] for x in ["DdeTopic::", "DdeData::", "DdeService::", 
"DdeTransaction::", "DdeConnection::", "DdeLink::", "DdeItem::", 
"DdeGetPutItem::"]):
continue
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index d60c75606fb3..f0b72ca4ce15 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
cppcanvas/source/wrapper/implbitmapcanvas \
cppcanvas/source/wrapper/implcanvas \
cppcanvas/source/wrapper/implcustomsprite \
-   cppcanvas/source/wrapper/implfont \
cppcanvas/source/wrapper/implpolypolygon \
cppcanvas/source/wrapper/implsprite \
cppcanvas/source/wrapper/implspritecanvas \
diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx 
b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 6a091d78895a..96daa1a74b9f 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -56,7 +56,6 @@ namespace cppcanvas
 // for our clients
 // ===
 const CanvasSharedPtr& 
  getCanvas() const {  return mpCanvas; }
-const css::uno::Reference< css::rendering::XGraphicDevice >&   
  getGraphicDevice() const {  return mxGraphicDevice; }
 const css::rendering::RenderState& 
  getRenderState() const;
 
 private:
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx 
b/cppcanvas/source/wrapper/implcanvas.cxx
index 68a4cb28750c..d5adeb5a0257 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 
-#include "implfont.hxx"
 #include "implcanvas.hxx"
 
 
diff --git a/cppcanvas/source/wrapper/implfont.cxx 
b/cppcanvas/source/wrapper/implfont.cxx
deleted file mode 100644
index 9cb52095129a..
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- 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 

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.0-branch-point'

[Olivier Hallot]

Tag 'cp-6.0-branch-point' created by Andras Timar  
at 2018-03-12 10:27 +

cp-6.0-branch-point

Changes since libreoffice-6-0-branch-point-39:
---
 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/cp-6.0-branch-point'

[László Németh]

Tag 'cp-6.0-branch-point' created by Andras Timar  
at 2018-03-12 10:27 +

cp-6.0-branch-point

Changes since libreoffice-6-0-branch-point-12:
---
 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 'distro/collabora/cp-6.0'

[László Németh]

New branch 'distro/collabora/cp-6.0' available with the following commits:
___
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/cp-6.0-branch-point'

[Mike Kaganski]

Tag 'cp-6.0-branch-point' created by Andras Timar  
at 2018-03-12 10:27 +

cp-6.0-branch-point

Changes since libreoffice-6-0-branch-point-725:
---
 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/cp-6.0-branch-point'

[Andras Timar]

Tag 'cp-6.0-branch-point' created by Andras Timar  
at 2018-03-12 10:27 +

cp-6.0-branch-point

Changes since libreoffice-6-0-branch-point-21:
---
 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 'distro/collabora/cp-6.0'

[Andras Timar]

New branch 'distro/collabora/cp-6.0' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'distro/collabora/cp-6.0'

[Olivier Hallot]

New branch 'distro/collabora/cp-6.0' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'distro/collabora/cp-6.0'

[Mike Kaganski]

New branch 'distro/collabora/cp-6.0' available with the following commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/xmloff offapi/com reportdesign/source sc/source sdext/CppunitTest_sdext_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Library_pdfi

[Mohammed Abdul Azeem]

 include/xmloff/xmlimp.hxx |5 
 include/xmloff/xmlmetai.hxx   |   16 -
 offapi/com/sun/star/xml/dom/XSAXDocumentBuilder2.idl  |4 
 reportdesign/source/filter/xml/xmlfilter.cxx  |   25 +
 reportdesign/source/filter/xml/xmlfilter.hxx  |5 
 sc/source/filter/xml/xmlimprt.cxx |   92 +--
 sc/source/filter/xml/xmlimprt.hxx |8 
 sd/source/filter/xml/sdxmlwrp.cxx |   10 
 sdext/CppunitTest_sdext_pdfimport.mk  |1 
 sdext/Executable_pdf2xml.mk   |1 
 sdext/Executable_pdfunzip.mk  |1 
 sdext/Library_pdfimport.mk|1 
 sdext/source/pdfimport/sax/emitcontext.cxx|3 
 sfx2/source/doc/SfxDocumentMetaData.cxx   |8 
 starmath/source/mathmlimport.cxx  |  124 ++---
 starmath/source/mathmlimport.hxx  |3 
 sw/source/filter/xml/swxml.cxx|8 
 sw/source/filter/xml/xmlimp.cxx   |   90 ---
 sw/source/filter/xml/xmlimp.hxx   |5 
 sw/source/filter/xml/xmlmeta.cxx  |8 
 unoxml/Library_unoxml.mk  |1 
 unoxml/source/dom/saxbuilder.cxx  |  231 +-
 unoxml/source/dom/saxbuilder.hxx  |   25 -
 xmloff/inc/SchXMLImport.hxx   |3 
 xmloff/source/chart/SchXMLImport.cxx  |   41 ++-
 xmloff/source/chart/contexts.cxx  |   44 ++-
 xmloff/source/chart/contexts.hxx  |   17 -
 xmloff/source/core/XMLEmbeddedObjectImportContext.cxx |3 
 xmloff/source/core/xmlimp.cxx |   37 ++
 xmloff/source/draw/sdxmlimp.cxx   |  138 ++
 xmloff/source/draw/sdxmlimp_impl.hxx  |   11 
 xmloff/source/meta/MetaImportComponent.cxx|   21 -
 xmloff/source/meta/xmlmetai.cxx   |  121 -
 33 files changed, 637 insertions(+), 474 deletions(-)

New commits:
commit bf46b46a1d734348096936284fb8a76e977936d0
Author: Mohammed Abdul Azeem 
Date:   Sun Oct 1 14:11:11 2017 +0530

Moving XSAXDocumentBuilder2 to use XFastDocumentHandler:

This is used in parsing of meta Contexts across different
modules. This also involved moving to XFastParser for
parsing xml filters in sw, sd, starmath.

Change-Id: Ic663aaac6cb20ee8ce5b97cae87c93220f5a2929
Reviewed-on: https://gerrit.libreoffice.org/42989
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 364411681aa8..77b620a3f1df 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -55,6 +55,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -225,6 +227,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public 
cppu::WeakImplHelper<
 css::uno::Reference< css::xml::sax::XFastDocumentHandler > 
mxFastDocumentHandler;
 static css::uno::Reference< css::xml::sax::XFastTokenHandler > 
xTokenHandler;
 static std::unordered_map< sal_Int32, std::pair< OUString, OUString > > 
aNamespaceMap;
+static std::unordered_map< OUString, OUString, OUStringHash > 
aNamespaceURIPrefixMap;
 static bool bIsNSMapsInitialized;
 
 static void initializeNamespaceMaps();
@@ -378,6 +381,8 @@ public:
 
 static const OUString getNameFromToken( sal_Int32 nToken );
 static const OUString getNamespacePrefixFromToken( sal_Int32 nToken );
+static const OUString getNamespaceURIFromToken( sal_Int32 nToken );
+static const OUString getNamespacePrefixFromURI( const OUString& rURI );
 
 SvXMLNamespaceMap& GetNamespaceMap() { return *mpNamespaceMap; }
 const SvXMLNamespaceMap& GetNamespaceMap() const { return *mpNamespaceMap; 
}
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 2b9160251bc0..9b9f59da7f10 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -40,22 +40,20 @@ private:
 css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2> mxDocBuilder;
 
 public:
-SvXMLMetaDocumentContext(SvXMLImport& rImport, sal_uInt16 nPrfx,
-const OUString& rLName,
-const css::uno::Reference< css::document::XDocumentProperties>& 
xDocProps);
-
 SvXMLMetaDocumentContext(SvXMLImport& rImport,
 const css::uno::Reference< css::document::XDocumentProperties>& 
xDocProps);
 
 virtual ~SvXMLMetaDocumentContext() override;
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) 
override;
+virtual void SAL_CALL characters( const OUString& aChars ) override;
+
+virtual void SAL_CALL startF

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

[Caolán McNamara]

 sfx2/uiconfig/ui/loadtemplatedialog.ui|4 ++--
 sfx2/uiconfig/ui/saveastemplatedlg.ui |2 +-
 sw/uiconfig/swriter/ui/autoformattable.ui |2 +-
 sw/uiconfig/swriter/ui/inserttable.ui |1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 03782946065d8a31808f1dab9bc848d349d623f1
Author: Caolán McNamara 
Date:   Wed Mar 14 11:56:15 2018 +

enable column search for welded treeviews

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

diff --git a/sfx2/uiconfig/ui/loadtemplatedialog.ui 
b/sfx2/uiconfig/ui/loadtemplatedialog.ui
index e33497f2f6d6..d2b258c8e110 100644
--- a/sfx2/uiconfig/ui/loadtemplatedialog.ui
+++ b/sfx2/uiconfig/ui/loadtemplatedialog.ui
@@ -136,7 +136,7 @@
 liststore1
 False
 False
-False
+0
 False
 
   
@@ -203,7 +203,7 @@
 liststore2
 False
 False
-False
+0
 False
 
   
diff --git a/sfx2/uiconfig/ui/saveastemplatedlg.ui 
b/sfx2/uiconfig/ui/saveastemplatedlg.ui
index ac58199f808a..1e1dd0e4e4dd 100644
--- a/sfx2/uiconfig/ui/saveastemplatedlg.ui
+++ b/sfx2/uiconfig/ui/saveastemplatedlg.ui
@@ -178,7 +178,7 @@
 categorylist
 False
 False
-False
+0
 False
 
   
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui 
b/sw/uiconfig/swriter/ui/autoformattable.ui
index f1c785e89968..1d9a6eb4f8be 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -137,7 +137,7 @@
 liststore1
 False
 False
-False
+0
 False
 
   
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui 
b/sw/uiconfig/swriter/ui/inserttable.ui
index a670ca54f60e..2e62b425de29 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -388,7 +388,6 @@
 liststore1
 False
 False
-False
 0
 False
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: desktop/source framework/inc framework/source include/sfx2 include/svx include/tools sd/source sfx2/source svx/source tools/source xmloff/source

[Noel Grandin]

 desktop/source/deployment/inc/dp_package.hxx  |2 +-
 desktop/source/deployment/registry/dp_registry.cxx|2 +-
 desktop/source/deployment/registry/package/dp_package.cxx |4 ++--
 framework/inc/uielement/statusbarmerger.hxx   |2 --
 framework/source/uielement/statusbarmanager.cxx   |2 --
 framework/source/uielement/statusbarmerger.cxx|   12 +---
 include/sfx2/frame.hxx|2 +-
 include/svx/galtheme.hxx  |2 +-
 include/svx/svdtext.hxx   |2 +-
 include/tools/urlobj.hxx  |4 ++--
 sd/source/ui/slideshow/slideshow.cxx  |2 +-
 sfx2/source/view/frame2.cxx   |4 ++--
 svx/source/gallery2/galexpl.cxx   |2 +-
 svx/source/gallery2/galtheme.cxx  |4 ++--
 svx/source/svdraw/svdtext.cxx |4 ++--
 svx/source/table/cell.cxx |2 +-
 tools/source/fsys/urlobj.cxx  |6 +++---
 xmloff/source/forms/propertyimport.hxx|5 ++---
 18 files changed, 28 insertions(+), 35 deletions(-)

New commits:
commit a1b58e93f631c6bfd92fc8269da89c74e3784d58
Author: Noel Grandin 
Date:   Wed Mar 14 14:22:34 2018 +0200

loplugin:constantparam

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

diff --git a/desktop/source/deployment/inc/dp_package.hxx 
b/desktop/source/deployment/inc/dp_package.hxx
index 579b008e43c2..22ab1a5a2d4b 100644
--- a/desktop/source/deployment/inc/dp_package.hxx
+++ b/desktop/source/deployment/inc/dp_package.hxx
@@ -35,7 +35,7 @@ namespace dp_registry { namespace backend { namespace bundle {
 css::uno::Reference create(
 css::uno::Reference const &
 xRootRegistry,
-OUString const & context, OUString const & cachePath, bool readOnly,
+OUString const & context, OUString const & cachePath,
 css::uno::Reference const & 
xComponentContext);
 
 } } }
diff --git a/desktop/source/deployment/registry/dp_registry.cxx 
b/desktop/source/deployment/registry/dp_registry.cxx
index 9d12da270d24..26da83826b93 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -341,7 +341,7 @@ Reference 
PackageRegistryImpl::create(
 // backends.
 Reference extensionBackend =
 ::dp_registry::backend::bundle::create(
-that, context, cachePath, /*readOnly*/false, xComponentContext);
+that, context, cachePath, xComponentContext);
 that->insertBackend(extensionBackend);
 
 Reference xServiceInfo(
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx 
b/desktop/source/deployment/registry/package/dp_package.cxx
index 7ea79fd9454d..ff7a245f6519 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1588,14 +1588,14 @@ BackendImpl::PackageImpl::getPackagesFromDb(
 
 Reference create(
 Reference const & xRootRegistry,
-OUString const & context, OUString const & cachePath, bool readOnly,
+OUString const & context, OUString const & cachePath,
 Reference const & xComponentContext )
 {
 Sequence args(cachePath.isEmpty() ? 1 : 3 );
 args[ 0 ] <<= context;
 if (!cachePath.isEmpty()) {
 args[ 1 ] <<= cachePath;
-args[ 2 ] <<= readOnly;
+args[ 2 ] <<= false; // readOnly
 }
 return new BackendImpl( args, xComponentContext, xRootRegistry );
 }
diff --git a/framework/inc/uielement/statusbarmerger.hxx 
b/framework/inc/uielement/statusbarmerger.hxx
index 7e593734cbcd..5d752d1d4f8b 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -56,14 +56,12 @@ namespace StatusbarMerger
 bool ProcessMergeOperation( StatusBar* pStatusbar,
sal_uInt16 nPos,
sal_uInt16& rItemId,
-   const ::rtl::OUString& 
rModuleIdentifier,
const ::rtl::OUString& rMergeCommand,
const ::rtl::OUString& 
rMergeCommandParameter,
const AddonStatusbarItemContainer& 
rItems );
 
 bool ProcessMergeFallback( StatusBar* pStatusbar,
   sal_uInt16& rItemId,
-  const ::rtl::OUString& rModuleIdentifier,
   const ::rtl::OUString& rMergeCommand,
   const ::rtl::OUString& rMergeFallback,
  

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

[Samuel Mehrbrodt]

 sfx2/source/appl/openuriexternally.cxx |   58 ++---
 sfx2/source/inc/openuriexternally.hxx  |   32 +++---
 sfx2/source/view/viewsh.cxx|3 +
 3 files changed, 62 insertions(+), 31 deletions(-)

New commits:
commit 5d5da77e82b6498dd73123ec0dc36d2315e279a1
Author: Samuel Mehrbrodt 
Date:   Mon Mar 12 09:50:17 2018 +0100

tdf#116305 Add timeout to help Windows bring browsers to the front

Adding a timeout seems to help Windows a lot to actually bring
the browser into the front, especially when it was closed before.

Still no 100% success rate, but much improved now.

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

diff --git a/sfx2/source/appl/openuriexternally.cxx 
b/sfx2/source/appl/openuriexternally.cxx
index c412d40aeb39..7ffa980706bd 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -30,27 +30,55 @@
 #include 
 #include 
 
-bool sfx2::openUriExternally(
-OUString const & uri, bool handleSystemShellExecuteException)
+class URITools
+{
+private:
+Timer aOpenURITimer;
+OUString msURI;
+bool mbHandleSystemShellExecuteException;
+DECL_LINK(onOpenURI, Timer*, void);
+
+public:
+void openURI(const OUString& sURI, bool 
bHandleSystemShellExecuteException);
+};
+
+void URITools::openURI(const OUString& sURI, bool 
bHandleSystemShellExecuteException)
 {
 if (comphelper::LibreOfficeKit::isActive())
 {
-if(SfxViewShell* pViewShell = SfxViewShell::Current())
+if (SfxViewShell* pViewShell = SfxViewShell::Current())
 {
 
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
-   uri.toUtf8().getStr());
-return true;
+   sURI.toUtf8().getStr());
 }
-return false;
+delete this;
+return;
 }
 
+mbHandleSystemShellExecuteException = bHandleSystemShellExecuteException;
+msURI = sURI;
+
+// tdf#116305 Workaround: Use timer to bring browsers to the front
+aOpenURITimer.SetInvokeHandler(LINK(this, URITools, onOpenURI));
+#ifdef WNT
+// 200ms seems to be the the best compromise between responsiveness and 
success rate
+aOpenURITimer.SetTimeout(200);
+#else
+aOpenURITimer.SetTimeout(0);
+#endif
+aOpenURITimer.SetDebugName("sfx2::openUriExternallyTimer");
+aOpenURITimer.Start();
+}
+
+IMPL_LINK_NOARG(URITools, onOpenURI, Timer*, void)
+{
 css::uno::Reference< css::system::XSystemShellExecute > exec(
 
css::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
 try {
 exec->execute(
-uri, OUString(),
+msURI, OUString(),
 css::system::SystemShellExecuteFlags::URIS_ONLY);
-return true;
+return;
 } catch (css::lang::IllegalArgumentException & e) {
 if (e.ArgumentPosition != 0) {
 throw css::uno::RuntimeException(
@@ -61,10 +89,10 @@ bool sfx2::openUriExternally(
 std::unique_ptr 
eb(Application::CreateMessageDialog(pWindow ? pWindow->GetFrameWeld() : nullptr,
  
VclMessageType::Warning, VclButtonsType::Ok,
  
SfxResId(STR_NO_ABS_URI_REF)));
-eb->set_primary_text(eb->get_primary_text().replaceFirst("$(ARG1)", 
uri));
+eb->set_primary_text(eb->get_primary_text().replaceFirst("$(ARG1)", 
msURI));
 eb->run();
 } catch (css::system::SystemShellExecuteException & e) {
-if (!handleSystemShellExecuteException) {
+if (!mbHandleSystemShellExecuteException) {
 throw;
 }
 SolarMutexGuard g;
@@ -73,13 +101,19 @@ bool sfx2::openUriExternally(
  
VclMessageType::Warning, VclButtonsType::Ok,
  
SfxResId(STR_NO_WEBBROWSER_FOUND)));
 eb->set_primary_text(
-eb->get_primary_text().replaceFirst("$(ARG1)", uri)
+eb->get_primary_text().replaceFirst("$(ARG1)", msURI)
 .replaceFirst("$(ARG2)", OUString::number(e.PosixError))
 .replaceFirst("$(ARG3)", e.Message));
 //TODO: avoid subsequent replaceFirst acting on previous 
replacement
 eb->run();
 }
-return false;
+delete this;
+}
+
+void sfx2::openUriExternally(const OUString& sURI, bool 
bHandleSystemShellExecuteException)
+{
+URITools* uriTools = new URITools;
+uriTools->openURI(sURI, bHandleSystemShellExecuteException);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/openuriexternally.hxx 
b/sfx2/source/inc/openu

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[Christian Lohmaier]

Hi Stephan, *,

On Fri, Mar 9, 2018 at 3:38 PM, Stephan Bergmann  wrote:
> On 06.03.2018 10:09, Stephan Bergmann wrote:
>>
>> There's no such mails blocked in my spam folder.

Then it is worse - your mailserver then silently deletes mail. Here's
one that was sent to both you and me and that still was in my
inbox...:
###
Delivered-To: lohmaier+libreoff...@gmail.com
Received: by 10.25.167.141 with SMTP id q135csp5071333lfe;
Tue, 27 Feb 2018 07:51:51 -0800 (PST)
X-Google-Smtp-Source:
AH8x224NAjuc6BmaBhi31NrkA4faf5cGS1kx9+zztpGGG1Md1ihiSh3e480lcZbM00Wufld+EIl4
X-Received: by 10.223.168.46 with SMTP id l43mr14044383wrc.118.1519746711808;
Tue, 27 Feb 2018 07:51:51 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1519746711; cv=none;
d=google.com; s=arc-20160816;
b=iHeBvUq+oS2NTKYTDBNRhn1NkFYOEcYbfrJg3wjuqSpQpfRQNWmrb/iqADc+JLTV1R
 ab1OLPz/FZ7Ir1N0qj2VQsPxr4ye85G0Ortl8gUkUXZ7dSnEEyxYbH9U+6vPbyK5uwU0
 d/34nqsZMw3BooIyN3IFIGR6lbutjOOIY/4EMtUGLKV+mjPRa0uEXqTtS3hGXwzZsBcE
 ckpaARC0TYSaXRjw2sFLotABr31I0PByh4N7srW7r3DVotpxmq4OIlwoAOv2b/xie3g1
 AUMU8Y9fqSzjnxx1pN7hDO47P5ZJp6OY6jYG1KGgysqMkw19EZZMne6qEK24brCEMTFs
 ERAg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed;
d=google.com; s=arc-20160816;
h=content-transfer-encoding:message-id:user-agent:content-disposition
 :mime-version:references:in-reply-to:subject:list-unsubscribe
 :list-id:reply-to:to:from:date:dkim-signature
 :arc-authentication-results;
bh=WlV0gXF8MWSj4XxSn23QafvqX6681ivj9Qv6OfVilAU=;
b=PiftyQjcTCQCVQ2Qz+eQO3QyzlTM94c2dQm6uc/I+H1nxbtLsQ2WI3OXw8M8mW8+H6
 CEBYaJL98i/EZnpTtKNajnOvvb/97ceUWgmsUP9o90KdkpozJajoP/SrDsUBAXG94nsV
 +gEvyq9zIdew2SwRsjCXO0i/ShA1YLizGobHf+V3lofLUoKTX9r7orcACa3IBPPTpPQ7
 EYyNfxwolZtmMLkRGKmFthoF1K9bt4sqpCzq1DjLwsMus6bBNlQY/sPhqkTOz285tf+m
 8AxaIIO7XFl6XyEPcyvx7bvYaMDCO/9U5QKeqO/eh7qJKDDhaZCQdksokWHMiW8+EDXl
 orTg==
ARC-Authentication-Results: i=1; mx.google.com;
   dkim=pass header.i=@libreoffice.org
header.s=091c684752c0c86472e3d9b91cc91375 header.b=FwRBbuym;
   spf=pass (google.com: domain of ger...@gerrit.libreoffice.org
designates 2a00:1828:a012:202::1 as permitted sender)
smtp.mailfrom=ger...@gerrit.libreoffice.org
Return-Path: 
Received: from vm202.documentfoundation.org
(vm202.documentfoundation.org. [2a00:1828:a012:202::1])
by mx.google.com with ESMTPS id f9si5237290wrf.83.2018.02.27.07.51.51
for 
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Tue, 27 Feb 2018 07:51:51 -0800 (PST)
Received-SPF: pass (google.com: domain of
ger...@gerrit.libreoffice.org designates 2a00:1828:a012:202::1 as
permitted sender) client-ip=2a00:1828:a012:202::1;
Authentication-Results: mx.google.com;
   dkim=pass header.i=@libreoffice.org
header.s=091c684752c0c86472e3d9b91cc91375 header.b=FwRBbuym;
   spf=pass (google.com: domain of ger...@gerrit.libreoffice.org
designates 2a00:1828:a012:202::1 as permitted sender)
smtp.mailfrom=ger...@gerrit.libreoffice.org
Received: from localhost (vm202.documentfoundation.org [127.0.0.1]) by
vm202.documentfoundation.org (Postfix) with ESMTP id 5F82040791; Tue,
27 Feb 2018 15:51:51 + (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libreoffice.org;
h=content-transfer-encoding:message-id:user-agent
:content-disposition:content-type:content-type:mime-version
:references:in-reply-to:subject:subject:list-unsubscribe:list-id
:reply-to:from:from:date:date:received:received:received; s=
091c684752c0c86472e3d9b91cc91375; i=@gerrit.libreoffice.org; t=
1519746709; x=1521561110; bh=WlV0gXF8MWSj4XxSn23QafvqX6681ivj9Qv
6OfVilAU=; b=FwRBbuymUOZXLXwiMmGc7JiCebatBBUboN9J/YtCuIOLm+OU4ji
k/etNXzdcYXBx8WONaJeILKrrsh7X3cKybNqKh2UJMdnBdD/ocjHR24eV8E3wOe0
GGhrN2/uPSmDbRA7O2jJr8aLN2zsZ1bdhm4xHeEnUUe4E62aMjbIpfgUpd3AHkO5
bTVhKTd6RI/XchYmK6ZR8zlbBknacpa/uF0qqQxzdWJ88nG31//6eHXWB48LC074
uQthtoBoWbAaBIeKbR6/9e5qPm4Bms9YyJDlA9HcnDuJw21YoCFjYHG91HQ1Bcu5
hUZXCrZRhQLfW3HhfVPN55ryFc0QL+cPuZw==
X-Virus-Scanned: amavisd-new at vm202.documentfoundation.org
Received: from vm202.documentfoundation.org ([127.0.0.1]) by localhost
(vm202.documentfoundation.org [127.0.0.1]) (amavisd-new, port 10026)
with LMTP id DTYcu3JnVCDc; Tue, 27 Feb 2018 15:51:49 + (UTC)
Received: from gerrit.libreoffice.org (vm148.documentfoundation.org
[IPv6:2a00:1828:a012:148::1]) (using TLSv1.2 with cipher
ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN
"gerrit.libreoffice.org", Issuer "gerrit.libreoffice.org" (not
verified)) by vm202.documentfoundation.org (Postfix) with ESMTPS id
3A7BB3FF53; Tue, 27 Feb 2018 15:51:49 + (UTC)
Received: from gerrit.libreoffice.org (gerrit.libreoffice.org
[127.0.0.1]) by gerrit.libreoffice.org (Postfix) with ESMTP id
EFC95E005A; Tue, 27 Feb 2018 16:51:48 +0100 (CET)
Date: Tue, 27 Feb 2018 16:51:47 +0100
From: "Jenkins (via Code Review)" 
To: Christian Lohmaier , Stephan
Bergmann 
Reply

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

[Stephan Bergmann]

 solenv/gdb/libreoffice/tl.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a9a3c8941d9ebcf7660e622325c8ac28610571d
Author: Stephan Bergmann 
Date:   Wed Mar 14 14:59:47 2018 +0100

Adapt FractionPrinter

...to 048a32d903c8cc81a8836c7c7209b92e0bfd6cd7 "use unique_ptr for pImpl in
tools/", exploiting intimate knowledge of libstdc++ internals as was already
done in 51bb68928933bf5d72efb9193f1be6af6e72c80f "fix BigPtrArray pretty
printer".

Due to  "ptype does 
not
find inner C++ class type without -readnow", at least for me only works 
when gdb
is invoked with -readnow.

Change-Id: I365733f3c661eea2f19a9b85015aa5d50e63e6a4

diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 2e096fc8d26c..670482027b7f 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -62,7 +62,7 @@ class FractionPrinter(object):
 self.val = val
 
 def to_string(self):
-impl = self.val['mpImpl'].dereference()
+impl = 
self.val['mpImpl']['_M_t']['_M_t']['_M_head_impl'].dereference().cast(gdb.lookup_type('Fraction::Impl'))
 numerator = impl['value']['num']
 denominator = impl['value']['den']
 if impl['valid']:
___
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

[Szymon Kłos]

 oox/source/ppt/animationspersist.cxx|   10 --
 sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx |binary
 sd/qa/unit/export-tests-ooxml2.cxx  |   16 
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 7c354d1bf1ca29a5ae9ee9d6f18dd68b90530043
Author: Szymon Kłos 
Date:   Tue Mar 13 20:57:52 2018 +0100

tdf#104792 Double check for target shape

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

diff --git a/oox/source/ppt/animationspersist.cxx 
b/oox/source/ppt/animationspersist.cxx
index cd14fe43b374..2c1aaa2c88c7 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -141,8 +141,14 @@ namespace oox { namespace ppt {
 sShapeName = maShapeTarget.msSubShapeId;
 
 Any rTarget;
-::oox::drawingml::ShapePtr pShape = pSlide->getShape(sShapeName);
-SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape");
+::oox::drawingml::ShapePtr pShape = pSlide->getShape( sShapeName );
+SAL_WARN_IF( !pShape, "oox.ppt", "failed to locate Shape" );
+
+if( !pShape && maShapeTarget.mnType == XML_dgm )
+{
+pShape = pSlide->getShape( msValue );
+}
+
 if( pShape )
 {
 Reference< XShape > xShape( pShape->getXShape() );
diff --git a/sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx 
b/sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx
new file mode 100644
index ..ac72639efd77
Binary files /dev/null and 
b/sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 9fb9d4ab6ff0..765ca29269ea 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -133,6 +133,8 @@ public:
 void testTdf115394Zero();
 void testBulletsAsImage();
 void testTdf111789();
+/// SmartArt animated elements
+void testTdf104792();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -191,6 +193,7 @@ public:
 CPPUNIT_TEST(testTdf115394Zero);
 CPPUNIT_TEST(testBulletsAsImage);
 CPPUNIT_TEST(testTdf111789);
+CPPUNIT_TEST(testTdf104792);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1538,6 +1541,19 @@ void SdOOXMLExportTest2::testTdf111789()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf104792()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx"),
 PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent, 
"/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst[1]/p:seq/p:cTn/p:childTnLst[1]/p:par[1]/p:cTn/p:childTnLst[1]/p:par/p:cTn/p:childTnLst[1]/p:par/p:cTn/p:childTnLst[1]/p:set/p:cBhvr/p:tgtEl/p:spTgt",
 1);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Behrens]

 android/Bootstrap/src/org/libreoffice/kit/Document.java  |   15 --
 android/source/res/drawable/ic_content_copy_black_24dp.xml   |9 -
 android/source/res/drawable/ic_content_cut_black_24dp.xml|9 -
 android/source/res/drawable/ic_content_paste_black_24dp.xml  |9 -
 android/source/res/menu/main.xml |   29 
 android/source/res/values/strings.xml|7 -
 android/source/src/java/org/libreoffice/InvalidationHandler.java |3 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   21 ---
 android/source/src/java/org/libreoffice/TileProvider.java|   13 -
 android/source/src/java/org/libreoffice/ToolbarController.java   |   70 
--
 desktop/source/lib/lokandroid.cxx|   17 --
 11 files changed, 202 deletions(-)

New commits:
commit b203e78a69acf5d84cc245ce7232ffee4a6edcd4
Author: Thorsten Behrens 
Date:   Wed Mar 14 15:24:14 2018 +0100

Revert "tdf#96796 - Added clipboard actions for the Android Viewer"

Breaks Android tinderbox

This reverts commit 31e939c9f4b29fb2b2e63eb096450cf3da35d67f.

Change-Id: Id565c9ef8330c0b3bce2c678facb7605dcf3e356

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index f0c5e7a6f99a..6a1f402970ea 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -232,21 +232,6 @@ public class Document {
 public native void setGraphicSelection(int type, int x, int y);
 
 /**
- * Get selected text
- * @param mimeType
- * @return
- */
-public native String getTextSelection(String mimeType);
-
-/**
- * paste
- * @param mimeType
- * @param data
- * @return
- */
-public native boolean paste(String mimeType, String data);
-
-/**
  * Reset current (any kind of) selection.
  */
 public native void resetSelection();
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml 
b/android/source/res/drawable/ic_content_copy_black_24dp.xml
deleted file mode 100644
index 8a894a3bcd73..
--- a/android/source/res/drawable/ic_content_copy_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android";
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml 
b/android/source/res/drawable/ic_content_cut_black_24dp.xml
deleted file mode 100644
index 1c0f96a37b42..
--- a/android/source/res/drawable/ic_content_cut_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android";
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml 
b/android/source/res/drawable/ic_content_paste_black_24dp.xml
deleted file mode 100644
index a902d9a856a0..
--- a/android/source/res/drawable/ic_content_paste_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-http://schemas.android.com/apk/res/android";
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-
-
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index 7fba5f46e380..229c20aed68c 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -47,35 +47,6 @@
 android:enabled="false" />
 
 
-
-
-
-
-
-
-
-
-
-
-
 
 Don\'t Compress
 Do you want to compress the 
photo?
 
-
-Copy
-Paste
-Cut
-Back
-Text copied to the clipboard
-
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index eb22f6c8f3d3..e411770976c9 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -452,7 +452,6 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
-mContext.getToolbarController().showHideClipboardCutAndCopy(false);
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
@@ -463,8 +462,6 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(rectangles.get(0));
 }
-

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

[László Németh]

 sw/source/core/txtnode/modeltoviewhelper.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit aab440c768b64b9d2ffa72223b6d843a84c2d061
Author: László Németh 
Date:   Tue Mar 13 16:03:01 2018 +0100

tdf#69416 don't remove field content in proofreading,

only the requested footnote numbers, allowing grammar
checking of automatic references with affixes, articles etc.

Expanded fields get also a starting ZWSP character
for more precise grammar checking.

(Partial revert of commit d477ff4a81ecba8a77ead5ff1a33d3e3ceed622e)

Change-Id: I78ab02cc8cf98d665e7f9ddc740879c203f2f7e4
Reviewed-on: https://gerrit.libreoffice.org/51228
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/sw/source/core/txtnode/modeltoviewhelper.cxx 
b/sw/source/core/txtnode/modeltoviewhelper.cxx
index 5018bf128474..e6f5b1885f56 100644
--- a/sw/source/core/txtnode/modeltoviewhelper.cxx
+++ b/sw/source/core/txtnode/modeltoviewhelper.cxx
@@ -147,9 +147,10 @@ ModelToViewHelper::ModelToViewHelper(const SwTextNode 
&rNode, ExpandMode eMode)
 case RES_TXTATR_ANNOTATION:
 if (eMode & ExpandMode::ExpandFields)
 {
-aFieldResult.m_sExpand = (eMode & 
ExpandMode::ReplaceMode)
-? OUString(CHAR_ZWSP)
-: static_txtattr_cast(pAttr)->
+// add a ZWSP before the expanded field in 
replace mode
+aFieldResult.m_sExpand = ((eMode & 
ExpandMode::ReplaceMode)
+? OUString(CHAR_ZWSP) : OUString("")) +
+  static_txtattr_cast(pAttr)->
   
GetFormatField().GetField()->ExpandField(true);
 aFieldResult.m_eType = FieldResult::FIELD;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[Stephan Bergmann]

On 14/03/18 14:38, Christian Lohmaier wrote:

Then it is worse - your mailserver then silently deletes mail. Here's
one that was sent to both you and me and that still was in my
inbox...:


Why do you assume that I did not get that mail?  It was apparently a 
mail triggered by a Jenkins comment made to 
, which is owned by me.  I do 
get such mails alright, just not mails about Jenkins comments made to 
changes owned by others, on which I'm merely a reviewer.  (And I think 
David already nailed the reason down in another mail in this thread.)



###
Delivered-To: lohmaier+libreoff...@gmail.com
Received: by 10.25.167.141 with SMTP id q135csp5071333lfe;
 Tue, 27 Feb 2018 07:51:51 -0800 (PST)
X-Google-Smtp-Source:
AH8x224NAjuc6BmaBhi31NrkA4faf5cGS1kx9+zztpGGG1Md1ihiSh3e480lcZbM00Wufld+EIl4
X-Received: by 10.223.168.46 with SMTP id l43mr14044383wrc.118.1519746711808;
 Tue, 27 Feb 2018 07:51:51 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1519746711; cv=none;
 d=google.com; s=arc-20160816;
 b=iHeBvUq+oS2NTKYTDBNRhn1NkFYOEcYbfrJg3wjuqSpQpfRQNWmrb/iqADc+JLTV1R
  ab1OLPz/FZ7Ir1N0qj2VQsPxr4ye85G0Ortl8gUkUXZ7dSnEEyxYbH9U+6vPbyK5uwU0
  d/34nqsZMw3BooIyN3IFIGR6lbutjOOIY/4EMtUGLKV+mjPRa0uEXqTtS3hGXwzZsBcE
  ckpaARC0TYSaXRjw2sFLotABr31I0PByh4N7srW7r3DVotpxmq4OIlwoAOv2b/xie3g1
  AUMU8Y9fqSzjnxx1pN7hDO47P5ZJp6OY6jYG1KGgysqMkw19EZZMne6qEK24brCEMTFs
  ERAg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed;
d=google.com; s=arc-20160816;
 h=content-transfer-encoding:message-id:user-agent:content-disposition
  :mime-version:references:in-reply-to:subject:list-unsubscribe
  :list-id:reply-to:to:from:date:dkim-signature
  :arc-authentication-results;
 bh=WlV0gXF8MWSj4XxSn23QafvqX6681ivj9Qv6OfVilAU=;
 b=PiftyQjcTCQCVQ2Qz+eQO3QyzlTM94c2dQm6uc/I+H1nxbtLsQ2WI3OXw8M8mW8+H6
  CEBYaJL98i/EZnpTtKNajnOvvb/97ceUWgmsUP9o90KdkpozJajoP/SrDsUBAXG94nsV
  +gEvyq9zIdew2SwRsjCXO0i/ShA1YLizGobHf+V3lofLUoKTX9r7orcACa3IBPPTpPQ7
  EYyNfxwolZtmMLkRGKmFthoF1K9bt4sqpCzq1DjLwsMus6bBNlQY/sPhqkTOz285tf+m
  8AxaIIO7XFl6XyEPcyvx7bvYaMDCO/9U5QKeqO/eh7qJKDDhaZCQdksokWHMiW8+EDXl
  orTg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@libreoffice.org
header.s=091c684752c0c86472e3d9b91cc91375 header.b=FwRBbuym;
spf=pass (google.com: domain of ger...@gerrit.libreoffice.org
designates 2a00:1828:a012:202::1 as permitted sender)
smtp.mailfrom=ger...@gerrit.libreoffice.org
Return-Path: 
Received: from vm202.documentfoundation.org
(vm202.documentfoundation.org. [2a00:1828:a012:202::1])
 by mx.google.com with ESMTPS id f9si5237290wrf.83.2018.02.27.07.51.51
 for 
 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
 Tue, 27 Feb 2018 07:51:51 -0800 (PST)
Received-SPF: pass (google.com: domain of
ger...@gerrit.libreoffice.org designates 2a00:1828:a012:202::1 as
permitted sender) client-ip=2a00:1828:a012:202::1;
Authentication-Results: mx.google.com;
dkim=pass header.i=@libreoffice.org
header.s=091c684752c0c86472e3d9b91cc91375 header.b=FwRBbuym;
spf=pass (google.com: domain of ger...@gerrit.libreoffice.org
designates 2a00:1828:a012:202::1 as permitted sender)
smtp.mailfrom=ger...@gerrit.libreoffice.org
Received: from localhost (vm202.documentfoundation.org [127.0.0.1]) by
vm202.documentfoundation.org (Postfix) with ESMTP id 5F82040791; Tue,
27 Feb 2018 15:51:51 + (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libreoffice.org;
h=content-transfer-encoding:message-id:user-agent
:content-disposition:content-type:content-type:mime-version
:references:in-reply-to:subject:subject:list-unsubscribe:list-id
:reply-to:from:from:date:date:received:received:received; s=
091c684752c0c86472e3d9b91cc91375; i=@gerrit.libreoffice.org; t=
1519746709; x=1521561110; bh=WlV0gXF8MWSj4XxSn23QafvqX6681ivj9Qv
6OfVilAU=; b=FwRBbuymUOZXLXwiMmGc7JiCebatBBUboN9J/YtCuIOLm+OU4ji
k/etNXzdcYXBx8WONaJeILKrrsh7X3cKybNqKh2UJMdnBdD/ocjHR24eV8E3wOe0
GGhrN2/uPSmDbRA7O2jJr8aLN2zsZ1bdhm4xHeEnUUe4E62aMjbIpfgUpd3AHkO5
bTVhKTd6RI/XchYmK6ZR8zlbBknacpa/uF0qqQxzdWJ88nG31//6eHXWB48LC074
uQthtoBoWbAaBIeKbR6/9e5qPm4Bms9YyJDlA9HcnDuJw21YoCFjYHG91HQ1Bcu5
hUZXCrZRhQLfW3HhfVPN55ryFc0QL+cPuZw==
X-Virus-Scanned: amavisd-new at vm202.documentfoundation.org
Received: from vm202.documentfoundation.org ([127.0.0.1]) by localhost
(vm202.documentfoundation.org [127.0.0.1]) (amavisd-new, port 10026)
with LMTP id DTYcu3JnVCDc; Tue, 27 Feb 2018 15:51:49 + (UTC)
Received: from gerrit.libreoffice.org (vm148.documentfoundation.org
[IPv6:2a00:1828:a012:148::1]) (using TLSv1.2 with cipher
ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN
"gerrit.libreoffice.org", Issuer "gerrit.libreoffice.org" (not
verified)) by vm202.documentfoundation.org (Postfix) with ESMTPS id
3A7BB3FF53; Tue, 27 Feb 2018 15:51:49 +0

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

[Mike Kaganski]

 sw/qa/extras/ooxmlexport/data/tdf112118.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |   32 
 sw/source/filter/ww8/docxattributeoutput.cxx   |  165 +
 sw/source/filter/ww8/docxattributeoutput.hxx   |   18 +-
 writerfilter/source/dmapper/PageBordersHandler.cxx |   17 +-
 writerfilter/source/dmapper/PageBordersHandler.hxx |8 -
 writerfilter/source/dmapper/PropertyMap.cxx|   75 ++---
 writerfilter/source/dmapper/PropertyMap.hxx|   23 ++
 8 files changed, 227 insertions(+), 111 deletions(-)

New commits:
commit fb959e581c900b392efd0bb329b7cf30c8ed56a5
Author: Mike Kaganski 
Date:   Wed Mar 14 10:18:15 2018 +0300

tdf#112118: DOCX: properly import/export border distance

https://wiki.openoffice.org/wiki/Writer/MSInteroperability/PageBorder
discusses implementation differences between ODF model and MS formats
wrt dealing with page margins and distances to borders.

This patch corrects import from DOCX, so that the border distance and
width doesn't add to the margin size imported from file anymore. It
takes care to preserve size from page edge to text (the most important
size that affects document layout). When borders go outside of range
valid for ODF, the margin is set to keep text area intact, and the
border is placed as close to intended position as possible.

Export code now also properly handles border width. Also, an improved
heuristic implemented to better export cases unsupported by Word, so
that the result would look closer to ODF original. We still write
correct sizes to OOXML, so that when reopened by LO, the borders will
be in correct places; but as Word cannot handle sizes more than 31 pt,
it will show borders shifted.

This prevents from adding border widths and distances to page margins
at each opening of DOCX, saving back the changed value, increasing
the margins each time.

Change-Id: Ia978ab119dd661949d6c321aea91397f28d205b0
Reviewed-on: https://gerrit.libreoffice.org/51267
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf112118.docx 
b/sw/qa/extras/ooxmlexport/data/tdf112118.docx
new file mode 100644
index ..87081d8c6dd9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf112118.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 4fdc51170d49..239786d5f8eb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -280,6 +281,37 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107035, "tdf107035.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_AUTO), nPgNumColour);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf112118, "tdf112118.docx")
+{
+auto xStyles = getStyles("PageStyles");
+auto testProc = [&](const OUString& sStyleName, sal_Int32 nMargin, 
sal_Int32 nBorderDistance,
+sal_Int16 nBorderWidth)
+{
+typedef std::initializer_list StringList;
+uno::Reference 
xStyle(xStyles->getByName(sStyleName), uno::UNO_QUERY_THROW);
+for (const auto& side : StringList{ "Top", "Left", "Bottom", "Right" })
+{
+table::BorderLine aBorder = getProperty(xStyle, 
side + "Border");
+CPPUNIT_ASSERT_EQUAL(sal_Int16(nBorderWidth), 
aBorder.OuterLineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aBorder.InnerLineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aBorder.LineDistance);
+
+sal_Int32 nMarginActual = getProperty(xStyle, side + 
"Margin");
+CPPUNIT_ASSERT_EQUAL(nMargin, nMarginActual);
+
+sal_Int32 nBorderDistanceActual = getProperty(xStyle, 
side + "BorderDistance");
+CPPUNIT_ASSERT_EQUAL(nBorderDistance, nBorderDistanceActual);
+}
+};
+
+// For both styles used in document, the total distance from page edge to 
text must be 2.54 cm.
+// The first style uses "from edge" border distance; the second uses "from 
text" border distance
+// Border distances in both cases are 24 pt = 847 mm100; line widths are 6 
pt = 212 mm100.
+// 1482 + 847 + 212 = 2541
+testProc("Standard", 847, 1482, 212);
+testProc("Converted1", 1482, 847, 212);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 1cde1640af0b..21b4d57d4321 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3036,8 +3036,6 @@ static OutputBorderOptions 
lcl_getTableDefaultBorderOptions(bool bEcma)
 rOptions.bWriteTag = true;
 rOptions.bWriteInsideHV = true;
 rOptions.bWriteDistance = false;
-rOptions.aShadowLocation

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

[Noel Grandin]

 cui/source/customize/cfg.cxx |7 +--
 solenv/gdb/libreoffice/tl.py |9 -
 2 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 55ad4e3cb7a0d705ff1c0f26feb644d8b06b71d8
Author: Noel Grandin 
Date:   Wed Mar 14 16:55:35 2018 +0200

fix pretty printing of Fraction better

work-around gdb bug, and deal with different representations of
std::unique_ptr in different versions of libc++.

Change-Id: I02a1f49c07dbcd70e13ef6be48e20b510bf5e3fa

diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 670482027b7f..dec0ae2f0d53 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -62,7 +62,14 @@ class FractionPrinter(object):
 self.val = val
 
 def to_string(self):
-impl = 
self.val['mpImpl']['_M_t']['_M_t']['_M_head_impl'].dereference().cast(gdb.lookup_type('Fraction::Impl'))
+# Workaround gdb bug 
 "ptype does not
+# find inner C++ class type without -readnow"
+gdb.lookup_type('Fraction')
+# This would be simpler and more reliable if we could call the 
operator* on mpImpl to get the internal Impl.
+# Different libc have different structures. Some have one _M_t, some 
have two nested.
+tmp = self.val['mpImpl']['_M_t']
+if tmp.type.fields()[0].name == '_M_t': tmp = tmp['_M_t']
+impl = 
tmp['_M_head_impl'].dereference().cast(gdb.lookup_type('Fraction::Impl'))
 numerator = impl['value']['num']
 denominator = impl['value']['den']
 if impl['valid']:
commit 3a0ae2aae3f226e5e2e3785e578dee3ab4d2fa35
Author: Noel Grandin 
Date:   Wed Mar 14 15:30:07 2018 +0200

fix crash on close customize dialog

after
commit 00431a8afcad08da11835131c2cd423d7f8cd115
Date:   Tue Mar 13 11:57:33 2018 +0200
loplugin:useuniqueptr in SvxEntries

Change-Id: Ia115454522b87db93cefcbd89ca5d965f9b431c7

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5762979a7528..515088d11916 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2085,9 +2085,12 @@ SvxConfigEntry::SvxConfigEntry( const OUString& 
rDisplayName,
 
 SvxConfigEntry::~SvxConfigEntry()
 {
-for (auto const& entry : *mpEntries)
+if (mpEntries)
 {
-delete entry;
+for (auto const& entry : *mpEntries)
+{
+delete entry;
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loolwsd-systemplate-setup

[Michael Meeks]

 loolwsd-systemplate-setup |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a459470ef0b9460bb802bc450eada2ef8e7fddf6
Author: Michael Meeks 
Date:   Sat Mar 10 13:50:43 2018 +

Clean up un-used pcf fonts from the systemplate to shrink it.

Also drop ~/docs/ copying for devs - too generic a name.

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

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 263a489a9..56ca87d20 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -80,13 +80,15 @@ if [ -h usr/share/fonts/ghostscript ]; then
 cp -r -p -L /usr/share/ghostscript/fonts usr/share/ghostscript
 fi
 
+# Remove obsolete & unused bitmap fonts
+find usr/share -name '*.pcf' | xargs rm -f
+find usr/share -name '*.pcf.gz' | xargs rm -f
+
 # Debugging only hackery to avoid confusion.
 if test "z$ENABLE_DEBUG" != "z" -a "z$HOME" != "z"; then
 echo "Copying development users's fonts into systemplate"
 mkdir -p $CHROOT/$HOME
-mkdir -p $CHROOT/$HOME/docs
 test -d $HOME/.fonts && cp -r -p -L $HOME/.fonts $CHROOT/$HOME
-test -d $HOME/docs && cp -r -p -L $HOME/docs $CHROOT/$HOME
 fi
 
 exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Revert "g: ignore submodule changes"

[Stephan Bergmann]

Just a heads-up:  If you want to get rid of those "submodule.*.ignore 
all" configurations in your existing git repo clones, you need to do 
that manually.


On 12/03/18 20:39, Stephan Bergmann wrote:

New commits:
commit 3a33d9ce82566387337faa3e7983a2aca39f3b1f
Author: Stephan Bergmann 
Date:   Mon Mar 12 16:56:30 2018 +0100

 Revert "g: ignore submodule changes"
 
 This reverts commit 27925032cd5aec8805185679e01c687c40bbd617.

 Conflicts:
 g
 
 According to vmiklos, that commit was meant to help with the following scenario:

 Assume a dev uses submodules and uses plain `git pull && git submodule 
update`
 instead of ./g.  When they forget the "&& git submodule update" part and do
 `git commit -a`, changes to the submodules were excluded from the commit.
 
 However, when they do `git add -u && git commit` instead of `git commit -a`,

 changes to the submodules /are/ included in the commit, despite `git 
status` or
 `git diff` (both prior to `git add -u`) or `git diff --cached` (after `git 
add
 -u`) not indicating that there are any changes to the submodules.  I 
consider
 that problem more confusing and severe than the problem that the commit 
solved.
 
 Change-Id: I595eed3c1c04efd108be1ccd792d8d7bce72a345

 Reviewed-on: https://gerrit.libreoffice.org/51155
 Tested-by: Jenkins 
 Reviewed-by: Miklos Vajna 

diff --git a/g b/g
index 49ece9ff6880..13bc73939e49 100755
--- a/g
+++ b/g
@@ -90,14 +90,6 @@ local hook
  for repo in ${SUBMODULES_ALL?} ; do
  refresh_submodule_hooks "$repo"
  done
-# In our workflow, it's always gerrit that does the submodule updates, so
-# better ignoring them to avoid accidentally including those changes in our
-# commits.
-# 'git submodule status' can be still used to see if a submodule has such
-# changes.
-for repo in ${SUBMODULES_CONFIGURED?} ; do
-git config submodule."$repo".ignore all
-done
  popd > /dev/null
  
  }

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

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[Christian Lohmaier]

On Wed, Mar 14, 2018 at 3:29 PM, Stephan Bergmann  wrote:
> On 14/03/18 14:38, Christian Lohmaier wrote:
>>
>> Then it is worse - your mailserver then silently deletes mail. Here's
>> one that was sent to both you and me and that still was in my
>> inbox...:
>
>
> Why do you assume that I did not get that mail?

Because I certainly do get mails for changes where I'm not the owner.
Because the other mails for jenkins comments I get always have other
recipients in CC
Because you (and Eike) are the only ones so far who said they wouldn't
receive mails for jenkins' comments.

> (And I think David already
> nailed the reason down in another mail in this thread.)

To be honest hard to find the info in all that ranting/user
permissions re setting verified statues surely should not have any
effect on notifications for comments/messages that are added using
"gerrit review" command, etc.

But whatever...

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

Re: [Libreoffice-commits] core.git: Revert "g: ignore submodule changes"

[Christian Lohmaier]

On Wed, Mar 14, 2018 at 4:02 PM, Stephan Bergmann  wrote:
> Just a heads-up:  If you want to get rid of those "submodule.*.ignore all"
> configurations in your existing git repo clones, you need to do that
> manually.

But think twice before you do.
There should be ~no reason to manually change a submodule's reference point.

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - wsd/LOOLWSD.cpp

[Jan Holesovsky]

 wsd/LOOLWSD.cpp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8a3509d0b5c51c17944628702a0717d6933385f6
Author: Jan Holesovsky 
Date:   Wed Mar 14 15:54:15 2018 +0100

Fix build without a support key.

Change-Id: I0900b29d936934b0dc0fd08f5de626b0ea9fcdc2
Reviewed-on: https://gerrit.libreoffice.org/51280
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index bb10acd00..89f698db9 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -197,6 +197,7 @@ static int careerSpanMs = 0;
 namespace
 {
 
+#if ENABLE_SUPPORT_KEY
 inline void shutdownLimitReached(WebSocketHandler& ws)
 {
 const std::string error = Poco::format(PAYLOAD_UNAVAILABLE_LIMIT_REACHED, 
LOOLWSD::MaxDocuments, LOOLWSD::MaxConnections);
@@ -215,6 +216,7 @@ inline void shutdownLimitReached(WebSocketHandler& ws)
 LOG_ERR("Error while shuting down socket on reaching limit: " << 
ex.what());
 }
 }
+#endif
 
 inline void infoLimitReached(const WebSocketHandler* ws)
 {
___
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' - libreofficekit/qa

[Pranav Kant]

 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f3b26d2e6871e88e6231d5de0bf408f000a50fab
Author: Pranav Kant 
Date:   Wed Mar 14 14:50:58 2018 +0530

lokdialog: debug red-colored boundary for last painted region

Easier to see what's going on inside the LOK dialog.

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

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index 5770e1349305..3e4d02f48e11 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -117,7 +117,13 @@ gtv_lok_dialog_draw(GtkWidget* pDialogDrawingArea, 
cairo_t* pCairo, gpointer)
 cairo_surface_mark_dirty(pSurface);
 
 cairo_set_source_surface(pCairo, pSurface, aRect.x, aRect.y);
+// paint the dialog image
 cairo_paint(pCairo);
+
+// debug red-colored border around the painted region
+cairo_set_source_rgb(pCairo, 1.0, 0, 0);
+cairo_rectangle(pCairo, aRect.x, aRect.y, nWidth, nHeight);
+cairo_stroke(pCairo);
 }
 
 static gboolean
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ed9ffad92c83db21c9fcb62e414aa0cb8f5c4c4
Author: Samuel Mehrbrodt 
Date:   Wed Mar 14 14:23:56 2018 +0100

tdf#116342 Fix label: selectable, not selected is what this means

Change-Id: Ie9b4fc71c7f262f896b69bbf4747f08e160447d7
Reviewed-on: https://gerrit.libreoffice.org/51275
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui 
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index af027ea1cb00..cb391d1ac5df 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -53,7 +53,7 @@
 
 
   
-Only text area selected
+Only text area 
selectable
 True
 True
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Let failed Jenkins builds set Verified: -1 in Gerrit?

[Stephan Bergmann]

On 14/03/18 16:03, Christian Lohmaier wrote:

On Wed, Mar 14, 2018 at 3:29 PM, Stephan Bergmann  wrote:

(And I think David already
nailed the reason down in another mail in this thread.)


To be honest hard to find the info in all that ranting/user
permissions re setting verified statues surely should not have any
effect on notifications for comments/messages that are added using
"gerrit review" command, etc.


Not sure what you mean with ranting, quoting 
:


"But let us do a step back and re-visit this thread: the actual
problem we are trying to solve is a different one: a missing
feedback from Jenkins on failed verifications jobs. [...]

"My proposal to solve that for now and avoid future discussions:

"1. Grant 'Remove Reviewer' ACL to stewards group: [5]. That way many
devs are able to drop the wrong vote, and someone is always on the IRC.

"2. Re-configure Jenkins Trigger Plugin set-up and enable voting of
Verified-1 on failed jobs."

To me at least, the proposal sounds like an effective way to address the 
problem, and I would be happy if somebody from the infra team could look 
into that.

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

Jenkins user and sending mails in gerrit

[d . ostrovsky]

I just saw mail from Christian, where he is claiming that Jenkins user
can send mail to reviewers (I said the opposite), and is referencing
this mail from his mailbox:

X-Gerrit-ChangeURL: 

he got from Jenkins, where he is claiming he got the mail,
even though he is not the change owner.

That's correct, he is not the owner, Stephan Bergmann is the owner
of this change, but he is the author, because he performed the rebase
on patch set 1 of this change. So he is the uploader/committer of patch set 2.

When Jenkins is sending email, all reviewers are blocked, because
Jenkins user was granted DENY permission on EmailReviewers ACL,
so that Jenkins can only send email to authors of the change.
So the subtle term is who is considered to be an author of gerrit change?

Well, that's something very easy to find out, we are using open source tool,
and all we need is to read some code, and we are all developers here:

The gerrit code on branch 2.11 for ChangEmail.java is here:

gerrit-server/src/main/java/com/google/gerrit/server/mail/ChangeEmail.java

the relevant parts are here:

  public void setFrom(final Account.Id id) {
super.setFrom(id);

/** Is the from user in an email squelching group? */
final IdentifiedUser user =  args.identifiedUserFactory.create(id);
emailOnlyAuthors = !user.getCapabilities().canEmailReviewers();
  }

^^^ Here you see where canEmailReviewers ACL is evaluated and is stored
in boolean emailOnlyAuthors.

  protected void add(final RecipientType rt, final Account.Id to) {
if (! emailOnlyAuthors || authors.contains(to)) {
  super.add(rt, to);
}
  }

^^^ Here you see, the part where emailOnlyAuthors considered and in  
Jenkins case
this condition is always false. So the mail can be sent then and only  
then, when

the second condition evaluates to true: authors.contains(to)

/** Find all users who are authors of any part of this change. */
  protected Set getAuthors() {
Set authors = new HashSet<>();

authors.add(change.getOwner());
if (patchSet != null) {
  authors.add(patchSet.getUploader());
}
if (patchSetInfo != null) {
  if (patchSetInfo.getAuthor().getAccount() != null) {
authors.add(patchSetInfo.getAuthor().getAccount());
  }
  if (patchSetInfo.getCommitter().getAccount() != null) {
authors.add(patchSetInfo.getCommitter().getAccount());
  }
}
return authors;
  }

^^^ Here is the part about second condition from the if statement above.
Author set contains change owners and/or uploader/committer.


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

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

[Henry Castro]

 sw/source/uibase/app/docsh2.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 02e8420af6bd75bf172296ea7f6f94db7b63e0c5
Author: Henry Castro 
Date:   Mon Mar 5 09:03:10 2018 -0400

lokdialog: more, convert the dialog to async exec

ClassificationDialog -> To trigger this dialog: enable TSCP Classification 
toolbar
click toolbar item "Classification Dialog"
SwWatermarkDialog -> To trigger this dialog: Format -> Watermark... 
SwWatermarkDialog

---

Obs: the ClassificationDialog is not implemented in cp-5.3 branch

Change-Id: I835648df8df5ad3ee5a404a582c2179e5b3b276a
Reviewed-on: https://gerrit.libreoffice.org/50771
Tested-by: Jenkins 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/50784
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index afcd25351308..469239160b26 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1185,9 +1185,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
 {
 SfxViewShell* pViewShell = GetView()? GetView(): 
SfxViewShell::Current();
 SfxBindings& rBindings( 
pViewShell->GetViewFrame()->GetBindings() );
-ScopedVclPtr pDlg( 
VclPtr::Create( nullptr, rBindings ) );
-pDlg->Execute();
-pDlg.disposeAndClear();
+VclPtr 
pDlg(VclPtr::Create(&GetView()->GetViewFrame()->GetWindow(), 
rBindings));
+pDlg->StartExecuteAsync([](sal_Int32 /*nResult*/){});
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 sd/source/ui/view/drviewse.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6a9326803c01f4c9bc7da855053ce4e80646fad8
Author: Xisco Fauli 
Date:   Wed Mar 14 10:19:47 2018 +0100

tdf#115539, tdf#116238: Don't display the notebookbar in presentation mode

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

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 29ee6b262045..e8111408ef0b 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -737,12 +737,8 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
 case SID_PRESENTATION_CURRENT_SLIDE:
 case SID_REHEARSE_TIMINGS:
 {
-sfx2::SfxNotebookBar::LockNotebookBar();
-
 slideshowhelp::ShowSlideShow(rReq, *GetDoc());
 rReq.Ignore ();
-
-sfx2::SfxNotebookBar::UnlockNotebookBar();
 }
 break;
 
@@ -1609,6 +1605,7 @@ namespace slideshowhelp
 Reference< XPresentation2 > xPresentation( rDoc.getPresentation() );
 if( xPresentation.is() )
 {
+sfx2::SfxNotebookBar::LockNotebookBar();
 if (SID_REHEARSE_TIMINGS == rReq.GetSlot())
 xPresentation->rehearseTimings();
 else if (rDoc.getPresentationSettings().mbCustomShow)
@@ -1638,6 +1635,7 @@ namespace slideshowhelp
 
 xPresentation->startWithArguments( aArguments );
 }
+sfx2::SfxNotebookBar::UnlockNotebookBar();
 }
 }
 }
___
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' - sc/source

[Henry Castro]

 sc/source/ui/view/tabvwshf.cxx |   28 +---
 1 file changed, 17 insertions(+), 11 deletions(-)

New commits:
commit 952a3a62090a8bd2a28798d2f1b4e26d37ac7399
Author: Henry Castro 
Date:   Sun Mar 11 18:44:58 2018 -0400

lokdialog: convert the show sheet dialog to async exec

To trigger this dialog: Sheet -> Show Sheet...

Change-Id: I501d9444ef9798a26b4db06ab51e4fb691144b17
Reviewed-on: https://gerrit.libreoffice.org/51094
Tested-by: Jenkins 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/51095
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 35d89eb15acb..ff3c764c89f4 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -131,7 +131,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 ScAbstractDialogFactory* pFact = 
ScAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-ScopedVclPtr 
pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
+VclPtr 
pDlg(pFact->CreateScShowTabDlg(GetDialogParent()));
 OSL_ENSURE(pDlg, "Dialog create fail!");
 
 OUString aTabName;
@@ -146,18 +146,24 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
 }
 }
 
-if ( pDlg->Execute() == RET_OK )
-{
-const sal_Int32 nCount = pDlg->GetSelectEntryCount();
-for (sal_Int32 nPos=0; nPos pReq = 
std::make_shared(rReq);
+pDlg->StartExecuteAsync([this, pDlg, pReq](sal_Int32 
nResult){
+OUString sTable;
+std::vector sTables;
+if (RET_OK == nResult)
 {
-aName = pDlg->GetSelectEntry(nPos);
-rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, 
aName ) );
-rNames.push_back(aName);
+const sal_Int32 nCount = 
pDlg->GetSelectEntryCount();
+for (sal_Int32 nPos=0; nPosGetSelectEntry(nPos);
+pReq->AppendItem( SfxStringItem( 
FID_TABLE_SHOW, sTable ) );
+sTables.push_back(sTable);
+}
+ShowTable( sTables );
+pReq->Done();
 }
-ShowTable( rNames );
-rReq.Done();
-}
+});
+rReq.Ignore();
 }
 }
 break;
___
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' - sfx2/source

[Samuel Mehrbrodt]

 sfx2/source/appl/openuriexternally.cxx |   50 +++--
 sfx2/source/inc/openuriexternally.hxx  |   32 +
 sfx2/source/view/viewsh.cxx|3 +
 3 files changed, 58 insertions(+), 27 deletions(-)

New commits:
commit b527fd0b6a8163d213529b386b80a8088136d1e4
Author: Samuel Mehrbrodt 
Date:   Mon Mar 12 09:50:17 2018 +0100

tdf#116305 Add timeout to help Windows bring browsers to the front

Adding a timeout seems to help Windows a lot to actually bring
the browser into the front, especially when it was closed before.

Still no 100% success rate, but much improved now.

Reviewed-on: https://gerrit.libreoffice.org/51132
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 5d5da77e82b6498dd73123ec0dc36d2315e279a1)

Change-Id: I62affee4b837e0a60b1aac2a20be6fe7c3f9d2e0

diff --git a/sfx2/source/appl/openuriexternally.cxx 
b/sfx2/source/appl/openuriexternally.cxx
index ed702340fb11..630c2c8391c5 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -28,16 +28,44 @@
 
 #include "app.hrc"
 
-bool sfx2::openUriExternally(
-OUString const & uri, bool handleSystemShellExecuteException)
+class URITools
+{
+private:
+Timer aOpenURITimer;
+OUString msURI;
+bool mbHandleSystemShellExecuteException;
+DECL_LINK_TYPED(onOpenURI, Timer*, void);
+
+public:
+void openURI(const OUString& sURI, bool 
bHandleSystemShellExecuteException);
+};
+
+void URITools::openURI(const OUString& sURI, bool 
bHandleSystemShellExecuteException)
+{
+mbHandleSystemShellExecuteException = bHandleSystemShellExecuteException;
+msURI = sURI;
+
+// tdf#116305 Workaround: Use timer to bring browsers to the front
+aOpenURITimer.SetInvokeHandler(LINK(this, URITools, onOpenURI));
+#ifdef WNT
+// 200ms seems to be the the best compromise between responsiveness and 
success rate
+aOpenURITimer.SetTimeout(200);
+#else
+aOpenURITimer.SetTimeout(0);
+#endif
+aOpenURITimer.SetDebugName("sfx2::openUriExternallyTimer");
+aOpenURITimer.Start();
+}
+
+IMPL_LINK_NOARG_TYPED(URITools, onOpenURI, Timer*, void)
 {
 css::uno::Reference< css::system::XSystemShellExecute > exec(
 
css::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
 try {
 exec->execute(
-uri, OUString(),
+msURI, OUString(),
 css::system::SystemShellExecuteFlags::URIS_ONLY);
-return true;
+return;
 } catch (css::lang::IllegalArgumentException & e) {
 if (e.ArgumentPosition != 0) {
 throw css::uno::RuntimeException(
@@ -46,10 +74,10 @@ bool sfx2::openUriExternally(
 SolarMutexGuard g;
 ScopedVclPtrInstance eb(
 SfxGetpApp()->GetTopWindow(), SfxResId(STR_NO_ABS_URI_REF));
-eb->set_primary_text(eb->get_primary_text().replaceFirst("$(ARG1)", 
uri));
+eb->set_primary_text(eb->get_primary_text().replaceFirst("$(ARG1)", 
msURI));
 eb->Execute();
 } catch (css::system::SystemShellExecuteException & e) {
-if (!handleSystemShellExecuteException) {
+if (!mbHandleSystemShellExecuteException) {
 throw;
 }
 SolarMutexGuard g;
@@ -57,13 +85,19 @@ bool sfx2::openUriExternally(
 SfxGetpApp()->GetTopWindow(),
 SfxResId(STR_NO_WEBBROWSER_FOUND));
 eb->set_primary_text(
-eb->get_primary_text().replaceFirst("$(ARG1)", uri)
+eb->get_primary_text().replaceFirst("$(ARG1)", msURI)
 .replaceFirst("$(ARG2)", OUString::number(e.PosixError))
 .replaceFirst("$(ARG3)", e.Message));
 //TODO: avoid subsequent replaceFirst acting on previous 
replacement
 eb->Execute();
 }
-return false;
+delete this;
+}
+
+void sfx2::openUriExternally(const OUString& sURI, bool 
bHandleSystemShellExecuteException)
+{
+URITools* uriTools = new URITools;
+uriTools->openURI(sURI, bHandleSystemShellExecuteException);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/openuriexternally.hxx 
b/sfx2/source/inc/openuriexternally.hxx
index 42013cd70609..b45b2b7a931d 100644
--- a/sfx2/source/inc/openuriexternally.hxx
+++ b/sfx2/source/inc/openuriexternally.hxx
@@ -12,24 +12,20 @@
 
 #include 
 
-
-namespace sfx2 {
-
-/// Open a URI via com.sun.star.system.SystemShellExecute
-///
-/// Handles XSystemShellExecute.execute's IllegalArgumentException (throwing a
-/// RuntimeException if it is unexpected, i.e., not caused by the given uri not
-/// being an absolute URI reference).
-///
-/// Handles XSystemShellExecute.execute's SystemShellExecuteException unless 
the
-/// given handleSystemShellExecuteException is false (in which case the
-/// exception is re-thrown).
-///
-/// @return true iff execution was successful
-bool openUriExternally(
-OUString 

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

[Miklos Vajna]

 include/test/xmltesttools.hxx |5 +
 test/source/xmltesttools.cxx  |   27 +++
 2 files changed, 32 insertions(+)

New commits:
commit 102292b1039462ad236730fb24baf232c1452c14
Author: Miklos Vajna 
Date:   Thu Mar 1 13:31:22 2018 +0100

test: add assertXPathNSDef()

Partial backport of Miklos' master commit
f8da775795052ad2eb879970c115d2e2a2fe8c81
without the EPUB changes.

Change-Id: Ic9dd105249a59200dba03bb30eda350a95aff263
Reviewed-on: https://gerrit.libreoffice.org/50582
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit 15cf7d30d475271b394ead3bb2458c1dc791a97c)
Reviewed-on: https://gerrit.libreoffice.org/51288
Reviewed-by: Michael Stahl 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
Reviewed-by: Christian Lohmaier 

diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 80f95b321a50..42025f9c9ce2 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -76,6 +76,11 @@ protected:
  */
 void  assertXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath, 
const OUString& rContent);
 /**
+ * Assert that rXPath exists and it has an rNSPrefix=rNSHref namespace 
definition.
+ */
+void assertXPathNSDef(xmlDocPtr pXmlDoc, const OString& rXPath, const 
OUString& rNSPrefix,
+  const OUString& rNSHref);
+/**
  * Assert that rXPath exists, and has exactly nNumberOfChildNodes child 
nodes.
  * Useful for checking that we do have a no child nodes to a specific node 
(nNumberOfChildNodes == 0).
  */
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 04e90f3cbd7e..94e2cc773e3c 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -122,6 +122,33 @@ void XmlTestTools::assertXPathContent(xmlDocPtr pXmlDoc, 
const OString& rXPath,
 CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("In <" + OString(pXmlDoc->name) + ">, 
XPath contents of child does not match").getStr(), rContent, 
getXPathContent(pXmlDoc, rXPath));
 }
 
+void XmlTestTools::assertXPathNSDef(xmlDocPtr pXmlDoc, const OString& rXPath,
+const OUString& rNSPrefix, const OUString& 
rNSHref)
+{
+xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
+xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+CPPUNIT_ASSERT_MESSAGE(
+OString("In <" + OString(pXmlDoc->name) + ">, XPath '" + rXPath + "' 
not found").getStr(),
+xmlXPathNodeSetGetLength(pXmlNodes) > 0);
+
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+bool bFound = false;
+for (xmlNsPtr pNamespace = pXmlNode->nsDef; pNamespace; pNamespace = 
pNamespace->next)
+{
+if (!pNamespace->prefix)
+continue;
+
+CPPUNIT_ASSERT(pNamespace->href);
+if (rNSPrefix == convert(pNamespace->prefix) && rNSHref == 
convert(pNamespace->href))
+{
+bFound = true;
+break;
+}
+}
+xmlXPathFreeObject(pXmlObj);
+CPPUNIT_ASSERT(bFound);
+}
+
 void XmlTestTools::assertXPathChildren(xmlDocPtr pXmlDoc, const OString& 
rXPath, int nNumberOfChildNodes)
 {
 #if LIBXML_VERSION >= 20703 /* xmlChildElementCount is only available in 
libxml2 >= 2.7.3 */
___
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-6' - sd/qa xmloff/source

[Michael Stahl]

 sd/qa/unit/data/unknown-attribute.fodp |   26 ++
 sd/qa/unit/export-tests.cxx|   26 ++
 xmloff/source/core/xmlictxt.cxx|2 ++
 xmloff/source/core/xmlimp.cxx  |   22 +++---
 4 files changed, 73 insertions(+), 3 deletions(-)

New commits:
commit 6bfe6822cc40a9bf3e1e237b6a0edd3dcb34de80
Author: Michael Stahl 
Date:   Thu Mar 1 13:10:40 2018 +0100

tdf#115429 xmloff: ODF import: fix handling of unknown attributes

... in SvXMLLegacyToFastDocHandler::startElement(), so that it does not
create invalid "-1" tokens that end up stored as empty-string
attribute names in SvXMLAttrCollection and ultimately exported
as invalid XML.

One surprising aspect is that the maNamespaceURL in struct
UnknownAttribute stores the namespace prefix in the libreoffice-5-4
branch, as it lacks commit bb59a80ee6000d3922fa95262f67e291fd9d8ee2.

The attributes are read and converted again in
SvXMLImportContext::startUnknownElement().

Change-Id: Id081c677286a77ec50d9884cdbd9135cf4f6e5b6
Reviewed-on: https://gerrit.libreoffice.org/50583
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit dab0220f91bcd2dab85309c14bcd10c27639544d)
Reviewed-on: https://gerrit.libreoffice.org/51260
Reviewed-by: Christian Lohmaier 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sd/qa/unit/data/unknown-attribute.fodp 
b/sd/qa/unit/data/unknown-attribute.fodp
new file mode 100644
index ..3aa39b10
--- /dev/null
+++ b/sd/qa/unit/data/unknown-attribute.fodp
@@ -0,0 +1,26 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.presentation">
+  
+
+  
+  
+
+
+  http://example.com/"; foo:non-existent-att="bar"
+/>
+
+
+  
+  
+
+
+  
+
+  
+
+
+  
+
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 10590131e939..294312f3c2a4 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -87,6 +87,7 @@ public:
 void testTdf97630();
 void testSwappedOutImageExport();
 void testOOoXMLAnimations();
+void testUnknownAttributes();
 void testTdf80020();
 void testLinkedGraphicRT();
 void testImageWithSpecialID();
@@ -107,6 +108,7 @@ public:
 CPPUNIT_TEST(testTdf97630);
 CPPUNIT_TEST(testSwappedOutImageExport);
 CPPUNIT_TEST(testOOoXMLAnimations);
+CPPUNIT_TEST(testUnknownAttributes);
 CPPUNIT_TEST(testTdf80020);
 CPPUNIT_TEST(testLinkedGraphicRT);
 CPPUNIT_TEST(testImageWithSpecialID);
@@ -138,6 +140,8 @@ public:
 { "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
 { "xlink", "http://www.w3c.org/1999/xlink"; },
 { "loext", 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" },
+// user-defined
+{ "foo", "http://example.com/"; },
 };
 for (size_t i = 0; i < SAL_N_ELEMENTS(namespaces); ++i)
 {
@@ -458,6 +462,28 @@ void SdExportTest::testOOoXMLAnimations()
 assertXPath(pXmlDoc, "//anim:par", 223);
 }
 
+void SdExportTest::testUnknownAttributes()
+{
+::sd::DrawDoc

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

[Christian Lohmaier]

Tag 'libreoffice-5.4.6.2' created by Christian Lohmaier 
 at 2018-03-14 17:23 +

Tag libreoffice-5.4.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaqVqMAAoJEPQ0oe+v7q6jdh8P/0q9OfXrbaoDAe2bjW/ycJcv
iZj82X7dmyGDLmJM5mZCiNQ+amahXBiwBXCfccqB0n/sZ/vrr4araMRNLna3hluc
agPM62eDpyS4iIbmnPiFsl0mP/7ZrvvvOwgItUZvo2pecF2hf56FoE7CskDOiqOL
pGWghjTlgIgUuc+5raymYzSL0SG49OBVI9Gp2lrrrbPg+SBgUNE/5Fld+rM2onOi
yWWQhfQ5fMluKlb5oFaS38EKcEo+CM7VBrRGdoRgOKoxekLq7ewryuHWbPaltrlg
lTbr27rysFkolUT93lvV+RLu3mkHn91qeaJ88zMEautaR5GWHmAT2Z08yOkPcGAc
Q074sUD0bSkdyS13gfCsQoDRTowosmZW1H39xv29md1EgsQ2uOTQwsWtTdzJXxDT
SISrc/Xu+GSbXt88xhRKksibOdUQXgC3nQ/y4TNPPNLukSoniD0RObyXKh8zQxYz
yx6guPtjNb8/575+Zw49l7VsjWEHDHnzzP+m6W5e8EQB3mzeMy2Kd2iMcWrGrjL7
KAICQpO04scJHuL74Ekcb8r5DexLdFrkBucU53fYvMOMkzva+YOA6Wsht25c0T6J
l5E+kMbQvEEpfLvTc6B5hpmCaURMGR1JMZdiWnuWeiq0Lyi/mrcK1k0NEjOp5Y7N
Qe47PLKEb0L+PPZ7Shzr
=jVdO
-END PGP SIGNATURE-

Changes since libreoffice-5-4-branch-point-1060:
---
 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.6.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.6.2' created by Christian Lohmaier 
 at 2018-03-14 17:23 +

Tag libreoffice-5.4.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaqVqDAAoJEPQ0oe+v7q6jihAQAK+Bcg/R1q6s3iYFANw7Iix7
ZC9upjUybRnBG5J+YVvuxYOjYyFIBxRN5nH1glE7xLjrs5rY3LCsZFyUNlluEo10
Wpv19SgDIxzVx8FS9x4S1N1w8p7KvPu4ceAI3ZhTHfHTOvhAnrhc84mlSCoiLu4g
kq2J4yl1OxxaVfglpRl/DRf/FSlBAzwZbLmBgf2BW6auZQSui2vrZXUfGkaQv6cf
5ugJazG2r82grOh6agwaA6XZEsQeW1o/gb26p/GyTtd7/r7S+phCCxDdP0hWs/+L
1lakI6U1kGwZUt/DVKubBWaAz2TpzhSb/DcjShGkOQGN71NaHQqlL23K3zhPFToM
sd11Z9Bi4b9fhyMqaF6JVnDrv7YZRsoRTkBjJ1Qd8r/zK7zJK1y7qt7IO//IQVV/
Yuyg/iSULvKFk0XCp9fy39NZfyHlzrycyws2BOCBZ2Bf7bmoQ0LM7AycI71b/fhO
ITHRd5pzUiSXt+Xm4nVIQMyVizIqn/7TmIUOPusqCBVj3HrfHMR5yivcxh8W/LD8
sCMNQFpR1QF6Jy55HQ/fobNIjSwdGHMa/1VbjsS/cAiXpmhgGoDLHdsnEn61ooe1
sM+bt+Y7n1bvw/otwi6NCj3nqvXVdlVyfTdgB6UGEnsYtY85ZvXTQMup8pFm2/gp
w7R4hQF+7KdxfDBV2mdl
=H7Yn
-END PGP SIGNATURE-

Changes since libreoffice-5-4-branch-point-9:
---
 0 files changed
---
___
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.6.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.6.2' created by Christian Lohmaier 
 at 2018-03-14 17:23 +

Tag libreoffice-5.4.6.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaqVqHAAoJEPQ0oe+v7q6jVEQP/1rsHKXBy/eli9lcK/QN2jAW
rmiL/ImwBTNuF/aEvsnJ4DW1csskPsCkCD3NmxPS676VmauMpcD/DKdfQvjM4V0v
ugwYz5PJXIZC8+k6nuerrbkFhlX9CbbrBOGhs7qx4p6oQL9Ke6evXuWOUWVXUJE6
W29mHNq6NHYiHfiutw0AuAqyChXodJA24oPOvwTwqBSfBfpaLY94msLEkChJFUT0
7En94i7WqYmOmB2tZx8gdUxf4mnYQ79GytkIlGZGMl2fchxe/j7h5ly8tTLUjTap
L1NwXELC1PHwnARgGNMI+8IXJA8bQMJimuvC2gPYTCR5eFTkVwHCXTKwkh6i7NAz
rZAZU8L4MgeoLp7QWs1dzX7DgnRLeyK6eaRbZ36k2fxyMISTKw1oBaBoh+ao7kEf
gynLY9LiIc/+y9sZqEaraFmlYtDncder5Yt/sWvN6k4cHwJVFITRNMaanZj8xRvE
cJj+cWr+Dd+wS4r0w5ki3XiUAtvgzz5pyEkefIpW9q4lUl/4YqtMjdjQNCUh21m4
VOoA2E51Isi9R7h/6E3VPTh+CNYIjiW3MY1xcmsO2ZJ9mvGBxh63mTHTx1GsL8L9
QzsbC2yCSYogVHUvHSj3p4axRmz5wHw0+/PEwFUSPd3q/MoKkVQxr3q4FNptwcHE
IDBLWcm8K/nJx8BqZu6Y
=HZVr
-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] core.git: Branch 'libreoffice-5-4-6' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 1df027eb882a92b59e2aa438d0fc68ee7f54e82d
Author: Christian Lohmaier 
Date:   Wed Mar 14 18:23:58 2018 +0100

bump product version to 5.4.6.2.0+

Change-Id: I597f72e1181798d7b050e5a8bdb4e545889caed1

diff --git a/configure.ac b/configure.ac
index 2831974a1c01..91a79757ba2e 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.6.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.6.2.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] translations.git: Changes to 'refs/tags/libreoffice-5.4.6.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.6.2' created by Christian Lohmaier 
 at 2018-03-14 17:23 +

Tag libreoffice-5.4.6.2
-BEGIN PGP SIGNATURE-

iQIbBAABAgAGBQJaqVqJAAoJEPQ0oe+v7q6jd/8P+MPSFLA1QbPJ4e7eCjO5AOMI
EPfpGlE3ElLH/dsKTmWnf2/7pULo2NkGBMEA+WeZOjqdy7piYu6L/H0q31l3CMWn
b3c8pjqnItePId1ulZzeTE/Jl0Kq2GujvMmRKFbn/hOtAFw8SQ6MVop3jWH0VXGE
dI6K93PuOhoj+7kr9PQuKvXJxvGiFnwPdySPigOSbq2DyOOcVZ78aRX/uB5Ga68U
eiXa54PnXNs9LEVV2kQlUMP+rvXq1FxbOtKWTlNfvCxiiG92QubOAQ2/pAHE41T1
/T5q6pWUw0FslEtLZ0/u9GxYdz1fTVSQvIVgFeyU+aOXRUzhX1Z5ECJCEZHERAPL
JZkxN2CobRwumfv8O+NasIR2ERiiMMA1h4vpe27Cc7XdJ5BYJ1zsi9IYfKJDmMcO
Eiawi0BaHuTlfjgW3HyvpZYBVi11qh3o4o5PO5BLlbcGMcBNBrTy+LGhQFyi6PkR
6gDA5a0L5kAVlZt8L//xCTbeWCEFkeCFsjk18xLSNwiRBQBPcYD0goXIffmiLMNq
lZRpVXCNpffR5hUybOXheS/D2snwsh2wUjhLzI6FBGG6kwC6fBy/AhUuCGOw7eh2
ui/ZUHWwmv5ECLR27sllnXN9+rMiavpQCnDu4i5jD5wFi/uebzyR4A2hRoJYQ15O
+tfNw6mY9LG8R09epKw=
=yV3L
-END PGP SIGNATURE-

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

GSoC'18 Application

[Mert Tümer]

Hello,

My name is Mert, I am a university student and i want to be in GSoC'18 with 
LibreOffice. I have been working on the Android Viewer for 2 years and i have 
submitted bunch of patches since I started working on it until today. I 
mentioned my candidacy before and i was asked to submit a c++ code too, which i 
did. Again today i felt that I need to mention it again because students' 
application period started.
Please consider my application.
Thank you!

PS: link to my contributions: https://gerrit.libreoffice.org/#/q/mert
Regards,
Mert Tümer
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Michael Meeks]

 desktop/inc/app.hxx |2 ++
 desktop/source/lib/init.cxx |8 
 2 files changed, 10 insertions(+)

New commits:
commit 005abf983d34042a7ced46d886f8ef2250cb3fce
Author: Michael Meeks 
Date:   Wed Mar 14 17:12:57 2018 +

Allow lok to re-set temporary paths on second init.

Change-Id: I40cd0538b573c2d090f56424e1110b938981a878
Reviewed-on: https://gerrit.libreoffice.org/51292
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 0e5f8774d3c3..53f4eba57829 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -130,9 +130,11 @@ class Desktop : public Application
 css::uno::Reference< 
css::uno::XComponentContext > const & context);
 static void DeregisterServices();
 
+public:
 static void CreateTemporaryDirectory();
 static void RemoveTemporaryDirectory();
 
+private:
 static bool InitializeConfiguration();
 static void FlushConfiguration();
 static bool InitializeQuickstartMode( const 
css::uno::Reference< css::uno::XComponentContext >& rxContext );
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d0978b449937..44d07125835a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -92,6 +92,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3805,6 +3806,13 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 
 if (eStage != PRE_INIT)
 {
+SAL_INFO("lok", "Re-initialize temp paths");
+SvtPathOptions aOptions;
+OUString aNewTemp;
+osl::FileBase::getTempDirURL(aNewTemp);
+aOptions.SetTempPath(aNewTemp);
+desktop::Desktop::CreateTemporaryDirectory();
+
 SAL_INFO("lok", "Enabling RequestHandler");
 RequestHandler::Enable(false);
 SAL_INFO("lok", "Starting soffice_main");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |3 ++-
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs|2 +-
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d799436414ab7e28b6bf9a918fd3779b3fc85008
Author: Samuel Mehrbrodt 
Date:   Wed Mar 14 14:25:44 2018 +0100

tdf#116342 Allow selecting text boxes anywhere by default

Not only by hitting the (invisble) frame or the text content.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 4e4c4ee3f6ba..0714b6804ca0 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -1280,7 +1280,8 @@ void DesktopLOKTest::testContextMenuImpress()
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
 pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
 
-Point aRandomPoint(1150, 1100);
+// random point where we don't hit an underlying comment or text box
+Point aRandomPoint(10, 1150);
 pDocument->pClass->postMouseEvent(pDocument,
   LOK_MOUSEEVENT_MOUSEBUTTONDOWN,
   aRandomPoint.X(), aRandomPoint.Y(),
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index ac2725eef58f..dab24b019bdc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -368,7 +368,7 @@
 Indicates whether a text frame can only be selected by 
clicking on the text or by clicking somewhere in the frame.
 Only text area selectable
   
-  true
+  false
 
   
   
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index e421a579a91e..e27df89f8129 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -591,7 +591,7 @@
 Indicates whether a text frame can only be selected by 
clicking on the text or by clicking somewhere in the frame.
 Only text area selectable
   
-  true
+  false
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 vcl/source/window/floatwin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96cdb8e7b28ef50e77dc897763dd8b6df3d39d2a
Author: Andrea Gelmini 
Date:   Tue Mar 13 19:30:13 2018 +0100

Fix typo

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

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index ef3119d2a073..f7b68203b67c 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -389,7 +389,7 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
 default: break;
 }
 
-// no further adjustement for LibreOfficeKit
+// no further adjustment for LibreOfficeKit
 if (bLOKActive)
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sw/source/core/fields/ddetbl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 109152b1b6afedad77cbf347d8b08aa0e5d8d07a
Author: Andrea Gelmini 
Date:   Wed Mar 14 12:32:14 2018 +0100

Remove duplicated include

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

diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index 174e0aacaee4..9311bb65c605 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -32,8 +32,6 @@
 #include 
 #include 
 #include 
-#include 
-
 
 /// Ctor moves all lines/boxes from a SwTable into itself.
 /// Afterwards the SwTable is empty and must be deleted.
___
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' - 5 commits - include/sfx2 sfx2/source sw/inc sw/source

[Michael Stahl]

 include/sfx2/objsh.hxx|3 
 sfx2/source/doc/objmisc.cxx   |7 +-
 sw/inc/IDocumentSettingAccess.hxx |3 
 sw/inc/docsh.hxx  |1 
 sw/inc/viewsh.hxx |2 
 sw/source/core/doc/DocumentSettingManager.cxx |9 ++
 sw/source/core/inc/DocumentSettingManager.hxx |1 
 sw/source/core/text/guess.cxx |   31 +-
 sw/source/core/text/inftxt.cxx|   80 +-
 sw/source/core/view/viewsh.cxx|   11 +++
 sw/source/uibase/app/docsh.cxx|   14 
 11 files changed, 157 insertions(+), 5 deletions(-)

New commits:
commit 15b9ea2b42d1c2e012c064d39b9afffdb08a9bbd
Author: Michael Stahl 
Date:   Wed Jan 18 15:54:47 2017 +0100

sw: remove duplicate "MsWordCompTrailingBlanks" view setting

This is already a document setting, no point in writing it twice into
settings.xml.

(cherry picked from commit 7667675397c98bb38cdd14dd689a32e9f8a986d3)

Change-Id: Idcc99a194df321e11e091a2388b919e11fe94316

diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 4ca6fc94bfe6..6037ff24a417 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1262,14 +1262,12 @@ void SwView::ReadUserDataSequence ( const uno::Sequence 
< beans::PropertyValue >
 sal_Int16 nViewLayoutColumns = pVOpt->GetViewLayoutColumns();
 
 bool bSelectedFrame = ( m_pWrtShell->GetSelFrameType() != 
FrameTypeFlags::NONE ),
- bMsWordCompTrailingBlanks = false,
  bGotVisibleLeft = false,
  bGotVisibleTop = false, bGotVisibleRight = false,
  bGotVisibleBottom = false, bGotZoomType = false,
  bGotZoomFactor = false, bGotIsSelectedFrame = false,
  bGotViewLayoutColumns = false, bGotViewLayoutBookMode = false,
- bBrowseMode = false, bGotBrowseMode = false,
- bGotMsWordCompTrailingBlanks = false;
+ bBrowseMode = false, bGotBrowseMode = false;
 
 for (sal_Int32 i = 0 ; i < nLength; i++)
 {
@@ -1337,11 +1335,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence 
< beans::PropertyValue >
pValue->Value >>= bBrowseMode;
bGotBrowseMode = true;
 }
-else if ( pValue->Name == "MsWordCompTrailingBlanks" )
-{
-pValue->Value >>= bMsWordCompTrailingBlanks;
-bGotMsWordCompTrailingBlanks = true;
-}
 // Fallback to common SdrModel processing
 else 
GetDocShell()->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->ReadUserDataSequenceValue(pValue);
 pValue++;
@@ -1473,10 +1466,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence 
< beans::PropertyValue >
 m_pWrtShell->EnableSmooth( true );
 }
 }
-if ( bGotMsWordCompTrailingBlanks )
-{
-GetDocShell()->GetDoc()->getIDocumentSettingAccess().set( 
DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS, bMsWordCompTrailingBlanks );
-}
 }
 }
 
@@ -1516,8 +1505,6 @@ void SwView::WriteUserDataSequence ( uno::Sequence < 
beans::PropertyValue >& rSe
 
 aVector.push_back(comphelper::makePropertyValue("IsSelectedFrame", 
FrameTypeFlags::NONE != m_pWrtShell->GetSelFrameType()));
 
-
aVector.push_back(comphelper::makePropertyValue("MsWordCompTrailingBlanks", 
GetDocShell()->GetDoc()->getIDocumentSettingAccess().get( 
DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS )));
-
 rSequence = comphelper::containerToSequence(aVector);
 
 // Common SdrModel processing
commit 6c86ae2fec7d2a1375a3e9683ea2155448990ce7
Author: Vitaliy Anderson 
Date:   Fri Jan 13 05:26:07 2017 -0800

tdf#104349, tdf#104668 MS Word compatibility trailing blanks option

The commits: 1c1747ac13a9d895df0fcba2fbb1bd266dccd74b and 
4a410dd147f7160c1d62e3e0b67388a178d5136c
make trailing spaces and their highlighting compatible with the Ms Word.

The option is enabled by default for imported MS Word formats: .doc, .docx, 
.rtf
For the ODF files the option is disabled by default

Also it allows saving and loading the option state to the ODF UserData.

It may be manually set in Tools->Options->LibreOffice Writer->Compatibility

Reviewed-on: https://gerrit.libreoffice.org/33046
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 7fa20da88a4778bdf20d6ca0491fe97ae03ab554)

Change-Id: I5a86359c52d18e50bbb54b9f37c79b672591c369

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 84ff20818883..ab885358b66f 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -460,6 +460,9 @@ public:
 // Transfer IFace
 boolIsAbortingImport() c

[Libreoffice-commits] online.git: kit/Kit.cpp

[Miklos Vajna]

 kit/Kit.cpp |   21 -
 1 file changed, 8 insertions(+), 13 deletions(-)

New commits:
commit b6e1a4e281d004b4d65c024747e780cbb5d91609
Author: Miklos Vajna 
Date:   Fri Mar 9 09:14:44 2018 +0100

kit: avoid manual management for Watermark::_pixmap

A simple std::vector is enough here and results in simpler code.

Change-Id: I7e6ad268aca13c4efb445c7918a3afd14e0ed146

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index d0e068d28..9868224d1 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -15,7 +15,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -562,14 +561,11 @@ public:
 , _width(0)
 , _height(0)
 , _alphaLevel(0.2)
-, _pixmap(nullptr)
 {
 }
 
 ~Watermark()
 {
-if (_pixmap)
-std::free(_pixmap);
 }
 
 void blending(unsigned char* tilePixmap,
@@ -631,11 +627,10 @@ private:
 /// Create bitmap that we later use as the watermark for every tile.
 const unsigned char* getPixmap(int width, int height)
 {
-if (_pixmap && width == _width && height == _height)
-return _pixmap;
+if (!_pixmap.empty() && width == _width && height == _height)
+return _pixmap.data();
 
-if (_pixmap)
-std::free(_pixmap);
+_pixmap.clear();
 
 _width = width;
 _height = height;
@@ -658,7 +653,7 @@ private:
 }
 
 const unsigned int pixel_count = width * height * 4;
-_pixmap = static_cast(malloc(pixel_count));
+_pixmap.reserve(pixel_count);
 
 // Create the white blurred background
 // Use box blur, it's enough for our purposes
@@ -694,18 +689,18 @@ private:
 }
 
 // Now copy the (black) text over the (white) blur
-alphaBlend(text, _width, _height, 0, 0, _pixmap, _width, _height);
+alphaBlend(text, _width, _height, 0, 0, _pixmap.data(), _width, 
_height);
 
 // No longer needed.
 std::free(text);
 
 // Make the resulting pixmap semi-transparent
-for (unsigned char* p = _pixmap; p < _pixmap + pixel_count; p++)
+for (unsigned char* p = _pixmap.data(); p < _pixmap.data() + 
pixel_count; p++)
 {
 *p = static_cast(*p * _alphaLevel);
 }
 
-return _pixmap;
+return _pixmap.data();
 }
 
 private:
@@ -715,7 +710,7 @@ private:
 int _width;
 int _height;
 double _alphaLevel;
-unsigned char* _pixmap;
+std::vector _pixmap;
 };
 
 static FILE* ProcSMapsFile = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 25 commits - framework/source include/svtools sfx2/source svtools/qa svtools/source sw/inc sw/qa sw/source

[Miklos Vajna]

 framework/source/classes/taskcreator.cxx  |4 
 framework/source/services/taskcreatorsrv.cxx  |2 
 include/svtools/HtmlWriter.hxx|8 
 include/svtools/htmlout.hxx   |2 
 include/svtools/parhtml.hxx   |5 
 sfx2/source/doc/docfile.cxx   |   34 +++
 svtools/qa/unit/testHtmlWriter.cxx|   33 +++
 svtools/source/svhtml/HtmlWriter.cxx  |   25 ++
 svtools/source/svhtml/htmlout.cxx |4 
 svtools/source/svhtml/parhtml.cxx |   10 +
 sw/inc/shellio.hxx|4 
 sw/qa/extras/htmlexport/data/reqif-jpg-img.xhtml  |4 
 sw/qa/extras/htmlexport/data/reqif-ole-data.ole   |1 
 sw/qa/extras/htmlexport/data/reqif-ole-data.xhtml |3 
 sw/qa/extras/htmlexport/data/reqif-ole-img.jpg|binary
 sw/qa/extras/htmlexport/data/reqif-ole-img.png|binary
 sw/qa/extras/htmlexport/data/reqif-ole-img.xhtml  |6 
 sw/qa/extras/htmlexport/data/reqif-p.xhtml|5 
 sw/qa/extras/htmlexport/data/reqif-png-img.xhtml  |4 
 sw/qa/extras/htmlexport/htmlexport.cxx|  119 +
 sw/qa/extras/htmlimport/data/outline-level.html   |5 
 sw/qa/extras/htmlimport/data/reqif-br.xhtml   |1 
 sw/qa/extras/htmlimport/htmlimport.cxx|   28 +++
 sw/qa/extras/inc/swmodeltestbase.hxx  |   45 +
 sw/source/filter/basflt/shellio.cxx   |   10 -
 sw/source/filter/html/css1atr.cxx |   18 +-
 sw/source/filter/html/htmlatr.cxx |   74 
 sw/source/filter/html/htmldrawwriter.cxx  |2 
 sw/source/filter/html/htmlfldw.cxx|2 
 sw/source/filter/html/htmlflywriter.cxx   |  110 
 sw/source/filter/html/htmlforw.cxx|8 
 sw/source/filter/html/htmlftn.cxx |   16 -
 sw/source/filter/html/htmlgrin.cxx|   13 +
 sw/source/filter/html/htmlnumwriter.cxx   |8 
 sw/source/filter/html/htmlplug.cxx|  197 +++---
 sw/source/filter/html/htmltabw.cxx|   63 +++
 sw/source/filter/html/swhtml.cxx  |   61 ++
 sw/source/filter/html/swhtml.hxx  |   14 +
 sw/source/filter/html/wrthtml.cxx |   50 -
 sw/source/filter/html/wrthtml.hxx |   14 +
 sw/source/filter/inc/fltini.hxx   |2 
 41 files changed, 826 insertions(+), 188 deletions(-)

New commits:
commit be27eb46318071127d4dd24e974819df5e32c750
Author: Miklos Vajna 
Date:   Wed Mar 14 12:00:19 2018 +0100

sw XHTML export: fix handling of character styles

Namespace prefix was missing here.

Change-Id: Id746d47713b22e2efd5d679c2325b32a0bee8a09
Reviewed-on: https://gerrit.libreoffice.org/51270
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 0efb6a1a3525a402ab28083181fc39b75f7ef556)

diff --git a/sw/qa/extras/htmlexport/data/reqif-p.xhtml 
b/sw/qa/extras/htmlexport/data/reqif-p.xhtml
index e5484ee79483..315a4db80918 100644
--- a/sw/qa/extras/htmlexport/data/reqif-p.xhtml
+++ b/sw/qa/extras/htmlexport/data/reqif-p.xhtml
@@ -2,3 +2,4 @@
 in 
table
 http://libreoffice.org/";>http://libreoffice.org
 u
+s
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 144572463922..6816853351c1 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -357,6 +357,9 @@ DECLARE_HTMLEXPORT_TEST(testReqIfParagraph, "reqif-p.xhtml")
 
 // This was "" instead of CSS.
 CPPUNIT_ASSERT(aStream.indexOf(", namespace prefix was missing.
+CPPUNIT_ASSERT(aStream.indexOf("") != -1);
 }
 
 DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testReqIfOleData, "reqif-ole-data.xhtml")
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index d1fd33326f1c..b08e1ee3f1ee 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -3056,7 +3056,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, 
const SfxPoolItem& rHt )
 
 if( rHTMLWrt.m_bTagOn )
 {
-OString sOut = "<";
+OString sOut = "<" + rHTMLWrt.GetNamespace();
 if( !pFormatInfo->aToken.isEmpty() )
 sOut += pFormatInfo->aToken;
 else
commit 51fec471b5c8122594ea5c86c0168232b5852227
Author: Miklos Vajna 
Date:   Mon Mar 12 17:54:34 2018 +0100

sw XHTML export: avoid  for underline in ReqIF mode

The spec insists on the CSS equivalent (while  and  is OK).

Change-Id: Ied3ebc896403ab85f544b0071e841e35eafdeb64
Reviewed-on: https://gerrit.libreoffice.org/51158
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 3a4b0b4a86258f56e699c324fb2282c49319f92f)

diff --git a/sw/qa/extras/htmlexport/data/reqif-p.xhtml 
b/sw/qa/extras/htmlexport/da

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

[Caolán McNamara]

 sw/source/core/crsr/crstrvl.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 14ca8f178f2ee713de5fc9a0c9579f49e52099f0
Author: Caolán McNamara 
Date:   Wed Mar 14 15:03:08 2018 +

tdf#116397 get bounds of full field, not start of char inside field

The pSpecialPos is set for the StartTag case (#i75130#) and I surmise
we only care about it if we are a smarttag

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

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 2fac420a2966..cd08869de125 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1233,7 +1233,14 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 if ( pField )
 {
 if( pFieldRect && nullptr != ( pFrame = 
pTextNd->getLayoutFrame( GetLayout(), &aPt ) ) )
+{
+//tdf#116397 now that we looking for the bounds of 
the field drop the SmartTag
+//index within field setting so we don't the 
bounds of the char within the field
+SwSpecialPos* pSpecialPos = 
aTmpState.m_pSpecialPos;
+aTmpState.m_pSpecialPos = nullptr;
 pFrame->GetCharRect( *pFieldRect, aPos, &aTmpState 
);
+aTmpState.m_pSpecialPos = pSpecialPos;
+}
 
 if( bSetCursor )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/columncopy_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png 
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/formatcopy_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/formatmirror_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/formatnormal_24x24.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/formatwide_24x24.png  
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common.png
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common_grey.png   
|binary
 icon-themes/colibre/sw/res/sidebar/pageproppanel/portraitcopy_24x24.png
|binary
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/Landscapecopy_24x24.svg   
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/columncopy_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.svg  
|1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.svg
   |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.svg
 |1 +
 
icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.svg 
   |1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.svg 
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/format_L_wide_24x24.svg   
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/formatcopy_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/formatmirror_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/formatnarrow_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/formatnormal_24x24.svg
|1 +
 icon-themes/colibre_svg/sw/res/sidebar/pageproppanel/formatwide_24x24.svg  
|1 +
 icon-themes/colibre_svg/sw/res/sideb

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

[Samuel Thibault]

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

New commits:
commit 76b6fd430098fb54ca5098f2e1be6eb1a3ad0cbb
Author: Samuel Thibault 
Date:   Wed Mar 14 17:30:20 2018 +0100

cui: Add missing mnemonic_widget

This is needed for proper accessibility labelling.

Change-Id: I11830d16816a471c1531012a18be81e5f8d136a9
Reviewed-on: https://gerrit.libreoffice.org/51287
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index 16d82364e712..95fa6ea2234d 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -122,6 +122,7 @@
 0
 _Degrees:
 True
+spinDegrees
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Thibault]

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

New commits:
commit 20d37ac04361dc80682417a06d542c51ea49
Author: Samuel Thibault 
Date:   Wed Mar 14 17:38:00 2018 +0100

pdf filter: fix bogus mnemonic_widget target

"Time Stamp Authority:" labels 'tsa', not 'reason'.

Change-Id: I60c007b04591a534323d0a86bb19475f27953107
Reviewed-on: https://gerrit.libreoffice.org/51290
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/filter/uiconfig/ui/pdfsignpage.ui 
b/filter/uiconfig/ui/pdfsignpage.ui
index 548f31691330..b5f3fdcaad1a 100644
--- a/filter/uiconfig/ui/pdfsignpage.ui
+++ b/filter/uiconfig/ui/pdfsignpage.ui
@@ -227,7 +227,7 @@
 1
 Time Stamp Authority:
 True
-reason
+tsa
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/sw/res/doublepage_10x22.png   |binary
 icon-themes/colibre/sw/res/doublepage_a_10x22.png |binary
 icon-themes/colibre/sw/res/emptypage_10x14.png|binary
 icon-themes/colibre/sw/res/emptypage_a_10x14.png  |binary
 icon-themes/colibre/sw/res/redline_deleted.png|binary
 icon-themes/colibre/sw/res/redline_inserted.png   |binary
 icon-themes/colibre/sw/res/twopages_10x24.png |binary
 icon-themes/colibre/sw/res/twopages_a_10x24.png   |binary
 icon-themes/colibre_svg/sw/res/doublepage_10x22.svg   |1 +
 icon-themes/colibre_svg/sw/res/doublepage_a_10x22.svg |1 +
 icon-themes/colibre_svg/sw/res/emptypage_10x14.svg|1 +
 icon-themes/colibre_svg/sw/res/emptypage_a_10x14.svg  |1 +
 icon-themes/colibre_svg/sw/res/redline_deleted.svg|1 +
 icon-themes/colibre_svg/sw/res/redline_inserted.svg   |1 +
 icon-themes/colibre_svg/sw/res/twopages_10x24.svg |1 +
 icon-themes/colibre_svg/sw/res/twopages_a_10x24.svg   |1 +
 16 files changed, 8 insertions(+)

New commits:
commit ed4d8a53d17543bbd969888049700e31538c1d9d
Author: andreas kainz 
Date:   Wed Mar 14 22:22:08 2018 +0100

Colibre icons: add sw/res page and redline icons

Change-Id: Ic628811e7efd15cb85e0d0336ce9173e0fb1349a
Reviewed-on: https://gerrit.libreoffice.org/51300
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/sw/res/doublepage_10x22.png 
b/icon-themes/colibre/sw/res/doublepage_10x22.png
new file mode 100644
index ..dbd33ed0b791
Binary files /dev/null and b/icon-themes/colibre/sw/res/doublepage_10x22.png 
differ
diff --git a/icon-themes/colibre/sw/res/doublepage_a_10x22.png 
b/icon-themes/colibre/sw/res/doublepage_a_10x22.png
new file mode 100644
index ..1efdfe601a58
Binary files /dev/null and b/icon-themes/colibre/sw/res/doublepage_a_10x22.png 
differ
diff --git a/icon-themes/colibre/sw/res/emptypage_10x14.png 
b/icon-themes/colibre/sw/res/emptypage_10x14.png
new file mode 100644
index ..ab7ce0aaa11b
Binary files /dev/null and b/icon-themes/colibre/sw/res/emptypage_10x14.png 
differ
diff --git a/icon-themes/colibre/sw/res/emptypage_a_10x14.png 
b/icon-themes/colibre/sw/res/emptypage_a_10x14.png
new file mode 100644
index ..7387def3ba08
Binary files /dev/null and b/icon-themes/colibre/sw/res/emptypage_a_10x14.png 
differ
diff --git a/icon-themes/colibre/sw/res/redline_deleted.png 
b/icon-themes/colibre/sw/res/redline_deleted.png
new file mode 100644
index ..4bdef0939bf0
Binary files /dev/null and b/icon-themes/colibre/sw/res/redline_deleted.png 
differ
diff --git a/icon-themes/colibre/sw/res/redline_inserted.png 
b/icon-themes/colibre/sw/res/redline_inserted.png
new file mode 100644
index ..91f048658741
Binary files /dev/null and b/icon-themes/colibre/sw/res/redline_inserted.png 
differ
diff --git a/icon-themes/colibre/sw/res/twopages_10x24.png 
b/icon-themes/colibre/sw/res/twopages_10x24.png
new file mode 100644
index ..069c259bffef
Binary files /dev/null and b/icon-themes/colibre/sw/res/twopages_10x24.png 
differ
diff --git a/icon-themes/colibre/sw/res/twopages_a_10x24.png 
b/icon-themes/colibre/sw/res/twopages_a_10x24.png
new file mode 100644
index ..f34248441cb9
Binary files /dev/null and b/icon-themes/colibre/sw/res/twopages_a_10x24.png 
differ
diff --git a/icon-themes/colibre_svg/sw/res/doublepage_10x22.svg 
b/icon-themes/colibre_svg/sw/res/doublepage_10x22.svg
new file mode 100644
index ..b52ff97023c5
--- /dev/null
+++ b/icon-themes/colibre_svg/sw/res/doublepage_10x22.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sw/res/doublepage_a_10x22.svg 
b/icon-themes/colibre_svg/sw/res/doublepage_a_10x22.svg
new file mode 100644
index ..452afded008d
--- /dev/null
+++ b/icon-themes/colibre_svg/sw/res/doublepage_a_10x22.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sw/res/emptypage_10x14.svg 
b/icon-themes/colibre_svg/sw/res/emptypage_10x14.svg
new file mode 100644
index ..10e8bb3a7162
--- /dev/null
+++ b/icon-themes/colibre_svg/sw/res/emptypage_10x14.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sw/res/emptypage_a_10x14.svg 
b/icon-themes/colibre_svg/sw/res/emptypage_a_10x14.svg
new file mode 100644
index ..ea3001dfaa39
--- /dev/null
+++ b/icon-themes/colibre_svg/sw/res/emptypage_a_10x14.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/sw/res/redline_deleted.svg 
b/icon-themes/colibre_svg/sw/res/redline_deleted.svg
new file mode 100644
index ..428763acba7b
--- /dev/null
+++ b/icon-themes/colibre_svg/sw/res/redline_deleted.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at 

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/svx/res/fr01.png   |binary
 icon-themes/colibre/svx/res/fr010.png  |binary
 icon-themes/colibre/svx/res/fr011.png  |binary
 icon-themes/colibre/svx/res/fr012.png  |binary
 icon-themes/colibre/svx/res/fr02.png   |binary
 icon-themes/colibre/svx/res/fr03.png   |binary
 icon-themes/colibre/svx/res/fr04.png   |binary
 icon-themes/colibre/svx/res/fr05.png   |binary
 icon-themes/colibre/svx/res/fr06.png   |binary
 icon-themes/colibre/svx/res/fr07.png   |binary
 icon-themes/colibre/svx/res/fr08.png   |binary
 icon-themes/colibre/svx/res/fr09.png   |binary
 icon-themes/colibre/svx/res/pr01.png   |binary
 icon-themes/colibre/svx/res/pr010.png  |binary
 icon-themes/colibre/svx/res/pr011.png  |binary
 icon-themes/colibre/svx/res/pr012.png  |binary
 icon-themes/colibre/svx/res/pr013.png  |binary
 icon-themes/colibre/svx/res/pr014.png  |binary
 icon-themes/colibre/svx/res/pr015.png  |binary
 icon-themes/colibre/svx/res/pr016.png  |binary
 icon-themes/colibre/svx/res/pr017.png  |binary
 icon-themes/colibre/svx/res/pr018.png  |binary
 icon-themes/colibre/svx/res/pr019.png  |binary
 icon-themes/colibre/svx/res/pr02.png   |binary
 icon-themes/colibre/svx/res/pr020.png  |binary
 icon-themes/colibre/svx/res/pr021.png  |binary
 icon-themes/colibre/svx/res/pr03.png   |binary
 icon-themes/colibre/svx/res/pr04.png   |binary
 icon-themes/colibre/svx/res/pr05.png   |binary
 icon-themes/colibre/svx/res/pr06.png   |binary
 icon-themes/colibre/svx/res/pr07.png   |binary
 icon-themes/colibre/svx/res/pr08.png   |binary
 icon-themes/colibre/svx/res/pr09.png   |binary
 icon-themes/colibre/svx/res/replac3d.png   |binary
 icon-themes/colibre/svx/res/selection_10x22.png|binary
 icon-themes/colibre/svx/res/sh01.png   |binary
 icon-themes/colibre/svx/res/sh02.png   |binary
 icon-themes/colibre/svx/res/sh03.png   |binary
 icon-themes/colibre/svx/res/sh04.png   |binary
 icon-themes/colibre/svx/res/sh05.png   |binary
 icon-themes/colibre/svx/res/slidezoombutton_10.png |binary
 icon-themes/colibre/svx/res/slidezoomin_10.png |binary
 icon-themes/colibre/svx/res/slidezoomout_10.png|binary
 icon-themes/colibre/svx/res/zetlhor2.png   |binary
 icon-themes/colibre/svx/res/zetlver2.png   |binary
 icon-themes/colibre_svg/svx/res/fr01.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr010.svg  |1 +
 icon-themes/colibre_svg/svx/res/fr011.svg  |1 +
 icon-themes/colibre_svg/svx/res/fr012.svg  |1 +
 icon-themes/colibre_svg/svx/res/fr02.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr03.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr04.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr05.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr06.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr07.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr08.svg   |1 +
 icon-themes/colibre_svg/svx/res/fr09.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr01.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr010.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr011.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr012.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr013.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr014.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr015.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr016.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr017.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr018.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr019.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr02.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr020.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr021.svg  |1 +
 icon-themes/colibre_svg/svx/res/pr03.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr04.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr05.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr06.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr07.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr08.svg   |1 +
 icon-themes/colibre_svg/svx/res/pr09.s

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/sc/res/sidebar/CellBorder_All_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_18x18.png 
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Empty_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_FourBorders_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Left_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Right_18x18.png  
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png   
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png 
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png
|binary
 icon-themes/colibre/sc/res/sidebar/CellBorder_Top_18x18.png
|binary
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_All_18x18.svg
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bottom_18x18.svg 
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bottom_Double_18x18.svg  
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.svg   
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Empty_18x18.svg  
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_FourBorders_18x18.svg
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.svg  
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_LeftAndRight_18x18.svg   
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.svg   
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Left_18x18.svg   
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_RightDiagonal_18x18.svg  
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Right_18x18.svg  
|1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_TopAndBottom_18x18.svg   
|1 +
 
icon-themes/colibre_svg/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.svg
 |1 +
 
icon-themes/colibre_svg/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.svg 
   |1 +
 icon-themes/colibre_svg/sc/res/sidebar/CellBorder_Top_18x18.svg
|1 +
 32 files changed, 16 insertions(+)

New commits:
commit b951cd126d0bcc950c71c069c7d2f4c210c4bcaf
Author: andreas kainz 
Date:   Wed Mar 14 23:56:39 2018 +0100

Colibre Icons: add CellBorder icons for Calc sidebar

Change-Id: I50a3b26cc4a6b6c82aee0d0175c01fae85050b85
Reviewed-on: https://gerrit.libreoffice.org/51304
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/sc/res/sidebar/CellBorder_All_18x18.png 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_All_18x18.png
new file mode 100644
index ..cc73b936cadd
Binary files /dev/null and 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_All_18x18.png differ
diff --git a/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_18x18.png 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_18x18.png
new file mode 100644
index ..65ee03a773f0
Binary files /dev/null and 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_18x18.png differ
diff --git 
a/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png
new file mode 100644
index ..38c59192792b
Binary files /dev/null and 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png differ
diff --git 
a/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png
new file mode 100644
index ..894d72328187
Binary files /dev/null and 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png differ
diff --git a/icon-themes/colibre/sc/res/sidebar/CellBorder_Empty_18x18.png 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Empty_18x18.png
new file mode 100644
index ..abda19a482d2
Binary files /dev/null and 
b/icon-themes/colibre/sc/res/sidebar/CellBorder_Empty_18x18.png differ
diff --git 
a/icon-themes/colibre/sc/res/sidebar/CellBorder_FourBorders_18x18.png 
b/icon-themes/co

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

[Mert Tümer]

 android/Bootstrap/src/org/libreoffice/kit/Document.java  |   15 ++
 android/source/res/drawable/ic_content_copy_black_24dp.xml   |9 +
 android/source/res/drawable/ic_content_cut_black_24dp.xml|9 +
 android/source/res/drawable/ic_content_paste_black_24dp.xml  |9 +
 android/source/res/menu/main.xml |   29 
 android/source/res/values/strings.xml|7 +
 android/source/src/java/org/libreoffice/InvalidationHandler.java |3 
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |   21 +++
 android/source/src/java/org/libreoffice/TileProvider.java|   13 +
 android/source/src/java/org/libreoffice/ToolbarController.java   |   70 
++
 desktop/source/lib/lokandroid.cxx|   17 ++
 11 files changed, 202 insertions(+)

New commits:
commit e5bc7fa4e83b33fc3eee343e560a4f8cb91eacd6
Author: Mert Tümer 
Date:   Wed Mar 14 19:19:56 2018 +0300

tdf#96796 - Added clipboard actions for the Android Viewer

Change-Id: I52e134532ab70e765b6ccd929f189be84f9c9a90
Signed-off-by: Mert Tümer 
Reviewed-on: https://gerrit.libreoffice.org/51286
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 6a1f402970ea..f0c5e7a6f99a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -232,6 +232,21 @@ public class Document {
 public native void setGraphicSelection(int type, int x, int y);
 
 /**
+ * Get selected text
+ * @param mimeType
+ * @return
+ */
+public native String getTextSelection(String mimeType);
+
+/**
+ * paste
+ * @param mimeType
+ * @param data
+ * @return
+ */
+public native boolean paste(String mimeType, String data);
+
+/**
  * Reset current (any kind of) selection.
  */
 public native void resetSelection();
diff --git a/android/source/res/drawable/ic_content_copy_black_24dp.xml 
b/android/source/res/drawable/ic_content_copy_black_24dp.xml
new file mode 100644
index ..8a894a3bcd73
--- /dev/null
+++ b/android/source/res/drawable/ic_content_copy_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_cut_black_24dp.xml 
b/android/source/res/drawable/ic_content_cut_black_24dp.xml
new file mode 100644
index ..1c0f96a37b42
--- /dev/null
+++ b/android/source/res/drawable/ic_content_cut_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_content_paste_black_24dp.xml 
b/android/source/res/drawable/ic_content_paste_black_24dp.xml
new file mode 100644
index ..a902d9a856a0
--- /dev/null
+++ b/android/source/res/drawable/ic_content_paste_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml
index 229c20aed68c..7fba5f46e380 100644
--- a/android/source/res/menu/main.xml
+++ b/android/source/res/menu/main.xml
@@ -47,6 +47,35 @@
 android:enabled="false" />
 
 
+
+
+
+
+
+
+
+
+
+
+
 
 Don\'t Compress
 Do you want to compress the 
photo?
 
+
+Copy
+Paste
+Cut
+Back
+Text copied to the clipboard
+
 
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index e411770976c9..eb22f6c8f3d3 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -452,6 +452,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
+mContext.getToolbarController().showHideClipboardCutAndCopy(false);
 } else {
 List rectangles = convertPayloadToRectangles(payload);
 if (mState != OverlayState.SELECTION) {
@@ -462,6 +463,8 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (mContext.isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(rectangles.get(0));
   

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/fd67ee14e769ebdf1e43d55e0117f70f90d53053/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: offapi/com

[Tomaž Vajngerl]

 offapi/com/sun/star/document/XGraphicStorageHandler.idl |   19 +++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 90cb743a69ad4b7cb3466b7ce5b2bbed6353d792
Author: Tomaž Vajngerl 
Date:   Wed Mar 14 15:18:42 2018 +0900

add comments to XGraphicStorageHandler.idl

Change-Id: Ib24d9c434f1f19fe7bca51235f6c6125d5c97a7c
Reviewed-on: https://gerrit.libreoffice.org/51305
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/offapi/com/sun/star/document/XGraphicStorageHandler.idl 
b/offapi/com/sun/star/document/XGraphicStorageHandler.idl
index 309309aefbf2..9c70132e0d61 100644
--- a/offapi/com/sun/star/document/XGraphicStorageHandler.idl
+++ b/offapi/com/sun/star/document/XGraphicStorageHandler.idl
@@ -15,17 +15,34 @@
 
 module com {  module sun {  module star {  module document {
 
-/** used to load, save and serialize XGraphic objects to the document storage
+/** interface for loading, saving and serializing of XGraphic objects to
+a document storage
+
+@since LibreOffice 6.1
  */
 interface XGraphicStorageHandler : com::sun::star::uno::XInterface
 {
+/** load a graphic defined by the URL from the storage
+*/
 com::sun::star::graphic::XGraphic loadGraphic([in] string aURL);
+
+/** load a graphic from the output stream
+*/
 com::sun::star::graphic::XGraphic loadGraphicFromOutputStream([in] 
com::sun::star::io::XOutputStream xOutputStream);
 
+/** save the graphic to the storage and return the URL reference to
+its location inside the storage
+*/
 string saveGraphic([in] com::sun::star::graphic::XGraphic xGraphic);
 
+/** save the graphic to the storage with a requested name and return
+the URL reference to its location inside the storage and the mime
+type of the format that the graphic was saved to as an output parameter
+*/
 string saveGraphicByName([in] com::sun::star::graphic::XGraphic xGraphic, 
[out] string savedMimeType, [in] string aRequestedName);
 
+/** create an input stream from the input graphic
+*/
 com::sun::star::io::XInputStream createInputStream([in] 
com::sun::star::graphic::XGraphic xGraphic);
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 xmlscript/source/xmldlg_imexp/common.hxx   |1 
 xmlscript/source/xmldlg_imexp/exp_share.hxx|8 ++---
 xmlscript/source/xmldlg_imexp/imp_share.hxx|2 -
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |   11 +++
 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx|   33 ++---
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |   12 +++
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx|   25 ---
 7 files changed, 52 insertions(+), 40 deletions(-)

New commits:
commit 043273e721ade64e4fb42f969cf22b4202c6b80d
Author: Tomaž Vajngerl 
Date:   Thu Mar 15 09:49:02 2018 +0900

xmlscript: change import/export to not use GraphicObject URL

Change-Id: Ic81bf1a5ce45394e098366d0f4af53845ba0da87
Reviewed-on: https://gerrit.libreoffice.org/51307
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/xmlscript/source/xmldlg_imexp/common.hxx 
b/xmlscript/source/xmldlg_imexp/common.hxx
index ecfa439d4c00..1737c3cf1330 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -40,7 +40,6 @@ extern StringTriple const * const g_pEventTranslations;
 
 }
 
-#define XMLSCRIPT_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/source/xmldlg_imexp/exp_share.hxx 
b/xmlscript/source/xmldlg_imexp/exp_share.hxx
index e58a2c215640..39dc1fc3b9ef 100644
--- a/xmlscript/source/xmldlg_imexp/exp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/exp_share.hxx
@@ -140,8 +140,6 @@ public:
 OUString const & rPropName, OUString const & rAttrName );
 void readVerticalAlignAttr(
 OUString const & rPropName, OUString const & rAttrName );
-void readImageURLAttr(
-OUString const & rPropName, OUString const & rAttrName );
 void readImageAlignAttr(
 OUString const & rPropName, OUString const & rAttrName );
 void readImagePositionAttr(
@@ -164,8 +162,10 @@ public:
 OUString const & rPropName, OUString const & rAttrName );
 void readImageScaleModeAttr(
 OUString const & rPropName, OUString const & rAttrName );
-void readDataAwareAttr(
-OUString const & rAttrName );
+
+void readDataAwareAttr(OUString const & rAttrName );
+void readImageOrGraphicAttr(OUString const & rAttrName );
+
 void addBoolAttr(
 OUString const & rAttrName, bool bValue )
 { addAttribute( rAttrName, OUString::boolean(bValue) ); }
diff --git a/xmlscript/source/xmldlg_imexp/imp_share.hxx 
b/xmlscript/source/xmldlg_imexp/imp_share.hxx
index 8f41b29172c9..c93bd905d363 100644
--- a/xmlscript/source/xmldlg_imexp/imp_share.hxx
+++ b/xmlscript/source/xmldlg_imexp/imp_share.hxx
@@ -421,7 +421,7 @@ public:
 bool importVerticalAlignProperty(
 OUString const & rPropName, OUString const & rAttrName,
 css::uno::Reference const & xAttributes 
);
-bool importImageURLProperty( OUString const & rPropName, OUString const & 
rAttrName,
+bool importGraphicOrImageProperty(OUString const & rAttrName,
 css::uno::Reference< css::xml::input::XAttributes > const & 
xAttributes );
 bool importImageAlignProperty(
 OUString const & rPropName, OUString const & rAttrName,
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index 764cdb892d77..9c0e71610112 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -187,8 +187,7 @@ void ElementDescriptor::readButtonModel( StyleBag * 
all_styles )
 readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
 readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
 readButtonTypeAttr( "PushButtonType", XMLNS_DIALOGS_PREFIX ":button-type" 
);
-readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
-
+readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src");
 readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX 
":image-position" );
 readImageAlignAttr( "ImageAlign", XMLNS_DIALOGS_PREFIX ":image-align" );
 
@@ -247,7 +246,7 @@ void ElementDescriptor::readCheckBoxModel( StyleBag * 
all_styles )
 readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
 readAlignAttr( "Align",  XMLNS_DIALOGS_PREFIX ":align" );
 readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" );
-readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
+readImageOrGraphicAttr(XMLNS_DIALOGS_PREFIX ":image-src");
 readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX 
":image-position" );
 readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
 
@@ -417,7 +416,7 @@ void ElementDescriptor::readRadioButtonModel( StyleBag * 
all_styles  )
 readStringAttr( "Label", XMLNS_DIALOGS_PREFIX ":value" );
 readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" );
 

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

[Tomaž Vajngerl]

 filter/source/msfilter/msdffimp.cxx  |   30 +-
 include/filter/msfilter/msdffimp.hxx |3 ++-
 sw/source/filter/ww8/ww8par.hxx  |2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit 531036fa296b6bfca5ec93c4d7ef1264dc6e7b65
Author: Tomaž Vajngerl 
Date:   Thu Mar 15 09:45:52 2018 +0900

change EscherBlipCache to cache Graphic and not GObject uniqueID

In addition change from map to unordered_map.

Change-Id: Ief33d6ebd7e42606ab20fcf9fc91020b1ef9aab6
Reviewed-on: https://gerrit.libreoffice.org/51306
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 794aa8a4a59b..960fa7f1ed2d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6294,10 +6294,9 @@ bool SvxMSDffManager::GetShape(sal_uLong nId, 
SdrObject*& rpShape,
 }
 
 
-/*  access to a BLIP at runtime (if the Blip-Number is already known)
----
-**/
-bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, 
tools::Rectangle* pVisArea )
+/** Access to a BLIP at runtime (if the Blip-Number is already known)
+ */
+bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rGraphic, 
tools::Rectangle* pVisArea )
 {
 if (!pStData)
 return false;
@@ -6305,24 +6304,22 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, 
Graphic& rData, tools::Rectangle
 bool bOk = false;   // initialize result variable
 
 // check if a graphic for this blipId is already imported
-if ( nIdx_)
+if (nIdx_)
 {
-std::map::iterator iter = 
aEscherBlipCache.find(nIdx_);
+auto iter = aEscherBlipCache.find(nIdx_);
 
 if (iter != aEscherBlipCache.end())
 {
-/* if this entry is available, then it should be possible
-to get the Graphic via GraphicObject */
-GraphicObject aGraphicObject( iter->second );
-rData = aGraphicObject.GetGraphic();
-if ( rData.GetType() != GraphicType::NONE )
+/* if this entry is available */
+rGraphic = Graphic(iter->second);
+if (rGraphic.GetType() != GraphicType::NONE)
 bOk = true;
 else
 aEscherBlipCache.erase(iter);
 }
 }
 
-if ( !bOk )
+if (!bOk)
 {
 sal_uInt16 nIdx = sal_uInt16( nIdx_ );
 if (!nIdx || (m_pBLIPInfos->size() < nIdx))
@@ -6347,7 +6344,7 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& 
rData, tools::Rectangle
 if (!bOk || pStData->GetError())
 pStData->ResetError();
 else
-bOk = GetBLIPDirect( *pStData, rData, pVisArea );
+bOk = GetBLIPDirect( *pStData, rGraphic, pVisArea );
 if( pStData2 && !bOk )
 {
 // Error, but the is a second chance: There is a second
@@ -6361,7 +6358,7 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& 
rData, tools::Rectangle
 if (!bOk || pStData2->GetError())
 pStData2->ResetError();
 else
-bOk = GetBLIPDirect( *pStData2, rData, pVisArea );
+bOk = GetBLIPDirect( *pStData2, rGraphic, pVisArea );
 // restore of FilePos of the second data stream
 pStData2->Seek( nOldPosData2 );
 }
@@ -6370,11 +6367,10 @@ bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, 
Graphic& rData, tools::Rectangle
 if( &rStCtrl != pStData )
   pStData->Seek( nOldPosData );
 
-if ( bOk )
+if (bOk)
 {
 // create new BlipCacheEntry for this graphic
-GraphicObject aGraphicObject( rData );
-
aEscherBlipCache.insert(std::make_pair(nIdx_,aGraphicObject.GetUniqueID()));
+aEscherBlipCache.insert(std::make_pair(nIdx_, rGraphic));
 }
 }
 
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index aafb47b3bc88..ba8e6897492d 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -529,7 +530,7 @@ protected:
 
 public:
 std::unique_ptr pSecPropSet;
-std::map aEscherBlipCache;
+std::unordered_map aEscherBlipCache;
 
 DffRecordManagermaShapeRecords;
 Color   mnDefaultColor;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 601dcc17fa53..a81e1754be32 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -743,7 +743,7 @@ class SwMSDffManager : public SvxMSDffManager
 private:
 SwWW8ImplReader& rReader;
 SvStream *pFallbackStream;
-std::map aOldEscherBlipCache;
+std::unordered_map aOldEscherBlipCache;
 

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

[Tomaž Vajngerl]

 basic/source/uno/dlgcont.cxx |   21 +++-
 dbaccess/source/core/dataaccess/databasedocument.cxx |   21 +++-
 include/vcl/GraphicObject.hxx|   26 --
 vcl/source/graphic/GraphicObject.cxx |   80 +++
 4 files changed, 96 insertions(+), 52 deletions(-)

New commits:
commit d775ef360168271f429466bbc174ae7dec402f1d
Author: Tomaž Vajngerl 
Date:   Thu Mar 15 09:57:46 2018 +0900

change recursive ImageURL prop. search to use XGraphic

In two cases we need to traverse and gather all ImageURL properties
and get the URL string and store the graphic content to a storage
(like we do in xmloff filter). ImageURL property can now only store
external URL and Graphic stores the embedded XGraphic, so this was
changed to look into Graphic property first and then ImageURL.

We also don't gather URL sting anymore so they need to be loaded
to XGraphic when gathering them.

Change-Id: I5f3f4be2b403b9589d72b8733df0c97109f2b65d
Reviewed-on: https://gerrit.libreoffice.org/51308
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index ac347db045de..24ecf29d4d22 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -236,17 +237,21 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( 
const uno::Reference< e
 
mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel",
 mxContext),
 UNO_QUERY );
 ::xmlscript::importDialogModel( xInput, xDialogModel, 
mxContext, mxOwnerDocument );
-std::vector< OUString > vEmbeddedImageURLs;
-GraphicObject::InspectForGraphicObjectImageURL( 
Reference(xDialogModel, UNO_QUERY),  vEmbeddedImageURLs );
-if ( !vEmbeddedImageURLs.empty() )
+std::vector> 
vxGraphicList;
+
vcl::graphic::SearchForGraphics(Reference(xDialogModel, UNO_QUERY), 
vxGraphicList);
+if (!vxGraphicList.empty())
 {
 // Export the images to the storage
-Reference< document::XGraphicObjectResolver > 
xGraphicResolver =
-
document::GraphicObjectResolver::createWithStorage( mxContext, xStorage );
-if ( xGraphicResolver.is() )
+Reference 
xGraphicResolver;
+
xGraphicResolver.set(document::GraphicObjectResolver::createWithStorage(mxContext,
 xStorage));
+Reference 
xGraphicStorageHandler;
+xGraphicStorageHandler.set(xGraphicResolver, 
uno::UNO_QUERY);
+if (xGraphicStorageHandler.is())
 {
-for ( const OUString& rURL : vEmbeddedImageURLs )
-xGraphicResolver->resolveGraphicObjectURL( 
rURL );
+for (uno::Reference const & 
rxGraphic : vxGraphicList)
+{
+xGraphicStorageHandler->saveGraphic(rxGraphic);
+}
 }
 }
 }
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b8c15f49df88..27a2114ae9fb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -355,7 +356,7 @@ void lcl_uglyHackToStoreDialogeEmbedImages( const 
Reference< XStorageBasedLibrar
 Sequence< OUString > sLibraries = xDlgCont->getElementNames();
 Reference< XStorage > xTmpPic = xStorage->openStorageElement( 
"tempPictures", ElementModes::READWRITE  );
 
-std::vector< OUString > vEmbedImgUrls;
+std::vector> vxGraphicList;
 for ( sal_Int32 i=0; i < sLibraries.getLength(); ++i )
 {
 OUString sLibrary( sLibraries[ i ] );
@@ -374,21 +375,25 @@ void lcl_uglyHackToStoreDialogeEmbedImages( const 
Reference< XStorageBasedLibrar
 
 Reference< css::awt::XControl > xDialog( 
xDlgPrv->createDialog( sDialogUrl ), UNO_QUERY );
 Reference< XInterface > xModel( xDialog->getModel() );
-GraphicObject::InspectForGraphicObjectImageURL( xModel, 
vEmbedImgUrls );
+vcl::graphic::SearchForGraphics(xModel, vxGraphicList);
 }
 }
 }
 // if we have any image urls, make sure we copy the associated images into 
tempPictures
-if ( !vEmbedImgUrls.empty() )
+if (!vxGraphicList.empty())
 {
 // Export t

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

[Noel Grandin]

 compilerplugins/clang/unusedmethods.results|  188 +++--
 compilerplugins/clang/unusedmethods.unused-returns.results |   50 ---
 sc/inc/address.hxx |5 
 sc/inc/rangelst.hxx|   17 -
 sc/source/core/data/documen3.cxx   |6 
 sc/source/core/tool/compiler.cxx   |   18 -
 sc/source/core/tool/rangelst.cxx   |   93 +++---
 sc/source/filter/excel/xecontent.cxx   |4 
 sc/source/ui/miscdlgs/crnrdlg.cxx  |   12 
 sc/source/ui/unoobj/nameuno.cxx|   29 --
 sw/inc/calbck.hxx  |2 
 11 files changed, 199 insertions(+), 225 deletions(-)

New commits:
commit c1ee9b9f746296b916569a1357aa8f1216d40535
Author: Noel Grandin 
Date:   Wed Mar 14 16:59:30 2018 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 3c535defd69c..351e78273543 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -6,6 +6,8 @@ basic/source/inc/buffer.hxx:42
 void SbiBuffer::operator+=(short)
 basic/source/inc/buffer.hxx:46
 void SbiBuffer::operator+=(int)
+canvas/source/vcl/impltools.hxx:105
+ vclcanvas::tools::LocalGuard::LocalGuard()
 connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51
 class com::sun::star::uno::Reference 
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
 connectivity/source/drivers/firebird/Driver.hxx:65
@@ -44,7 +46,7 @@ connectivity/source/inc/OTypeInfo.hxx:55
 _Bool connectivity::OTypeInfo::operator==(const struct 
connectivity::OTypeInfo &) const
 connectivity/source/inc/OTypeInfo.hxx:56
 _Bool connectivity::OTypeInfo::operator!=(const struct 
connectivity::OTypeInfo &) const
-dbaccess/source/ui/browser/genericcontroller.cxx:1230
+dbaccess/source/ui/browser/genericcontroller.cxx:1215
 const type-parameter-?-? & dbaui::(anonymous 
namespace)::SGI_identity::operator()(const type-parameter-?-? &) const
 dbaccess/source/ui/inc/indexcollection.hxx:54
 class __gnu_debug::_Safe_iterator > >, class 
std::__debug::vector > > dbaui::OIndexCollection::begin() const
@@ -86,6 +88,10 @@ drawinglayer/source/tools/emfpstringformat.hxx:57
 _Bool emfplushelper::EMFPStringFormat::NoClip() const
 drawinglayer/source/tools/emfpstringformat.hxx:58
 _Bool emfplushelper::EMFPStringFormat::BypassGDI() const
+editeng/inc/edtspell.hxx:112
+class __gnu_debug::_Safe_iterator > 
>, class std::__debug::vector > > WrongList::begin() const
+editeng/inc/edtspell.hxx:113
+class __gnu_debug::_Safe_iterator > 
>, class std::__debug::vector > > WrongList::end() const
 extensions/source/scanner/scanner.hxx:81
 void ScannerManager::SetData(void *)
 framework/source/uiconfiguration/ImageList.hxx:51
@@ -240,6 +246,34 @@ include/basegfx/vector/b3dvector.hxx:85
 class basegfx::B3DVector & basegfx::B3DVector::operator*=(const class 
basegfx::B3DVector &)
 include/basic/sbxvar.hxx:133
 struct SbxValues * SbxValue::data()
+include/canvas/rendering/icolorbuffer.hxx:49
+unsigned char * canvas::IColorBuffer::lock() const
+include/canvas/rendering/icolorbuffer.hxx:53
+void canvas::IColorBuffer::unlock() const
+include/canvas/rendering/icolorbuffer.hxx:68
+unsigned int canvas::IColorBuffer::getStride() const
+include/canvas/rendering/icolorbuffer.hxx:72
+enum canvas::IColorBuffer::Format canvas::IColorBuffer::getFormat() const
+include/canvas/rendering/isurfaceproxy.hxx:42
+void canvas::ISurfaceProxy::setColorBufferDirty()
+include/canvas/rendering/isurfaceproxy.hxx:55
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DHomMatrix &)
+include/canvas/rendering/isurfaceproxy.hxx:75
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DRange &,const class basegfx::B2DHomMatrix &)
+include/canvas/rendering/isurfaceproxy.hxx:95
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DPolyPolygon &,const class basegfx::B2DHomMatrix &)
+include/canvas/rendering/isurfaceproxymanager.hxx:58
+class std::shared_ptr 
canvas::ISurfaceProxyManager::createSurfaceProxy(const class 
std::shared_ptr &) const
+include/canvas/rendering/isurfaceproxymanager.hxx:64
+class std::shared_ptr 
createSurfaceProxyManager(const class std::shared_ptr &)
+include/canvas/vclwrapper.hxx:66
+ canvas::vcltools::VCLObject::VCLObject(type-parameter-?-? *)
+include/canvas/vclwrapper.hxx:134
+type-parameter-?-? & canvas::vcltools::VCLObject::get()

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

[Noel Grandin]

 include/vcl/BitmapTools.hxx   |2 
 svx/source/svdraw/svdfmtf.cxx |   83 --
 vcl/source/bitmap/BitmapTools.cxx |   70 
 3 files changed, 74 insertions(+), 81 deletions(-)

New commits:
commit 14d49662d32fa2fcf2916682dbf1f974a8eecb08
Author: Noel Grandin 
Date:   Wed Mar 14 17:13:42 2018 +0200

move some GDI import code from svx to vcl

part of making ScopedWriteAccess an internal detail of vcl

Change-Id: I916f2ca05c9d7c17b62c91e113df6d8454bb4351
Reviewed-on: https://gerrit.libreoffice.org/51283
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index d7525869320f..7dde62788a53 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -92,6 +92,8 @@ VCL_DLLPUBLIC BitmapEx CanvasTransformBitmap( const BitmapEx& 
rBitmap,
   ::basegfx::B2DRectangle const & rDestRect,
   ::basegfx::B2DHomMatrix const & 
rLocalTransform );
 
+VCL_DLLPUBLIC void DrawAlphaBitmapAndAlphaGradient(BitmapEx & rBitmapEx, bool 
bFixedTransparence, float fTransparence, AlphaMask & rNewMask);
+
 }} // end vcl::bitmap
 
 #endif // INCLUDED_VCL_BITMAP_TOOLS_HXX
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 457095f6adc0..f3806362aba6 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -71,6 +71,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -1557,87 +1558,7 @@ void 
ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction const & rAct)
 }
 else
 {
-// mix existing and new alpha mask
-AlphaMask aOldMask;
-
-if(aBitmapEx.IsAlpha())
-{
-aOldMask = aBitmapEx.GetAlpha();
-}
-else if(TransparentType::Bitmap == 
aBitmapEx.GetTransparentType())
-{
-aOldMask = aBitmapEx.GetMask();
-}
-else if(TransparentType::Color == 
aBitmapEx.GetTransparentType())
-{
-aOldMask = 
aBitmapEx.GetBitmap().CreateMask(aBitmapEx.GetTransparentColor());
-}
-
-AlphaMask::ScopedWriteAccess pOld(aOldMask);
-
-if(pOld)
-{
-const double fFactor(1.0 / 255.0);
-
-if(bFixedTransparence)
-{
-const double fOpNew(1.0 - fTransparence);
-
-for(long y(0); y < pOld->Height(); y++)
-{
-Scanline pScanline = pOld->GetScanline( y );
-for(long x(0); x < pOld->Width(); x++)
-{
-const double fOpOld(1.0 - 
(pOld->GetIndexFromData(pScanline, x) * fFactor));
-const sal_uInt8 aCol(basegfx::fround((1.0 - 
(fOpOld * fOpNew)) * 255.0));
-
-pOld->SetPixelOnData(pScanline, x, 
BitmapColor(aCol));
-}
-}
-}
-else
-{
-AlphaMask::ScopedReadAccess pNew(aNewMask);
-
-if(pNew)
-{
-if(pOld->Width() == pNew->Width() && 
pOld->Height() == pNew->Height())
-{
-for(long y(0); y < pOld->Height(); y++)
-{
-Scanline pScanline = pOld->GetScanline( y 
);
-for(long x(0); x < pOld->Width(); x++)
-{
-const double fOpOld(1.0 - 
(pOld->GetIndexFromData(pScanline, x) * fFactor));
-const double fOpNew(1.0 - 
(pNew->GetIndexFromData(pScanline, x) * fFactor));
-const sal_uInt8 
aCol(basegfx::fround((1.0 - (fOpOld * fOpNew)) * 255.0));
-
-pOld->SetPixelOnData(pScanline, x, 
BitmapColor(aCol));
-}
-}
-}
-else
-{
-OSL_ENSURE(false, "Alpha masks have different 
sizes (!)");
-}
-
-pNew.reset();
-}
-else
-{
-OSL_ENSURE(false, "Got no access to new alpha mask 
(!)");
-}
-}
-
-pOld.reset()

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit a90e9868507b906f5b9edbc249178c32b611ba46
Author: Adolfo Jayme Barrientos 
Date:   Thu Mar 15 00:41:44 2018 -0600

Updated core
Project: help  4dd9777f3e62637330b733526ed79ca4928e7e80

More assorted fixes

Change-Id: I7117d911967cacae9bb465d7eb3683f7299a09af

diff --git a/helpcontent2 b/helpcontent2
index 781da1e81754..4dd9777f3e62 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 781da1e8175459f27cca84bed2ca209b3e030067
+Subproject commit 4dd9777f3e62637330b733526ed79ca4928e7e80
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 source/text/scalc/01/04060107.xhp  |2 +-
 source/text/shared/autopi/01100300.xhp |2 +-
 source/text/shared/guide/cmis-remote-files.xhp |2 +-
 source/text/swriter/01/watermark.xhp   |4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4dd9777f3e62637330b733526ed79ca4928e7e80
Author: Adolfo Jayme Barrientos 
Date:   Thu Mar 15 00:41:44 2018 -0600

More assorted fixes

Change-Id: I7117d911967cacae9bb465d7eb3683f7299a09af

diff --git a/source/text/scalc/01/04060107.xhp 
b/source/text/scalc/01/04060107.xhp
index b9cd4e3e1..205e1913a 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -139,7 +139,7 @@
 Using 
Inline Array Constants in Formulas
 Calc supports 
inline matrix/array constants in formulas. An inline array is surrounded by 
curly braces '{' and '}'. Elements can be each a number (including negatives), 
a logical constant (TRUE, FALSE), or a literal string. Non-constant expressions 
are not allowed. Arrays can be entered with one or more rows, and one or more 
columns. All rows must consist of the same number of elements, all columns must 
consist of the same number of elements.
 The column 
separator (separating elements in one row) and the row separator are language 
and locale dependent. But in this help content, the ';' semicolon and '|' pipe 
symbol are used to indicate the column and row separators, respectively. For 
example, in the English locale, the ',' comma is used as the column separator, 
while the ';' semicolon is used as the row separator.
-The row and column 
separator can be seen and altered in Tools - Options - 
Calc - Formula - Separators.
+You can view and 
change the row and column separator in %PRODUCTNAME - 
PreferencesTools - 
Options - Calc - Formula - 
Separators.
 Arrays can not 
be nested.
 Examples:
 ={1;2;3}
diff --git a/source/text/shared/autopi/01100300.xhp 
b/source/text/shared/autopi/01100300.xhp
index 21bda1c7f..cd4be63ec 100644
--- a/source/text/shared/autopi/01100300.xhp
+++ b/source/text/shared/autopi/01100300.xhp
@@ -32,7 +32,7 @@
 
 
 Report Wizard - Sort Options
-.Select the 
fields by which to sort the report. Fields can be sorted by up to four levels, 
each either ascending or descending. Grouped fields can only be sorted within 
each group.
+Select the 
fields by which to sort the report. Fields can be sorted by up to four levels, 
each either ascending or descending. Grouped fields can only be sorted within 
each group.
 
 
   
diff --git a/source/text/shared/guide/cmis-remote-files.xhp 
b/source/text/shared/guide/cmis-remote-files.xhp
index 66108afb0..07d905613 100644
--- a/source/text/shared/guide/cmis-remote-files.xhp
+++ b/source/text/shared/guide/cmis-remote-files.xhp
@@ -100,7 +100,7 @@
 If the file was opened from a CMIS server, choose File - Save, click on the Save button or 
hit Ctrl + S.
   
   
-If the file is not stored in a CMIS server, Choose File - Save to Remote Server or do a long click in the 
Save icon, and select Save Remote File
+If the file is not stored in a CMIS server, choose File - Save to Remote Server or long-click the 
Save icon and select Save Remote File.
   
   
 The Remote files dialog appears
diff --git a/source/text/swriter/01/watermark.xhp 
b/source/text/swriter/01/watermark.xhp
index 6b5e60134..4d932a763 100644
--- a/source/text/swriter/01/watermark.xhp
+++ b/source/text/swriter/01/watermark.xhp
@@ -49,10 +49,10 @@
 Select the slant angle for the watermark. A 
positive angle displays tha watermark from bottom to top. A negative value 
displays the watermark text from top to bottom.
 
 Transparency
-Select the transparency index for the 
watermark. A 0% value produce an opaque watermark and a value of 100% is 
totally transparent (invisible).
+Select the transparency level for the 
watermark. A 0% value produces an opaque watermark and a value of 100% is 
totally transparent (invisible).
 
 Color
-Select color from the drop-down 
box.
+Select a color from the drop-down 
box.
 To change a watermark contents or setting.
 If 
the watermark in use is a text inserted by the Format - 
Watermark  menu command or by the document 
classification settings, you can edit the contents and settings on 
opening the watermark dialog.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits