[Libreoffice-commits] online.git: loleaflet/debug loleaflet/dist loleaflet/.gitignore loleaflet/Makefile.am loleaflet/po scripts/layoutsl10n.py scripts/locorestrings.py

[Andras Timar]

 loleaflet/.gitignore  |1 
 loleaflet/Makefile.am |8 
 loleaflet/debug/document/loleaflet.html   |2 
 loleaflet/dist/l10n/locore-localizations.json |  124 
 loleaflet/dist/l10n/locore/ab.json|8 
 loleaflet/dist/l10n/locore/af.json|  427 +++
 loleaflet/dist/l10n/locore/am.json|  620 
 loleaflet/dist/l10n/locore/an.json|8 
 loleaflet/dist/l10n/locore/ar.json|  584 
 loleaflet/dist/l10n/locore/as.json|  577 
 loleaflet/dist/l10n/locore/ast.json   |  564 
 loleaflet/dist/l10n/locore/az.json|3 
 loleaflet/dist/l10n/locore/be.json|  604 
 loleaflet/dist/l10n/locore/bg.json|  615 
 loleaflet/dist/l10n/locore/bn-IN.json |  575 
 loleaflet/dist/l10n/locore/bn.json|  467 +++
 loleaflet/dist/l10n/locore/bo.json|  409 ++
 loleaflet/dist/l10n/locore/br.json|  600 
 loleaflet/dist/l10n/locore/brx.json   |  204 +
 loleaflet/dist/l10n/locore/bs.json|  564 
 loleaflet/dist/l10n/locore/ca-valencia.json   |  597 
 loleaflet/dist/l10n/locore/ca.json|  620 
 loleaflet/dist/l10n/locore/cs.json|  612 
 loleaflet/dist/l10n/locore/cy.json|  613 
 loleaflet/dist/l10n/locore/da.json|  615 
 loleaflet/dist/l10n/locore/de.json|  620 
 loleaflet/dist/l10n/locore/dgo.json   |  482 +++
 loleaflet/dist/l10n/locore/dz.json|  253 +
 loleaflet/dist/l10n/locore/el.json|  615 
 loleaflet/dist/l10n/locore/en-GB.json |  620 
 loleaflet/dist/l10n/locore/en-ZA.json |  454 +++
 loleaflet/dist/l10n/locore/eo.json|  613 
 loleaflet/dist/l10n/locore/es.json|  620 
 loleaflet/dist/l10n/locore/et.json|  613 
 loleaflet/dist/l10n/locore/eu.json|  620 
 loleaflet/dist/l10n/locore/fa.json|  405 ++
 loleaflet/dist/l10n/locore/fi.json|  608 
 loleaflet/dist/l10n/locore/fr.json|  620 
 loleaflet/dist/l10n/locore/ga.json|  620 
 loleaflet/dist/l10n/locore/gd.json|  615 
 loleaflet/dist/l10n/locore/gl.json|  614 
 loleaflet/dist/l10n/locore/gu.json|  571 
 loleaflet/dist/l10n/locore/gug.json   |  598 
 loleaflet/dist/l10n/locore/he.json|  578 
 loleaflet/dist/l10n/locore/hi.json|  529 +++
 loleaflet/dist/l10n/locore/hr.json|  613 
 loleaflet/dist/l10n/locore/hsb.json   |  595 
 loleaflet/dist/l10n/locore/hu-Hung.json   |3 
 loleaflet/dist/l10n/locore/hu.json|  614 
 loleaflet/dist/l10n/locore/id.json|  613 
 loleaflet/dist/l10n/locore/is.json|  615 
 loleaflet/dist/l10n/locore/it.json|  615 
 loleaflet/dist/l10n/locore/ja.json|  597 
 loleaflet/dist/l10n/locore/jv.json|   13 
 loleaflet/dist/l10n/locore/ka.json|  239 +
 loleaflet/dist/l10n/locore/kk.json|  613 
 loleaflet/dist/l10n/locore/kl.json|5 
 loleaflet/dist/l10n/locore/km.json|  572 
 loleaflet/dist/l10n/locore/kmr-Latn.json  |  442 +++
 loleaflet/dist/l10n/locore/kn.json|  577 
 loleaflet/dist/l10n/locore/ko.json|  540 +++
 loleaflet/dist/l10n/locore/kok.json   |  475 +++
 loleaflet/dist/l10n/locore/ks.json|  203 +
 loleaflet/dist/l10n/locore/ky.json|3 
 loleaflet/dist/l10n/locore/lb.json|  111 
 loleaflet/dist/l10n/locore/lo.json|  206 +
 loleaflet/dist/l10n/locore/lt.json|  555 
 loleaflet/dist/l10n/locore/lv.json|  603 
 loleaflet/dist/l10n/locore/mai.json   |  259 +
 loleaflet/dist/l10n/locore/mk.json|  422 +++
 loleaflet/dist/l10n/locore/ml.json|  537 +++
 loleaflet/dist/l10n/locore/mn.json|  417 +++
 loleaflet/dist/l10n/locore/mni.json   |  213 +
 loleaflet/dist/l10n/locore/mr.json|  538 +++
 loleaflet/dist/l10n/locore/my.json|  467 +++
 loleaflet/dist/l10n/locore/nb.json|  613 
 loleaflet/dist/l10n/locore/ne.json|  468 +++
 loleaflet/dist/l10n/locore/nl.json|  614 
 loleaflet/dist/l10n/locore/nn.json|  615 
 loleaflet/dist/l10n/locore/nr.json|  296 ++
 loleaflet/dist/l10n/locore/nso.json   |  421 +++
 loleaflet/dist/l10n/locore/oc.json|  615 
 loleaflet/dist/l10n/locore/om.json|  430 +++
 loleaflet/dist/l10n/locore/or.json|  544 +++
 loleaflet/dist/l10n/locore/pa-IN.json |  503 +++
 loleaflet/dist/l10n/locore/pl.json|  603 
 loleaflet/dist/l1

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/tablevalidation.hxx   |   34 ++
 qadevOOo/Jar_OOoRunner.mk|1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv |   10 
 qadevOOo/tests/java/ifc/sheet/_TableValidation.java  |   43 --
 sc/qa/extras/sctablevalidationobj.cxx|   10 
 test/Library_subsequenttest.mk   |1 
 test/source/sheet/tablevalidation.cxx|  154 
++
 7 files changed, 197 insertions(+), 56 deletions(-)

New commits:
commit 056575f7ceff003348783f7611f84a68463fa8c8
Author: Jens Carl 
Date:   Wed Jan 3 05:42:01 2018 +

tdf#45904 Move _TableValidation Java tests to C++

Fixes #i90346.

Change-Id: Iec7e5ebfe28d3d26f5c50950ee2d3f5fc890da65
Reviewed-on: https://gerrit.libreoffice.org/47292
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/tablevalidation.hxx 
b/include/test/sheet/tablevalidation.hxx
new file mode 100644
index ..809745254141
--- /dev/null
+++ b/include/test/sheet/tablevalidation.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_TABLEVALIDATION_HXX
+#define INCLUDED_TEST_SHEET_TABLEVALIDATION_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST TableValidation
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testTableValidationProperties();
+
+protected:
+~TableValidation() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_TABLEVALIDATION_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index de087a156028..b8ed2487e317 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -581,7 +581,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_SubTotalDescriptor \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormat \
 qadevOOo/tests/java/ifc/sheet/_TableAutoFormatField \
-qadevOOo/tests/java/ifc/sheet/_TableValidation \
 qadevOOo/tests/java/ifc/sheet/_XActivationBroadcaster \
 qadevOOo/tests/java/ifc/sheet/_XArrayFormulaRange \
 qadevOOo/tests/java/ifc/sheet/_XCalculatable \
diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv
index 6ece7b010e7c..743fb8ef8851 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableValidationObj.csv
@@ -1,13 +1,3 @@
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"Type"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ShowInputMessage"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"InputTitle"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"InputMessage"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ShowErrorMessage"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ErrorTitle"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ErrorMessage"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"IgnoreBlankCells"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ErrorAlertStyle"
-"ScTableValidationObj";"com::sun::star::sheet::TableValidation";"ShowList#optional"
 
"ScTableValidationObj";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
 
"ScTableValidationObj";"com::sun::star::beans::XPropertySet";"setPropertyValue()"
 
"ScTableValidationObj";"com::sun::star::beans::XPropertySet";"getPropertyValue()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_TableValidation.java 
b/qadevOOo/tests/java/ifc/sheet/_TableValidation.java
deleted file mode 100644
index aab7a1640daa..
--- a/qadevOOo/tests/java/ifc/sheet/_TableValidation.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to

[Libreoffice-commits] online.git: loleaflet/admin.strings.js loleaflet/dist loleaflet/Makefile.am loleaflet/src

[Andras Timar]

 loleaflet/Makefile.am   |1 +
 loleaflet/admin.strings.js  |3 +++
 loleaflet/dist/admin/adminHistory.html  |6 +++---
 loleaflet/src/admin/AdminSocketAnalytics.js |4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 6aa893badf1c1bc1669fac304a824663b5432868
Author: Andras Timar 
Date:   Tue Jan 2 23:55:04 2018 +0100

l10n: admin console fixes

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

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 1e558399..e19bb442 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -50,6 +50,7 @@ pot:
unocommands.js \
dist/errormessages.js \
dist/toolbar/toolbar.js \
+   src/admin/AdminSocketAnalytics.js \
src/admin/AdminSocketBase.js \
src/admin/AdminSocketOverview.js \
src/admin/AdminSocketHistory.js \
diff --git a/loleaflet/admin.strings.js b/loleaflet/admin.strings.js
index 06812103..d4851649 100644
--- a/loleaflet/admin.strings.js
+++ b/loleaflet/admin.strings.js
@@ -35,6 +35,9 @@ l10nstrings.strCpuStatsInterval = _('Time interval of CPU 
statistics (in ms)');
 l10nstrings.strLimitVirtMemMb = _('Maximum Document process virtual memory (in 
MB) - reduce only');
 l10nstrings.strLimitStackMemKb = _('Maximum Document process stack memory (in 
KB) - reduce only');
 l10nstrings.strLimitFileSizeMb = _('Maximum file size allowed to write to disk 
(in MB) - reduce only');
+l10nstrings.strDocuments = _('Documents:');
+l10nstrings.strExpired = _('Expired:');
+l10nstrings.strRefresh = _('Refresh');
 
 if (module) {
module.exports = l10nstrings;
diff --git a/loleaflet/dist/admin/adminHistory.html 
b/loleaflet/dist/admin/adminHistory.html
index ba71ca0e..76dec2c9 100644
--- a/loleaflet/dist/admin/adminHistory.html
+++ b/loleaflet/dist/admin/adminHistory.html
@@ -64,10 +64,10 @@
 
 
   document.write(l10nstrings.strHistory)
-  refresh
+  document.write(l10nstrings.strRefresh)
   
-Documents:
-Expired:
+document.write(l10nstrings.strDocuments)
+document.write(l10nstrings.strExpired)
 
   
 
diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js 
b/loleaflet/src/admin/AdminSocketAnalytics.js
index d6a80f17..34decef0 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -215,11 +215,11 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 
var legendData = [
{
-   text: 'Recieved',
+   text: _('Received'),
color: 'red'
},
{
-   text: 'Sent',
+   text: _('Sent'),
color: 'green'
}
];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source compilerplugins/clang dbaccess/source desktop/source editeng/source include/editeng include/sfx2 include/svx sc/source sd/source sfx2/source svx/source sw

[Noel Grandin]

 basctl/source/basicide/baside2.hxx|4 ++--
 compilerplugins/clang/passstuffbyref.cxx  |   10 ++
 compilerplugins/clang/test/passstuffbyref.cxx |3 +--
 dbaccess/source/core/misc/dsntypes.cxx|4 ++--
 dbaccess/source/inc/dsntypes.hxx  |4 ++--
 dbaccess/source/ui/inc/ConnectionLineData.hxx |4 ++--
 dbaccess/source/ui/querydesign/QTableConnection.hxx   |2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2 +-
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx   |2 +-
 editeng/source/outliner/outliner.cxx  |2 +-
 include/editeng/outliner.hxx  |2 +-
 include/sfx2/sidebar/TabBar.hxx   |2 +-
 include/sfx2/tabdlg.hxx   |2 +-
 include/svx/SmartTagMgr.hxx   |2 +-
 include/svx/clipfmtitem.hxx   |2 +-
 sc/source/ui/drawfunc/drawsh2.cxx |2 +-
 sc/source/ui/inc/drawsh.hxx   |2 +-
 sd/source/ui/dlg/RemoteDialogClientBox.hxx|2 +-
 sd/source/ui/inc/DrawViewShell.hxx|2 +-
 sd/source/ui/inc/zoomlist.hxx |4 ++--
 sd/source/ui/sidebar/MasterPageContainer.cxx  |2 +-
 sd/source/ui/sidebar/MasterPageContainer.hxx  |2 +-
 sd/source/ui/view/drviewsa.cxx|2 +-
 sd/source/ui/view/zoomlist.cxx|4 ++--
 sfx2/source/sidebar/TabBar.cxx|2 +-
 sfx2/source/view/classificationcontroller.cxx |2 +-
 svx/source/inc/tablemodel.hxx |4 ++--
 svx/source/items/clipfmtitem.cxx  |2 +-
 svx/source/table/tablemodel.cxx   |4 ++--
 sw/inc/authfld.hxx|4 ++--
 sw/inc/redline.hxx|2 +-
 sw/inc/swmodule.hxx   |2 +-
 sw/source/core/doc/docredln.cxx   |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx |2 +-
 sw/source/filter/ww8/wrtww8.hxx   |2 +-
 sw/source/uibase/app/swmodul1.cxx |2 +-
 sw/source/uibase/inc/glosdoc.hxx  |2 +-
 sw/source/uibase/inc/wrtsh.hxx|2 +-
 sw/source/uibase/misc/glosdoc.cxx |2 +-
 sw/source/uibase/utlui/initui.cxx |4 ++--
 sw/source/uibase/wrtsh/wrtsh1.cxx |2 +-
 writerfilter/source/dmapper/TableData.hxx |2 +-
 writerfilter/source/ooxml/OOXMLPropertySet.cxx|2 +-
 writerfilter/source/ooxml/OOXMLPropertySet.hxx|2 +-
 writerperfect/source/common/WPXSvInputStream.cxx  |4 ++--
 xmloff/source/transform/StyleOASISTContext.cxx|8 
 47 files changed, 66 insertions(+), 65 deletions(-)

New commits:
commit acdba3c2eee18ef0c079b7c41cd4165e06c956c7
Author: Noel Grandin 
Date:   Tue Jan 2 15:10:58 2018 +0200

loplugin:passstuffbyref more return improvements

slightly less restrictive check when calling functions

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

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 1e97b1cf9040..79428e116b9e 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -422,7 +422,7 @@ public:
 void BasicRemoveWatch ();
 Color const & GetBackgroundColor () const { return 
aSyntaxColors.GetBackgroundColor(); }
 Color const & GetFontColor () const { return aSyntaxColors.GetFontColor(); 
}
-Color GetSyntaxColor (TokenType eType) const { return 
aSyntaxColors.GetColor(eType); }
+Color const & GetSyntaxColor (TokenType eType) const { return 
aSyntaxColors.GetColor(eType); }
 
 protected:
 // Window:
@@ -449,7 +449,7 @@ private:
 public:
 Color const & GetBackgroundColor () const { return m_aBackgroundColor; 
};
 Color const & GetFontColor () const { return m_aFontColor; }
-Color GetColor (TokenType eType) const { return aColors[eType]; }
+Color const & GetColor(TokenType eType) const { return aColors[eType]; 
}
 
 private:
 virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, 
ConfigurationHints) override;
diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index 54982fdfc045..8cfae946f041 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -275,7 +275,7 @@ void PassStuffByRef::checkReturnValue(const 

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

[Jens Carl]

 test/source/sheet/scenario.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f4bd9029ba7b500ebf99b7fa3d774de7fa029176
Author: Jens Carl 
Date:   Wed Jan 3 04:35:57 2018 +

Remove unused header.

Change-Id: Ie61537af3dd30e47cc5a9ab925e636686c0325f4
Reviewed-on: https://gerrit.libreoffice.org/47291
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/test/source/sheet/scenario.cxx b/test/source/sheet/scenario.cxx
index 1e89d0fa7a20..6121715c3fd8 100644
--- a/test/source/sheet/scenario.cxx
+++ b/test/source/sheet/scenario.cxx
@@ -11,7 +11,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/help.js help3xsl/xhp2html.sh source/text to-wiki/wikiconv2.py upload-wiki.pl wiki-to-help/HHC wiki-to-help/hhc.py wiki-to-help/mwlib_mods

[Andrea Gelmini]

 help3xsl/help.js  |2 +-
 help3xsl/xhp2html.sh  |6 +++---
 source/text/scalc/01/04060109.xhp |2 +-
 source/text/scalc/01/04060119.xhp |2 +-
 source/text/schart/01/0404.xhp|2 +-
 source/text/schart/01/0405.xhp|2 +-
 source/text/sdraw/guide/groups.xhp|2 +-
 source/text/shared/01/05020300.xhp|2 +-
 source/text/shared/01/ref_epub_export.xhp |2 +-
 source/text/shared/guide/chart_legend.xhp |2 +-
 source/text/shared/guide/dragdrop_fromgallery.xhp |2 +-
 source/text/shared/guide/language_select.xhp  |2 +-
 source/text/shared/optionen/01010501.xhp  |2 +-
 source/text/smath/01/03090500.xhp |2 +-
 source/text/smath/01/03090700.xhp |2 +-
 source/text/swriter/guide/pagenumbers.xhp |4 ++--
 source/text/swriter/guide/table_select.xhp|2 +-
 to-wiki/wikiconv2.py  |2 +-
 upload-wiki.pl|6 +++---
 wiki-to-help/HHC/install_hhc.sh   |4 ++--
 wiki-to-help/hhc.py   |2 +-
 wiki-to-help/mwlib_mods/docbook_table_tags.py |2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 7c78c30b297d368b94ab82f761c032b59f225c06
Author: Andrea Gelmini 
Date:   Tue Sep 19 10:09:22 2017 +0200

Fix typos

Change-Id: I7ef82f8d2896f3687be1aacfd08b8cf0d0d6e105
Reviewed-on: https://gerrit.libreoffice.org/47273
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/help.js b/help3xsl/help.js
index 552022070..04b02e526 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-// Used to set Apllication in caseinlie=APP
+// Used to set Application in caseinline=APP
 function setModule(module){
 if (module == null){module="WRITER"}
 var itemspan = document.getElementsByTagName("span");
diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh
index b4e56b5a7..6c7145e66 100755
--- a/help3xsl/xhp2html.sh
+++ b/help3xsl/xhp2html.sh
@@ -6,7 +6,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# This script builds translated XHP file with helpex excutable
+# This script builds translated XHP file with helpex executable
 # and thes transform it to html pages
 # 1) generates redirection from LibreOffice Help URL to right html page
 #in index.html with bookmark2file.js
@@ -186,7 +186,7 @@ mkdir -p $here'/html/'$productversion'/media/icon-themes'
 cp -a ../../icon-themes/galaxy/* 
$here'/html/'$productversion'/media/icon-themes/'
 ln -s $productversion html/latest
 
-# Set helpex utilty and environment
+# Set helpex utility and environment
 
 while test ! -d "${rootHelpex}/instdir/program" ; do
 if test "${dir}" = "/"; then
@@ -238,7 +238,7 @@ mkdir -p $outDirLang
 outDirHTML=$here'/html/'$productversion'/'$lang
 mkdir -p $outDirHTML
 
-# Special case of en-US, tehre is no translation to do
+# Special case of en-US, there is no translation to do
 
 if [ "$lang" == en-US ];
 then
diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index ef8d5bd5e..95e3d8791 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -50,7 +50,7 @@
 In INDIRECT, the parameter is appended as the second 
parameter.
 In both functions, if the argument is inserted with the value 
0, then the R1C1 notation is used. If the argument is not given or has a value 
other than 0, then the A1 notation is used. 
 In case of R1C1 notation, ADDRESS returns address strings 
using the exclamation mark '!' as the sheet name separator, and INDIRECT 
expects the exclamation mark as sheet name separator. Both functions still use 
the dot '.' sheet name separator with A1 notation.
-When opening documents from ODF 1.0/1.1 format, the ADDRESS 
functions that show a sheet name as the fourth paramater will shift that sheet 
name to become the fifth parameter. A new fourth parameter with the value 1 
will be inserted.
+When opening documents from ODF 1.0/1.1 format, the ADDRESS 
functions that show a sheet name as the fourth parameter will shift that sheet 
name to become the fifth parameter. A new fourth parameter with the value 1 
will be inserted.
 When storing a document in ODF 1.0/1.1 format, if ADDRESS 
functions have a fourth parameter, that parameter will be removed.
 Do not save a spreadsheet in the old ODF 1.0/1.1 format if the 
ADDRESS function's new fourth parameter was used with a value of 0.
 The INDIRECT function is saved without conversion to 

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini]

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

New commits:
commit 620be71536a8a5313b89b1670dc05fd2c7476a7c
Author: Andrea Gelmini 
Date:   Tue Sep 19 10:09:22 2017 +0200

Updated core
Project: help  7c78c30b297d368b94ab82f761c032b59f225c06

Fix typos

Change-Id: I7ef82f8d2896f3687be1aacfd08b8cf0d0d6e105
Reviewed-on: https://gerrit.libreoffice.org/47273
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 1228aaeb66e0..7c78c30b297d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1228aaeb66e050dfacd1ac57ec785bc2e13997df
+Subproject commit 7c78c30b297d368b94ab82f761c032b59f225c06
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andrea Gelmini]

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

New commits:
commit 7b7779d7c43c32332bbfd2ed28f087948bac5c23
Author: Andrea Gelmini 
Date:   Wed Oct 4 22:11:22 2017 +0200

Updated core
Project: help  1228aaeb66e050dfacd1ac57ec785bc2e13997df

Fix typo

Change-Id: I180510136adc14ff60f1474fbcf2365af7d5821e
Reviewed-on: https://gerrit.libreoffice.org/47274
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index cac2a5ccfd5d..1228aaeb66e0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cac2a5ccfd5d7197a1a1ad706bca5f0f4235a2fd
+Subproject commit 1228aaeb66e050dfacd1ac57ec785bc2e13997df
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 source/text/scalc/01/0512.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1228aaeb66e050dfacd1ac57ec785bc2e13997df
Author: Andrea Gelmini 
Date:   Wed Oct 4 22:11:22 2017 +0200

Fix typo

Change-Id: I180510136adc14ff60f1474fbcf2365af7d5821e
Reviewed-on: https://gerrit.libreoffice.org/47274
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/0512.xhp 
b/source/text/scalc/01/0512.xhp
index ee3a0db7f..bcc2e7a00 100644
--- a/source/text/scalc/01/0512.xhp
+++ b/source/text/scalc/01/0512.xhp
@@ -111,7 +111,7 @@ Apply a color scale to a range consist of displaying a 
bicolor or tricolor gradi
 
 
   Conditions to display each icon can be specified relative to a 
value (Value), a percentage of the number of values in the range (Percentage) 
as a percentage of range values (Percentile) or formula (Formula).
-  For a 
detailed explanation and examples, please visit http://wiki.documentfoundation.org/Faq/Calc/141";>How to use Icon Set 
Conditional Formating page in TDF Wiki.
+  For a 
detailed explanation and examples, please visit http://wiki.documentfoundation.org/Faq/Calc/141";>How to use Icon Set 
Conditional Formatting page in TDF Wiki.
 
 Dates
   This 
option will apply a defined style depending on a date that you choose in the 
drop down box: Today - Yesterday - Tomorrow - Last 7 days - This week - Last 
week.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Jens Carl]

 include/test/sheet/scenario.hxx |   34 ++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |8 
 qadevOOo/tests/java/ifc/sheet/_Scenario.java|   33 --
 sc/qa/extras/sctablesheetobj.cxx|9 
 test/Library_subsequenttest.mk  |1 
 test/source/sheet/scenario.cxx  |  115 
++
 7 files changed, 157 insertions(+), 44 deletions(-)

New commits:
commit 23a1c5429c67986a945baab6dae553e58d2d72d9
Author: Jens Carl 
Date:   Wed Jan 3 00:47:36 2018 +

tdf#45904 Move _Scenario Java tests to C++

Change-Id: I313f3a56fd99e7fb29e6f729cfe13e99adf1fed6
Reviewed-on: https://gerrit.libreoffice.org/47289
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/include/test/sheet/scenario.hxx b/include/test/sheet/scenario.hxx
new file mode 100644
index ..3a3ec8d87121
--- /dev/null
+++ b/include/test/sheet/scenario.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_TEST_SHEET_SCENARIO_HXX
+#define INCLUDED_TEST_SHEET_SCENARIO_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST Scenario
+{
+public:
+virtual css::uno::Reference getScenarioSpreadsheet() 
= 0;
+
+void testScenarioProperties();
+
+protected:
+~Scenario() {}
+};
+}
+
+#endif // INCLUDED_TEST_SHEET_SCENARIO_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 1fa333cd889b..de087a156028 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -567,7 +567,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/sheet/_DocumentSettings \
 qadevOOo/tests/java/ifc/sheet/_FunctionDescription \
 qadevOOo/tests/java/ifc/sheet/_GlobalSheetSettings \
-qadevOOo/tests/java/ifc/sheet/_Scenario \
 qadevOOo/tests/java/ifc/sheet/_Shape \
 qadevOOo/tests/java/ifc/sheet/_SheetCell \
 qadevOOo/tests/java/ifc/sheet/_SheetCellRange \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index fcebef99d308..a733f9e19d38 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -109,14 +109,6 @@
 
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontPitchComplex"
 
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharPostureComplex"
 
"ScTableSheetObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"IsActive#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"BorderColor#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"Protected#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"ShowBorder#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"PrintBorder#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"CopyBack#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"CopyStyles#optional"
-"ScTableSheetObj";"com::sun::star::sheet::Scenario";"CopyFormulas#optional"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"protect()"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"unprotect()"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"isProtected()"
diff --git a/qadevOOo/tests/java/ifc/sheet/_Scenario.java 
b/qadevOOo/tests/java/ifc/sheet/_Scenario.java
deleted file mode 100644
index 48efe7a84bb6..
--- a/qadevOOo/tests/java/ifc/sheet/_Scenario.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a

Re: LibreOfficeLight / iOS

[Thorsten Behrens]

jan iversen wrote:
> Please advice me, how to disable GPGME for both build and host
> configuration.
> 
Ah, for makefiles, use ENABLE_GPGMEPP to check if that's
available. HAVE_FEATURE_GPGME is for source code, and defined in
config_host/config_gpgme.h

Cheers,

-- Thorsten


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

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

[Jan-Marek Glogowski]

 svtools/source/misc/langhelp.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6a29d733651eb307ee8a6c3cf1bc64579070e53a
Author: Jan-Marek Glogowski 
Date:   Wed Dec 27 15:47:26 2017 +0100

Treat OOO_VENDOR as (non-Unicode) plain char string

Fixes the loplugin:stringconstant complains when using a unicode
vendor name.

Change-Id: Ib15e558585fe388f734da469e728909a48686ef0
Co-authored-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/47278
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 47cb87e36963..e4e64375e4b5 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -125,7 +126,7 @@ OUString getInstalledLocaleForSystemUILanguage(const 
css::uno::Sequencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: master build fails if --with-vendor option is set in autogen.input

[Jean-Baptiste Faure]

Hi,

Le 02/01/2018 à 22:20, Caolán McNamara a écrit :

On Fri, 2017-12-22 at 23:14 +0100, Jean-Baptiste Faure wrote:

Hi,

I get the following error when building the master:


[build CXX] framework/source/fwe/classes/sfxhelperfunctions.cxx
/home/libo/master/svtools/source/misc/langhelp.cxx: In function
‘rtl::OUString getInstalledLocaleForSystemUILanguage(const
com::sun::star::uno::Sequence&, bool)’:
/home/libo/master/svtools/source/misc/langhelp.cxx:128:47: error:
unable to find string literal operator ‘operator""JBF_at_home’ with
‘const char [1]’, ‘long unsigned int’ arguments
  OUString sVendor(OOO_VENDOR);


I guess the problem is in the commit
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=1c7d3
390022908cfbfd30f55e8c0c3b60a045da7
because no other recent commit
changed  svtools/source/misc/langhelp.cxx

If I remove the option --with-vendor=JBF_at_home from my
autogen.input file the compile error disappears


Is it
--with-vendor=JBF_at_home
or
--with-vendor="JBF_at_home"
that has the problem ? I imagine the second, right ?


Yes, the problem is with
--with-vendor="JBF_at_home"

Do you mean that I must remove the double quotes ?
It works with the double quotes for 6.0 branch. In fact in 6.0 branch 
and master until recently, I used the option

--with-vendor="JBF at home"
without underscore; I added them only for testing purpose.

Best regards.
JBF

--
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
Disclaimer: my Internet Provider being located in France, each of our
exchanges over Internet will be scanned by French spying services.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: master build fails if --with-vendor option is set in autogen.input

[Caolán McNamara]

On Fri, 2017-12-22 at 23:14 +0100, Jean-Baptiste Faure wrote:
> Hi,
> 
> I get the following error when building the master:
> 
> > [build CXX] framework/source/fwe/classes/sfxhelperfunctions.cxx
> > /home/libo/master/svtools/source/misc/langhelp.cxx: In function
> > ‘rtl::OUString getInstalledLocaleForSystemUILanguage(const
> > com::sun::star::uno::Sequence&, bool)’:
> > /home/libo/master/svtools/source/misc/langhelp.cxx:128:47: error:
> > unable to find string literal operator ‘operator""JBF_at_home’ with
> > ‘const char [1]’, ‘long unsigned int’ arguments
> >  OUString sVendor(OOO_VENDOR);
> 
> I guess the problem is in the commit
> https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=1c7d3
> 390022908cfbfd30f55e8c0c3b60a045da7
> because no other recent commit
> changed  svtools/source/misc/langhelp.cxx
> 
> If I remove the option --with-vendor=JBF_at_home from my
> autogen.input file the compile error disappears

Is it
--with-vendor=JBF_at_home
or
--with-vendor="JBF_at_home"
that has the problem ? I imagine the second, right ?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: G_SLICE in sal module

[Caolán McNamara]

On Mon, 2018-01-01 at 04:38 +1100, Chris Sherlock wrote:
> I submitted a gerrit change https://gerrit.libreoffice.org/#/c/46139/
>  to remove check of the G_SLICE environment variable. Stephan made
> the following reasonable comment:
> 
> > Note that (before bc6a5d8e79e7d0e7d75ac107aa8e6aa275e434e9 "Disable
> > custom allocator") determine_alloc_mode (sal/rtl/alloc_global.cxx)
> > had piggybacked the decision which allocator to use onto the
> > preexisting G_SLICE environment variable.  Removing settings of
> > that environment variable may have other consequences (see  > /developer.gnome.org/glib/unstable/glib-Memory-Slices.html> for
> > documentation).  I'm not sure how relevant setting that environment
> > variable still is; maybe you can bring it up on the mailing list.
> 
> So, as suggested, taking this to the mailing list :-)

Yeah, G_SLICE affects glib and we just piggy-backed our own allocator
disable off that variable too for simplicity so both got disabled.

I think its probably worth keeping setting G_SLICE in the current
scripts and .mk files where we currently have it so that it continues
to disable the glib allocator for the gtk[2|3] and other pieces that
call glib stuff
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/source/filter/html/htmlsect.cxx |7 ++-
 sw/source/filter/html/swhtml.cxx   |1 +
 sw/source/filter/html/swhtml.hxx   |   11 +--
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 834cebd153573eea3cc321eca5bcb572b4776dec
Author: Caolán McNamara 
Date:   Tue Jan 2 17:19:32 2018 +

ofz: assert on trying to insert footer when already inserting the footer

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

diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 0b2facf82e62..9a23aebaa8f9 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -138,8 +138,11 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 }
 }
 
-if( !bPositioned && (bHeader || bFooter) && IsNewDoc() )
+if (!bPositioned && (bHeader || bFooter) && IsNewDoc() && 
!m_bReadingHeaderOrFooter)
 {
+m_bReadingHeaderOrFooter = true;
+xCntxt->SetHeaderOrFooter(true);
+
 SwPageDesc *pPageDesc = m_pCSS1Parser->GetMasterPageDesc();
 SwFrameFormat& rPageFormat = pPageDesc->GetMaster();
 
@@ -403,6 +406,8 @@ void SwHTMLParser::EndDivision()
 // close attribute
 EndContext(xCntxt.get());
 SetAttr();  // set paragraph attributes really fast because of 
JavaScript
+if (xCntxt->IsHeaderOrFooter())
+m_bReadingHeaderOrFooter = false;
 }
 }
 
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index e8d3b316aaab..86a305b836a8 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -299,6 +299,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, 
SvStream& rIn,
 m_bIgnoreHTMLComments( bNoHTMLComments ),
 m_bRemoveHidden( false ),
 m_bBodySeen( false ),
+m_bReadingHeaderOrFooter( false ),
 m_pTempViewFrame(nullptr)
 {
 m_nEventId = nullptr;
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 8d6130d6c70c..45b5effe1857 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -231,6 +231,7 @@ class HTMLAttrContext
 boolbRestartPRE : 1;
 boolbRestartXMP : 1;
 boolbRestartListing : 1;
+boolbHeaderOrFooter : 1;
 
 public:
 void ClearSaveDocContext();
@@ -255,7 +256,8 @@ public:
 bFinishPREListingXMP( false ),
 bRestartPRE( false ),
 bRestartXMP( false ),
-bRestartListing( false )
+bRestartListing( false ),
+bHeaderOrFooter( false )
 {}
 
 explicit HTMLAttrContext( HtmlTokenId nTokn ) :
@@ -276,7 +278,8 @@ public:
 bFinishPREListingXMP( false ),
 bRestartPRE( false ),
 bRestartXMP( false ),
-bRestartListing( false )
+bRestartListing( false ),
+bHeaderOrFooter( false )
 {}
 
 ~HTMLAttrContext() { ClearSaveDocContext(); }
@@ -326,6 +329,9 @@ public:
 void SetRestartListing( bool bSet ) { bRestartListing = bSet; }
 bool IsRestartListing() const { return bRestartListing; }
 
+void SetHeaderOrFooter( bool bSet ) { bHeaderOrFooter = bSet; }
+bool IsHeaderOrFooter() const { return bHeaderOrFooter; }
+
 void SetAppendMode( SwHTMLAppendMode eMode ) { eAppend = eMode; }
 SwHTMLAppendMode GetAppendMode() const { return eAppend; }
 };
@@ -485,6 +491,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 bool m_bRemoveHidden : 1; // the filter implementation might set the 
hidden flag
 
 bool m_bBodySeen : 1;
+bool m_bReadingHeaderOrFooter : 1;
 
 /// the names corresponding to the DOCINFO field subtypes INFO[1-4]
 OUString m_InfoNames[4];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/swhtml.cxx |   10 ++
 sw/source/filter/ww8/ww8par.cxx  |9 ++---
 2 files changed, 4 insertions(+), 15 deletions(-)

New commits:
commit a820979e22e882f7005c326c8597c0647f4fcf90
Author: Caolán McNamara 
Date:   Tue Jan 2 16:13:15 2018 +

always going to be a textnode

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

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index d6ffd1928348..e8d3b316aaab 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5544,14 +5544,8 @@ bool TestImportHTML(SvStream &rStream)
 xDocSh->DoInitNew();
 SwDoc *pD =  static_cast((&xDocSh))->GetDoc();
 
-SwNodeIndex aIdx(
-*pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
-if( !aIdx.GetNode().IsTextNode() )
-{
-pD->GetNodes().GoNext( &aIdx );
-}
-SwPaM aPaM( aIdx );
-aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
+SwNodeIndex aIdx(pD->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
 pD->SetInReading(true);
 bool bRet = false;
 try
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 1a35d257e596..bf508642f9b8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6233,13 +6233,8 @@ bool TestImportDOC(SvStream &rStream, const OUString 
&rFltName)
 xDocSh->DoInitNew();
 SwDoc *pD =  static_cast((&xDocSh))->GetDoc();
 
-SwNodeIndex aIdx(
-*pD->GetNodes().GetEndOfContent().StartOfSectionNode(), 1);
-if( !aIdx.GetNode().IsTextNode() )
-{
-pD->GetNodes().GoNext( &aIdx );
-}
-SwPaM aPaM( aIdx );
+SwNodeIndex aIdx(pD->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
 aPaM.GetPoint()->nContent.Assign(aIdx.GetNode().GetContentNode(), 0);
 pD->SetInReading(true);
 bool bRet = xReader->Read(*pD, OUString(), aPaM, OUString()) == 
ERRCODE_NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl.mk sal/qa

[Stephan Bergmann]

 sal/CppunitTest_sal_osl.mk|1 -
 sal/qa/osl/file/osl_old_test_file.cxx |   25 -
 2 files changed, 26 deletions(-)

New commits:
commit 49e62852c9c59b55ed27dcf433d99f5a65f7d6c0
Author: Stephan Bergmann 
Date:   Tue Jan 2 16:11:15 2018 +0100

Remove broken test

...introduced with 26be5f21cebfe9acad088a1086f97eebdb437b7c "unotools: 
don't go
belly-up if temp dir is wrong or empty".  At least Flatpak builds can 
create a
/not/found/dir directory just fine.

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

diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk
index 787dbf96174f..d96ab2d41483 100644
--- a/sal/CppunitTest_sal_osl.mk
+++ b/sal/CppunitTest_sal_osl.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\
 
 $(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
sal \
-   utl \
 ))
 
 # the test uses the library created by Module_DLL
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx 
b/sal/qa/osl/file/osl_old_test_file.cxx
index fbbefbb03884..f093d5fe1bb8 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -32,9 +32,6 @@
 #include 
 #include 
 
-#include 
-
-
 namespace osl_test_file
 {
 
@@ -140,30 +137,8 @@ void oldtestfile::test_file_004()
 #endif
 }
 
-class TempFileTest : public CppUnit::TestFixture
-{
-
-public:
-TempFileTest() {}
-
-void SetTempNameBaseDirectory()
-{   // only testing: of not found the directory
-OUString path = 
utl::TempFile::SetTempNameBaseDirectory("file:///not/found/dir");
-
-CPPUNIT_ASSERT_MESSAGE("SetTempNameBaseDirectory must give a empty 
string back",
-path.isEmpty());
-}
-
-
-CPPUNIT_TEST_SUITE(TempFileTest);
-CPPUNIT_TEST(SetTempNameBaseDirectory);
-CPPUNIT_TEST_SUITE_END();
-};
-
-
 } // namespace osl_test_file
 
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile);
-CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::TempFileTest);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LibreOfficeLight / iOS

[jan iversen]

Manually adding BRAND_SHARE_SUBDIR=share

> to fundamentalrc allowed me to render a tile using the CGContext based
> code in the unit test, and save it to a png. Woohoo!
>
> I'm not sure where that should be added?
>
It is generated in iOS/CustomTarget_iOS_setup.mk line 54-64, once I get my
things to compile again, I will have a closer look.

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

Re: LibreOfficeLight / iOS

[jan iversen]

libassuan is part of the gpg4libre subsystem, and rather certainly not
> useful on iOS. I suggest to disable that, like on Android (there's a
> feature check define now, HAVE_FEATURE_GPGME).
>

Thanks for the info, I can see HAVE_FEATURE_GPGME is being defined in
configure.ac, but it not declared in
config_host/config_features.h.in or config_host.mk.in

so it seems not to be available to clang or make ?

I cannot see how to disable it, I need to disable it both for iOS and for
cross-toolset (that runs on normal Mac).

My problem is svidl (part of cross-toolset), when called it tries to load
libassuan.

Funny thing is that when I build for MAC I have no problem.

Please advice me, how to disable GPGME for both build and host
configuration.

Thanks in advance.
rgds
jan I.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[David Tardon]

 download.lst|4 
 external/libqxp/0001-WaE-narrowing-conversion.patch.1   |   28 
---
 external/libqxp/0001-add-missing-includes.patch.1   |   37 

 external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1 |   89 
--
 external/libqxp/ExternalProject_libqxp.mk   |5 
 external/libqxp/UnpackedTarball_libqxp.mk   |5 
 6 files changed, 4 insertions(+), 164 deletions(-)

New commits:
commit c576312aa60c8ffbae7628ad1a86155a96266356
Author: David Tardon 
Date:   Tue Jan 2 13:43:18 2018 +0100

upload libqxp 0.0.1

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

diff --git a/download.lst b/download.lst
index c5b260a0f9c9..b98f31a8521b 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f0
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
 export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
 export PYTHON_TARBALL := Python-3.5.4.tgz
-export QXP_SHA256SUM := 
0dd32afbf1c889debc28848b260c1bdc0eba5f57504476b787e164f7c59776d5
-export QXP_TARBALL := libqxp-0.0.0.tar.xz
+export QXP_SHA256SUM := 
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
+export QXP_TARBALL := libqxp-0.0.1.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
 export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
 export RASQAL_SHA256SUM := 
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
diff --git a/external/libqxp/0001-WaE-narrowing-conversion.patch.1 
b/external/libqxp/0001-WaE-narrowing-conversion.patch.1
deleted file mode 100644
index 0c73c0501f3c..
--- a/external/libqxp/0001-WaE-narrowing-conversion.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d0b78eb855dc3797e614a72019afbebbebc536a Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 28 Aug 2017 08:58:10 +0200
-Subject: [PATCH] WaE: narrowing conversion
-
-error C2398: Element '3': conversion from 'unsigned __int64' to 'unsigned 
long' requires a narrowing conversion

- src/lib/QXPContentCollector.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/QXPContentCollector.cpp b/src/lib/QXPContentCollector.cpp
-index 6a227a6..9c3076d 100644
 a/src/lib/QXPContentCollector.cpp
-+++ b/src/lib/QXPContentCollector.cpp
-@@ -943,7 +943,9 @@ void QXPContentCollector::drawText(const 
std::shared_ptr &text, const Link
- break;
-   }
- 
--  const unsigned long spanTextEnd = std::min({ 
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(), 
textEnd });
-+  const auto spanTextEnd = static_cast(
-+ std::min({ 
charFormat.afterEndIndex(), paragraph.afterEndIndex(), text->text.length(), 
textEnd })
-+   );
- 
-   if (charFormat.format->isControlChars)
-   {
--- 
-2.13.0
-
diff --git a/external/libqxp/0001-add-missing-includes.patch.1 
b/external/libqxp/0001-add-missing-includes.patch.1
deleted file mode 100644
index c5dbeb535fdf..
--- a/external/libqxp/0001-add-missing-includes.patch.1
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5658a197de7dd7827e6cb2ba9acd8ed7934e9e83 Mon Sep 17 00:00:00 2001
-From: Aleksas Pantechovskis 
-Date: Sun, 27 Aug 2017 22:55:00 +0300
-Subject: [PATCH] add missing includes
-

- src/lib/QXPBlockParser.cpp  | 1 +
- src/lib/QXPContentCollector.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/lib/QXPBlockParser.cpp b/src/lib/QXPBlockParser.cpp
-index a9a8c9b..d0a58e7 100644
 a/src/lib/QXPBlockParser.cpp
-+++ b/src/lib/QXPBlockParser.cpp
-@@ -13,6 +13,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- #include "QXPHeader.h"
- #include "QXPMemoryStream.h"
-diff --git a/src/lib/QXPContentCollector.cpp b/src/lib/QXPContentCollector.cpp
-index 0a5a2c9..6a227a6 100644
 a/src/lib/QXPContentCollector.cpp
-+++ b/src/lib/QXPContentCollector.cpp
-@@ -11,6 +11,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #include 
- #include 
--- 
-2.7.4
-
diff --git 
a/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1 
b/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
deleted file mode 100644
index 40e4ee179ac8..
--- a/external/libqxp/0001-don-t-use-RVNGStringStream-in-the-main-lib.patch.1
+++ /dev/null
@@ -1,89 +0,0 @@
-From 4118cfa23d2e251278a55f7fd44c246c84c41ab5 Mon Sep 17 00:00:00 2001
-From: Aleksas Pantechovskis 
-Date: Sun, 27 Aug 2017 19:39:37 +0300
-Subject: [PATCH] don't use RVNGStringStream in the main lib
-
-librevenge-stream is not used in libreoffi

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

[Tor Lillqvist]

 connectivity/source/parse/sqlbison.y |4 ++--
 connectivity/source/parse/sqlflex.l  |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 72ff62a13af402d19e6e53b809b29033a985c04a
Author: Tor Lillqvist 
Date:   Tue Jan 2 18:46:33 2018 +0200

tdf#104986: Add MILLISECOND, WEEKDAY, and YEARDAY tokens for Firebird

Change-Id: I2ba866c408dbf49f1655cc08cc5d0df840eaf01e
Reviewed-on: https://gerrit.libreoffice.org/47271
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 2c55bae0f66b..0f21bcc6fcc9 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -146,8 +146,8 @@ using namespace connectivity;
 /* time and date functions */
 %token  SQL_TOKEN_CURRENT_DATE SQL_TOKEN_CURRENT_TIME 
SQL_TOKEN_CURRENT_TIMESTAMP SQL_TOKEN_CURDATE SQL_TOKEN_CURTIME
 %token  SQL_TOKEN_DAYNAME  SQL_TOKEN_DAYOFMONTH  
SQL_TOKEN_DAYOFWEEK  SQL_TOKEN_DAYOFYEAR SQL_TOKEN_EXTRACT
-%token  SQL_TOKEN_HOUR SQL_TOKEN_MINUTE  SQL_TOKEN_MONTH  
SQL_TOKEN_MONTHNAME SQL_TOKEN_NOW SQL_TOKEN_QUARTER SQL_TOKEN_DATEDIFF
-%token  SQL_TOKEN_SECOND SQL_TOKEN_TIMESTAMPADD 
SQL_TOKEN_TIMESTAMPDIFF SQL_TOKEN_TIMEVALUE SQL_TOKEN_WEEK SQL_TOKEN_YEAR
+%token  SQL_TOKEN_HOUR SQL_TOKEN_MILLISECOND SQL_TOKEN_MINUTE  
SQL_TOKEN_MONTH  SQL_TOKEN_MONTHNAME SQL_TOKEN_NOW SQL_TOKEN_QUARTER 
SQL_TOKEN_DATEDIFF
+%token  SQL_TOKEN_SECOND SQL_TOKEN_TIMESTAMPADD 
SQL_TOKEN_TIMESTAMPDIFF SQL_TOKEN_TIMEVALUE SQL_TOKEN_WEEK SQL_TOKEN_WEEKDAY 
SQL_TOKEN_YEAR SQL_TOKEN_YEARDAY
 
 /* numeric functions */
 %token  SQL_TOKEN_ABS SQL_TOKEN_ACOS SQL_TOKEN_ASIN SQL_TOKEN_ATAN 
SQL_TOKEN_ATAN2 SQL_TOKEN_CEILING
diff --git a/connectivity/source/parse/sqlflex.l 
b/connectivity/source/parse/sqlflex.l
index 9d9f119fd640..5d8a59c27844 100644
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -260,6 +260,7 @@ LOWER   {SQL_NEW_KEYWORD(SQL_TOKEN_LOWER);  }
 LTRIM   {SQL_NEW_KEYWORD(SQL_TOKEN_LTRIM);  }
 
 MAX {SQL_NEW_KEYWORD(SQL_TOKEN_MAX);  }
+MILLISECOND {SQL_NEW_KEYWORD(SQL_TOKEN_MILLISECOND);  }
 MIN {SQL_NEW_KEYWORD(SQL_TOKEN_MIN);  }
 MINUTE  {SQL_NEW_KEYWORD(SQL_TOKEN_MINUTE);  }
 MOD {SQL_NEW_KEYWORD(SQL_TOKEN_MOD);  }
@@ -394,6 +395,7 @@ VALUES  {SQL_NEW_KEYWORD(SQL_TOKEN_VALUES);  }
 VIEW{SQL_NEW_KEYWORD(SQL_TOKEN_VIEW);  }
 
 WEEK{SQL_NEW_KEYWORD(SQL_TOKEN_WEEK);  }
+WEEKDAY {SQL_NEW_KEYWORD(SQL_TOKEN_WEEKDAY);  }
 WHEN{SQL_NEW_KEYWORD(SQL_TOKEN_WHEN);  }
 WHERE   {SQL_NEW_KEYWORD(SQL_TOKEN_WHERE);  }
 WITH{SQL_NEW_KEYWORD(SQL_TOKEN_WITH);  }
@@ -402,6 +404,7 @@ WITHOUT {SQL_NEW_KEYWORD(SQL_TOKEN_WITHOUT);  }
 WORK{SQL_NEW_KEYWORD(SQL_TOKEN_WORK);  }
 
 YEAR{SQL_NEW_KEYWORD(SQL_TOKEN_YEAR);  }
+YEARDAY {SQL_NEW_KEYWORD(SQL_TOKEN_YEARDAY);  }
 
 ZONE{SQL_NEW_KEYWORD(SQL_TOKEN_ZONE);  }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |9 -
 connectivity/source/drivers/firebird/ResultSet.cxx |   12 
 2 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit e0a22d47d281f61f51ead6d2831cd53c15036ffe
Author: Tor Lillqvist 
Date:   Tue Jan 2 16:54:40 2018 +0200

tdf#71007: Pass also fractional seconds to/from Firebird

We know that ISC_TIME is simply in units of
seconds/ISC_TIME_SECONDS_PRECISION.

Change-Id: I2896f53c2d32a773c535e19f55dd1314abd18ec9
Reviewed-on: https://gerrit.libreoffice.org/47266
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 35cd4579be1a..f951537fde28 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -462,6 +462,10 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 
nIndex, const css::util::Ti
 ISC_TIME aISCTime;
 isc_encode_sql_time(&aCTime, &aISCTime);
 
+// Here we "know" that ISC_TIME is simply in units of 
seconds/ISC_TIME_SECONDS_PRECISION with no
+// other funkiness, so we can simply add the fraction of a second.
+aISCTime += rTime.NanoSeconds / (10 / ISC_TIME_SECONDS_PRECISION);
+
 setValue< ISC_TIME >(nIndex, aISCTime, SQL_TYPE_TIME);
 }
 
@@ -478,6 +482,9 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 
nIndex, const DateTime&
 ISC_TIMESTAMP aISCTimestamp;
 isc_encode_timestamp(&aCTime, &aISCTimestamp);
 
+// As in previous function
+aISCTimestamp.timestamp_time += rTimestamp.NanoSeconds / (10 / 
ISC_TIME_SECONDS_PRECISION);
+
 setValue< ISC_TIMESTAMP >(nIndex, aISCTimestamp, SQL_TIMESTAMP);
 }
 
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index caf7b540ade5..2d440097151e 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -526,9 +526,12 @@ Time OResultSet::retrieveValue(const sal_Int32 
nColumnIndex, const ISC_SHORT /*n
 struct tm aCTime;
 isc_decode_sql_time(&aISCTime, &aCTime);
 
-// first field is nanoseconds -- not supported in firebird or struct 
tm.
+// First field is nanoseconds.
 // last field denotes UTC (true) or unknown (false)
-return Time(0, aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour, false);
+// Here we "know" that ISC_TIME is simply in units of 
seconds/ISC_TIME_SECONDS_PRECISION
+// with no other funkiness, so we can get the fractional seconds 
easily.
+return Time((aISCTime % ISC_TIME_SECONDS_PRECISION) * (10 / 
ISC_TIME_SECONDS_PRECISION),
+aCTime.tm_sec, aCTime.tm_min, aCTime.tm_hour, false);
 }
 else
 {
@@ -546,7 +549,8 @@ DateTime OResultSet::retrieveValue(const sal_Int32 
nColumnIndex, const ISC_SHORT
 struct tm aCTime;
 isc_decode_timestamp(&aISCTimestamp, &aCTime);
 
-return DateTime(0, //nanoseconds, not supported
+// Ditto here, see comment in previous function about ISC_TIME and 
ISC_TIME_SECONDS_PRECISION.
+return DateTime((aISCTimestamp.timestamp_time % 
ISC_TIME_SECONDS_PRECISION) * (10 / ISC_TIME_SECONDS_PRECISION), 
//nanoseconds
 aCTime.tm_sec,
 aCTime.tm_min,
 aCTime.tm_hour,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - help3xsl/online_transform.xsl

[Olivier Hallot]

 help3xsl/online_transform.xsl |   31 +++
 1 file changed, 11 insertions(+), 20 deletions(-)

New commits:
commit 6d883096dc275e1b384ed9ad08fd9ab4ad26bb3f
Author: Olivier Hallot 
Date:   Wed Dec 27 16:19:16 2017 -0200

tdf#112755 reorder modules in new help (II)

reorder modules in Index

Change-Id: Ib226a7c243e682e4e2a98d6d48ae1d9b1e3cace1
Reviewed-on: https://gerrit.libreoffice.org/47095
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit dfdc1f55f63d4497e6bd5fa5793ba8b57d6a78fc)
Reviewed-on: https://gerrit.libreoffice.org/47105

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 649671421..6349bfa77 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -212,8 +212,8 @@
 
 
 Writer
-   Calc
-   Impress
+Calc
+Impress
 Draw
 Base
 Math
@@ -258,24 +258,15 @@
   🔎  
 
 
-   CALC
-   
-   CHART
-
-   WRITER
-
-   DRAW
-
-   IMPRESS
-
-   MATH
-
-   BASE
-
-   BASIC
-
-   GLOBAL
-
+WRITER
+CALC
+IMPRESS
+DRAW
+BASE
+MATH
+CHART
+BASIC
+GLOBAL
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Olivier Hallot]

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

New commits:
commit 47cc374c0659fd3db74a1b184c870eaa56bc385b
Author: Olivier Hallot 
Date:   Wed Dec 27 16:19:16 2017 -0200

Updated core
Project: help  6d883096dc275e1b384ed9ad08fd9ab4ad26bb3f

tdf#112755 reorder modules in new help (II)

reorder modules in Index

Change-Id: Ib226a7c243e682e4e2a98d6d48ae1d9b1e3cace1
Reviewed-on: https://gerrit.libreoffice.org/47095
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit dfdc1f55f63d4497e6bd5fa5793ba8b57d6a78fc)
Reviewed-on: https://gerrit.libreoffice.org/47105

diff --git a/helpcontent2 b/helpcontent2
index cd872746d22e..6d883096dc27 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cd872746d22ed4904b59c761855af5159d7eccb6
+Subproject commit 6d883096dc275e1b384ed9ad08fd9ab4ad26bb3f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 download.lst  |4 ++--
 external/libmspub/ExternalProject_libmspub.mk |8 +---
 external/libmspub/UnpackedTarball_libmspub.mk |2 --
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit a3488acbeb3b618cf5b6b1a93608c58d0eb9d646
Author: David Tardon 
Date:   Tue Jan 2 13:40:57 2018 +0100

upload libmspub 0.1.3

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

diff --git a/download.lst b/download.lst
index 81d48e94c356..c5b260a0f9c9 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export MDDS_SHA256SUM := 
dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1
 export MDDS_TARBALL := mdds-1.3.1.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
-export MSPUB_SHA256SUM := 
26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a
-export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
+export MSPUB_SHA256SUM := 
f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97
+export MSPUB_TARBALL := libmspub-0.1.3.tar.xz
 export MWAW_SHA256SUM := 
db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
 export MWAW_VERSION_MICRO := 13
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
diff --git a/external/libmspub/ExternalProject_libmspub.mk 
b/external/libmspub/ExternalProject_libmspub.mk
index b374c0483466..271aaf78e4d3 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -22,10 +22,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
zlib \
 ))
 
-# -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR is needed when building against 
libc++ in C++17 mode, as
-# libmspub configure checking for boost/ptr_container/ptr_vector.hpp can 
(indirectly) include
-# Boost 1.65.1 
workdir/UnpackedTarball/boost/boost/ptr_container/detail/reversible_ptr_container.hpp
-# which mentions std::auto_ptr:
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -40,9 +36,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(gb_CXXFLAGS) $(if 
$(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
-   CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) 
$(BOOST_CPPFLAGS) \
-   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED \
-   -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" \
+   CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) 
$(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/libmspub/UnpackedTarball_libmspub.mk 
b/external/libmspub/UnpackedTarball_libmspub.mk
index 23e81eed785d..57845333cb4e 100644
--- a/external/libmspub/UnpackedTarball_libmspub.mk
+++ b/external/libmspub/UnpackedTarball_libmspub.mk
@@ -13,8 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0))
 
-$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub))
-
 $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\
 external/libmspub/ubsan.patch \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 solenv/bin/native-code.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 269f12c8e8c9d43f0b84a40405eed53daef72cfe
Author: Caolán McNamara 
Date:   Tue Jan 2 12:42:07 2018 +

ofz#4864 SvgTools::create required via html import

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1fbc0ae98884..c141a49f3383 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -62,6 +62,7 @@ core_factory_list = [
 ("libmcnttype.a", "mcnttype_component_getFactory"),
 ("libvcllo.a", "vcl_component_getFactory"),
 ("libspelllo.a", "spell_component_getFactory")
+("libsvgiolo.a", "svgio_component_getFactory"),
 ]
 
 core_constructor_list = [
@@ -304,7 +305,6 @@ calc_constructor_list = [
 
 draw_factory_list = [
 ("libsdlo.a", "sd_component_getFactory"),
-("libsvgiolo.a", "svgio_component_getFactory"),
 ("libsvgfilterlo.a", "svgfilter_component_getFactory"),
 ("libdeployment.a", "deployment_component_getFactory"),
 ("libemboleobj.a", "emboleobj_component_getFactory"),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |8 +---
 connectivity/source/drivers/firebird/PreparedStatement.hxx |2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit d4469196a2072d2d3fa2e433d02552facaa269f2
Author: Julien Nabet 
Date:   Mon Jan 1 16:59:58 2018 +0100

Related tdf#104942: implement setByte on firebird

There's no TINYINT or equivalent so let's do the same as setShort

Tested-by: Jenkins 
(cherry picked from commit f31ccd18f1b142f8c851e7e219f8bc18b157bc52)

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

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 400b6c147cf8..a120ada7c1f9 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -350,7 +350,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 
nIndex, sal_Bool bValue)
 }
 
 template 
-void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType)
+void OPreparedStatement::setValue(sal_Int32 nIndex, const T& nValue, ISC_SHORT 
nType)
 {
 MutexGuard aGuard( m_aMutex );
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
@@ -372,9 +372,11 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& 
nValue, ISC_SHORT nType)
 memcpy(pVar->sqldata, &nValue, sizeof(nValue));
 }
 
-void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 
/*nValue*/)
+void SAL_CALL OPreparedStatement::setByte(sal_Int32 nIndex, sal_Int8 nValue)
 {
-::dbtools::throwFunctionNotSupportedSQLException("XParameters::setByte", 
*this);
+// there's no TINYINT or equivalent on Firebird,
+// so do the same as setShort
+setValue< sal_Int16 >(nIndex, nValue, SQL_SHORT);
 }
 
 void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue)
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx 
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 986752cd66c1..81910ad1f3dd 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -64,7 +64,7 @@ namespace connectivity
  * @throws css::sdbc::SQLException
  * @throws css::uno::RuntimeException
  */
-template  void setValue(sal_Int32 nIndex, T& nValue, 
ISC_SHORT nType);
+template  void setValue(sal_Int32 nIndex, const T& 
nValue, ISC_SHORT nType);
 void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = 
true);
 
 /// @throws css::sdbc::SQLException
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 svx/source/table/tablemodel.cxx |   16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

New commits:
commit e7fd8ee57c69e676ec622d13212ab3b3091c1a2d
Author: Julien Nabet 
Date:   Sun Dec 31 16:44:52 2017 +0100

cppcheck: fix prefer ++/-- for non primitive types

Here, we can just initialize the iterators with the right increment
instead of using while loops to increment them

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

diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index bbe6c42edebd..4d6a558a3622 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -67,21 +67,7 @@ template< class Vec, class Iter > void remove_range( Vec& 
rVector, sal_Int32 nIn
 }
 else
 {
-Iter aBegin( rVector.begin() );
-while( nIndex-- )
-aBegin++;
-if( nCount == 1 )
-{
-rVector.erase( aBegin );
-}
-else
-{
-Iter aEnd( aBegin );
-
-while( nCount-- )
-aEnd++;
-rVector.erase( aBegin, aEnd );
-}
+rVector.erase(rVector.begin() + nIndex, rVector.begin() + nIndex + 
nCount);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 icon-themes/sifr_svg/cmd/32/deletetable.svg |  311 +---
 icon-themes/sifr_svg/cmd/32/entirecell.svg  |   31 +
 icon-themes/sifr_svg/cmd/32/entirecolumn.svg|6 
 icon-themes/sifr_svg/cmd/32/entirerow.svg   |8 
 icon-themes/sifr_svg/cmd/32/insertcolumnsafter.svg  |   29 +
 icon-themes/sifr_svg/cmd/32/insertcolumnsbefore.svg |   29 +
 icon-themes/sifr_svg/cmd/32/insertrowsafter.svg |   29 +
 icon-themes/sifr_svg/cmd/32/insertrowsbefore.svg|   29 +
 icon-themes/sifr_svg/cmd/lc_deletetable.svg |  286 --
 icon-themes/sifr_svg/cmd/lc_entirecolumn.svg|6 
 icon-themes/sifr_svg/cmd/lc_entirerow.svg   |6 
 icon-themes/sifr_svg/cmd/lc_insertcolumnsafter.svg  |   28 +
 icon-themes/sifr_svg/cmd/lc_insertcolumnsbefore.svg |   28 +
 icon-themes/sifr_svg/cmd/lc_insertrowsafter.svg |   28 +
 icon-themes/sifr_svg/cmd/lc_insertrowsbefore.svg|   28 +
 icon-themes/sifr_svg/cmd/sc_deletetable.svg |  130 
 icon-themes/sifr_svg/cmd/sc_entirecolumn.svg|   10 
 icon-themes/sifr_svg/cmd/sc_entirerow.svg   |   10 
 icon-themes/sifr_svg/cmd/sc_insertcolumnsafter.svg  |   19 +
 icon-themes/sifr_svg/cmd/sc_insertcolumnsbefore.svg |   19 +
 icon-themes/sifr_svg/cmd/sc_insertrowsafter.svg |   19 +
 icon-themes/sifr_svg/cmd/sc_insertrowsbefore.svg|   19 +
 22 files changed, 413 insertions(+), 695 deletions(-)

New commits:
commit 1e83e713b3e2ef5bb0aa123910598b37a2a97ffe
Author: Matthias Freund 
Date:   Tue Jan 2 12:51:06 2018 +0100

tdf#75256 Sifr update opacity fix - fixed SVG files

Change-Id: Ia3d0c08fe29ead82195bb1088e577a1383d9b508
Reviewed-on: https://gerrit.libreoffice.org/47250
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr_svg/cmd/32/deletetable.svg 
b/icon-themes/sifr_svg/cmd/32/deletetable.svg
index 4cbe2e05330f..e65d9fc80d02 100644
--- a/icon-themes/sifr_svg/cmd/32/deletetable.svg
+++ b/icon-themes/sifr_svg/cmd/32/deletetable.svg
@@ -1,296 +1,17 @@
-
-http://purl.org/dc/elements/1.1/";
-   xmlns:cc="http://creativecommons.org/ns#";
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
-   xmlns:svg="http://www.w3.org/2000/svg";
-   xmlns="http://www.w3.org/2000/svg";
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   viewBox="0 0 32 32"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="deletetable.svg"
-   inkscape:version="0.92.2 (unknown)"
-   inkscape:export-filename="/home/matthias/git/icons/sifr_svg/deletetable.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   width="32"
-   height="32">
-  
-  
-
-  
-  
-
-  
-image/svg+xml
-http://purl.org/dc/dcmitype/StillImage"; />
-
-http://creativecommons.org/licenses/by-sa/4.0/"; />
-
-  
-The Document Foundation
-  
-
-
-  
-Matthias Freund
-  
-
-  
-  http://creativecommons.org/licenses/by-sa/4.0/";>
-http://creativecommons.org/ns#Reproduction"; />
-http://creativecommons.org/ns#Distribution"; />
-http://creativecommons.org/ns#Notice"; />
-http://creativecommons.org/ns#Attribution"; />
-http://creativecommons.org/ns#DerivativeWorks"; />
-http://creativecommons.org/ns#ShareAlike"; />
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+http://www.w3.org/2000/svg";>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+  
+  
+  
+  
+  
+ 
 
diff --git a/icon-themes/sifr_svg/cmd/32/entirecell.svg 
b/icon-themes/sifr_svg/cmd/32/entirecell.svg
new file mode 100644
index ..4529e747a44e
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/entirecell.svg
@@ -0,0 +1,31 @@
+http://www.w3.org/2000/svg";>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+  
+  
+  
+  
+  
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
diff --git a/icon-themes/sifr_svg/cmd/32/entirecolumn.svg 
b/icon-themes/sifr_svg/cmd/32/entirecolumn.svg
new file mode 100644
index ..dc72639a3444
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/entirecolumn.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg";>
+ 
+ 
+ 
+ 
+
diff --git a/icon-themes/sifr_svg/cmd/32/entirerow.svg 
b/icon-themes/sifr_svg/cmd/32/entirerow.svg
new file mode 100644
index ..f78b2c3f1cb0
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/entirerow.svg
@@ -0,0 +1,8 @@
+http://www.w3.org/2000/svg";>
+ 
+  
+  
+  
+ 
+ 
+
diff --git a/icon-themes/sifr_svg/cmd/32/insertcolumnsafter.svg 
b/icon-themes/sifr_svg/cmd/32/insertcolumnsafter.svg
new file mode 100644
index ..efb2fbe54ede
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/insertcolumnsafter.svg
@@ -0,0 +1,29 @@
+http://www.w3.org/2000/svg";>
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  

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

[Andrea Gelmini]

 canvas/source/vcl/canvashelper_texturefill.cxx |4 ++--
 sc/source/filter/inc/pagesettings.hxx  |2 +-
 sc/source/filter/inc/xlchart.hxx   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 61fbeb12c1d6b6ff02e3bead2e2e72f0f44a2197
Author: Andrea Gelmini 
Date:   Tue Jan 2 14:16:15 2018 +0100

Fix typos

Change-Id: Ida13b0649f0b6b1bb25f906ca9ad3a891b45739d
Reviewed-on: https://gerrit.libreoffice.org/47262
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index c2735a5ce46d..7df0c9831c11 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -212,7 +212,7 @@ namespace vclcanvas

(sal_uInt8)(basegfx::utils::lerp(rColors[nIndex].GetGreen(),rColors[nIndex+1].GetGreen(),fAlpha)),

(sal_uInt8)(basegfx::utils::lerp(rColors[nIndex].GetBlue(),rColors[nIndex+1].GetBlue(),fAlpha))
 ));
 
-// copy right egde of polygon to left edge (and also
+// copy right edge of polygon to left edge (and also
 // copy the closing point)
 aTempPoly[0] = aTempPoly[4] = aTempPoly[1];
 aTempPoly[3] = aTempPoly[2];
@@ -241,7 +241,7 @@ namespace vclcanvas
 // diagonal to the 'right'
 
 
-// copy right egde of polygon to left edge (and also
+// copy right edge of polygon to left edge (and also
 // copy the closing point)
 aTempPoly[0] = aTempPoly[4] = aTempPoly[1];
 aTempPoly[3] = aTempPoly[2];
diff --git a/sc/source/filter/inc/pagesettings.hxx 
b/sc/source/filter/inc/pagesettings.hxx
index 59dd1ebd0a6c..03a0c8d32e36 100644
--- a/sc/source/filter/inc/pagesettings.hxx
+++ b/sc/source/filter/inc/pagesettings.hxx
@@ -44,7 +44,7 @@ struct PageSettingsModel
 OUString maFirstFooter;  /// Footer string for first page of 
the sheet.
 double  mfLeftMargin;   /// Margin between left edge 
of page and begin of sheet area.
 double  mfRightMargin;  /// Margin between end of 
sheet area and right edge of page.
-double  mfTopMargin;/// Margin between top egde of 
page and begin of sheet area.
+double  mfTopMargin;/// Margin between top edge of 
page and begin of sheet area.
 double  mfBottomMargin; /// Margin between end of 
sheet area and bottom edge of page.
 double  mfHeaderMargin; /// Margin between top edge of 
page and begin of header.
 double  mfFooterMargin; /// Margin between end of 
footer and bottom edge of page.
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index f59901f88131..bdb9fbad783f 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -890,7 +890,7 @@ struct XclChMarkerFormat
 struct XclCh3dDataFormat
 {
 sal_uInt8   mnBase; /// Base form.
-sal_uInt8   mnTop;  /// Top egde mode.
+sal_uInt8   mnTop;  /// Top edge mode.
 
 explicitXclCh3dDataFormat();
 };
___
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' - svx/source

[Andras Timar]

 svx/source/dialog/dialmgr.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5022038726af951bf6ec06d94219c1d387349e28
Author: Andras Timar 
Date:   Thu Dec 28 15:55:44 2017 +0100

lokdialog: Allow switching language of svx ResMgr

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

diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx
index e683a72fab3c..150022b6ecce 100644
--- a/svx/source/dialog/dialmgr.cxx
+++ b/svx/source/dialog/dialmgr.cxx
@@ -22,13 +22,15 @@
 #include 
 #include 
 
-static ResMgr* pResMgr=nullptr;
+static std::unique_ptr pResMgr;
 
 ResMgr* DialogsResMgr::GetResMgr()
 {
-if (!pResMgr)
-pResMgr = ResMgr::CreateResMgr("svx", 
Application::GetSettings().GetUILanguageTag());
-return pResMgr;
+const LanguageTag& rLocale = Application::GetSettings().GetUILanguageTag();
+
+if (!pResMgr || pResMgr->GetLocale() != rLocale)
+pResMgr.reset(ResMgr::CreateResMgr("svx", rLocale));
+return pResMgr.get();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranav Kant]

 desktop/source/lib/init.cxx  |   11 +++---
 include/vcl/window.hxx   |7 
 vcl/source/window/window.cxx |   68 ---
 3 files changed, 6 insertions(+), 80 deletions(-)

New commits:
commit 34372e6e849519c30461f70d94748295412dcb2b
Author: Pranav Kant 
Date:   Wed Dec 20 17:58:05 2017 +0530

lokdialog: Use Post(Mouse,Key)Event() to post to main thread

... instead of custom machinery there to post to main thread. This also
now posts window key events to the main thread instead of processing
them on the lok thread.

Change-Id: Ided1efb3f237a1838fa50bb8d74752be714c3032
(cherry picked from commit 7dab9f9b50d83d2bcadcdd7e852f805739371cd1)
Reviewed-on: https://gerrit.libreoffice.org/46858
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2f385341e939..a993a3a30a90 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2291,10 +2292,10 @@ static void 
doc_postWindowKeyEvent(LibreOfficeKitDocument* /*pThis*/, unsigned n
 switch (nType)
 {
 case LOK_KEYEVENT_KEYINPUT:
-pWindow->LOKKeyInput(aEvent);
+Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, pWindow, 
&aEvent);
 break;
 case LOK_KEYEVENT_KEYUP:
-pWindow->LOKKeyUp(aEvent);
+Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, pWindow, &aEvent);
 break;
 default:
 assert(false);
@@ -2476,13 +2477,13 @@ static void 
doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned
 switch (nType)
 {
 case LOK_MOUSEEVENT_MOUSEBUTTONDOWN:
-pWindow->LogicMouseButtonDown(aEvent);
+Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEBUTTONDOWN, 
pWindow, &aEvent);
 break;
 case LOK_MOUSEEVENT_MOUSEBUTTONUP:
-pWindow->LogicMouseButtonUp(aEvent);
+Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEBUTTONUP, 
pWindow, &aEvent);
 break;
 case LOK_MOUSEEVENT_MOUSEMOVE:
-pWindow->LogicMouseMove(aEvent);
+Application::PostMouseEvent(VCLEVENT_WINDOW_MOUSEMOVE, pWindow, 
&aEvent);
 break;
 default:
 assert(false);
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 7fbb39df9d0e..a46e7569e74f 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1221,13 +1221,6 @@ public:
 /// Dialog / window tunneling related methods.
 Size PaintActiveFloatingWindow(VirtualDevice& rDevice) const;
 
-void LogicMouseButtonDown(const MouseEvent& rMouseEvent);
-void LogicMouseButtonUp(const MouseEvent& rMouseEvent);
-void LogicMouseMove(const MouseEvent& rMouseEvent);
-
-void LOKKeyInput(const KeyEvent& rKeyEvent);
-void LOKKeyUp(const KeyEvent& rKeyEvent);
-
 /** @name Accessibility
  */
 ///@{
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7c1591c42a06..77f6c28d168e 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3250,74 +3250,6 @@ VclPtr Window::GetParentWithLOKNotifier()
 return pWindow;
 }
 
-struct LOKAsyncEvent
-{
-VclPtr mpWindow;
-SalEvent mnEvent;
-MouseEvent maMouseEvent;
-};
-
-static void LOKAsyncEventLink( void* pEvent, void* )
-{
-LOKAsyncEvent* pLOKEv = static_cast(pEvent);
-if (!pLOKEv->mpWindow->IsDisposed())
-{
-ImplWindowFrameProc(pLOKEv->mpWindow, pLOKEv->mnEvent, 
&pLOKEv->maMouseEvent);
-}
-delete pLOKEv;
-}
-
-void Window::LogicMouseButtonDown(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpWindow = ImplIsFloatingWindow() ? ImplGetBorderWindow() : this;
-pEv->mnEvent = SalEvent::ExternalMouseButtonDown;
-pEv->maMouseEvent = rMouseEvent;
-Application::PostUserEvent( Link(pEv, LOKAsyncEventLink) );
-
-}
-
-void Window::LogicMouseButtonUp(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpWindow = ImplIsFloatingWindow() ? ImplGetBorderWindow() : this;
-pEv->mnEvent = SalEvent::ExternalMouseButtonUp;
-pEv->maMouseEvent = rMouseEvent;
-Application::PostUserEvent( Link(pEv, LOKAsyncEventLink) );
-}
-
-void Window::LogicMouseMove(const MouseEvent& rMouseEvent)
-{
-// When we're not doing tiled rendering, then positions must be passed as 
pixels.
-assert(comphelper::LibreOfficeKit::isActive());
-
-LOKAsyncEvent* pEv = new LOKAsyncEvent;
-pEv->mpW

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

[Pranav Kant]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96b365709ca1c8922cecd1516f895f64b5e380b3
Author: Pranav Kant 
Date:   Tue Dec 19 22:51:00 2017 +0530

lokdialog: Handle closing of modeless dialogs too

Change-Id: I87ed60e940fad199b14a2e2179cc1f10008bfe93
(cherry picked from commit 2bed0b64d2766121b9eed46c7cdcfb01efa0ac10)
Reviewed-on: https://gerrit.libreoffice.org/46804
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dd843e83e68d..2f385341e939 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3335,7 +3335,7 @@ static void doc_postWindow(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKWindo
 if (Dialog* pDialog = dynamic_cast(pWindow.get()))
 {
 if (nAction == LOK_WINDOW_CLOSE)
-pDialog->EndDialog( RET_CANCEL );
+pDialog->Close();
 }
 }
 
___
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-0' - loleaflet/src

[Andras Timar]

 loleaflet/src/control/Control.DocumentRepair.js |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f8bf2c28608c139279aaa484603da8cc539ff948
Author: Andras Timar 
Date:   Tue Jan 2 13:00:09 2018 +0100

l10n: localize 'Undo' and 'Redo' labels on Document Repair dialog

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

diff --git a/loleaflet/src/control/Control.DocumentRepair.js 
b/loleaflet/src/control/Control.DocumentRepair.js
index f425db7f..bbd3b20b 100644
--- a/loleaflet/src/control/Control.DocumentRepair.js
+++ b/loleaflet/src/control/Control.DocumentRepair.js
@@ -37,6 +37,9 @@ L.Control.DocumentRepair = L.Control.extend({
var tbody = this._tbody = L.DomUtil.create('tbody', '', table);
var tr = L.DomUtil.create('tr', '', tbody);
var th = L.DomUtil.create('th', '', tr);
+   L.DomUtil.setStyle(th, 'display', 'none');
+   th.appendChild(document.createTextNode(''));
+   th = L.DomUtil.create('th', '', tr);
th.appendChild(document.createTextNode(_('Type')));
th = L.DomUtil.create('th', '', tr);
th.appendChild(document.createTextNode(_('Index')));
@@ -59,8 +62,11 @@ L.Control.DocumentRepair = L.Control.extend({
createAction: function (type, index, comment, viewId, dateTime) {
var row = L.DomUtil.create('tr', '', this._tbody);
var td = L.DomUtil.create('td', '', row);
+   L.DomUtil.setStyle(td, 'display', 'none');
td.appendChild(document.createTextNode(type));
td = L.DomUtil.create('td', '', row);
+   td.appendChild(document.createTextNode(_UNO('.uno:'+type)));
+   td = L.DomUtil.create('td', '', row);
td.appendChild(document.createTextNode(index));
td = L.DomUtil.create('td', '', row);
td.appendChild(document.createTextNode(comment));
@@ -125,7 +131,7 @@ L.Control.DocumentRepair = L.Control.extend({
_onJumpClick: function (e) {
if (this._selected) {
var action = this._selected.childNodes[0].innerHTML;
-   var index = 
parseInt(this._selected.childNodes[1].innerHTML);
+   var index = 
parseInt(this._selected.childNodes[2].innerHTML);
var command = {
Repair: {
type: 'boolean',
___
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-0' - loleaflet/po

[Andras Timar]

 loleaflet/po/styles/ab.po  |1 -
 loleaflet/po/styles/af.po  |   10 --
 loleaflet/po/styles/am.po  |   14 --
 loleaflet/po/styles/an.po  |1 -
 loleaflet/po/styles/ar.po  |   14 --
 loleaflet/po/styles/as.po  |   10 --
 loleaflet/po/styles/ast.po |   10 --
 loleaflet/po/styles/be.po  |6 --
 loleaflet/po/styles/bg.po  |   18 --
 loleaflet/po/styles/bn-IN.po   |   14 --
 loleaflet/po/styles/bn.po  |   10 --
 loleaflet/po/styles/bo.po  |6 --
 loleaflet/po/styles/br.po  |   18 --
 loleaflet/po/styles/brx.po |6 --
 loleaflet/po/styles/bs.po  |   10 --
 loleaflet/po/styles/ca-valencia.po |   14 --
 loleaflet/po/styles/ca.po  |   14 --
 loleaflet/po/styles/cs.po  |   18 --
 loleaflet/po/styles/cy.po  |   18 --
 loleaflet/po/styles/da.po  |   14 --
 loleaflet/po/styles/de.po  |   18 --
 loleaflet/po/styles/dgo.po |6 --
 loleaflet/po/styles/dz.po  |6 --
 loleaflet/po/styles/el.po  |   18 --
 loleaflet/po/styles/en-GB.po   |1 -
 loleaflet/po/styles/en-ZA.po   |1 -
 loleaflet/po/styles/eo.po  |   18 --
 loleaflet/po/styles/es.po  |   14 --
 loleaflet/po/styles/et.po  |   18 --
 loleaflet/po/styles/eu.po  |   18 --
 loleaflet/po/styles/fa.po  |   10 --
 loleaflet/po/styles/fi.po  |   18 --
 loleaflet/po/styles/fr.po  |   18 --
 loleaflet/po/styles/ga.po  |   14 --
 loleaflet/po/styles/gd.po  |   18 --
 loleaflet/po/styles/gl.po  |   14 --
 loleaflet/po/styles/gu.po  |   10 --
 loleaflet/po/styles/gug.po |   14 --
 loleaflet/po/styles/he.po  |   14 --
 loleaflet/po/styles/hi.po  |   10 --
 loleaflet/po/styles/hr.po  |   18 --
 loleaflet/po/styles/hu.po  |   18 --
 loleaflet/po/styles/id.po  |   18 --
 loleaflet/po/styles/is.po  |   18 --
 loleaflet/po/styles/it.po  |   18 --
 loleaflet/po/styles/ja.po  |   14 --
 loleaflet/po/styles/ka.po  |   10 --
 loleaflet/po/styles/kk.po  |   18 --
 loleaflet/po/styles/kl.po  |1 -
 loleaflet/po/styles/km.po  |   10 --
 loleaflet/po/styles/kmr-Latn.po|   10 --
 loleaflet/po/styles/kn.po  |   10 --
 loleaflet/po/styles/ko.po  |   10 --
 loleaflet/po/styles/kok.po |6 --
 loleaflet/po/styles/ks.po  |6 --
 loleaflet/po/styles/ky.po  |1 -
 loleaflet/po/styles/lb.po  |2 --
 loleaflet/po/styles/lo.po  |6 --
 loleaflet/po/styles/lt.po  |   18 --
 loleaflet/po/styles/lv.po  |   18 --
 loleaflet/po/styles/mai.po |6 --
 loleaflet/po/styles/mk.po  |6 --
 loleaflet/po/styles/ml.po  |   10 --
 loleaflet/po/styles/mn.po  |6 --
 loleaflet/po/styles/mni.po |6 --
 loleaflet/po/styles/mr.po  |   10 --
 loleaflet/po/styles/my.po  |   10 --
 loleaflet/po/styles/nb.po  |   18 --
 loleaflet/po/styles/ne.po  |   10 --
 loleaflet/po/styles/nl.po  |   18 --
 loleaflet/po/styles/nn.po  |   18 --
 loleaflet/po/styles/nr.po  |   10 --
 loleaflet/po/styles/nso.po |6 --
 loleaflet/po/styles/oc.po  |   18 --
 loleaflet/po/styles/om.po  |   10 --
 loleaflet/po/styles/or.po  |   10 --
 loleaflet/po/styles/pa-IN.po   |   10 --
 loleaflet/po/styles/pl.po  |   18 --
 loleaflet/po/styles/pt-BR.po   |   14 --
 loleaflet/po/styles/pt.po  |   14 --
 loleaflet/po/styles/ro.po  |   18 --
 loleaflet/po/styles/ru.po  |   18 --
 loleaflet/po/styles/rw.po  |6 --
 loleaflet/po/styles/sa-IN.po   |6 --
 loleaflet/po/styles/sat.po |2 --
 loleaflet/po/styles/sd.po  |6 --
 loleaflet/po/styles/si.po  |   10 --
 loleaflet/po/styles/sid.po |   10 --
 loleaflet/po/styles/sk.po  |   18 --
 loleaflet/po/styles/sl.po  |   18 

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/po

[Andras Timar]

 loleaflet/po/styles/af.po  |   24 
 loleaflet/po/styles/am.po  |   36 ++
 loleaflet/po/styles/ar.po  |   40 +
 loleaflet/po/styles/as.po  |   36 ++
 loleaflet/po/styles/ast.po |   36 ++
 loleaflet/po/styles/be.po  |   20 
 loleaflet/po/styles/bg.po  |   44 +
 loleaflet/po/styles/bn-IN.po   |8 ++
 loleaflet/po/styles/bn.po  |4 +++
 loleaflet/po/styles/bo.po  |   36 ++
 loleaflet/po/styles/br.po  |   40 +
 loleaflet/po/styles/brx.po |   32 ++
 loleaflet/po/styles/bs.po  |   28 +++
 loleaflet/po/styles/ca-valencia.po |   36 ++
 loleaflet/po/styles/ca.po  |   40 +
 loleaflet/po/styles/cs.po  |   36 ++
 loleaflet/po/styles/cy.po  |   40 +
 loleaflet/po/styles/da.po  |   36 ++
 loleaflet/po/styles/de.po  |   32 ++
 loleaflet/po/styles/dgo.po |   36 ++
 loleaflet/po/styles/dz.po  |   20 
 loleaflet/po/styles/el.po  |   44 +
 loleaflet/po/styles/eo.po  |   36 ++
 loleaflet/po/styles/es.po  |   40 +
 loleaflet/po/styles/et.po  |   28 +++
 loleaflet/po/styles/eu.po  |   44 +
 loleaflet/po/styles/fa.po  |   36 ++
 loleaflet/po/styles/fi.po  |   44 +
 loleaflet/po/styles/fr.po  |   32 ++
 loleaflet/po/styles/ga.po  |   40 +
 loleaflet/po/styles/gd.po  |   32 ++
 loleaflet/po/styles/gl.po  |   40 +
 loleaflet/po/styles/gu.po  |   28 +++
 loleaflet/po/styles/gug.po |   40 +
 loleaflet/po/styles/he.po  |4 +++
 loleaflet/po/styles/hi.po  |   16 +
 loleaflet/po/styles/hr.po  |   28 +++
 loleaflet/po/styles/hu.po  |   44 +
 loleaflet/po/styles/id.po  |4 +++
 loleaflet/po/styles/is.po  |   40 +
 loleaflet/po/styles/it.po  |   36 ++
 loleaflet/po/styles/ja.po  |   40 +
 loleaflet/po/styles/ka.po  |   28 +++
 loleaflet/po/styles/kk.po  |   44 +
 loleaflet/po/styles/km.po  |   28 +++
 loleaflet/po/styles/kmr-Latn.po|   32 ++
 loleaflet/po/styles/kn.po  |   28 +++
 loleaflet/po/styles/ko.po  |   32 ++
 loleaflet/po/styles/kok.po |   28 +++
 loleaflet/po/styles/ks.po  |   32 ++
 loleaflet/po/styles/lo.po  |   24 
 loleaflet/po/styles/lt.po  |   44 +
 loleaflet/po/styles/lv.po  |   44 +
 loleaflet/po/styles/mai.po |   24 
 loleaflet/po/styles/mk.po  |   36 ++
 loleaflet/po/styles/ml.po  |   20 
 loleaflet/po/styles/mn.po  |   24 
 loleaflet/po/styles/mni.po |   32 ++
 loleaflet/po/styles/mr.po  |8 ++
 loleaflet/po/styles/my.po  |   28 +++
 loleaflet/po/styles/nb.po  |   32 ++
 loleaflet/po/styles/ne.po  |   28 +++
 loleaflet/po/styles/nl.po  |   28 +++
 loleaflet/po/styles/nn.po  |   28 +++
 loleaflet/po/styles/nr.po  |4 +++
 loleaflet/po/styles/nso.po |4 +++
 loleaflet/po/styles/oc.po  |   32 ++
 loleaflet/po/styles/om.po  |   24 
 loleaflet/po/styles/or.po  |   36 ++
 loleaflet/po/styles/pa-IN.po   |   24 
 loleaflet/po/styles/pl.po  |   40 +
 loleaflet/po/styles/pt-BR.po   |   40 +
 lole

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/dist

[Andras Timar]

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

New commits:
commit 26f1889dc11d357bc980bd60ed83dd8a5f016479
Author: Andras Timar 
Date:   Wed Dec 27 22:17:22 2017 +0100

localize StateTableCell status bar string (Sum, Average, Count, etc.)

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

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 35fc4f35..aae417c2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -707,6 +707,20 @@ var userJoinedPopupMessage = '' + _('%user has 
joined') + '';
 var userLeftPopupMessage = '' + _('%user has left') + '';
 var userPopupTimeout = null;
 
+function localizeStateTableCell (text) {
+   var stateArray = text.split(';');
+   var stateArrayLength = stateArray.length;
+   var localizedText = '';
+   for (var i = 0; i < stateArrayLength; i++) {
+   var labelValuePair = stateArray[i].split(':');
+   localizedText += _(labelValuePair[0].trim()) + ':' + 
labelValuePair[1];
+   if (stateArrayLength > 1 && i < stateArrayLength - 1) {
+   localizedText += '; ';
+   }
+   }
+   return localizedText;
+}
+
 function toLocalePattern (pattern, regex, text, sub1, sub2) {
var matches = new RegExp(regex, 'g').exec(text);
if (matches) {
@@ -1275,7 +1289,7 @@ map.on('commandstatechanged', function (e) {
updateToolbarItem(statusbar, 'StatusSelectionMode', 
$('#StatusSelectionMode').html(state ? 
L.Styles.selectionMode[state].toLocaleString() : 
' ').parent().html());
}
else if (commandName == '.uno:StateTableCell') {
-   updateToolbarItem(statusbar, 'StateTableCell', 
$('#StateTableCell').html(state ? state : 
' ').parent().html());
+   updateToolbarItem(statusbar, 'StateTableCell', 
$('#StateTableCell').html(state ? localizeStateTableCell(state) : 
' ').parent().html());
}
else if (commandName === '.uno:StatusBarFunc') {
if (state) {
___
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-0' - loleaflet/dist loleaflet/po

[Andras Timar]

 loleaflet/dist/toolbar/toolbar.js  |1 +
 loleaflet/po/styles/am.po  |4 
 loleaflet/po/styles/ar.po  |4 
 loleaflet/po/styles/bg.po  |4 
 loleaflet/po/styles/br.po  |4 
 loleaflet/po/styles/ca-valencia.po |4 
 loleaflet/po/styles/ca.po  |4 
 loleaflet/po/styles/cs.po  |4 
 loleaflet/po/styles/cy.po  |4 
 loleaflet/po/styles/da.po  |4 
 loleaflet/po/styles/de.po  |4 
 loleaflet/po/styles/el.po  |4 
 loleaflet/po/styles/eo.po  |4 
 loleaflet/po/styles/es.po  |4 
 loleaflet/po/styles/et.po  |4 
 loleaflet/po/styles/eu.po  |4 
 loleaflet/po/styles/fi.po  |4 
 loleaflet/po/styles/fr.po  |4 
 loleaflet/po/styles/gd.po  |4 
 loleaflet/po/styles/gl.po  |4 
 loleaflet/po/styles/gug.po |4 
 loleaflet/po/styles/hr.po  |4 
 loleaflet/po/styles/hu.po  |4 
 loleaflet/po/styles/id.po  |4 
 loleaflet/po/styles/is.po  |4 
 loleaflet/po/styles/it.po  |4 
 loleaflet/po/styles/kk.po  |4 
 loleaflet/po/styles/lt.po  |4 
 loleaflet/po/styles/lv.po  |4 
 loleaflet/po/styles/nb.po  |4 
 loleaflet/po/styles/nl.po  |4 
 loleaflet/po/styles/nn.po  |4 
 loleaflet/po/styles/oc.po  |4 
 loleaflet/po/styles/pl.po  |4 
 loleaflet/po/styles/pt-BR.po   |4 
 loleaflet/po/styles/pt.po  |4 
 loleaflet/po/styles/ro.po  |4 
 loleaflet/po/styles/ru.po  |4 
 loleaflet/po/styles/sk.po  |4 
 loleaflet/po/styles/sl.po  |4 
 loleaflet/po/styles/sv.po  |4 
 loleaflet/po/styles/ta.po  |4 
 loleaflet/po/styles/tr.po  |4 
 loleaflet/po/styles/ug.po  |4 
 loleaflet/po/styles/uk.po  |4 
 loleaflet/po/styles/zh-CN.po   |4 
 loleaflet/po/styles/zh-TW.po   |4 
 47 files changed, 185 insertions(+)

New commits:
commit ac1902b1907fa462220eb04bb204af64a5ea7725
Author: Andras Timar 
Date:   Thu Dec 21 22:27:10 2017 +0100

Add translations for '$1 of $2 records found' in Calc status bar

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

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index a475f67a..35fc4f35 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1264,6 +1264,7 @@ map.on('commandstatechanged', function (e) {
}
else if (commandName === '.uno:RowColSelCount') {
state = toLocalePattern('$1 rows, $2 columns selected', '(\\d+) 
rows, (\\d+) columns selected', state, '$1', '$2');
+   state = toLocalePattern('$1 of $2 records found', '(\\d+) of 
(\\d+) records found', state, '$1', '$2');
updateToolbarItem(statusbar, 'RowColSelCount', 
$('#RowColSelCount').html(state ? state : 
' ').parent().html());
}
else if (commandName === '.uno:InsertMode') {
diff --git a/loleaflet/po/styles/am.po b/loleaflet/po/styles/am.po
index 699e369a..b3c11965 100644
--- a/loleaflet/po/styles/am.po
+++ b/loleaflet/po/styles/am.po
@@ -2055,3 +2055,7 @@ msgstr "ፈረንሳይኛ (ሞሪሸስ)"
 #: resource.src
 msgid "None (Do not check spelling)"
 msgstr "ምንም (ፊደሉን አታርም)"
+
+#: globstr.src
+msgid "$1 of $2 records found"
+msgstr "$1 ከ $2 መዝገቦች ተገኝተዋል"
diff --git a/loleaflet/po/styles/ar.po b/loleaflet/po/styles/ar.po
index 20bf108b..1f249204 100644
--- a/loleaflet/po/styles/ar.po
+++ b/loleaflet/po/styles/ar.po
@@ -3444,3 +3444,7 @@ msgstr "الفرنسية (موريشيوس)"
 #: resource.src
 msgid "None (Do not check spelling)"
 msgstr "بلا (لا تدقّق الإملاء)"
+
+#: globstr.src
+msgid "$1 of $2 records found"
+msgstr "وُجد $1 من أصل $2 من السجلات"
diff --git a/loleaflet/po/styles/bg.po b/loleaflet/po/styles/bg.po
index 56de4d19..99759cae 100644
--- a/loleaflet/po/styles/bg.po
+++ b/loleaflet/po/styles/bg.po
@@ -3523,3 +3523,7 @@ msgstr "Английски (Малайзия)"
 #: resource.src
 msgid "None (Do not check spelling)"
 msgstr "Няма (без проверка на правописа)"
+
+#: globstr.src
+msgid "$1 of $2 records found"
+msgstr "$1 от намерени $2 записа"
diff --git a/loleaflet/po/styles/br.po b/loleaflet/po/styles/br.po
index e1658af9..edcd5119 100644
--- a/loleaflet/po/styles/br.po
+++ b/loleaflet/po/styles/br.po
@@ -3296,3 +3296,7 @@ msgstr "Galleg (Enez Maoris)"
 #

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/po

[Andras Timar]

 loleaflet/po/styles/ab.po  |2 
 loleaflet/po/styles/af.po  |  302 --
 loleaflet/po/styles/am.po  |  222 ---
 loleaflet/po/styles/an.po  |2 
 loleaflet/po/styles/ar.po  |  882 --
 loleaflet/po/styles/as.po  |  882 --
 loleaflet/po/styles/ast.po |  702 
 loleaflet/po/styles/be.po  |  394 -
 loleaflet/po/styles/bg.po  | 1054 -
 loleaflet/po/styles/bn-IN.po   |  798 
 loleaflet/po/styles/bn.po  |  374 -
 loleaflet/po/styles/bo.po  |  374 -
 loleaflet/po/styles/br.po  |  938 
 loleaflet/po/styles/brx.po |6 
 loleaflet/po/styles/bs.po  |  762 --
 loleaflet/po/styles/ca-valencia.po |  842 -
 loleaflet/po/styles/ca.po  |  842 -
 loleaflet/po/styles/cs.po  |  890 ---
 loleaflet/po/styles/cy.po  |  702 
 loleaflet/po/styles/da.po  |  754 --
 loleaflet/po/styles/de.po  |  838 -
 loleaflet/po/styles/dgo.po |  362 
 loleaflet/po/styles/dz.po  |  374 -
 loleaflet/po/styles/el.po  | 1050 
 loleaflet/po/styles/en-GB.po   |   14 
 loleaflet/po/styles/en-ZA.po   |2 
 loleaflet/po/styles/eo.po  |  994 --
 loleaflet/po/styles/es.po  |  882 --
 loleaflet/po/styles/et.po  |  958 -
 loleaflet/po/styles/eu.po  |  810 
 loleaflet/po/styles/fa.po  |   54 -
 loleaflet/po/styles/fi.po  |  794 ---
 loleaflet/po/styles/fr.po  |  786 ---
 loleaflet/po/styles/ga.po  |  730 -
 loleaflet/po/styles/gd.po  |  794 ---
 loleaflet/po/styles/gl.po  |  818 
 loleaflet/po/styles/gu.po  |  886 ---
 loleaflet/po/styles/gug.po |   54 -
 loleaflet/po/styles/he.po  |  482 
 loleaflet/po/styles/hi.po  |  882 --
 loleaflet/po/styles/hr.po  |  734 -
 loleaflet/po/styles/hu.po  |  758 --
 loleaflet/po/styles/id.po  |  654 --
 loleaflet/po/styles/is.po  |  802 
 loleaflet/po/styles/it.po  |  758 --
 loleaflet/po/styles/ja.po  |  914 
 loleaflet/po/styles/ka.po  |  326 ---
 loleaflet/po/styles/kk.po  | 1046 
 loleaflet/po/styles/kl.po  |2 
 loleaflet/po/styles/km.po  |  686 
 loleaflet/po/styles/kmr-Latn.po|  210 ---
 loleaflet/po/styles/kn.po  |  882 --
 loleaflet/po/styles/ko.po  |  686 
 loleaflet/po/styles/kok.po |  350 
 loleaflet/po/styles/ks.po  |6 
 loleaflet/po/styles/ky.po  |2 
 loleaflet/po/styles/lb.po  |   58 --
 loleaflet/po/styles/lo.po  |   10 
 loleaflet/po/styles/lt.po  |  450 ---
 loleaflet/po/styles/lv.po  |  938 
 loleaflet/po/styles/mai.po |   46 -
 loleaflet/po/styles/mk.po  |   50 -
 loleaflet/po/styles/ml.po  |  882 --
 loleaflet/po/styles/mn.po  |   50 -
 loleaflet/po/styles/mni.po |6 
 loleaflet/po/styles/mr.po  |  882 --
 loleaflet/po/styles/my.po  |  382 -
 loleaflet/po/styles/nb.po  |  766 --
 loleaflet/po/styles/ne.po  |   98 ---
 loleaflet/po/styles/nl.po  |  762 --
 loleaflet/po/styles/nn.po  |  766 --
 loleaflet/po/styles/nr.po  |  374 -
 loleaflet/po/styles/nso.po |  354 
 loleaflet/po/styles/oc.po  |  750 --
 loleaflet/po/styles/om.po  |  370 
 loleaflet/po/styles/or.po  |  878 --
 loleaflet/po/styles/pa-IN.po   |  386 -
 loleaflet/po/styles/pl.po  |  862 --
 loleaflet/po/styles/pt-BR.po   |  814 
 loleaflet/po/styles

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

[Pranav Kant]

 loleaflet/src/control/Control.LokDialog.js |   41 ++---
 loleaflet/src/layer/tile/TileLayer.js  |   14 -
 loleaflet/src/map/handler/Map.Keyboard.js  |   24 +---
 3 files changed, 17 insertions(+), 62 deletions(-)

New commits:
commit e59ef72e19bf3001fe4dd361531cbc8715609a73
Author: Pranav Kant 
Date:   Sat Dec 23 18:36:28 2017 +0530

loleaflet: Unify dialog key handling logic with document's

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 4abf350b..82f69130 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -222,7 +222,9 @@ L.Control.LokDialog = L.Control.extend({
this._postWindowMouseEvent(lokEventType, 
this._toRawDlgId(strDlgId), e.offsetX, e.offsetY, 1, buttons, 0);
}, this);
L.DomEvent.on(dialogCanvas, 'keyup keypress keydown', 
function(e) {
-   this._handleDialogKeyEvent(e, 
this._toRawDlgId(strDlgId));
+   // _onKeyDown fn below requires this kind of structure 
but leaflet DomEvent.on doesn't pass it
+   e.originalEvent = e;
+   map['keyboard']._onKeyDown(e, 
L.bind(this._postWindowKeyboardEvent, this, this._toRawDlgId(strDlgId)));
}, this);
L.DomEvent.on(dialogCanvas, 'contextmenu', function() {
return false;
@@ -242,43 +244,6 @@ L.Control.LokDialog = L.Control.extend({
  ' char=' + charcode + ' key=' + 
keycode);
},
 
-   _handleDialogKeyEvent: function(e, winid) {
-   var docLayer = this._map._docLayer;
-   this.modifier = 0;
-   var shift = e.shiftKey ? 
this._map['keyboard'].keyModifier.shift : 0;
-   var ctrl = e.ctrlKey ? this._map['keyboard'].keyModifier.ctrl : 
0;
-   var alt = e.altKey ? this._map['keyboard'].keyModifier.alt : 0;
-   var cmd = e.metaKey ? this._map['keyboard'].keyModifier.ctrl : 
0;
-   var location = e.location;
-   this.modifier = shift | ctrl | alt | cmd;
-
-   var charCode = e.charCode;
-   var keyCode = e.keyCode;
-   var unoKeyCode = this._map['keyboard']._toUNOKeyCode(keyCode);
-
-   if (this.modifier) {
-   unoKeyCode |= this.modifier;
-   if (e.type !== 'keyup') {
-   this._postWindowKeyboardEvent(winid, 'input', 
charCode, unoKeyCode);
-   return;
-   }
-   }
-
-   if (e.type === 'keydown' && 
this._map['keyboard'].handleOnKeyDownKeys[keyCode]) {
-   this._postWindowKeyboardEvent(winid, 'input', charCode, 
unoKeyCode);
-   }
-   else if (e.type === 'keypress' && 
(!this._map['keyboard'].handleOnKeyDownKeys[keyCode] || charCode !== 0)) {
-   if (charCode === keyCode && charCode !== 13) {
-   keyCode = 0;
-   unoKeyCode = 
this._map['keyboard']._toUNOKeyCode(keyCode);
-   }
-   this._postWindowKeyboardEvent(winid, 'input', charCode, 
unoKeyCode);
-   }
-   else if (e.type === 'keyup') {
-   this._postWindowKeyboardEvent(winid, 'up', charCode, 
unoKeyCode);
-   }
-   },
-
_onDialogClose: function(dialogId, notifyBackend) {
if (notifyBackend)
this._sendCloseWindow(dialogId);
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index de0091b5..16ac17b3 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1334,20 +1334,6 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
-   _postKeyboardEvents: function(type, charcodes, keycodes) {
-   // Both are arrays
-   if (typeof(charcodes.length) !== 'number' && 
typeof(keycodes.length) !== 'number')
-   return;
-
-   // both have same length
-   if (charcodes.length !== keycodes.length)
-   return;
-
-   for (var i = 0; i < charcodes.length; i++) {
-   this._postKeyboardEvent(type, charcodes[i], 
keycodes[i]);
-   }
-   },
-
_postKeyboardEvent: function(type, charcode, keycode) {
if (this._docType === 'spreadsheet' && this._prevCellCursor && 
type === 'input') {
if (keycode === 1030) { // PgUp
diff --git a/lolea

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

[Pranav Kant]

 loleaflet/dist/loleaflet.css   |1 +
 loleaflet/src/control/Control.LokDialog.js |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 5d190a3a363aacbc6eee4ac218fed7db956695bf
Author: Pranav Kant 
Date:   Sat Dec 23 17:57:00 2017 +0530

loleaflet: '/' or backspace launches browser-specific actions

Make the canvas contentEditable which prevents such actions from being
invoked. Other alternative would be to add a dummy text field but this
seems to do the work as well.

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

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 7c054c33..38d9383e 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -349,5 +349,6 @@ body {
 }
 
 .lokdialog_canvas {
+cursor: default;
 display: block; /* required to remove all borders around canvas 
element */
 }
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 0f3dc49f..4abf350b 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -187,6 +187,7 @@ L.Control.LokDialog = L.Control.extend({
dialogCanvas.width = width;
dialogCanvas.height = height;
dialogCanvas.tabIndex = '0';
+   dialogCanvas.contentEditable = true;
dialogCanvas.id = strDlgId + '-canvas';
 
var that = this;
___
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-0' - loleaflet/src

[Pranav Kant]

 loleaflet/src/control/Control.LokDialog.js |  137 +
 1 file changed, 63 insertions(+), 74 deletions(-)

New commits:
commit f491dfb13059221cc4a829d01a89424c43cbbeae
Author: Pranav Kant 
Date:   Sat Dec 23 16:12:18 2017 +0530

Clean up; use Leaflet DomUtil API wherever possible

Not possible to use in all the cases while keeping the behavior same.
Need further investigation.

Also rearrange the API a bit in preparation to use the common
Map.Keyboard.js handler to handle key events for both dialog and the
document.

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

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 2e1e80b1..0f3dc49f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -39,12 +39,14 @@ L.Control.LokDialog = L.Control.extend({
$('#' + this._toDlgPrefix(dialogId)).length > 0;
},
 
+   // given a prefixed dialog id like 'lokdialog-323', gives a raw id, 323
_toRawDlgId: function(dialogId) {
if (typeof(dialogId) === 'string')
return parseInt(dialogId.replace(this.dialogIdPrefix, 
''));
return dialogId;
},
 
+   // converts a raw dialog id like 432, to 'lokdialog-432'
_toDlgPrefix: function(id) {
return this.dialogIdPrefix + id;
},
@@ -85,16 +87,13 @@ L.Control.LokDialog = L.Control.extend({
_onDialogMsg: function(e) {
e.id = parseInt(e.id);
var strDlgId = this._toDlgPrefix(e.id);
+
if (e.action === 'created') {
var width = parseInt(e.size.split(',')[0]);
var height = parseInt(e.size.split(',')[1]);
if (e.winType === 'dialog') {
this._launchDialog(this._toDlgPrefix(e.id), 
width, height, e.title);
this._sendPaintWindow(e.id, 
this._createRectStr(e.id));
-   if (e.title) {
-   this._dialogs[e.id].title = e.title;
-   $('#' + strDlgId).dialog('option', 
'title', e.title);
-   }
} else if (e.winType === 'child') {
if (!this._isOpen(e.parentId))
return;
@@ -128,8 +127,6 @@ L.Control.LokDialog = L.Control.extend({
} else if (e.action === 'size_changed') {
width = parseInt(e.size.split(',')[0]);
height = parseInt(e.size.split(',')[1]);
-
-   strDlgId = this._toDlgPrefix(e.id);
// FIXME: we don't really have to destroy and launch 
the dialog again but do it for
// now because the size sent to us previously in 
'created' cb is not correct
$('#' + strDlgId).remove();
@@ -142,10 +139,12 @@ L.Control.LokDialog = L.Control.extend({
var y = parseInt(rectangle[1]);
var height = parseInt(rectangle[3]);
 
-   $('#' + strDlgId + '-cursor').css({height: 
height});
-   // set the position of the lokdialog-cursor
-   $(this._dialogs[e.id].cursor).css({left: x, 
top: y});
-   $('#' + strDlgId + '-cursor').css({display: 
this._dialogs[e.id].cursorVisible ? 'block' : 'none'});
+   var dialogCursor = L.DomUtil.get(strDlgId + 
'-cursor');
+   L.DomUtil.setStyle(dialogCursor, 'height', 
height + 'px');
+   L.DomUtil.setStyle(dialogCursor, 'display', 
this._dialogs[e.id].cursorVisible ? 'block' : 'none');
+   // set the position of the cursor container 
element
+   L.DomUtil.setStyle(this._dialogs[e.id].cursor, 
'left', x + 'px');
+   L.DomUtil.setStyle(this._dialogs[e.id].cursor, 
'top', y + 'px');
}
} else if (e.action === 'title_changed') {
if (e.title && this._dialogs[parseInt(e.id)]) {
@@ -154,10 +153,8 @@ L.Control.LokDialog = L.Control.extend({
}
} else if (e.action === 'cursor_visible') {
this._dialogs[e.id].cursorVisible = e.visible === 
'true';
-   if (this._dialogs[e.id].cursorVisible)
-   $('#' + strDlgId + '-cursor').css({display: 
'block'});
-   else
-  

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

[Henry Castro]

 loleaflet/src/layer/AnnotationManager.js |   25 -
 1 file changed, 16 insertions(+), 9 deletions(-)

New commits:
commit 015f2974a53e8fcdeaa400a345e7e68ed0072f9f
Author: Henry Castro 
Date:   Tue May 30 15:59:00 2017 -0400

loleaflet: merge comments and redlines items

Comments and Redlines were mutually exclusive, but a document
can contain both.

Change-Id: Idb13f0c0e1216edc6bed3291c0c486b45ad74b56
Reviewed-on: https://gerrit.libreoffice.org/38235
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/46448

diff --git a/loleaflet/src/layer/AnnotationManager.js 
b/loleaflet/src/layer/AnnotationManager.js
index 7b1cdf4e..c3e9b9a2 100644
--- a/loleaflet/src/layer/AnnotationManager.js
+++ b/loleaflet/src/layer/AnnotationManager.js
@@ -27,21 +27,28 @@ L.AnnotationManager = L.Class.extend({
 
// Remove only text comments from the document (excluding change 
tracking comments)
clear: function () {
-   for (var key in this._items) {
-   if (!this._items[key].trackchange) {
-   this._map.removeLayer(this._items[key]);
+   var it = 0;
+   while (it < this._items.length) {
+   if (!this._items[it].trackchange) {
+   this._map.removeLayer(this._items[it]);
+   this._items.splice(it, 1);
+   } else {
+   it++;
}
}
-   this._items = [];
this._selected = null;
this._map.removeLayer(this._arrow);
},
 
// Remove only change tracking comments from the document
clearChanges: function() {
-   for (var key in this._items) {
-   if (this._items[key].trackchange) {
-   this._map.removeLayer(this._items[key]);
+   var it = 0;
+   while (it < this._items.length) {
+   if (this._items[it].trackchange) {
+   this._map.removeLayer(this._items[it]);
+   this._items.splice(it, 1);
+   } else {
+   it++;
}
}
},
@@ -121,7 +128,7 @@ L.AnnotationManager = L.Class.extend({
var comment;
this.clear();
// items contains redlines
-   var ordered = !this._items.length > 0;
+   var ordered = !this._items.length;
for (var index in comments) {
comment = comments[index];
this.adjustComment(comment);
@@ -145,7 +152,7 @@ L.AnnotationManager = L.Class.extend({
var changecomment;
this.clearChanges();
// items contains comments
-   var ordered = !this._items.length > 0;
+   var ordered = !this._items.length;
for (var idx in redlines) {
changecomment = redlines[idx];
if (!this.adjustRedLine(changecomment)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/qa compilerplugins/clang reportdesign/inc reportdesign/source scripting/source sd/inc sd/source svgio/inc svgio/source

[Noel Grandin]

 chart2/qa/extras/chart2dump/chart2dump.cxx|2 +-
 compilerplugins/clang/passstuffbyref.cxx  |4 
 compilerplugins/clang/test/passstuffbyref.cxx |1 +
 reportdesign/inc/reportformula.hxx|8 
 reportdesign/source/ui/inc/DesignView.hxx |2 +-
 reportdesign/source/ui/inc/ReportWindow.hxx   |2 +-
 reportdesign/source/ui/inc/ScrollHelper.hxx   |2 +-
 reportdesign/source/ui/report/DesignView.cxx  |2 +-
 reportdesign/source/ui/report/ReportWindow.cxx|2 +-
 reportdesign/source/ui/report/ScrollHelper.cxx|2 +-
 scripting/source/dlgprov/dlgevtatt.cxx|2 +-
 scripting/source/dlgprov/dlgevtatt.hxx|2 +-
 sd/inc/sdpage.hxx |2 +-
 sd/inc/stlsheet.hxx   |2 +-
 sd/source/core/stlsheet.cxx   |2 +-
 sd/source/filter/grf/sdgrffilter.cxx  |2 +-
 sd/source/ui/inc/ViewShell.hxx|4 ++--
 sd/source/ui/inc/ViewShellBase.hxx|8 
 sd/source/ui/sidebar/SlideBackground.cxx  |   10 +-
 sd/source/ui/sidebar/SlideBackground.hxx  |   10 +-
 sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx |4 ++--
 sd/source/ui/slidesorter/view/SlsLayouter.cxx |4 ++--
 sd/source/ui/view/ViewShellBase.cxx   |8 
 sd/source/ui/view/drviews2.cxx|2 +-
 sd/source/ui/view/viewshe2.cxx|4 ++--
 svgio/inc/svgstyleattributes.hxx  |2 +-
 svgio/source/svgreader/svgstyleattributes.cxx |2 +-
 27 files changed, 51 insertions(+), 46 deletions(-)

New commits:
commit a0e136d2cbb3784ddfcbddcfed5d784c8e4c9a64
Author: Noel Grandin 
Date:   Tue Jan 2 11:33:15 2018 +0200

loplugin:passstuffbyref improved return in sd,various

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

diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx 
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index c852446efe7e..7e8cd9b2a2f6 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -108,7 +108,7 @@ protected:
 bool isInDumpMode () const {return m_bDumpMode;}
 
 virtual OUString getTestName() { return OUString(); }
-OUString getTestFileName() { return m_sTestFileName; }
+OUString const & getTestFileName() { return m_sTestFileName; }
 OUString getTestFileDirName() { return 
OUString("/chart2/qa/extras/chart2dump/data/"); }
 OUString getReferenceDirName()
 {
diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index aca8b89da5a3..54982fdfc045 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -380,6 +380,10 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* 
expr)
 return isReturnExprDisqualified(condOper->getTrueExpr())
 || isReturnExprDisqualified(condOper->getFalseExpr());
 }
+if (auto unaryOp = dyn_cast(expr)) {
+expr = unaryOp->getSubExpr();
+continue;
+}
 if (auto operatorCallExpr = dyn_cast(expr)) {
 // TODO could improve this, but sometimes it means we're returning 
a copy of a temporary.
 // Same logic as CXXOperatorCallExpr::isAssignmentOp(), which our 
supported clang
diff --git a/compilerplugins/clang/test/passstuffbyref.cxx 
b/compilerplugins/clang/test/passstuffbyref.cxx
index ed86d4d309d9..71c219c986ec 100644
--- a/compilerplugins/clang/test/passstuffbyref.cxx
+++ b/compilerplugins/clang/test/passstuffbyref.cxx
@@ -52,6 +52,7 @@ struct S2 {
 OUString set5(OUString const & s) { return s; }
 OUString set6() { std::vector v1(1); return v1[0]; }
 OUString set7(S1 const & s) { return s.get(); }
+OUString set8() { OUString * p = nullptr; return *p; }
 };
 
 
diff --git a/reportdesign/inc/reportformula.hxx 
b/reportdesign/inc/reportformula.hxx
index 7d10243aee86..5e5976a075b9 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -77,7 +77,7 @@ namespace rptui
 const OUString& getUndecoratedContent() const { return 
m_sUndecoratedContent; }
 
 /// convenience alias for getUndecoratedContent, which 
asserts (in a non-product build) when used on an expression
-inline OUString  getFieldName() const;
+inline OUString const & getFieldName() const;
 
 /**
 @returns "=" + getFieldName()
@@ -85,7 +85,7 @@ namespace rptui
 OUString getEqualUndecoratedContent() const;
 
 /// convenience alias for getUndecoratedContent, which 
asserts (in a non-product build) when used on a field
-inline OUString  getExpression() const;
+i

Re: LibreOfficeLight / iOS

[Thorsten Behrens]

jan iversen wrote:
> I have just updated my master, and now I see your problem with libassuan,
> which I am trying to solve. It is being build locally but not copied to the
> right place. I did a couple of commits yesterday to a.o. include your idea
> on how to make LIBRARY_PATH relative, thanks for that.
> 
libassuan is part of the gpg4libre subsystem, and rather certainly not
useful on iOS. I suggest to disable that, like on Android (there's a
feature check define now, HAVE_FEATURE_GPGME).

Cheers,

-- Thorsten


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

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

[Michael Meeks]

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

New commits:
commit 849bcefe094d4bcaea1054ad7e5d15660e5ecbcd
Author: Michael Meeks 
Date:   Tue Jan 2 11:53:57 2018 +

Most pressing - fix formatting.

diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index b4b38b4..f23840d 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -317,10 +317,12 @@ def report_esc_prototype():
 
 txt = ' open:\n'
 for id, title in 
statList['escList']['MostPressingBugs']['open']['list'].items():
-txt += '{} "{}"\n'.format(id, title)
+txt += '+ {}\n'.format(title)
+txt += '+ 
https://bugs.documentfoundation.org/show_bug.cgi?id={}\n'.format(id)
 txt += ' closed:\n'
 for id, title in 
statList['escList']['MostPressingBugs']['closed']['list'].items():
-txt += '{} "{}"\n'.format(id, title)
+txt += '+ {}\n'.format(title)
+txt += '+ 
https://bugs.documentfoundation.org/show_bug.cgi?id={}\n'.format(id)
 escPrototype = escPrototype.replace('$', txt)
 
 txt = '+ {}({:+d}) import failure, {}({:+d}) export failures'.format(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basic/inc basic/source compilerplugins/clang cui/source include/basic include/svtools include/svx oox/source sd/source sfx2/source svtools/source svx/source

[Noel Grandin]

 basic/inc/basic.hrc|2 -
 basic/source/classes/sb.cxx|7 
 compilerplugins/clang/passstuffbyref.cxx   |3 +
 cui/source/options/optdict.cxx |2 -
 cui/source/tabpages/backgrnd.cxx   |2 -
 include/basic/sbdef.hxx|2 -
 include/svtools/ehdl.hxx   |4 +-
 include/svtools/soerr.hxx  |4 +-
 include/svx/svxerr.hxx |4 +-
 oox/source/ppt/pptimport.cxx   |2 -
 sd/source/ui/func/futhes.cxx   |2 -
 sd/source/ui/view/sdview4.cxx  |2 -
 sd/source/ui/view/viewshe2.cxx |2 -
 sfx2/source/appl/appinit.cxx   |6 +--
 sfx2/source/view/ipclient.cxx  |2 -
 svtools/source/misc/ehdl.cxx   |   26 +
 svx/source/items/svxerr.cxx|   12 ---
 sw/inc/AnnotationWin.hxx   |2 -
 sw/inc/ddefld.hxx  |2 -
 sw/inc/doc.hxx |2 -
 sw/inc/editsh.hxx  |4 +-
 sw/inc/list.hxx|4 +-
 sw/inc/ndole.hxx   |2 -
 sw/inc/numrule.hxx |2 -
 sw/inc/pagedesc.hxx|2 -
 sw/inc/section.hxx |6 +--
 sw/inc/shellio.hxx |6 +--
 sw/inc/swmodule.hxx|2 -
 sw/inc/tox.hxx |4 +-
 sw/inc/view.hxx|2 -
 sw/source/core/access/accpara.cxx  |2 -
 sw/source/core/access/accpara.hxx  |2 -
 sw/source/core/doc/docfld.cxx  |2 -
 sw/source/core/doc/list.cxx|4 +-
 sw/source/core/doc/number.cxx  |2 -
 sw/source/core/docnode/section.cxx |2 -
 sw/source/core/edit/edfld.cxx  |2 -
 sw/source/core/edit/edtox.cxx  |2 -
 sw/source/core/fields/ddefld.cxx   |2 -
 sw/source/core/inc/flyfrms.hxx |2 -
 sw/source/core/inc/unometa.hxx |2 -
 sw/source/core/layout/anchoreddrawobject.cxx   |4 +-
 sw/source/core/layout/flyincnt.cxx |2 -
 sw/source/core/layout/pagedesc.cxx |2 -
 sw/source/core/ole/ndole.cxx   |2 -
 sw/source/core/swg/swblocks.cxx|4 +-
 sw/source/core/unocore/unorefmk.cxx|2 -
 sw/source/core/unocore/unostyle.cxx|2 -
 sw/source/filter/html/htmlctxt.cxx |4 +-
 sw/source/filter/html/htmlfly.hxx  |2 -
 sw/source/filter/ww8/docxattributeoutput.cxx   |2 -
 sw/source/filter/ww8/wrtww8.hxx|2 -
 sw/source/filter/ww8/ww8toolbar.hxx|2 -
 sw/source/uibase/app/swmodul1.cxx  |2 -
 sw/source/uibase/dbui/mmconfigitem.cxx |   26 -
 sw/source/uibase/inc/mmconfigitem.hxx  |   26 -
 sw/source/uibase/inc/prcntfld.hxx  |2 -
 sw/source/uibase/inc/uivwimp.hxx   |2 -
 sw/source/uibase/sidebar/PageStylesPanel.cxx   |   10 +++---
 sw/source/uibase/sidebar/PageStylesPanel.hxx   |   10 +++---
 sw/source/uibase/uiview/view0.cxx  |2 -
 sw/source/uibase/uiview/viewling.cxx   |4 +-
 uui/source/iahndl-errorhandler.cxx |4 +-
 xmlsecurity/inc/documentsignaturemanager.hxx   |4 +-
 xmlsecurity/inc/pdfsignaturehelper.hxx |2 -
 xmlsecurity/source/helper/documentsignaturemanager.cxx |4 +-
 xmlsecurity/source/helper/pdfsignaturehelper.cxx   |2 -
 67 files changed, 122 insertions(+), 156 deletions(-)

New commits:
commit 4855257e52056241633c2b1d8159c3f0e71e05f3
Author: Noel Grandin 
Date:   Sun Dec 31 21:34:58 2017 +0200

loplugin:passstuffbyref improved return in sw

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

diff --git a/compilerplugins/clang/passstuffbyref.cxx 
b/compilerplugins/clang/passstuffbyref.cxx
index cb7ac1366c70..aca8b89da5a3 100644
--- a/compilerplug

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

[vikasmahato]

 sw/source/ui/frmdlg/cption.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 11cc1afb2fd46c3dfdd519ad51c5fb2e7e3b7837
Author: vikasmahato 
Date:   Sun Dec 31 18:17:15 2017 +0530

tdf#40457 - Place captions above tables by default

Change-Id: I2b367a451c03b42120c7599158cc05b8c99e1697
Reviewed-on: https://gerrit.libreoffice.org/47216
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index d8bc996a03ce..f1532f6599f6 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -242,7 +242,15 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, 
SwView &rV ) :
 m_pPosBox->InsertEntry(SwResId(STR_CAPTION_BEGINNING));
 m_pPosBox->InsertEntry(SwResId(STR_CAPTION_END ));
 }
-m_pPosBox->SelectEntryPos(1);
+
+if (eType & SelectionType::Table)
+{
+m_pPosBox->SelectEntryPos(0);
+}
+else
+{
+m_pPosBox->SelectEntryPos(1);
+}
 
 m_pCategoryBox->GetModifyHdl().Call(*m_pCategoryBox);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski]

 sw/inc/strings.hrc|4 ++--
 sw/source/uibase/uiview/view2.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 180fe42c7cff913a0d7e4059e9355f0cfed9ab6b
Author: Jim Raykowski 
Date:   Mon Jan 1 20:47:12 2018 -0900

tdf#112474 change behavior of left click on writer statusbar page number

in document to open Go to Page dialog

Change-Id: I9782fa9a2d9c3d541e09bad4f721c9b2417f29d5
Reviewed-on: https://gerrit.libreoffice.org/47247
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 38a7918c2928..e1c40138fcbb 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1017,8 +1017,8 @@
 #define STR_VIEWLAYOUT_ONE  NC_("STR_VIEWLAYOUT_ONE", 
"Single-page view")
 #define STR_VIEWLAYOUT_MULTINC_("STR_VIEWLAYOUT_MULTI", 
"Multiple-page view")
 #define STR_VIEWLAYOUT_BOOK NC_("STR_VIEWLAYOUT_BOOK", 
"Book view")
-#define STR_BOOKCTRL_HINT   NC_("STR_BOOKCTRL_HINT", "Page 
number in document. Click to open Navigator window or right-click for bookmark 
list.")
-#define STR_BOOKCTRL_HINT_EXTENDED  
NC_("STR_BOOKCTRL_HINT_EXTENDED", "Page number in document (Page number on 
printed document). Click to open Navigator window.")
+#define STR_BOOKCTRL_HINT   NC_("STR_BOOKCTRL_HINT", "Page 
number in document. Click to open Go to Page dialog or right-click for bookmark 
list.")
+#define STR_BOOKCTRL_HINT_EXTENDED  
NC_("STR_BOOKCTRL_HINT_EXTENDED", "Page number in document (Page number on 
printed document). Click to open Go to Page dialog.")
 #define STR_TMPLCTRL_HINT   NC_("STR_TMPLCTRL_HINT", "Page 
Style. Right-click to change style or click to open Style dialog.")
 
 // Strings for textual attributes.
diff --git a/sw/source/uibase/uiview/view2.cxx 
b/sw/source/uibase/uiview/view2.cxx
index aa65ab2544c1..75b63fb5fc0f 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1588,7 +1588,7 @@ void SwView::ExecuteStatusLine(SfxRequest &rReq)
 {
 case FN_STAT_PAGE:
 {
-GetViewFrame()->GetDispatcher()->Execute( SID_NAVIGATOR,
+GetViewFrame()->GetDispatcher()->Execute( FN_GOTO_PAGE,
   
SfxCallMode::SYNCHRON|SfxCallMode::RECORD );
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

--with-alloc={tcmalloc,jemalloc} removed from master

[Stephan Bergmann]

From the 
 
"Support for tcmalloc and jemalloc is long dead" commit message:  "So 
the only remaining effect of --with-alloc={tcmalloc,jemalloc} is to set 
FORCE_SYSALLOC in Library_sal.mk, same as --with-alloc=system does.  So 
whoever still uses the former configure switches should just switch to 
the latter."  (Notwithstanding the fact that FORCE_SYSALLOC is 
effectively dead, too.)

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark

[Matthias Freund]

 icon-themes/sifr/cmd/32/deletetable.png  |binary
 icon-themes/sifr/cmd/32/entirecolumn.png |binary
 icon-themes/sifr/cmd/32/entirerow.png|binary
 icon-themes/sifr/cmd/32/insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/32/insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/32/insertrowsafter.png  |binary
 icon-themes/sifr/cmd/32/insertrowsbefore.png |binary
 icon-themes/sifr/cmd/lc_deletetable.png  |binary
 icon-themes/sifr/cmd/lc_entirecolumn.png |binary
 icon-themes/sifr/cmd/lc_entirerow.png|binary
 icon-themes/sifr/cmd/lc_insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/lc_insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/lc_insertrowsafter.png  |binary
 icon-themes/sifr/cmd/lc_insertrowsbefore.png |binary
 icon-themes/sifr/cmd/sc_deletetable.png  |binary
 icon-themes/sifr/cmd/sc_entirecolumn.png |binary
 icon-themes/sifr/cmd/sc_entirerow.png|binary
 icon-themes/sifr/cmd/sc_insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/sc_insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/sc_insertrowsafter.png  |binary
 icon-themes/sifr/cmd/sc_insertrowsbefore.png |binary
 icon-themes/sifr_dark/cmd/32/deletetable.png |binary
 icon-themes/sifr_dark/cmd/32/entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/32/entirerow.png   |binary
 icon-themes/sifr_dark/cmd/32/insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/32/insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/32/insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/32/insertrowsbefore.png|binary
 icon-themes/sifr_dark/cmd/lc_deletetable.png |binary
 icon-themes/sifr_dark/cmd/lc_entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/lc_entirerow.png   |binary
 icon-themes/sifr_dark/cmd/lc_insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/lc_insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/lc_insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/lc_insertrowsbefore.png|binary
 icon-themes/sifr_dark/cmd/sc_deletetable.png |binary
 icon-themes/sifr_dark/cmd/sc_entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/sc_entirerow.png   |binary
 icon-themes/sifr_dark/cmd/sc_insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/sc_insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/sc_insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/sc_insertrowsbefore.png|binary
 42 files changed

New commits:
commit 24b3fc49238b1890769fa45571a3043646e4e4b9
Author: Matthias Freund 
Date:   Mon Jan 1 22:34:06 2018 +0100

tdf#75256 Sifr update opacity fix for some icons

Change-Id: Ie151389d318e39757b4050a2949281613fc521f6
Reviewed-on: https://gerrit.libreoffice.org/47244
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr/cmd/32/deletetable.png 
b/icon-themes/sifr/cmd/32/deletetable.png
index 7ecaeab3cbf0..9f26fb02786a 100644
Binary files a/icon-themes/sifr/cmd/32/deletetable.png and 
b/icon-themes/sifr/cmd/32/deletetable.png differ
diff --git a/icon-themes/sifr/cmd/32/entirecolumn.png 
b/icon-themes/sifr/cmd/32/entirecolumn.png
new file mode 100644
index ..dfd26198bb5f
Binary files /dev/null and b/icon-themes/sifr/cmd/32/entirecolumn.png differ
diff --git a/icon-themes/sifr/cmd/32/entirerow.png 
b/icon-themes/sifr/cmd/32/entirerow.png
new file mode 100644
index ..aa7c63e42e8f
Binary files /dev/null and b/icon-themes/sifr/cmd/32/entirerow.png differ
diff --git a/icon-themes/sifr/cmd/32/insertcolumnsafter.png 
b/icon-themes/sifr/cmd/32/insertcolumnsafter.png
index afc680cf857f..4d601d25fa89 100644
Binary files a/icon-themes/sifr/cmd/32/insertcolumnsafter.png and 
b/icon-themes/sifr/cmd/32/insertcolumnsafter.png differ
diff --git a/icon-themes/sifr/cmd/32/insertcolumnsbefore.png 
b/icon-themes/sifr/cmd/32/insertcolumnsbefore.png
index 4792c5079ea4..912cd17717dd 100644
Binary files a/icon-themes/sifr/cmd/32/insertcolumnsbefore.png and 
b/icon-themes/sifr/cmd/32/insertcolumnsbefore.png differ
diff --git a/icon-themes/sifr/cmd/32/insertrowsafter.png 
b/icon-themes/sifr/cmd/32/insertrowsafter.png
index ad809b7cf1a3..382aa465b196 100644
Binary files a/icon-themes/sifr/cmd/32/insertrowsafter.png and 
b/icon-themes/sifr/cmd/32/insertrowsafter.png differ
diff --git a/icon-themes/sifr/cmd/32/insertrowsbefore.png 
b/icon-themes/sifr/cmd/32/insertrowsbefore.png
index a67d33bc816d..6c60cddfd93a 100644
Binary files a/icon-themes/sifr/cmd/32/insertrowsbefore.png and 
b/icon-themes/sifr/cmd/32/insertrowsbefore.png differ
diff --git a/icon-themes/sifr/cmd/lc_deletetable.png 
b/icon-themes/sifr/cmd/lc_deletetable.png
index eaf3601147d8..be8ca73d82ce 100644
Binary files a/icon-themes/sifr/cmd/lc_deletetable.png and 
b/icon-themes/sifr/cmd/lc_deletetable.png differ
diff --g

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

[Aleksandr Andreev]

 i18nutil/source/utility/casefolding_data.h |   24 
 i18nutil/source/utility/unicode_data.h |   14 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 08c20c208e17dfbdaf0e140dac7b2c4a2868dd52
Author: Aleksandr Andreev 
Date:   Sun Dec 24 21:51:53 2017 +0300

tdf#114681: Adding support for case folding in Glagolitic

Change-Id: I3f7f4b7ecfd53a918318c2091a0756ba327c98ba
Reviewed-on: https://gerrit.libreoffice.org/47057
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/i18nutil/source/utility/casefolding_data.h 
b/i18nutil/source/utility/casefolding_data.h
index 644abce1ea3c..06525cbc7cde 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -390,18 +390,18 @@ static const Value CaseMappingValue[] = {
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 24f0 - 24f7
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 24f8 - 24ff
 
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c00 - 2c07
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c08 - 2c0f
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c10 - 2c17
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c18 - 2c1f
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c20 - 2c27
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c28 - 2c2f
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c30 - 2c37
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c38 - 2c3f
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c40 - 2c47
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c48 - 2c4f
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c50 - 2c57
-{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c58 - 2c5f
+{0x6a, 0x2C30}, {0x6a, 0x2C31}, {0x6a, 0x2C32}, {0x6a, 0x2C33}, {0x6a, 
0x2C34}, {0x6a, 0x2C35}, {0x6a, 0x2C36}, {0x6a, 0x2C37}, // 2c00 - 2c07, 
Glagolitic
+{0x6a, 0x2C38}, {0x6a, 0x2C39}, {0x6a, 0x2C3A}, {0x6a, 0x2C3B}, {0x6a, 
0x2C3C}, {0x6a, 0x2C3D}, {0x6a, 0x2C3E}, {0x6a, 0x2C3F}, // 2c08 - 2c0f
+{0x6a, 0x2C40}, {0x6a, 0x2C41}, {0x6a, 0x2C42}, {0x6a, 0x2C43}, {0x6a, 
0x2C44}, {0x6a, 0x2C45}, {0x6a, 0x2C46}, {0x6a, 0x2C47}, // 2c10 - 2c17
+{0x6a, 0x2C48}, {0x6a, 0x2C49}, {0x6a, 0x2C4A}, {0x6a, 0x2C4B}, {0x6a, 
0x2C4C}, {0x6a, 0x2C4D}, {0x6a, 0x2C4E}, {0x6a, 0x2C4F}, // 2c18 - 2c1f
+{0x6a, 0x2C50}, {0x6a, 0x2C51}, {0x6a, 0x2C52}, {0x6a, 0x2C53}, {0x6a, 
0x2C54}, {0x6a, 0x2C55}, {0x6a, 0x2C56}, {0x6a, 0x2C57}, // 2c20 - 2c27
+{0x6a, 0x2C58}, {0x6a, 0x2C59}, {0x6a, 0x2C5A}, {0x6a, 0x2C5B}, {0x6a, 
0x2C5C}, {0x6a, 0x2C5D}, {0x6a, 0x2C5E}, {0x00, 0x}, // 2c28 - 2c2f
+{0x15, 0x2C00}, {0x15, 0x2C01}, {0x15, 0x2C02}, {0x15, 0x2C03}, {0x15, 
0x2C04}, {0x15, 0x2C05}, {0x15, 0x2C06}, {0x15, 0x2C07}, // 2c30 - 2c37
+{0x15, 0x2C08}, {0x15, 0x2C09}, {0x15, 0x2C0A}, {0x15, 0x2C0B}, {0x15, 
0x2C0C}, {0x15, 0x2C0D}, {0x15, 0x2C0E}, {0x15, 0x2C0F}, // 2c38 - 2c3f
+{0x15, 0x2C10}, {0x15, 0x2C11}, {0x15, 0x2C12}, {0x15, 0x2C13}, {0x15, 
0x2C14}, {0x15, 0x2C15}, {0x15, 0x2C16}, {0x15, 0x2C17}, // 2c40 - 2c47
+{0x15, 0x2C18}, {0x15, 0x2C19}, {0x15, 0x2C1A}, {0x15, 0x2C1B}, {0x15, 
0x2C1C}, {0x15, 0x2C1D}, {0x15, 0x2C1E}, {0x15, 0x2C1F}, // 2c48 - 2c4f
+{0x15, 0x2C20}, {0x15, 0x2C21}, {0x15, 0x2C22}, {0x15, 0x2C23}, {0x15, 
0x2C24}, {0x15, 0x2C25}, {0x15, 0x2C26}, {0x15, 0x2C27}, // 2c50 - 2c57
+{0x15, 0x2C28}, {0x15, 0x2C29}, {0x15, 0x2C2A}, {0x15, 0x2C2B}, {0x15, 
0x2C2C}, {0x15, 0x2C2D}, {0x15, 0x2C2E}, {0x00, 0x}, // 2c58 - 2c5f
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 2c60 - 2c67
 {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 
0x}, {0x00, 

Weekly QA Report (W52-2017)

[Xisco Fauli]

Hello,

What have happened in QA in the last 8 days?

  * 112 bugs have been created, of which, 44 are still unconfirmed (
Total Unconfirmed bugs: 395 )
    Link: http://tinyurl.com/y88evx73

  * 934 comments have been written.

== STATUSES CHANGED ==
  * 15 bugs have been changed to 'ASSIGNED'.
    Link: http://tinyurl.com/yavkgvsv
    Done by: Tamás Zolnai ( 5 ), Xisco Faulí ( 4 ), Winfried Donkers ( 1
), Kevin Suo ( 1 ), Julien Nabet ( 1 ), tagezi ( 1 ), Laurent BP ( 1 ),
David Tardon ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
    Link: http://tinyurl.com/yb8uycmj
    Done by: Torge Riedel ( 1 ), Cor Nouws ( 1 )

  * 21 bugs have been changed to 'NEEDINFO'.
    Link: http://tinyurl.com/yalawz2a
    Done by: Buovjaga ( 6 ), Cor Nouws ( 4 ), Xisco Faulí ( 3 ),
Jean-Baptiste Faure ( 3 ), V Stuart Foote ( 1 ), Mike Kaganski ( 1 ),
m.a.riosv ( 1 ), Aron Budea ( 1 ), architjugran ( 1 )

  * 78 bugs have been changed to 'NEW'.
    Link: http://tinyurl.com/y6uxvjls
    Done by: Buovjaga ( 19 ), Xisco Faulí ( 10 ), Yousuf Philips (jay) (
6 ), Heiko Tietze ( 4 ), Julien Nabet ( 4 ), raal ( 4 ), Dieter Praas (
4 ), V Stuart Foote ( 3 ), Tamás Zolnai ( 2 ), Telesto ( 2 ), robert ( 2
), Terrence Enger ( 2 ), Kevin Suo ( 1 ), Sophia Schroeder ( 1 ), Regina
Henschel ( 1 ), MM ( 1 ), m.a.riosv ( 1 ), tagezi ( 1 ), Gabor Kelemen (
1 ), jorojmaqui ( 1 ), Jean-Baptiste Faure ( 1 ), h4himanshu.ranjan ( 1
), Jacques Guilleron ( 1 ), Timur ( 1 ), Adolfo Jayme ( 1 ), Cor Nouws (
1 ), Aron Budea ( 1 ), architjugran ( 1 )

  * 1 bug has been changed to 'REOPENED'.
    Link: http://tinyurl.com/yd4qgvqj
    Done by: stefan ( 1 )

  * 33 bugs have been changed to 'RESOLVED DUPLICATE'.
    Link: http://tinyurl.com/y96frau6
    Done by: Buovjaga ( 7 ), V Stuart Foote ( 5 ), Timur ( 4 ), Xisco
Faulí ( 3 ), Mike Kaganski ( 3 ), raal ( 2 ), Johnny_M ( 2 ), Cor Nouws
( 2 ), Aron Budea ( 2 ), Telesto ( 1 ), Olivier Hallot ( 1 ), Dieter
Praas ( 1 )

  * 29 bugs have been changed to 'RESOLVED FIXED'.
    Link: http://tinyurl.com/yaoufdvc
    Done by: David Tardon ( 5 ), Tamás Zolnai ( 3 ), Mike Kaganski ( 3
), Buovjaga ( 2 ), Heiko Tietze ( 2 ), Mark Hung ( 2 ), Laurent BP ( 2
), Tor Lillqvist ( 1 ), Szymon Kłos ( 1 ), Yousuf Philips (jay) ( 1 ),
Markus Mohrhard ( 1 ), Gabor Kelemen ( 1 ), Adolfo Jayme ( 1 ), Cor
Nouws ( 1 ), Chris Grove ( 1 ), Caolán McNamara ( 1 ), Tamas Bunth ( 1 )

  * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'.
    Link: http://tinyurl.com/ycklkuq6
    Done by: Timur ( 1 ), Cor Nouws ( 1 )

  * 2 bugs have been changed to 'RESOLVED INVALID'.
    Link: http://tinyurl.com/ybhl9fff
    Done by: V Stuart Foote ( 1 ), Timur ( 1 )

  * 12 bugs have been changed to 'RESOLVED NOTABUG'.
    Link: http://tinyurl.com/yczvyhg8
    Done by: Timur ( 4 ), Cor Nouws ( 2 ), Xavier Van Wijmeersch ( 1 ),
Buovjaga ( 1 ), Thomas Woltjer ( 1 ), ogb1966 ( 1 ), Mike Kaganski ( 1
), Jean-Baptiste Faure ( 1 )

  * 1 bug has been changed to 'RESOLVED NOTOURBUG'.
    Link: http://tinyurl.com/ya6ywwly
    Done by: Timur ( 1 )

  * 3 bugs have been changed to 'RESOLVED WONTFIX'.
    Link: http://tinyurl.com/y86ybwyc
    Done by: Buovjaga ( 2 ), V Stuart Foote ( 1 )

  * 29 bugs have been changed to 'RESOLVED WORKSFORME'.
    Link: http://tinyurl.com/yayphft6
    Done by: Cor Nouws ( 10 ), robert ( 3 ), Timur ( 3 ), Buovjaga ( 2
), Mike Kaganski ( 2 ), Heiko Tietze ( 1 ), Thomas Lendo ( 1 ),
sergio.callegari ( 1 ), Robert ( 1 ), raal ( 1 ), Philippe ( 1 ),
Juanito ( 1 ), bunkem ( 1 ), tommy27 ( 1 )

  * 10 bugs have been changed to 'UNCONFIRMED'.
    Link: http://tinyurl.com/y9vbbm9a
    Done by: Buovjaga ( 2 ), Xisco Faulí ( 1 ), Nikita ( 1 ), Elmar ( 1
), Luca ( 1 ), HG Rybak ( 1 ), Timur ( 1 ), Dieter Praas ( 1 ), antanins
( 1 )

  * 13 bugs have been changed to 'VERIFIED FIXED'.
    Link: http://tinyurl.com/y9fu2yzs
    Done by: Xisco Faulí ( 9 ), Terrence Enger ( 2 ), Cor Nouws ( 2 )

== KEYWORDS ADDED ==
  * 'bibisectRequest' has been added to 5 bugs.
    Link: http://tinyurl.com/y8xtjp4z
    Done by: Buovjaga ( 4 ), robert ( 1 )

  * 'bibisected' has been added to 20 bugs.
    Link: http://tinyurl.com/y9jb7s5o
    Done by: Xisco Faulí ( 7 ), Terrence Enger ( 5 ), raal ( 4 ),
Telesto ( 3 ), Aron Budea ( 1 )

  * 'bisected' has been added to 16 bugs.
    Link: http://tinyurl.com/yd3v78lk
    Done by: Xisco Faulí ( 7 ), raal ( 4 ), Telesto ( 3 ), Mihkel Tõnnov
( 1 ), Aron Budea ( 1 )

  * 'dataLoss' has been added to 2 bugs.
    Link: http://tinyurl.com/yb2l4mrg
    Done by: Buovjaga ( 1 ), raal ( 1 )

  * 'easyHack' has been added to 2 bugs.
    Link: http://tinyurl.com/yaspq2ko
    Done by: Xisco Faulí ( 1 ), tagezi ( 1 )

  * 'filter:doc' has been added to 1 bug.
    Link: http://tinyurl.com/ydfh67mn
    Done by: Buovjaga ( 1 )

  * 'filter:docx' has been added to 1 bug.
    Link: http://tinyurl.com/ydfh67mn
    Done by: Buovjaga ( 1 )

  * 'filter:emf' has been added to 1 bug.
    Link: http://tinyurl.com/yboupuon
    Don

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

[Henry Castro]

 loleaflet/debug/document/loleaflet.html  |8 +---
 loleaflet/main.js|7 ---
 loleaflet/src/control/Control.Menubar.js |7 +++
 loleaflet/src/map/handler/Map.WOPI.js|7 ---
 4 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit 9a7e1411cd802bcfb49011e79137b38da67fde15
Author: Henry Castro 
Date:   Tue Nov 21 18:09:23 2017 -0400

loleaflet: replace title parameter with wopi BaseFileName

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

diff --git a/loleaflet/debug/document/loleaflet.html 
b/loleaflet/debug/document/loleaflet.html
index fc239f3b..70d923f6 100644
--- a/loleaflet/debug/document/loleaflet.html
+++ b/loleaflet/debug/document/loleaflet.html
@@ -100,14 +100,8 @@
 wopiSrc += '?access_header=' + access_header;
 }
 
-
-var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var host = '%HOST%';
+var filePath = getParameterByName('file_path');
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 var closebutton = getParameterByName('closebutton');
diff --git a/loleaflet/main.js b/loleaflet/main.js
index 5d8aaed0..a780f866 100644
--- a/loleaflet/main.js
+++ b/loleaflet/main.js
@@ -65,11 +65,6 @@ else if (wopiSrc !== '' && access_header !== '') {
 }
 
 var filePath = getParameterByName('file_path');
-var title = getParameterByName('title');
-if (title === '') {
-title = 
decodeURIComponent(filePath.substring(filePath.lastIndexOf('/')+1));
-}
-
 var permission = getParameterByName('permission') || 'edit';
 var timestamp = getParameterByName('timestamp');
 // Shows close button if non-zero value provided
@@ -91,7 +86,6 @@ if (host === '') {
 // TODO: Get rid of these globals
 global.closebutton = closebutton;
 global.revHistoryEnabled = revHistoryEnabled;
-global.title = title;
 global.errorMessages = errorMessages;
 var docURL, docParams;
 var isWopi = false;
@@ -104,7 +98,6 @@ if (wopiSrc != '') {
docParams = {};
 }
 
-document.title = title;
 var map = L.map('map', {
server: host,
doc: docURL,
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 956454d8..6ad04838 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -2,7 +2,7 @@
 * Control.Menubar
 */
 
-/* global $ _ map title vex revHistoryEnabled closebutton L */
+/* global $ _ map vex revHistoryEnabled closebutton L */
 L.Control.Menubar = L.Control.extend({
// TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
options: {
@@ -536,9 +536,8 @@ L.Control.Menubar = L.Control.extend({
map.print();
} else if (id.startsWith('downloadas-')) {
var format = id.substring('downloadas-'.length);
-   // remove the extension if any
-   var fileName = title.substr(0, title.lastIndexOf('.')) 
|| title;
-   // check if it is empty
+   var fileName = map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
fileName = fileName === '' ? 'document' : fileName;
map.downloadAs(fileName + '.' + format, format);
} else if (id === 'findandreplace') {
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 0201e1d0..c4c310b5 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -2,7 +2,7 @@
  * L.WOPI contains WOPI related logic
  */
 
-/* global title w2ui toolbarUpMobileItems resizeToolbar */
+/* global w2ui toolbarUpMobileItems resizeToolbar */
 L.Map.WOPI = L.Handler.extend({
// If the CheckFileInfo call fails on server side, we won't have any 
PostMessageOrigin.
// So use '*' because we still needs to send 'close' message to the 
parent frame which
@@ -188,8 +188,9 @@ L.Map.WOPI = L.Handler.extend({
else if (msg.MessageId === 'Action_Export') {
if (msg.Values) {
var format = msg.Values.Format;
-   var filename = title.substr(0, 
title.lastIndexOf('.')) || title;
-   filename = filename === '' ? 'document' : 
filename;
+   var fileName = this._map['wopi'].BaseFileName;
+   fileName = fileName.substr(0, 
fileName.lastIndexOf('.'));
+   fileName = fileName === '' ? 'document' : 
fileName;
 

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

[Andrea Gelmini]

 basegfx/source/polygon/b2dlinegeometry.cxx |4 ++--
 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e87d32a38054c3bd47f21cd7f542ba690f5a2707
Author: Andrea Gelmini 
Date:   Mon Jan 1 23:07:33 2018 +0100

Fix typos

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

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 69939ffb2037..d9c24377a16e 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -130,7 +130,7 @@ namespace basegfx
 
 namespace basegfx
 {
-// anonymus namespace for local helpers
+// anonymous namespace for local helpers
 namespace
 {
 bool impIsSimpleEdge(const B2DCubicBezier& rCandidate, double 
fMaxCosQuad, double fMaxPartOfEdgeQuad)
@@ -775,7 +775,7 @@ namespace basegfx
 
 return aEdgePolygon;
 }
-} // end of anonymus namespace
+} // end of anonymous namespace
 
 namespace utils
 {
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx 
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 4965ea11830b..bd11e2ea53c3 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -166,7 +166,7 @@ isBluez5Available(DBusConnection *pConnection)
 {
 DBusMessage *pMsg;
 
-// Simplest wasy to check whether we have Bluez 5+ is to check
+// Simplest ways to check whether we have Bluez 5+ is to check
 // that we can obtain adapters using the new interfaces.
 // The first two error checks however don't tell us anything as they should
 // succeed as long as dbus is working correctly.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matthias Freund]

 icon-themes/sifr/cmd/32/deletetable.png  |binary
 icon-themes/sifr/cmd/32/entirecolumn.png |binary
 icon-themes/sifr/cmd/32/entirerow.png|binary
 icon-themes/sifr/cmd/32/insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/32/insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/32/insertrowsafter.png  |binary
 icon-themes/sifr/cmd/32/insertrowsbefore.png |binary
 icon-themes/sifr/cmd/lc_deletetable.png  |binary
 icon-themes/sifr/cmd/lc_entirecolumn.png |binary
 icon-themes/sifr/cmd/lc_entirerow.png|binary
 icon-themes/sifr/cmd/lc_insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/lc_insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/lc_insertrowsafter.png  |binary
 icon-themes/sifr/cmd/lc_insertrowsbefore.png |binary
 icon-themes/sifr/cmd/sc_deletetable.png  |binary
 icon-themes/sifr/cmd/sc_entirecolumn.png |binary
 icon-themes/sifr/cmd/sc_entirerow.png|binary
 icon-themes/sifr/cmd/sc_insertcolumnsafter.png   |binary
 icon-themes/sifr/cmd/sc_insertcolumnsbefore.png  |binary
 icon-themes/sifr/cmd/sc_insertrowsafter.png  |binary
 icon-themes/sifr/cmd/sc_insertrowsbefore.png |binary
 icon-themes/sifr_dark/cmd/32/deletetable.png |binary
 icon-themes/sifr_dark/cmd/32/entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/32/entirerow.png   |binary
 icon-themes/sifr_dark/cmd/32/insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/32/insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/32/insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/32/insertrowsbefore.png|binary
 icon-themes/sifr_dark/cmd/lc_deletetable.png |binary
 icon-themes/sifr_dark/cmd/lc_entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/lc_entirerow.png   |binary
 icon-themes/sifr_dark/cmd/lc_insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/lc_insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/lc_insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/lc_insertrowsbefore.png|binary
 icon-themes/sifr_dark/cmd/sc_deletetable.png |binary
 icon-themes/sifr_dark/cmd/sc_entirecolumn.png|binary
 icon-themes/sifr_dark/cmd/sc_entirerow.png   |binary
 icon-themes/sifr_dark/cmd/sc_insertcolumnsafter.png  |binary
 icon-themes/sifr_dark/cmd/sc_insertcolumnsbefore.png |binary
 icon-themes/sifr_dark/cmd/sc_insertrowsafter.png |binary
 icon-themes/sifr_dark/cmd/sc_insertrowsbefore.png|binary
 42 files changed

New commits:
commit d1625cb2c411330d5231e5ff79f3542d0a797073
Author: Matthias Freund 
Date:   Mon Jan 1 22:34:06 2018 +0100

tdf#75256 Sifr update opacity fix for some icons

Change-Id: Ie151389d318e39757b4050a2949281613fc521f6
Reviewed-on: https://gerrit.libreoffice.org/47239
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr/cmd/32/deletetable.png 
b/icon-themes/sifr/cmd/32/deletetable.png
index 7ecaeab3cbf0..9f26fb02786a 100644
Binary files a/icon-themes/sifr/cmd/32/deletetable.png and 
b/icon-themes/sifr/cmd/32/deletetable.png differ
diff --git a/icon-themes/sifr/cmd/32/entirecolumn.png 
b/icon-themes/sifr/cmd/32/entirecolumn.png
new file mode 100644
index ..dfd26198bb5f
Binary files /dev/null and b/icon-themes/sifr/cmd/32/entirecolumn.png differ
diff --git a/icon-themes/sifr/cmd/32/entirerow.png 
b/icon-themes/sifr/cmd/32/entirerow.png
new file mode 100644
index ..aa7c63e42e8f
Binary files /dev/null and b/icon-themes/sifr/cmd/32/entirerow.png differ
diff --git a/icon-themes/sifr/cmd/32/insertcolumnsafter.png 
b/icon-themes/sifr/cmd/32/insertcolumnsafter.png
index afc680cf857f..4d601d25fa89 100644
Binary files a/icon-themes/sifr/cmd/32/insertcolumnsafter.png and 
b/icon-themes/sifr/cmd/32/insertcolumnsafter.png differ
diff --git a/icon-themes/sifr/cmd/32/insertcolumnsbefore.png 
b/icon-themes/sifr/cmd/32/insertcolumnsbefore.png
index 4792c5079ea4..912cd17717dd 100644
Binary files a/icon-themes/sifr/cmd/32/insertcolumnsbefore.png and 
b/icon-themes/sifr/cmd/32/insertcolumnsbefore.png differ
diff --git a/icon-themes/sifr/cmd/32/insertrowsafter.png 
b/icon-themes/sifr/cmd/32/insertrowsafter.png
index ad809b7cf1a3..382aa465b196 100644
Binary files a/icon-themes/sifr/cmd/32/insertrowsafter.png and 
b/icon-themes/sifr/cmd/32/insertrowsafter.png differ
diff --git a/icon-themes/sifr/cmd/32/insertrowsbefore.png 
b/icon-themes/sifr/cmd/32/insertrowsbefore.png
index a67d33bc816d..6c60cddfd93a 100644
Binary files a/icon-themes/sifr/cmd/32/insertrowsbefore.png and 
b/icon-themes/sifr/cmd/32/insertrowsbefore.png differ
diff --git a/icon-themes/sifr/cmd/lc_deletetable.png 
b/icon-themes/sifr/cmd/lc_deletetable.png
index eaf3601147d8..be8ca73d82ce 100644
Binary files a/icon-themes/sifr/cmd/lc_deletetable.png and 
b/icon-themes/sifr/cmd/lc_deletetable.png differ
diff --g