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

[Libreoffice Gerrit user]

 dev/null   |binary
 sw/Module_sw.mk|1 
 sw/UITest_fields.mk|   16 ---
 sw/qa/uitest/fields/insertField.py |  187 -
 4 files changed, 204 deletions(-)

New commits:
commit d374834344132f53c96c12234f4b33f437454e3a
Author: Zdenek Crhonek 
AuthorDate: Mon Dec 10 08:00:01 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Dec 10 08:59:50 2018 +0100

Revert "uitest writer - insert field"

This reverts commit 5743e432e45ed5ed7a4f010a262b2737f1351d3c.

The test is not stable.

Change-Id: I3ad13392ef32ab2d8d305e7a0876014573c79a37
Reviewed-on: https://gerrit.libreoffice.org/64856
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 5e0e69e936ea..ee052eceb24a 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -146,7 +146,6 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
UITest_chapterNumbering \
UITest_librelogo \
UITest_options \
-   UITest_fields \
 ))
 endif
 
diff --git a/sw/UITest_fields.mk b/sw/UITest_fields.mk
deleted file mode 100644
index e0df0c178b8e..
--- a/sw/UITest_fields.mk
+++ /dev/null
@@ -1,16 +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/.
-#
-
-$(eval $(call  gb_UITest_UITest,fields))
-
-$(eval $(call gb_UITest_add_modules,fields,$(SRCDIR)/sw/qa/uitest,\
-   fields/ \
-))
-
-$(eval $(call gb_UITest_set_defs,fields, \
-TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
-))
diff --git a/sw/qa/uitest/fields/insertField.py 
b/sw/qa/uitest/fields/insertField.py
deleted file mode 100644
index ab394d097748..
--- a/sw/qa/uitest/fields/insertField.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# 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/.
-#
-
-from uitest.framework import UITestCase
-import time
-from uitest.uihelper.common import get_state_as_dict, type_text
-from uitest.debug import sleep
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import select_pos
-from uitest.framework import UITestCase
-from uitest.path import get_srcdir_url
-
-def get_url_for_data_file(file_name):
-return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
-
-class insertField(UITestCase):
-
-def test_insert_field_document_author(self):
-
-writer_doc = 
self.ui_test.load_file(get_url_for_data_file("insertField.odt"))
-xWriterDoc = self.xUITest.getTopFocusWindow()
-xWriterEdit = xWriterDoc.getChild("writer_edit")
-document = self.ui_test.get_component()
-
-#fill the Options-> User data
-self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog")
-xProperties = self.xUITest.getTopFocusWindow()
-
-xCompanyText = xProperties.getChild("company")
-xCompanyText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xCompanyText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xCompanyText.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Documentfoundation"}))
-
-xfirstnameText = xProperties.getChild("firstname")
-xfirstnameText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xfirstnameText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xfirstnameText.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Libre"}))
-
-xlastnameText = xProperties.getChild("lastname")
-xlastnameText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xlastnameText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xlastnameText.executeAction("TYPE", 
mkPropertyValues({"TEXT":"Office"}))
-
-xstreetText = xProperties.getChild("street")
-xstreetText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xstreetText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xstreetText.executeAction("TYPE", mkPropertyValues({"TEXT":"Street"}))
-
-xCityText = xProperties.getChild("city")
-xCityText.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xCityText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xCityText.executeAction("TYPE", mkPropertyValues({"TEXT":"City"}))
-
-xStateText = xProperties.getChild("state")
-xStateText.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xStateText.executeAction("TYPE", 
mkPropertyValues({"

[Libreoffice-commits] core.git: configure.patch

[Libreoffice Gerrit user]

 configure.patch |   32 
 1 file changed, 32 deletions(-)

New commits:
commit b2583abd214467c40c4ca2d9e6e6168bf6160aa8
Author: Stephan Bergmann 
AuthorDate: Mon Dec 10 09:13:12 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 09:13:12 2018 +0100

Remove configure.patch junk

...accidentally added with 8fa5c0315046e741d301ed236c946c55693d1eee
"HAVE_BROKEN_CONST_ITERATORS is always false now"

Change-Id: I11f19d771818002a6f61e08132bd56c854412ef0

diff --git a/configure.patch b/configure.patch
deleted file mode 100644
index 4aa1650c4b05..
--- a/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index d4a6a13..f8c5895 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -12064,13 +12064,14 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != 
"no"; then
- if test "$_os" = "WINNT"; then
- OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
- fi
--"$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \
--grep org/junit/Before.class > /dev/null 2>&5
--if test $? -eq 0; then
-+if "$JAVA_HOME/bin/javah" -o conftestj -classpath "$OOO_JUNIT_JAR" \
-+org.junit.Before > /dev/null 2>&5
-+then
- # check if either class-path entry is available for hamcrest or
- # it's bundled
--if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
--"$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP 
'Class-Path:' | $GREP -q 'hamcrest'; then
-+if "$JAVA_HOME/bin/javah" -o conftestj -classpath "$OOO_JUNIT_JAR" \
-+org.hamcrest.BaseDescription > /dev/null 2>&5
-+then
- AC_MSG_RESULT([$OOO_JUNIT_JAR])
- else
- AC_MSG_ERROR([your junit jar neither sets a classpath nor 
includes hamcrest; please
-@@ -12082,6 +12083,7 @@ provide a full junit jar or use --without-junit])
- location (/usr/share/java), specify its pathname via
- --with-junit=..., or disable it via --without-junit])
- fi
-+rm conftestj
- if test $OOO_JUNIT_JAR != ""; then
- BUILD_TYPE="$BUILD_TYPE QADEVOOO"
- fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Muhammet Kara license statement

[Muhammet Kara]

All of my past & future contributions to LibreOffice may be licensed 
under the MPLv2/LGPLv3+ dual license.


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

Re: B2DRange

[Miklos Vajna]

Hi Chris,

On Mon, Dec 10, 2018 at 04:49:29AM +1100, Chris Sherlock 
 wrote:
> How does one apply a translation matrix to a B2DRange? I can see a
> transform() function, but that’s a matrix multiplication - I want to
> move the 2d range from left or right, and top or bottom.

Did you try creating a basegfx::B2DHomMatrix, calling translate() on it,
then using that as an argument on transform()?

Regards,

Miklos


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

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0648d462ff81a6fa4aeea58636810f565a01d4cc
Author: Miklos Vajna 
AuthorDate: Mon Dec 10 10:10:20 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 10 10:10:58 2018 +0100

signing: update end point URL suffix to work again

Server-side code was changed.

Change-Id: Icf784a261de66e519f1c6975b70820ef0b6888a0

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index d4113cc67..183d5ed88 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -421,7 +421,7 @@ L.Map.include({
}
}
},
-   vereignURL + '/api/js/iframe'
+   vereignURL + '/vcl/js/iframe'
).then(function(lib) {
library = lib;
adjustUIState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/sidebar/SlideBackground.cxx |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 86abd3ec30bac181df228569b70aaf9086ed5f4a
Author: Xisco Fauli 
AuthorDate: Fri Dec 7 11:10:14 2018 +0100
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 10:15:28 2018 +0100

Check pDoc is not null

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

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx 
b/sd/source/ui/sidebar/SlideBackground.cxx
index e1958c1927ad..d1c7bdcdb8ef 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -157,19 +157,22 @@ SlideBackground::SlideBackground(
 
 ::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( 
SfxObjectShell::Current() );
 SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
-SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
-if (pOptions)
+if (pDoc)
 {
-FieldUnit eMetric = static_cast(pOptions->GetMetric());
-if (IsInch(eMetric))
+SdOptions* pOptions = SD_MOD()->GetSdOptions(pDoc->GetDocumentType());
+if (pOptions)
 {
-for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
-
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
+FieldUnit eMetric = static_cast(pOptions->GetMetric());
+if (IsInch(eMetric))
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_INCH); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_INCH[i]));
+}
+else
+{
+for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
+
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
 }
-else
-{
-for (size_t i = 0; i < 
SAL_N_ELEMENTS(RID_PAGEFORMATPANEL_MARGINS_CM); ++i)
-
mpMarginSelectBox->InsertEntry(SdResId(RID_PAGEFORMATPANEL_MARGINS_CM[i]));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/sidebar/AllMasterPagesSelector.cxx   |6 
 sd/source/ui/sidebar/DocumentHelper.cxx   |   17 +-
 sd/source/ui/sidebar/LayoutMenu.cxx   |   23 +--
 sd/source/ui/sidebar/MasterPageContainer.cxx  |   38 ++---
 sd/source/ui/sidebar/MasterPageObserver.cxx   |9 -
 sd/source/ui/sidebar/MasterPagesSelector.cxx  |   25 +--
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx  |   23 +--
 sd/source/ui/slideshow/slideshowimpl.cxx  |   15 --
 sd/source/ui/slideshow/slideshowviewimpl.cxx  |5 
 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx |   39 ++
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx  |7 -
 sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx|   65 --
 sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx  |   12 -
 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx|4 
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx |7 -
 sd/source/ui/slidesorter/controller/SlsAnimator.cxx   |   17 +-
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx  |7 -
 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx   |6 
 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx   |5 
 sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx  |8 -
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx|9 -
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx |   24 +--
 sd/source/ui/slidesorter/model/SlideSorterModel.cxx   |   12 -
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx   |   13 --
 sd/source/ui/slidesorter/view/SlideSorterView.cxx |8 -
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx|   12 -
 sd/source/ui/tools/EventMultiplexer.cxx   |   17 --
 sd/source/ui/tools/SlotStateListener.cxx  |   13 --
 sd/source/ui/unoidl/SdUnoDrawView.cxx |5 
 sd/source/ui/unoidl/unomodel.cxx  |   15 --
 sd/source/ui/unoidl/unopage.cxx   |   23 +--
 sd/source/ui/unoidl/unopback.cxx  |   22 +--
 sd/source/ui/view/ToolBarManager.cxx  |   44 ++
 sd/source/ui/view/ViewClipboard.cxx   |4 
 sd/source/ui/view/ViewShellManager.cxx|   13 --
 sd/source/ui/view/ViewTabBar.cxx  |   13 +-
 sd/source/ui/view/WindowUpdater.cxx   |   10 -
 sd/source/ui/view/drtxtob.cxx |4 
 sd/source/ui/view/frmview.cxx |8 -
 sd/source/ui/view/outlnvsh.cxx|   16 --
 sd/source/ui/view/outlview.cxx|   34 +
 sd/source/ui/view/sdview2.cxx |   10 -
 sd/source/ui/view/sdview5.cxx |   12 -
 sd/source/ui/view/viewoverlaymanager.cxx  |   14 --
 44 files changed, 265 insertions(+), 428 deletions(-)

New commits:
commit 7c7ec84c26a3a92635811e4cf491b7e21796e1fa
Author: Arkadiy Illarionov 
AuthorDate: Sat Dec 8 18:27:03 2018 +0300
Commit: Noel Grandin 
CommitDate: Mon Dec 10 10:18:46 2018 +0100

Simplify containers iterations in sd/source/ui/[s-v]*

Use range-based loop or replace with STL functions

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

diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx 
b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
index 6c768d00d2ae..4520f9ecb005 100644
--- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx
@@ -174,10 +174,8 @@ void AllMasterPagesSelector::AddItem 
(MasterPageContainer::Token aToken)
 
 void AllMasterPagesSelector::UpdatePageSet (ItemList& rItemList)
 {
-SortedMasterPageDescriptorList::const_iterator iDescriptor;
-SortedMasterPageDescriptorList::const_iterator iEnd 
(mpSortedMasterPages->end());
-for (iDescriptor=mpSortedMasterPages->begin(); iDescriptor!=iEnd; 
++iDescriptor)
-rItemList.push_back((*iDescriptor)->maToken);
+for (const auto& rxDescriptor : *mpSortedMasterPages)
+rItemList.push_back(rxDescriptor->maToken);
 }
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx 
b/sd/source/ui/sidebar/DocumentHelper.cxx
index 9392d5fa4ab6..31a4b1df7c16 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -301,17 +301,16 @@ void DocumentHelper::AssignMasterPageToPageList (
 
 // Create a second list that contains only the valid poin

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

[Libreoffice Gerrit user]

 loleaflet/html/signing-identities.html  |8 +++
 loleaflet/po/templates/loleaflet-ui.pot |   36 +---
 loleaflet/src/control/Signing.js|5 +++-
 3 files changed, 32 insertions(+), 17 deletions(-)

New commits:
commit 37425878ea181f755233357d2dce834039c1f468
Author: Miklos Vajna 
AuthorDate: Mon Dec 10 10:10:20 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 10 10:20:06 2018 +0100

signing: update end point URL suffix to work again

Server-side code was changed.

Change-Id: Icf784a261de66e519f1c6975b70820ef0b6888a0
(cherry picked from commit 0648d462ff81a6fa4aeea58636810f565a01d4cc)

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index d4113cc67..183d5ed88 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -421,7 +421,7 @@ L.Map.include({
}
}
},
-   vereignURL + '/api/js/iframe'
+   vereignURL + '/vcl/js/iframe'
).then(function(lib) {
library = lib;
adjustUIState();
commit 937e548850f52daa5dc20522bdc3360d37aef15a
Author: Andras Timar 
AuthorDate: Sun Dec 9 21:53:49 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 10 10:19:52 2018 +0100

loleaflet: enable l10n of Signing Identities dialog

Change-Id: I4b6f5c998c649c6bfe89fc6af1e1f32f39053cbe
(cherry picked from commit 9539c212ef6770a9a0d30fe2fba894e256fdc6bd)

diff --git a/loleaflet/html/signing-identities.html 
b/loleaflet/html/signing-identities.html
index c40b5f8cc..e6ba57416 100644
--- a/loleaflet/html/signing-identities.html
+++ b/loleaflet/html/signing-identities.html
@@ -14,7 +14,7 @@
 }
 
 
-Select identity:
-
-Login from mobile
-Recover from email
+
+
+
+
diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 82bb656ab..5760c1f9b 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-09 17:36+0100\n"
+"POT-Creation-Date: 2018-12-09 21:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -666,47 +666,59 @@ msgstr ""
 msgid "Document uploaded."
 msgstr ""
 
-#: src/control/Signing.js:464
-msgid "Not Signed"
+#: src/control/Signing.js:362
+msgid "Select identity:"
+msgstr ""
+
+#: src/control/Signing.js:363
+msgid "Login from mobile"
+msgstr ""
+
+#: src/control/Signing.js:364
+msgid "Recover from email"
 msgstr ""
 
 #: src/control/Signing.js:467
+msgid "Not Signed"
+msgstr ""
+
+#: src/control/Signing.js:470
 msgid "Document signed and validated."
 msgstr ""
 
-#: src/control/Signing.js:468
+#: src/control/Signing.js:471
 msgid "Signed and validated"
 msgstr ""
 
-#: src/control/Signing.js:471
+#: src/control/Signing.js:474
 msgid "Document signed but signature is broken."
 msgstr ""
 
-#: src/control/Signing.js:472
+#: src/control/Signing.js:475
 msgid "Signature broken"
 msgstr ""
 
-#: src/control/Signing.js:475
+#: src/control/Signing.js:478
 msgid "Document signed but the document is already modified."
 msgstr ""
 
-#: src/control/Signing.js:476
+#: src/control/Signing.js:479
 msgid "Signed but document modified"
 msgstr ""
 
-#: src/control/Signing.js:479
+#: src/control/Signing.js:482
 msgid "Document signed but can not be validated."
 msgstr ""
 
-#: src/control/Signing.js:480
+#: src/control/Signing.js:483
 msgid "Signed but not validated"
 msgstr ""
 
-#: src/control/Signing.js:483
+#: src/control/Signing.js:486
 msgid "Document signed but not all files are signed."
 msgstr ""
 
-#: src/control/Signing.js:484
+#: src/control/Signing.js:487
 msgid "Signed but not all files are signed"
 msgstr ""
 
diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index fa1e796ff..d4113cc67 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -359,6 +359,9 @@ L.Map.include({
contentCSS: { width: w + 'px' },
buttons: {},
afterOpen: function($vexContent) {
+   $('#select-identity').text(_('Select 
identity:'));
+   $('#login-qr').text(_('Login from 
mobile'));
+   
$('#recover-from-email').text(_('Recover from email'));

library.listIdentities().then(function(response) {
var identities = response.data;
var identitiesDiv = 
$vexContent.find('#identites');
__

[Libreoffice-commits] online.git: Branch 'refs/tags/CODE-4.0-beta1' - 0 commits -

[Libreoffice Gerrit user]

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 48/1dffd377f43beb9c77e9a1da2edf363ec58ec8

[Libreoffice Gerrit user]

 48/1dffd377f43beb9c77e9a1da2edf363ec58ec8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a7d3951e68fdff5a1d51a46680f129d53d13a01f
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 09:23:52 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 09:23:52 2018 +

Notes added by 'git notes add'

diff --git a/48/1dffd377f43beb9c77e9a1da2edf363ec58ec8 
b/48/1dffd377f43beb9c77e9a1da2edf363ec58ec8
new file mode 100644
index ..a1c04ca3c6c5
--- /dev/null
+++ b/48/1dffd377f43beb9c77e9a1da2edf363ec58ec8
@@ -0,0 +1 @@
+reject: original remove not merged
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/tags/CODE-4.0-beta1' - 0 commits -

[Libreoffice Gerrit user]

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

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit eb469025573c2d74fe4b1089345a1f5dff930107
Author: Michael Weghorn 
AuthorDate: Tue Dec 4 14:42:31 2018 +0100
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 10:25:15 2018 +0100

tdf#121399 Join cmd reading thread in gtk3_kde5

Stop reading commands from the pipe on kde5 side once
the "Quit" command has been sent, in order to have
the thread that is reading commands from stdin finish
properly.

Join the thread in the 'FilePickerIpc' destructor, rather than
just deleting it while it may still be running, which
resulted in 'terminate()' being called.

Change-Id: Ia184987e7994cc1de0208ff2757a3cf06c8b7194
Reviewed-on: https://gerrit.libreoffice.org/63835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 93815c2b04f1905e43c695caf5cc2c594bb897ce)
Reviewed-on: https://gerrit.libreoffice.org/64588
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 626ebc8d81d684d3a845ff787fbaaf416df7e427)
Reviewed-on: https://gerrit.libreoffice.org/64813
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx 
b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 803e5bedd853..4d7aff80c27c 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -192,6 +192,12 @@ void readCommands(FilePickerIpc* ipc)
 readCommandArgs(command, args);
 
 emit ipc->commandReceived(messageId, command, args);
+
+// stop processing once 'Quit' command has been sent
+if (command == Commands::Quit)
+{
+return;
+}
 }
 }
 
@@ -211,7 +217,11 @@ FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker, 
QObject* parent)
 m_ipcReaderThread = std::unique_ptr{ new 
std::thread(readCommands, this) };
 }
 
-FilePickerIpc::~FilePickerIpc() = default;
+FilePickerIpc::~FilePickerIpc()
+{
+// join thread that reads commands
+m_ipcReaderThread->join();
+};
 
 bool FilePickerIpc::handleCommand(uint64_t messageId, Commands command, 
QList args)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui|   64 ++--
 sd/uiconfig/sdraw/ui/notebookbar.ui|   60 +-
 sd/uiconfig/simpress/ui/notebookbar.ui |   60 +-
 sw/uiconfig/swriter/ui/notebookbar.ui  |   66 +++--
 4 files changed, 241 insertions(+), 9 deletions(-)

New commits:
commit 9066d04bca1ab0d2348049a2d7c4cb3abe4a5456
Author: andreas kainz 
AuthorDate: Sat Dec 8 16:47:01 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 10 10:31:42 2018 +0100

Tabbedbar: add EditDoc command to Review Tab

Change-Id: I37b1397dc8406759ac138921aa9fa6c528f95bc7
Reviewed-on: https://gerrit.libreoffice.org/64827
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit aced039b26168342e8e5527c61daa0ae2abf786d)
Reviewed-on: https://gerrit.libreoffice.org/64841

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index bd8b1a5cba49..2fc30b8453b6 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7764,7 +7764,7 @@
   
 
 
-  
+  
 
   
   
@@ -7833,7 +7833,7 @@
   
 
 
-  
+  
 
   
   
@@ -7999,8 +7999,23 @@
 2
   
 
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+3
+  
+
 
-  
+  
 
   
   
@@ -8009,6 +8024,49 @@
 3
   
 
+
+  
+True
+False
+center
+True
+
+  
+True
+False
+center
+True
+both
+False
+3
+
+  
+True
+False
+.uno:EditDoc
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+
+  
+  
+False
+True
+4
+  
+
   
   
 True
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 7fe609087c5d..0fabfc3526d4 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -6221,8 +6221,23 @@
 2
   
 
+
+  
+True
+False
+5
+5
+vertical
+  
+  
+False
+True
+5
+3
+  
+
 
-  
+  
 
   
   
@@ -6231,6 +6246,4

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

[Libreoffice Gerrit user]

 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c56b2e3f8dc260e9927289ca382534f491b97aba
Author: Rene Engelhard 
AuthorDate: Sun Dec 9 22:56:16 2018 +0100
Commit: Lionel Elie Mamane 
CommitDate: Mon Dec 10 10:41:01 2018 +0100

replace hardcoded jdbc mysql driver URL with env variable

introduce CONNECTIVITY_TEST_MYSQL_DRIVER_JDBC analogous to
CONNECTIVITY_TEST_MYSQL_DRIVER for mysqlc

Change-Id: I90b14e7145418248de79aa9d4bf4285fd4f98f9d
Reviewed-on: https://gerrit.libreoffice.org/64854
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane 

diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java 
b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index a44f1b9d1241..73f6ca2d5116 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -57,7 +57,12 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 {
 System.out.println("== Start testing ==");
 
-String url = "jdbc:mysql://localhost:3306/mysql?user=root";
+/* Get URL from environment variable.
+*
+* Example URL:
+* jdbc:mysql://localhost:3306/mysql?user=username?password=password
+*/
+String url = System.getenv("CONNECTIVITY_TEST_MYSQL_DRIVER_JDBC");
 com.sun.star.beans.PropertyValue prop[] = new PropertyValue[1];
 prop[0] = new PropertyValue("JavaDriverClass", 0, 
"com.mysql.jdbc.Driver", PropertyState.DIRECT_VALUE);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/check-elf-dynamic-objects

[Libreoffice Gerrit user]

 bin/check-elf-dynamic-objects |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e4afe6fc5a26060976b5b36e860bf2bebfbd9863
Author: Stephan Bergmann 
AuthorDate: Mon Aug 27 12:45:37 2018 +0200
Commit: Michael Weghorn 
CommitDate: Mon Dec 10 11:04:25 2018 +0100

Adapt CustomTarget_postprocess/check_dynamic_objects to --enable-kde5

Change-Id: I3b03e3a75f5a6157479582e74be349c567fc1e8c
(cherry picked from commit 0705d2a239b8fd44420fe2af3555436775660cd6)

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 1a11e6dca223..e1ce2763a716 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -103,6 +103,11 @@ local file="$1"
 */libvclplug_kde4lo.so|*/libkde4be1lo.so)
 whitelist="${whitelist} ${x11whitelist} ${kde4whitelist}"
 ;;
+*/libvclplug_kde5lo.so|*/libkde5be1lo.so)
+if [ "$ENABLE_KDE5" = TRUE ]; then
+whitelist="${whitelist} ${qt5whitelist} ${kf5whitelist} 
libxcb.so.1"
+fi
+;;
 */libvclplug_gtklo.so|*/libqstart_gtklo.so|*/updater)
 whitelist="${whitelist} ${x11whitelist} ${gtk2whitelist}"
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: test-bugzilla-files/new-control.py

[Libreoffice Gerrit user]

 test-bugzilla-files/new-control.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f237c6eae0eb4dc9b30e70f4efe7ce43fce9951a
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 10:05:58 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 10:05:58 2018 +

use better values for number of jobs

diff --git a/test-bugzilla-files/new-control.py 
b/test-bugzilla-files/new-control.py
index 68397bd..f234086 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -82,9 +82,9 @@ if __name__ == "__main__":
 sys.exit(1)
 
 task_size = 100
-workers = 20
+workers = 30
 if asan == 1:
-workers = 32
+workers = 64
 
 with concurrent.futures.ThreadPoolExecutor(max_workers=workers) as 
executor:
 future_to_task = {executor.submit(execute_task, task_file, asan): 
task_file for task_file in get_tasks(directory, task_size)}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: test-bugzilla-files/config.asan

[Libreoffice Gerrit user]

 test-bugzilla-files/config.asan |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b609f03e78c1e9e644fd7735ec477e1299eff04
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 10:06:48 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 10:06:48 2018 +

fix INSTDIR

diff --git a/test-bugzilla-files/config.asan b/test-bugzilla-files/config.asan
index 8f0e826..281a0f7 100644
--- a/test-bugzilla-files/config.asan
+++ b/test-bugzilla-files/config.asan
@@ -1,4 +1,4 @@
 export CRASHTESTDATA=/srv/crashtestdata
 export SRCDIR=/home/buildslave/source/libo-core
-export INSTDIR=/srv/crashtestdata/asan-build/instdir/program
+export INSTDIR=/srv/crashtestdata/asan-build/instdir
 export USERDIR=/home/buildslave/.config
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: test-bugzilla-files/test-bugzilla-files.py

[Libreoffice Gerrit user]

 test-bugzilla-files/test-bugzilla-files.py |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit d7a0c23d35310f62e1a728ee72c012c11db651d6
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 10:07:13 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 10:07:13 2018 +

keep cores

diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index 503a56b..8bf815d 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -546,9 +546,6 @@ class LoadFileTest:
 connection.tearDown()
 connection.setUp()
 print("...done with: " + self.file)
-cores = glob.glob("core*")
-for core in cores:
-os.remove(core)
 
 class NormalTimer:
 def __init__(self):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source formula/source fpicker/source

[Libreoffice Gerrit user]

 avmedia/source/framework/MediaControlBase.cxx  |2 
 basctl/source/basicide/baside2b.cxx|4 
 basctl/source/basicide/bastype2.cxx|   16 
 basctl/source/basicide/bastype3.cxx|2 
 basctl/source/basicide/moduldl2.cxx|6 
 basctl/source/basicide/moduldlg.cxx|4 
 chart2/source/controller/dialogs/ChartTypeDialogController.cxx |  206 
 chart2/source/controller/dialogs/DataBrowser.cxx   |   18 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx   |   10 
 cui/source/customize/cfgutil.cxx   |   12 
 cui/source/dialogs/cuihyperdlg.cxx |8 
 cui/source/dialogs/scriptdlg.cxx   |8 
 cui/source/options/dbregister.cxx  |2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx |4 
 dbaccess/source/ui/app/AppIconControl.cxx  |2 
 dbaccess/source/ui/dlg/CollectionView.cxx  |4 
 dbaccess/source/ui/dlg/indexdialog.cxx |2 
 dbaccess/source/ui/misc/WNameMatch.cxx |4 
 dbaccess/source/ui/misc/WTypeSelect.cxx|2 
 dbaccess/source/ui/misc/imageprovider.cxx  |8 
 dbaccess/source/ui/querydesign/TableWindow.cxx |2 
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx|8 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx  |2 
 extensions/source/bibliography/toolbar.cxx |6 
 extensions/source/dbpilots/commonpagesdbp.cxx  |4 
 extensions/source/propctrlr/selectlabeldialog.cxx  |   10 
 extensions/source/propctrlr/taborder.cxx   |2 
 extensions/source/update/ui/updatecheckui.cxx  |2 
 formula/source/ui/dlg/parawin.cxx  |8 
 formula/source/ui/dlg/structpg.cxx |4 
 fpicker/source/office/RemoteFilesDialog.cxx|2 
 fpicker/source/office/iodlg.cxx|2 
 framework/source/uielement/controlmenucontroller.cxx   |2 
 framework/source/uielement/popuptoolbarcontroller.cxx  |6 
 reportdesign/source/ui/dlg/Navigator.cxx   |7 
 reportdesign/source/ui/report/StartMarker.cxx  |4 
 sc/source/ui/app/inputwin.cxx  |   20 
 sc/source/ui/app/scmod.cxx |4 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx|6 
 sc/source/ui/miscdlgs/dataproviderdlg.cxx  |2 
 sc/source/ui/navipi/content.cxx|3 
 sc/source/ui/navipi/navipi.cxx |2 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx   |   20 
 sc/source/ui/view/olinewin.cxx |2 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx|6 
 sd/source/ui/animations/CustomAnimationList.cxx|7 
 sd/source/ui/animations/SlideTransitionPane.cxx|2 
 sd/source/ui/app/sdmod2.cxx|4 
 sd/source/ui/dlg/navigatr.cxx  |2 
 sd/source/ui/dlg/sdtreelb.cxx  |   28 
 sd/source/ui/tools/IconCache.cxx   |2 
 sfx2/source/appl/newhelp.cxx   |   44 
 sfx2/source/control/recentdocsview.cxx |2 
 sfx2/source/dialog/dinfdlg.cxx |2 
 sfx2/source/dialog/infobar.cxx |4 
 sfx2/source/dialog/templdlg.cxx|6 
 sfx2/source/dialog/titledockwin.cxx|3 
 sfx2/source/doc/templatedlg.cxx|4 
 svtools/source/contnr/fileview.cxx |2 
 svtools/source/contnr/foldertree.cxx   |4 
 svtools/source/misc/imagemgr.cxx   |  184 
 svx/source/dialog/docrecovery.cxx  |6 
 svx/source/dialog/fontwork.cxx |8 
 svx/source/dialog/langbox.cxx  |4 
 svx/source/engine3d/float3d.cxx|4 
 svx/source/fmcomp/fmgridcl.cxx |3 
 svx/source/form/datanavi.cxx   |   26 
 svx/source/form/filtnav.cxx|   10 
 svx/source/form/fmexpl.cxx |   46 
 svx/source/form/fmshimp.cxx   

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

[Libreoffice Gerrit user]

 sw/source/uibase/app/apphdl.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit b27a9058c706d70adddc71544b74b1f9607185bb
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 23:36:04 2018 +0300
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 11:10:25 2018 +0100

tdf#121606: displaying Mail Merge toolbar shouldn't activate connection

At least I think so. Thus now the code that queries the state of the
toolbar controls only queries dataset if connection is active.

Operating the navigation buttons (next/prev) will, naturally, activate
connection if not yet active. This should also enable the other controls
that may be initially disabled: create/save/print/email documents. Thus,
the navigation controls also check if they have activated the connection,
and invalidate said document creation controls state. Possibly there's a
better place for the invalidation of the controls, but I was unable to
find one.

Regression after commit 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec

Change-Id: I76f895c871718c9c761339ba03963baf6837b592
Reviewed-on: https://gerrit.libreoffice.org/64738
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 60714a814847f6d10f00aa6809a3896a48741e0b)
Reviewed-on: https://gerrit.libreoffice.org/64746
Reviewed-by: Katarina Behrens 

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a0aead88a3ea..c0b0c1dc4ef6 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -156,7 +156,8 @@ void SwModule::StateOther(SfxItemSet &rSet)
 xConfigItem = pView->GetMailMergeConfigItem();
 if (!xConfigItem)
 rSet.DisableItem(nWhich);
-else
+else if (xConfigItem->GetConnection().is()
+ && !xConfigItem->GetConnection()->isClosed())
 {
 bool bFirst, bLast;
 bool bValid = xConfigItem->IsResultSetFirstLast(bFirst, 
bLast);
@@ -209,6 +210,8 @@ void SwModule::StateOther(SfxItemSet &rSet)
 // #i51949# hide e-Mail option if e-Mail is not supported
 // #i63267# printing might be disabled
 if (!xConfigItem ||
+!xConfigItem->GetConnection().is() ||
+xConfigItem->GetConnection()->isClosed() ||
 !xConfigItem->GetResultSet().is() ||
 xConfigItem->GetCurrentDBData().sDataSource.isEmpty() ||
 xConfigItem->GetCurrentDBData().sCommand.isEmpty() ||
@@ -729,6 +732,9 @@ void SwModule::ExecOther(SfxRequest& rReq)
 if (!xConfigItem)
 return;
 
+const bool bHadConnection
+= xConfigItem->GetConnection().is() && 
!xConfigItem->GetConnection()->isClosed();
+
 sal_Int32 nPos = xConfigItem->GetResultSetPosition();
 switch (nWhich)
 {
@@ -766,6 +772,15 @@ void SwModule::ExecOther(SfxRequest& rReq)
 rBindings.Invalidate(FN_MAILMERGE_LAST_ENTRY);
 rBindings.Invalidate(FN_MAILMERGE_CURRENT_ENTRY);
 rBindings.Invalidate(FN_MAILMERGE_EXCLUDE_ENTRY);
+if (!bHadConnection && xConfigItem->GetConnection().is()
+&& !xConfigItem->GetConnection()->isClosed())
+{
+// The connection has been activated. Update controls that 
were disabled
+rBindings.Invalidate(FN_MAILMERGE_CREATE_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_SAVE_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_PRINT_DOCUMENTS);
+rBindings.Invalidate(FN_MAILMERGE_EMAIL_DOCUMENTS);
+}
 rBindings.Update();
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 58/a04e692ad903a9a16e258afc7f80a37fa188cf

[Libreoffice Gerrit user]

 58/a04e692ad903a9a16e258afc7f80a37fa188cf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3ca8a1193ff24516c6324e595958dc7fed93f5c5
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 10:34:03 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 10:34:03 2018 +

Notes added by 'git notes add'

diff --git a/58/a04e692ad903a9a16e258afc7f80a37fa188cf 
b/58/a04e692ad903a9a16e258afc7f80a37fa188cf
new file mode 100644
index ..118689b98bd0
--- /dev/null
+++ b/58/a04e692ad903a9a16e258afc7f80a37fa188cf
@@ -0,0 +1 @@
+merged as: dbd5b255f016fc92530e2325bded0f07a0dbc861
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/test/useuniqueptr.cxx |4 ++--
 compilerplugins/clang/useuniqueptr.cxx  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 88738347f81be508a639dd75f3a8627bee21d20a
Author: Julien Nabet 
AuthorDate: Sun Dec 9 10:12:13 2018 +0100
Commit: Julien Nabet 
CommitDate: Mon Dec 10 11:46:41 2018 +0100

cppcheck: incorrectStringBooleanError

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

diff --git a/compilerplugins/clang/test/useuniqueptr.cxx 
b/compilerplugins/clang/test/useuniqueptr.cxx
index 5f20c734958c..74f8ae10a0bb 100644
--- a/compilerplugins/clang/test/useuniqueptr.cxx
+++ b/compilerplugins/clang/test/useuniqueptr.cxx
@@ -231,8 +231,8 @@ class Foo18 {
 void foo19()
 {
 std::vector vec; // expected-note {{var is here 
[loplugin:useuniqueptr]}}
-for(char * p : vec)
-delete p; // expected-error {{rather manage this var with 
std::some_container> [loplugin:useuniqueptr]}}
+for(char * p : vec) // expected-note {{var is here 
[loplugin:useuniqueptr]}}
+delete p; // expected-error {{rather manage this var with 
std::some_container> [loplugin:useuniqueptr]}} 
expected-error {{call to delete on a var, should be using std::unique_ptr 
[loplugin:useuniqueptr]}}
 }
 
 // no warning expected
diff --git a/compilerplugins/clang/useuniqueptr.cxx 
b/compilerplugins/clang/useuniqueptr.cxx
index 3aabbccf991a..1f0f9d649317 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -511,7 +511,7 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* 
functionDecl, const C
 || name == "StgDirEntry::SetSize" || name == 
"UCBStorage::CopyStorageElement_Impl"
 || parentName == "SfxItemSet" || parentName == "SfxItemPool"
 || name == "OutputDevice::ImplDrawPolyPolygon" || name == 
"OutputDevice::ImplDrawPolyPolygon"
-|| name == "ImplListBox::InsertEntry" || "Edit::dispose")
+|| name == "ImplListBox::InsertEntry" || name == "Edit::dispose")
 return;
 // very dodgy
 if (name == "UCBStorage::OpenStorage_Impl")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 extras/source/templates/wizard/bitmap/FormWizard_1.bmp |binary
 extras/source/templates/wizard/bitmap/FormWizard_2.bmp |binary
 2 files changed

New commits:
commit acbd2433493997f238c4787653d8d3f80f648360
Author: Matthias Seidel 
AuthorDate: Mon Nov 12 10:20:25 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 11:52:00 2018 +0100

Add missing graphics

(cherry picked from commit c267268f2d1f8648af4897ada2753080520cbd7b)

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

diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
new file mode 100644
index ..aa7cb4940d1d
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp differ
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
new file mode 100644
index ..347c8c36e52b
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePicker.cxx |   19 +
 fpicker/source/win32/VistaFilePickerImpl.cxx |   39 +++
 fpicker/source/win32/VistaFilePickerImpl.hxx |2 -
 3 files changed, 7 insertions(+), 53 deletions(-)

New commits:
commit b836f8241d6eaf0a4969341084fa8bfe3bdf0586
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 00:57:38 2018 +0300
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 11:54:06 2018 +0100

Revert "tdf#119747 FileSaveDialog: Windows dialog shows only one extension."

This reverts commit 1b50fa88b148739a7b192ba70f08af2c6e326fd2.

Change-Id: Ide94c1be6a265cee2e70c319578d816efa1d2eb9
Reviewed-on: https://gerrit.libreoffice.org/64655
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/64839
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/fpicker/source/win32/VistaFilePicker.cxx 
b/fpicker/source/win32/VistaFilePicker.cxx
index e1eb66a9ce83..0737100d07e6 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,7 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& 
sTitle ,
 {
 RequestRef rRequest(new Request());
 rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
-rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
+rRequest->setArgument(PROP_FILTER_TITLE, sTitle );
 rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
 
 m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::NON_BLOCKED);
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index aa33dcdacbdb..ff0cf2c27956 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -360,22 +360,11 @@ void VistaFilePickerImpl::impl_sta_appendFilter(const 
RequestRef& rRequest)
 {
 const OUString sTitle  = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, 
OUString());
 const OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, 
OUString());
+
 // SYNCHRONIZED->
 ::osl::ResettableMutexGuard aLock(m_aMutex);
 
-const sal_Int32 idx = sTitle.indexOf("(.");
-if (idx > 0)
-{
-const OUString sTitle_ = sTitle.copy(0, idx);
-m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle_, sFilter);
-}
-else
-{
-m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle, sFilter);
-}
-
+m_lFilters.addFilter(sTitle, sFilter);
 }
 
 
@@ -395,20 +384,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const 
RequestRef& rRequest)
 for (i=0; i 0)
-{
-const OUString sTitle_ = sTitle.copy(0, idx);
-m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle_, sFilter);
-}
-else
-{
-m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
-m_lFilters.addFilter(sTitle, sFilter);
-}
+m_lFilters.addFilter(rFilter.First, rFilter.Second);
 }
 }
 
@@ -441,15 +417,10 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const 
RequestRef& rRequest)
 OUString sTitle;
 ::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... 
filter container on 0 .-)
 if (
-(nRealIndex >= 0) &&
+(nRealIndex >= 0 ) &&
 (m_lFilters.getFilter(nRealIndex, sTitle))
-)
-{
-if (m_mapRealFilter.find(sTitle) != m_mapRealFilter.end())
-sTitle = m_mapRealFilter[sTitle].first;
-
+   )
 rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
-}
 else if ( nRealIndex == -1 ) // Dialog not visible yet
 {
 sTitle = m_lFilters.getCurrentFilter();
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx 
b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 460136a73b48..9cce75b5714f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -37,7 +37,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace fpicker{
 namespace win32{
@@ -306,7 +305,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
 
 /// @todo document me
 CFilterContainer m_lFilters;
-std::map> m_mapRealFilter;
 
 
 /** help us to handle dialog events and provide them to interested 
office
commit 3b03604d1bb48fc1c1337307d0ba259dca9fbf1e
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 00:56:15 2018 +0300
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 11:53:59 2018 +0100

Revert "tdf#121497 "Save As": File Format Type unchanged in Windows"

This reverts commit c444eb7934d4a3c190e1d060805d9d175c1a9127.

Change-Id: I19b969572afbd0a017b8086b390611cfc04c7386
Reviewed-on: https://gerrit.libreoffice.org/64654
Tes

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

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePickerImpl.cxx |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 414246683899928014ea11ec07caebdfdf8aaee4
Author: Mike Kaganski 
AuthorDate: Thu Dec 6 01:32:35 2018 +0300
Commit: Katarina Behrens 
CommitDate: Mon Dec 10 11:54:22 2018 +0100

tdf#119747 FileSaveDialog: remove duplicate extension on Windows

This properly reimplements the fix, only changing the display strings
sent to native dialog, and never modifying the filter names as seen
by LibreOffice code.

Change-Id: Iee5f09acd6b12c0ba8b7568b16f8ab07821006ee
Reviewed-on: https://gerrit.libreoffice.org/64656
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
Reviewed-by: Thorsten Behrens 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/64840

diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/VistaFilePickerImpl.cxx
index ff0cf2c27956..6c168a244fa0 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -147,8 +147,17 @@ bailout:
 return sURL;
 }
 
+// Vista file picker shows the filter mask next to filter name in the list; so 
we need to remove the
+// mask from the filter name to avoid duplicating masks
+static OUString lcl_AdjustFilterName(const OUString& sName)
+{
+const sal_Int32 idx = sName.indexOf("(.");
+return (idx > 0) ? sName.copy(0, idx).trim() : sName;
+}
 
-static ::std::vector< COMDLG_FILTERSPEC > 
lcl_buildFilterList(CFilterContainer& rContainer)
+// rvStrings holds the OUStrings, pointers to which data are stored in 
returned COMDLG_FILTERSPEC
+static ::std::vector lcl_buildFilterList(CFilterContainer& 
rContainer,
+
std::vector& rvStrings)
 {
   ::std::vector< COMDLG_FILTERSPEC > lList  ;
   CFilterContainer::FILTER_ENTRY_T   aFilter;
@@ -158,7 +167,8 @@ static ::std::vector< COMDLG_FILTERSPEC > 
lcl_buildFilterList(CFilterContainer&
 {
 COMDLG_FILTERSPEC aSpec;
 
-aSpec.pszName = o3tl::toW(aFilter.first.getStr()) ;
+rvStrings.push_back(lcl_AdjustFilterName(aFilter.first)); // to avoid 
dangling pointer
+aSpec.pszName = o3tl::toW(rvStrings.back().getStr());
 aSpec.pszSpec = o3tl::toW(aFilter.second.getStr());
 
 lList.push_back(aSpec);
@@ -824,7 +834,9 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
 // SYNCHRONIZED->
 ::osl::ResettableMutexGuard aLock(m_aMutex);
 
-::std::vector< COMDLG_FILTERSPEC > lFilters   = 
lcl_buildFilterList(m_lFilters);
+std::vector vStrings; // to hold the adjusted filter names, 
pointers to which will be
+// stored in lFilters
+::std::vector< COMDLG_FILTERSPEC > lFilters   = 
lcl_buildFilterList(m_lFilters, vStrings);
 OUStringsCurrentFilter = m_lFilters.getCurrentFilter();
 sal_Int32  nCurrentFilter = 
m_lFilters.getFilterPos(sCurrentFilter);
 TFileDialogiDialog= 
impl_getBaseDialogInterface();
@@ -991,7 +1003,9 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const 
RequestRef& rRequest)
 {
 // COM dialog base on 1 ... filter container on 0 .-)
 ::size_t nRealIndex = (nFileType-1);
-::std::vector< COMDLG_FILTERSPEC > lFilters = 
lcl_buildFilterList(m_lFilters);
+std::vector vStrings;
+::std::vector lFilters
+= lcl_buildFilterList(m_lFilters, vStrings);
 if ( nRealIndex < lFilters.size() )
 {
 PCWSTR lpFilterExt = lFilters[nRealIndex].pszSpec;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/Jenkins

[Libreoffice Gerrit user]

 distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ed81fe44d4e6b36c4c61a22e9e28a3a94fef9238
Author: Stephan Bergmann 
AuthorDate: Sun Nov 25 17:45:54 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 11:56:03 2018 +0100

Enabling Developer Toolset 7 for Jenkins' remaining GCC master jobs

...now that gandalf (which all of these jobs may run on) has been updated 
(see
d27d75f86cf8ea4fd87e2cd64b58cc8c0ac0029a "Revert 'Enabling Developer 
Toolset 7
for Jenkins' lo_tb_random_config_linux'"):

*  aka
  "lo_daily_update_gandalf", configured with
  --distro-config="LibreOfficeLinuxUpdater"

*  aka
  "lo_tb_ui_testing_linux", configued with --distro-config="rel_master"

*  aka "Tinderbox on 
Master
  for Linux", configured with --distro-config="rel_master"

Change-Id: If8afe079cc45e06ea95124e56fa974fd3aca2c78
Reviewed-on: https://gerrit.libreoffice.org/63991
Reviewed-by: Markus Mohrhard 
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf 
b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
index 810ef33a62da..f006518ce0c8 100644
--- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
+++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
@@ -32,3 +32,5 @@
 --with-lang=de es fr ar zh-CN
 --with-package-format=archive
 --with-update-config=~/updater.ini
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |  447 +++
 1 file changed, 406 insertions(+), 41 deletions(-)

New commits:
commit da6ec7f3274650dfdf047ba8d42291ddc5161858
Author: Caolán McNamara 
AuthorDate: Thu Dec 6 17:44:16 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 12:18:40 2018 +0100

Related: tdf#120371 a scheme to provide multi-level notebook tabs

Change-Id: Ib92b5e63aa6457f5df8e51fe5404d2341aae5ffb
Reviewed-on: https://gerrit.libreoffice.org/64767
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit bf379a1054bdf84fc05550e5b9e600b50e04769e)
Reviewed-on: https://gerrit.libreoffice.org/64848

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 028462532918..22e553bc8991 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -3105,9 +3106,16 @@ class GtkInstanceNotebook : public GtkInstanceContainer, 
public virtual weld::No
 {
 private:
 GtkNotebook* m_pNotebook;
+GtkBox* m_pOverFlowBox;
+GtkNotebook* m_pOverFlowNotebook;
 gulong m_nSwitchPageSignalId;
+gulong m_nOverFlowSwitchPageSignalId;
 gulong m_nSizeAllocateSignalId;
 gulong m_nScrollSignalId;
+bool m_bOverFlowBoxActive;
+bool m_bOverFlowBoxIsStart;
+int m_nStartTabCount;
+int m_nEndTabCount;
 mutable std::vector> m_aPages;
 
 static void signalSwitchPage(GtkNotebook*, GtkWidget*, guint nNewPage, 
gpointer widget)
@@ -3117,7 +3125,18 @@ private:
 pThis->signal_switch_page(nNewPage);
 }
 
-void signal_switch_page(guint nNewPage)
+static gboolean launch_overflow_switch_page(GtkInstanceNotebook* pThis)
+{
+pThis->signal_overflow_switch_page();
+return false;
+}
+
+static void signalOverFlowSwitchPage(GtkNotebook*, GtkWidget*, guint, 
gpointer widget)
+{
+g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, 
reinterpret_cast(launch_overflow_switch_page), widget, nullptr);
+}
+
+void signal_switch_page(int nNewPage)
 {
 bool bAllow = !m_aLeavePageHdl.IsSet() || 
m_aLeavePageHdl.Call(get_current_page_ident());
 if (!bAllow)
@@ -3125,10 +3144,68 @@ private:
 g_signal_stop_emission_by_name(m_pNotebook, "switch-page");
 return;
 }
+if (m_bOverFlowBoxActive)
+gtk_notebook_set_current_page(m_pOverFlowNotebook, 
gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1);
 OString sNewIdent(get_page_ident(nNewPage));
 m_aEnterPageHdl.Call(sNewIdent);
 }
 
+void unsplit_notebooks()
+{
+int nOverFlowPages = gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1;
+int nMainPages = gtk_notebook_get_n_pages(m_pNotebook);
+int nPageIndex = 0;
+if (!m_bOverFlowBoxIsStart)
+nPageIndex += nMainPages;
+
+// take the overflow pages, and put them back at the end of the normal 
one
+int i = nMainPages;
+while (nOverFlowPages)
+{
+OString sIdent(get_page_ident(m_pOverFlowNotebook, 0));
+OUString sLabel(get_tab_label_text(m_pOverFlowNotebook, 0));
+remove_page(m_pOverFlowNotebook, sIdent);
+
+GtkWidget* pPage = m_aPages[nPageIndex]->getWidget();
+append_page(m_pNotebook, sIdent, sLabel, pPage);
+
+GtkWidget* pTabWidget = gtk_notebook_get_tab_label(m_pNotebook,
+   
gtk_notebook_get_nth_page(m_pNotebook, i));
+gtk_widget_set_hexpand(pTabWidget, true);
+--nOverFlowPages;
+++i;
+++nPageIndex;
+}
+
+// remove the dangling placeholder tab page
+remove_page(m_pOverFlowNotebook, "useless");
+}
+
+// a tab has been selected on the overflow notebook
+void signal_overflow_switch_page()
+{
+int nNewPage = gtk_notebook_get_current_page(m_pOverFlowNotebook);
+int nOverFlowPages = gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1;
+if (nNewPage == nOverFlowPages)
+{
+// the useless tab which is there because there has to be an 
active tab
+return;
+}
+
+disable_notify_events();
+
+// take the overflow pages, and put them back at the end of the normal 
one
+unsplit_notebooks();
+
+// now redo the split, the pages will be split the other way around 
this time
+std::swap(m_nStartTabCount, m_nEndTabCount);
+split_notebooks();
+
+gtk_notebook_set_current_page(m_pNotebook, nNewPage);
+
+enable_notify_events();
+}
+
 static gboolean signalScroll(GtkWidget*, GdkEventScroll* event, gpointer 
widget)
 {
 GtkInstanceNotebook* pThis = static_cast(widg

[Libreoffice-commits] core.git: extras/source wizards/source

[Libreoffice Gerrit user]

 extras/source/templates/wizard/bitmap/FormWizard_1.png |binary
 extras/source/templates/wizard/bitmap/FormWizard_2.png |binary
 wizards/source/formwizard/FormWizard.xba   |   24 +++--
 3 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit dd89dc8df8d82ab43f34a0c8fcfa67f93aefcb99
Author: Matthias Seidel 
AuthorDate: Sat Dec 8 00:00:11 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 12:31:42 2018 +0100

Cleaning up FormWizard, moving graphics from bmp to png

(cherry picked from commit 6e5c06d0fe430c9e71c6705c14b160c950fc2c59)

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

diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.png 
b/extras/source/templates/wizard/bitmap/FormWizard_1.png
new file mode 100644
index ..75e25dc6f20f
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_1.png differ
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.png 
b/extras/source/templates/wizard/bitmap/FormWizard_2.png
new file mode 100644
index ..b56bdaf84f7f
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/FormWizard_2.png differ
diff --git a/wizards/source/formwizard/FormWizard.xba 
b/wizards/source/formwizard/FormWizard.xba
index a744014634a5..68a80ff88eff 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -184,7 +184,7 @@ Dim LocList() as String
ControlCaptionsToStandardLayout()
oDocument.GetCurrentController().Frame.ComponentWindow.Enable = True
oProgressBar.Value = 90
-   DialogModel.imgTheme.ImageURL = FormPath & 
"FormWizard_1.bmp"
+   DialogModel.imgTheme.ImageURL = FormPath & 
"FormWizard_1.png"
DialogModel.imgTheme.BackGroundColor = RGB(0,60,126)
ToggleDatabasePage(True)
oProgressBar.Value = 100
@@ -197,11 +197,11 @@ Dim LocList() as String
oFormDocuments = oDataSource.getFormDocuments()
DlgFormDB.Dispose()
oDocument.dispose()
-   Dim bLinkExists as Boolean
+   Dim bLinkExists as Boolean
i = 1
-   Dim FormBaseName  as String
+   Dim FormBaseName as String
FormBaseName = FormName
-   Do  
 
+   Do
bLinkExists = 
oFormDocuments.HasbyHierarchicalName(FormName)
If bLinkExists Then
i = i + 1
@@ -222,7 +222,7 @@ Dim LocList() as String
End If
If ((Not IsNull(oDBConnection)) And (Not bConnectionIsovergiven)) Then
oDBConnection.Dispose()
-   End If  
+   End If
 WIZARDERROR:
If Err <> 0 Then
Msgbox(sMsgErrMsg, 16, GetProductName())
@@ -257,7 +257,7 @@ Dim QueryIndex as Integer
CurCommandType = iCommandTypes(SelIndex)
End If
If CurCommandType = com.sun.star.sdb.CommandType.QUERY Then
-   QueryIndex = SelIndex  - Ubound(Tablenames()) - 1
+   QueryIndex = SelIndex - Ubound(Tablenames()) - 1
Tablename = QueryNames(QueryIndex)
oColumns = 
oDBConnection.Queries.GetByName(TableName).Columns
Else
@@ -287,7 +287,7 @@ Sub PreviousStep()
.cmdGoOn.Enabled = True
.lstSelFields.Tag = Not bControlsareCreated
.cmdGoOn.Label = sGoOn
-   .imgTheme.ImageUrl = FormPath & "FormWizard_1.bmp"
+   .imgTheme.ImageUrl = FormPath & "FormWizard_1.png"
End With
FormSetMoveRights()
 WIZARDERROR:
@@ -322,7 +322,7 @@ Sub NextStep()
DlgFormDB.EndExecute()
exit Sub
End Select
-   DialogModel.imgTheme.ImageUrl = FormPath & "FormWizard_" 
& DialogModel.Step & ".bmp"
+   DialogModel.imgTheme.ImageUrl = FormPath & "FormWizard_" 
& DialogModel.Step & ".png"
DlgFormDB.Title = WizardTitle(DialogModel.Step)
 WIZARDERROR:
If Err <> 0 Then
@@ -386,7 +386,7 @@ End Sub
 
 
 Sub StoreFormInDatabase()
-   Dim NoArgs() as new com.sun.star.beans.PropertyValue
+   Dim NoArgs() as new com.sun.star.beans.PropertyValue
FormName = "Form_" & sDBName & "_" & 
TableName & ".sxw"
sFormUrl = TempPath & "/" & FormName
oDocument.StoreAsUrl(sFormUrl, NoArgs())
@@ -395,7 +395,6 @@ Sub StoreFormInDatabase()
 End Sub
 
 
-
 Sub StoreForm()
 Dim sTargetPath as String
 Dim TypeNames(0,2) as String
@@ -411,7 +410,6 @@ Dim oTypes() as Object
 End Sub
 
 
-
 Sub EmptyFieldsListboxes()
 Dim NullList() as String
ToggleListboxControls(DialogModel, False)
@@ -433,9 +431,9 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6e/5c06d0fe430c9e71c6705c14b160c950fc2c59

[Libreoffice Gerrit user]

 6e/5c06d0fe430c9e71c6705c14b160c950fc2c59 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3430a4e4b22ec1993fa00f8bd5cd36dadf59a247
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 11:33:45 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 11:33:45 2018 +

Notes added by 'git notes add'

diff --git a/6e/5c06d0fe430c9e71c6705c14b160c950fc2c59 
b/6e/5c06d0fe430c9e71c6705c14b160c950fc2c59
new file mode 100644
index ..bb1f07f26ae9
--- /dev/null
+++ b/6e/5c06d0fe430c9e71c6705c14b160c950fc2c59
@@ -0,0 +1 @@
+merged as: dd89dc8df8d82ab43f34a0c8fcfa67f93aefcb99
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/transfrm.cxx|   48 +-
 include/LibreOfficeKit/LibreOfficeKitEnums.h|6 +
 svx/sdi/svx.sdi |2 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   66 ++--
 svx/source/svdraw/svdedtv1.cxx  |   58 -
 svx/source/svdraw/svdmrkv.cxx   |   11 +++
 6 files changed, 164 insertions(+), 27 deletions(-)

New commits:
commit e9164b9bc8bd39e02f99cf7c08e38ea0b1e1134a
Author: Marco Cecchetti 
AuthorDate: Thu Nov 29 22:37:45 2018 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Dec 10 12:40:24 2018 +0100

lok: shape scaling rework

Now shape scaling is handled through the transform dialog instead of
simulating a drag and drop event in core.

For Impress the unit used for length is '100th mm' instead of twips,
so we need to transform positions and size from twips to '100th mm'.
Anyway since we don't know in SetGeoAttrToMarked if the new data is
due to a mouse event or by entering a new value in the transormation
dialog or in the side pane, for Impress we need to convert the new
values sent by the dialogs from '100th mm' to twips which are
converted back in SetGeoAttrToMarked.

For performing a uniform scaling when the shape/image is rotated we
need to inform the client about the rotation angle for the selected
graphic object that has been achieved but appending an angle argument
to the graphic selection callback.

Now it is also possible to reverse shapes/images through negative
scaling.

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

diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 2b56a7a76ad0..1918f676a15d 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 // static 
 
@@ -83,6 +84,28 @@ const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
 0
 };
 
+namespace {
+
+bool lcl_twipsNeeded(const SdrView* pView)
+{
+const bool bTiledRendering = comphelper::LibreOfficeKit::isActive();
+if (bTiledRendering)
+{
+// We gets the position in twips
+if (OutputDevice* pOutputDevice = pView->GetFirstOutputDevice())
+{
+if (pOutputDevice->GetMapMode().GetMapUnit() == 
MapUnit::Map100thMM)
+{
+return true;
+}
+}
+}
+return false;
+}
+
+} // anonymouus ns
+
+
 /*
 |*
 |* constructor of the tab dialog: adds the pages to the dialog
@@ -252,9 +275,18 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet)
 const double fTmpX((GetCoreValue(*m_xMtrPosX, ePoolUnit) + 
maAnchor.getX()) * fUIScale);
 const double fTmpY((GetCoreValue(*m_xMtrPosY, ePoolUnit) + 
maAnchor.getY()) * fUIScale);
 
+long nRotateX = basegfx::fround(fTmpX);
+long nRotateY = basegfx::fround(fTmpY);
+
+if (lcl_twipsNeeded(pView))
+{
+nRotateX = OutputDevice::LogicToLogic(nRotateX, 
MapUnit::Map100thMM, MapUnit::MapTwip);
+nRotateY = OutputDevice::LogicToLogic(nRotateY, 
MapUnit::Map100thMM, MapUnit::MapTwip);
+}
+
 rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), 
m_aCtlAngle.GetRotation()));
-rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), 
basegfx::fround(fTmpX)));
-rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), 
basegfx::fround(fTmpY)));
+rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), nRotateX));
+rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), nRotateY));
 
 bModified = true;
 }
@@ -938,6 +970,12 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* 
rOutAttrs )
 // #101581# GetTopLeftPosition(...) needs coordinates after UI 
scaling, in real PagePositions
 GetTopLeftPosition(fX, fY, maRange);
 
+if (lcl_twipsNeeded(mpView))
+{
+fX = OutputDevice::LogicToLogic(fX, MapUnit::Map100thMM, 
MapUnit::MapTwip);
+fY = OutputDevice::LogicToLogic(fY, MapUnit::Map100thMM, 
MapUnit::MapTwip);
+}
+
 rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X), 
basegfx::fround(fX)));
 rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y), 
basegfx::fround(fY)));
 
@@ -977,6 +1015,12 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* 
rOutAttrs )
 lHeight = OutputDevice::LogicToLogic( lHeight, MapUnit::Map100thMM, 
mePoolUnit );
 lHeight = static_cast(m_xMtrHeight->denormalize( lHeight ));
 
+

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

[Libreoffice Gerrit user]

 wizards/source/euro/DlgConvert.xdl |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f1cf8cd8c34d51279f2870ef87a885bf3f2896b8
Author: Matthias Seidel 
AuthorDate: Sun Nov 11 14:49:18 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 12:51:15 2018 +0100

Small changes to Euro Converter dialog

(cherry picked from commit 3a4bcd943f772f1c284cdd01d5865df47886900b)

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

diff --git a/wizards/source/euro/DlgConvert.xdl 
b/wizards/source/euro/DlgConvert.xdl
index aecfa610137b..ff3f523a7e25 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -19,11 +19,11 @@
 -->
 http://openoffice.org/2000/dialog"; 
xmlns:script="http://openoffice.org/2000/script"; dlg:id="DialogConvert" 
dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" 
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_DIALOG" dlg:closeable="true" 
dlg:moveable="true">
  
-  
+  
   

   
-  
+  

   
   
@@ -74,7 +74,7 @@
   
   
   
-  
+  
   
   
   
@@ -91,4 +91,4 @@

   
  
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compiler baselines

[Thorsten Behrens]

Hi Moggi,

Markus Mohrhard wrote:
> Gandalf is not a CentOS based buildbot but the self-built gcc is now
> available under "/opt/rh/devtoolset-7/root/usr/bin/gcc" to reduce the
> differences between the different buildbots and make it easier to move jobs
> between different jenkins VMs.
>
Ah that's a very nice solution to the baseline problem, thx a lot!

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 17 commits - chart2/source filter/source include/sfx2 include/svx include/vcl sc/source sd/inc sd/qa sd/source setup_nat

[Libreoffice Gerrit user]

 chart2/source/view/axes/DateHelper.cxx|3 
 chart2/source/view/charttypes/AreaChart.cxx   |5 
 chart2/source/view/charttypes/VSeriesPlotter.cxx  |7 
 filter/source/msfilter/svdfppt.cxx|5 
 include/sfx2/signaturestate.hxx   |4 
 include/sfx2/strings.hrc  |1 
 include/svx/unoshprp.hxx  |2 
 include/vcl/dialog.hxx|1 
 sc/source/filter/oox/sheetdatacontext.cxx |2 
 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx   |2 
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |4 
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx   |2 
 sd/inc/sdfilter.hxx   |5 
 sd/qa/unit/data/tdf120527.jpg |binary
 sd/qa/unit/misc-tests.cxx |   44 +++
 sd/source/filter/cgm/sdcgmfilter.cxx  |7 
 sd/source/filter/sdfilter.cxx |   37 ++
 sd/source/filter/sdpptwrp.cxx |  126 
--
 sd/source/ui/app/sddll.cxx|3 
 setup_native/source/win32/customactions/inst_msu/inst_msu.cxx |   66 +++--
 sfx2/source/doc/objserv.cxx   |8 
 slideshow/source/engine/animationnodes/animationcommandnode.cxx   |   24 +
 slideshow/source/engine/animationnodes/animationcommandnode.hxx   |2 
 svx/source/unodraw/unoshap2.cxx   |   14 +
 sw/source/uibase/shells/textsh1.cxx   |1 
 vcl/quartz/salvd.cxx  |9 
 vcl/source/window/dialog.cxx  |   37 ++
 vcl/source/window/layout.cxx  |2 
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx|6 
 vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx |   12 
 xmlsecurity/qa/unit/signing/signing.cxx   |5 
 xmlsecurity/source/xmlsec/xmlstreamio.cxx |6 
 32 files changed, 332 insertions(+), 120 deletions(-)

New commits:
commit 026b57f73f5d322f2616fb8def6fdee46000486c
Merge: e4afe6fc5a26 323d12f278d3
Author: Michael Weghorn 
AuthorDate: Mon Dec 10 12:26:50 2018 +0100
Commit: Michael Weghorn 
CommitDate: Mon Dec 10 12:26:50 2018 +0100

Merge branch 'libreoffice-6-1' into distro/lhm/libreoffice-6-1+backports

Change-Id: I29c8c7cfbc86a2a4273c15f47de8a741f70cc9b3

commit 323d12f278d3b0a51c7c2b8d3a362a27a6a232d3
Author: Miklos Vajna 
AuthorDate: Mon Nov 26 21:14:39 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sun Dec 9 22:15:24 2018 +0100

tdf#120527 svx GraphicObjectShape: handle XBitmap for GraphicURL

This restores compatibility for API users who called getByName() on the
bitmap table and expected that the result can be set as a value for the
GraphicURL property.

The case is similar to the Writer images, which was handled in commit
587803ba46055d43b5b108be744fdde17aeabc7c (sw TextGraphicObject: handle
XBitmap for GraphicURL, 2018-08-08) already.

(cherry picked from commit e30f3e76a9350e2b027d99bba5a46aa0a0ff8256)

Conflicts:
sd/qa/unit/misc-tests.cxx

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

diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 6341c37f3dc6..a09f242506a9 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -431,7 +431,7 @@
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
-{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
+{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE), 
OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID), 
OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAM

[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/reference.md wsd/Storage.cpp wsd/Storage.hpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |   12 +---
 wsd/DocumentBroker.hpp |4 +++-
 wsd/Storage.cpp|1 +
 wsd/Storage.hpp|4 
 wsd/reference.md   |4 
 5 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit ff1f3d8249bf9676335b0e91676abbab7e0e3bdf
Author: Samuel Mehrbrodt 
AuthorDate: Tue Dec 4 08:49:49 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 10 13:28:22 2018 +0100

Add custom http header when saving before document is cleaned up from memory

Change-Id: I3ac417d83a79a665ae6575097835542f43d40cef
Reviewed-on: https://gerrit.libreoffice.org/64499
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 
(cherry picked from commit 2e9af9da16a7ed42bde4b6294f7970c00be9c566)
Reviewed-on: https://gerrit.libreoffice.org/64757
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index c14e5a111..661dbb2a2 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -962,7 +962,9 @@ bool DocumentBroker::autoSave(const bool force)
 {
 LOG_TRC("Sending forced save command for [" << _docKey << "].");
 // Don't terminate editing as this can be invoked by the admin OOM, 
but otherwise force saving anyway.
-sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/ true, 
/*dontSaveIfUnmodified=*/ true, /*isAutosave=*/ false);
+sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/true,
+   /*dontSaveIfUnmodified=*/true, /*isAutosave=*/false,
+   /*isExitSave=*/true);
 }
 else if (_isModified)
 {
@@ -979,14 +981,17 @@ bool DocumentBroker::autoSave(const bool force)
 timeSinceLastSaveMs >= autoSaveDurationMs)
 {
 LOG_TRC("Sending timed save command for [" << _docKey << "].");
-sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/ true, 
/*dontSaveIfUnmodified=*/ true, /*isAutosave=*/ true);
+sent = sendUnoSave(savingSessionId, /*dontTerminateEdit=*/true,
+   /*dontSaveIfUnmodified=*/true, 
/*isAutosave=*/true,
+   /*isExitSave=*/false);
 }
 }
 
 return sent;
 }
 
-bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool 
dontTerminateEdit, bool dontSaveIfUnmodified, bool isAutosave)
+bool DocumentBroker::sendUnoSave(const std::string& sessionId, bool 
dontTerminateEdit,
+ bool dontSaveIfUnmodified, bool isAutosave, 
bool isExitSave)
 {
 assertCorrectThread();
 
@@ -1029,6 +1034,7 @@ bool DocumentBroker::sendUnoSave(const std::string& 
sessionId, bool dontTerminat
 
 assert(_storage);
 _storage->setIsAutosave(isAutosave || UnitWSD::get().isAutosave());
+_storage->setIsExitSave(isExitSave);
 
 const std::string saveArgs = oss.str();
 LOG_TRC(".uno:Save arguments: " << saveArgs);
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index 6f66bfb58..45f37edd1 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -348,7 +348,9 @@ public:
 }
 
 /// Sends the .uno:Save command to LoKit.
-bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = 
true, bool dontSaveIfUnmodified = true, bool isAutosave = false);
+bool sendUnoSave(const std::string& sessionId, bool dontTerminateEdit = 
true,
+ bool dontSaveIfUnmodified = true, bool isAutosave = false,
+ bool isExitSave = false);
 
 /// Sends a message to all sessions
 void broadcastMessage(const std::string& message);
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index a3f86e743..3b36ef7d7 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -717,6 +717,7 @@ StorageBase::SaveResult 
WopiStorage::saveLocalFileToStorage(const Authorization&
 request.set("X-WOPI-Override", "PUT");
 request.set("X-LOOL-WOPI-IsModifiedByUser", _isUserModified? 
"true": "false");
 request.set("X-LOOL-WOPI-IsAutosave", _isAutosave? "true": 
"false");
+request.set("X-LOOL-WOPI-IsExitSave", isExitSave()? "true": 
"false");
 
 if (!_forceSave)
 {
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index cbb6f9c42..67cda1dfb 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -151,6 +151,8 @@ public:
 
 /// To be able to set the WOPI 'is autosave?' header appropriately.
 void setIsAutosave(bool isAutosave) { _isAutosave = isAutosave; }
+void setIsExitSave(bool isExitSave) { _isExitSave = isExitSave; }
+bool isExitSave() const { return _isExitSave; }
 
 /// Returns the basic information about the file.
 const FileInfo& getFileInfo() const { return _fileInfo; }
@@ -196,6 +198,8 @@ protected:
 
 /// This save operation is an autosave.
 bool _isAutosave;
+/// Saving on exit (when the document is cleaned up fr

[Libreoffice-commits] core.git: extras/Package_tplwizbitmap.mk extras/source wizards/source

[Libreoffice Gerrit user]

 dev/null |binary
 extras/Package_tplwizbitmap.mk   |6 ++---
 extras/source/templates/wizard/bitmap/euro_1.png |binary
 extras/source/templates/wizard/bitmap/euro_2.png |binary
 extras/source/templates/wizard/bitmap/euro_3.png |binary
 wizards/source/euro/AutoPilotRun.xba |   26 +++
 wizards/source/euro/Init.xba |   20 +++--
 7 files changed, 25 insertions(+), 27 deletions(-)

New commits:
commit 0761fbdd146c306190e41d65b9d4eec03c39c1b8
Author: Matthias Seidel 
AuthorDate: Thu Nov 8 15:06:51 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 13:29:43 2018 +0100

Cleaning up Euro Converter wizard, moving graphics from bmp to png

(cherry picked from commit 7364f1749a8e25959aa580d7a4c2bc710a52ccbe)

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

diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index 6fdc3cb66340..043e6de0794a 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -14,9 +14,9 @@ $(eval $(call 
gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/temp
cancel_up.bmp \
down.bmp \
end.bmp \
-   euro_1.bmp \
-   euro_2.bmp \
-   euro_3.bmp \
+   euro_1.png \
+   euro_2.png \
+   euro_3.png \
ftpconnected.gif \
ftpconnecting.gif \
ftperror.gif \
diff --git a/extras/source/templates/wizard/bitmap/euro_1.bmp 
b/extras/source/templates/wizard/bitmap/euro_1.bmp
deleted file mode 100644
index 81869151541f..
Binary files a/extras/source/templates/wizard/bitmap/euro_1.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_1.png 
b/extras/source/templates/wizard/bitmap/euro_1.png
new file mode 100644
index ..38a68c0a0caa
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_1.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_2.bmp 
b/extras/source/templates/wizard/bitmap/euro_2.bmp
deleted file mode 100644
index 34031d9efdda..
Binary files a/extras/source/templates/wizard/bitmap/euro_2.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_2.png 
b/extras/source/templates/wizard/bitmap/euro_2.png
new file mode 100644
index ..cc066dae2f52
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_2.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_3.bmp 
b/extras/source/templates/wizard/bitmap/euro_3.bmp
deleted file mode 100644
index 70f73b141d67..
Binary files a/extras/source/templates/wizard/bitmap/euro_3.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/euro_3.png 
b/extras/source/templates/wizard/bitmap/euro_3.png
new file mode 100644
index ..bf544d2f61e1
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/euro_3.png 
differ
diff --git a/wizards/source/euro/AutoPilotRun.xba 
b/wizards/source/euro/AutoPilotRun.xba
index 5c869459ebb8..77ca182df999 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -51,7 +51,7 @@ Dim oFactoryKey as Object
InitializeConverter(oLocale, 2)
ToggleGoOnButton()
oFactoryKey = 
GetRegistryKeyContent("org.openoffice.Setup/Office/Factories")
-   DialogModel.chkTextDocuments.Enabled =  
oFactoryKey.hasbyName("com.sun.star.text.TextDocument")
+   DialogModel.chkTextDocuments.Enabled = 
oFactoryKey.hasbyName("com.sun.star.text.TextDocument")
DialogModel.cmdGoOn.DefaultButton = True
DialogModel.lstCurrencies.TabIndex = 12
DialogConvert.GetControl("optWholeDir").SetFocus()
@@ -136,7 +136,7 @@ Dim sExtension as String
bIsReadOnly = False
RetrieveDocumentObjects()
sViewPath = CutPathView(SourceFile, 60)
-   DialogModel.lblCurDocument.Label = 
Str(DocIndex+1) & "/" & sTotDocCount & "  (" 
& sViewPath & ")"
+   DialogModel.lblCurDocument.Label = 
Str(DocIndex+1) & "/" & sTotDocCount & " (" 
& sViewPath & ")"
End If
InitializeDocument() = Not bIsReadOnly
Else
@@ -235,7 +235,7 @@ Dim TextBoxText as String
TextBoxText = TextBoxText & 
DeleteStr(sInclusiveSubDir,"~") & chr(13)
End If
Else
-   TextBoxText = sSOURCEFILE & " " & 
ConvertFromUrl(Source) & chr(13) 
+   TextBoxText = sSOURCEFILE & " " & 
ConvertFromUrl(Source) & chr(13)
End If
  

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 6 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit a93fd78c58881e0cfd95a1e19acea231a0567839
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 10 14:01:53 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..60cc3a5f46a9 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,8 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
-!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+#if 0
+  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -890,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 8d7bd677651039fe6c0b04097702d2560d02af60
Author: Michael Stahl 
AuthorDate: Wed Dec 5 16:37:18 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 10 14:01:53 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7b6411163cb3..c756aedf4cd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -267,6 +267,7 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 
 bool bGoOn = true;
 TextFrameIndex const nOffset = MapModelToViewPos(rPos);
+assert(nOffset != TextFrameIndex(COMPLETE_STRING)); // not going to 
end well
 TextFrameIndex nNextOfst;
 
 do
commit 469c71a24535d5f1ed4eb70c1d1fb40c41864cc1
Author: Michael Stahl 
AuthorDate: Fri Dec 7 18:52:54 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 10 14:01:53 2018 +0100

sw_redlinehide_4b: adapt FindText()

Generally speaking, the find functions should find the strings that are
visible in the document view.  However, they may also be called from
SwXTextDocument functions, where they ought to find the strings that are
actually in the document model.

So concoct some funny helper types and adapt this so it can handle both
cases; it's not pretty but maybe it even works.

Change-Id: I1917398ff928e922673353e75e8fb724dc042031

diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 4999c07d734b..9da44ada4dfe 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1135,7 +1135,7 @@ int SwFindParaAttr::DoFind(SwPaM & rCursor, 
SwMoveFnCollection const & fnMove,
 // TODO: searching for attributes in Outliner text?!
 
 // continue search in correct section (pTextRegion)
-if (sw::FindTextImpl(aSrchPam, *pSearchOpt, 
false/*bSearchInNotes*/, *pSText, fnMove, *pTextRegion, bInReadOnly) &&
+if (sw::FindTextImpl(aSrchPam, *pSearchOpt, 
false/*bSearchInNotes*/, *pSText, fnMove, *pTextRegion, bInReadOnly, 
nullptr/*FIXME*/) &&
 *aSrchPam.GetMark() != *aSrchPam.GetPoint() )
 break; // found
 else if( !pSet->Count() )
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 5fe3a757e890..c99ac4f34c9a 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -53,59 +54,184 @@
 using namespace ::com::sun::star;
 using namespace util;
 
+/// because the Find may be called on the View or the Model, we need an index
+/// afflicted by multiple personality disorder
+struct AmbiguousIndex
+{
+private:
+sal_Int32 m_value;
+
+#ifndef NDEBUG
+enum class tags : char { Any, Frame, Model };
+tags m_tag;
+#endif
+
+public:
+AmbiguousIndex() : m_value(-1), m_tag(tags::Any) {}
+explicit AmbiguousIndex(TextFrameIndex const value) : m_value(value), 
m_tag(tags::Frame)  {}
+explicit AmbiguousIndex(sal_Int32 const value) : m_value(value), 
m_tag(tags::Model) {}
+explicit AmbiguousIndex(sal_Int32 const value, tags const tag) : 
m_value(value), m_tag(tag) {}
+
+sal_Int32 & GetAnyIndex(

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.0-17'

[Libreoffice Gerrit user]

Tag 'cp-6.0-17' created by Andras Timar  at 
2018-12-10 13:04 +

cp-6.0-17

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.0-17'

[Libreoffice Gerrit user]

Tag 'cp-6.0-17' created by Andras Timar  at 
2018-12-10 13:04 +

cp-6.0-17

Changes since cp-6.0-12-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.0-17'

[Libreoffice Gerrit user]

Tag 'cp-6.0-17' created by Andras Timar  at 
2018-12-10 13:04 +

cp-6.0-17

Changes since cp-6.0-16-57:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

Tag 'cp-6.0-17' created by Andras Timar  at 
2018-12-10 13:04 +

cp-6.0-17

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/unosett.hxx  |   12 
 sw/qa/extras/layout/data/forcepoint76-1.rtf | 3388 
 sw/qa/extras/layout/layout.cxx  |5 
 sw/source/core/inc/frame.hxx|2 
 sw/source/core/inc/ftnfrm.hxx   |1 
 sw/source/core/layout/calcmove.cxx  |1 
 sw/source/core/layout/ftnfrm.cxx|   29 
 sw/source/core/layout/tabfrm.cxx|5 
 sw/source/core/unocore/unosett.cxx  |   56 
 9 files changed, 3461 insertions(+), 38 deletions(-)

New commits:
commit 0005b330eaed0b5559042d2597fb45e0c9125d7e
Author: Caolán McNamara 
AuthorDate: Wed Dec 5 13:22:44 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 14:18:48 2018 +0100

forcepoint#76 avoid deleting footnote that would delete undeletable page

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

diff --git a/sw/qa/extras/layout/data/forcepoint76-1.rtf 
b/sw/qa/extras/layout/data/forcepoint76-1.rtf
new file mode 100644
index ..f3ed2cc468e3
--- /dev/null
+++ b/sw/qa/extras/layout/data/forcepoint76-1.rtf
@@ -0,0 +1,3388 @@
+{\rtf1\a|eflang1037\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose
 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Arial;}
+{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier 
New;}{\f3\froman\fcharset2\fprq2{\*\panose 
05050102010706020507}Symbol;}{\f4\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Helvetica;}
+{\f5\fmodern\fcharset0\fprq1{\*\panose 
02060409020205020404}Courier;}{\f6\froman\fcharset0\fprq2{\*\panose 
02020603040505020304}Tms Rmn;}{\f7\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202030204}Helv;}
+{\f8\froman\fcharset0\fprq2{\*\panose 02040503060506020304}New 
York;}{\f9\fswiss\fcharset0\fprq2{\*\panose 
}System;}{\f10\fnil\fcharset2\fprq2{\*\panose 
0500}Wingdings;}
+{\f11\froman\fcharset128\fprq1{\*\panose 02020609040205080304}MS 
Mincho{\*\falt ?l?r ??\'81\'66c};}{\f12\fnil\fcharset129\fprq1{\*\panose 
0203060101010101}Batang{\*\falt \'a2\'ae\'a1\'d7IoUAA};}
+{\f13\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt 
\'a8\'ac??};}{\f14\fnil\fcharset136\fprq2{\*\panose 
02010601000101010101}PMingLiU{\*\falt !Ps2OcuAe};}
+{\f15\fmodern\fcharset128\fprq1{\*\panose 020b0609070205080204}MS 
Gothic{\*\falt ?l?r ?S?V?b?N};}
+{\f16\fmodern\fcharset129\fprq1{\*\panose 020b060101010101}Dotum{\*\falt 
\'a1\'cb\'a2\'e7Ii\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a1\'cb\'a2\'e7e?o};}
+{\f17\fmodern\fcharset134\fprq1{\*\panose 02010600030101010101}SimHei{\*\falt 
o??\'a8\'ac2??\'a8\'ac??};}{\f0\fmodern\fcharset136\fprq1{\*\panose 
02010609000101010101}MingLiU{\*\falt 2OcuAe};}
+{\f19\froman\fcharset128\fprq1{\*\panose 7202762996549695502}Mincho{\*\falt 
??\'81\'66c};}
+{\f20\froman\fcharset129\fprq1{\*\panose 020b060101010101}Gulim{\*\falt 
\'a2\'aee\'a1\'cbc\'a2\'ae\'a1\'d7u\'a1\'cb\'a2\'e7\'a2\'ae\'a1\'bfu\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a2\'ae\'a1\'d7I\'a1\'cb\'a2\'e7a};}
+{\f21\froman\fcharset0\fprq2{\*\panose 
02040603050705020303}Century;}{\f22\froman\fcharset0\fprq2{\*\panose 
02020603050405020304}Angsana New;}{\f23\fswiss\fcharset0\fprq2{\*\panose 
020b0304020202020204}Cordia New;}
+{\f24\fnil\fcharset1\fprq2{\*\panose 
0400}Mangal;}{\f25\fnil\fcharset1\fprq2{\*\panose 
02000400}Latha;}{\f26\froman\fcharset0\fprq2{\*\panose 
010a0502050306030303}Sylfaen;}
+{\f27\froman\fcharset1\fprq2{\*\panose 
0400}Vrinda;}{\f28\fnil\fcharset1\fprq2{\*\panose 
02000500}Raavi;}{\f29\fnil\fcharset1\fprq2{\*\panose 
02000500}Shruti;}
+{\f30\froman\fcharset1\fprq2{\*\panose 
0400}Sendnya;}{\f31\fnil\fcharset1\fprq2{\*\panose 
02000500}Gautami;}{\f32\fnil\fcharset1\fprq2{\*\panose 
0400}Tunga;}
+{\f33\fscript\fcharset1\fprq2{\*\panose 03080600}Estrangelo 
Edessa;}{\f34\froman\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial 
Unicode MS;}{\f35\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
+{\f36\fnil\fcharset134\fprq2{\*\panose 
}@SimSun;}{\f37\froman\fcharset0\fprq2 Times New Roman 
CE;}{\f38\froman\fcharset0\fprq2 Times New Roman 
CYR;}{\f39\froman\fcharset0\fprq2 Times New Roman Greek;}
+{\f40\froman\fcharset0\fprq2 Times New Roman TUR;}{\f41\froman\fcharset0\fprq2 
Times New Roman Baltic;}{\f42\fswiss\fcharset0\fprq2{\*\panose 
020b0604030504040204}Verdana;}{\f43\fswiss\fcharset0\fprq2{\*\panose 
020b0603020202020204}Trebuchet MS;}
+{\f44\fswiss\fcharset0\fprq2{\*\panose 020e0802040304020204}Albertus Extra 
Bold;}{

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

[Libreoffice Gerrit user]

 sw/qa/extras/layout/data/forcepoint76-1.rtf | 3388 
 sw/qa/extras/layout/layout.cxx  |5 
 sw/source/core/inc/frame.hxx|2 
 sw/source/core/inc/ftnfrm.hxx   |1 
 sw/source/core/layout/calcmove.cxx  |1 
 sw/source/core/layout/ftnfrm.cxx|   29 
 sw/source/core/layout/tabfrm.cxx|5 
 7 files changed, 3427 insertions(+), 4 deletions(-)

New commits:
commit f4212175fe7c18855c52ef3e1aaa34eece2dccc5
Author: Caolán McNamara 
AuthorDate: Wed Dec 5 13:22:44 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 14:19:06 2018 +0100

forcepoint#76 avoid deleting footnote that would delete undeletable page

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

diff --git a/sw/qa/extras/layout/data/forcepoint76-1.rtf 
b/sw/qa/extras/layout/data/forcepoint76-1.rtf
new file mode 100644
index ..f3ed2cc468e3
--- /dev/null
+++ b/sw/qa/extras/layout/data/forcepoint76-1.rtf
@@ -0,0 +1,3388 @@
+{\rtf1\a|eflang1037\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose
 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Arial;}
+{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier 
New;}{\f3\froman\fcharset2\fprq2{\*\panose 
05050102010706020507}Symbol;}{\f4\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Helvetica;}
+{\f5\fmodern\fcharset0\fprq1{\*\panose 
02060409020205020404}Courier;}{\f6\froman\fcharset0\fprq2{\*\panose 
02020603040505020304}Tms Rmn;}{\f7\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202030204}Helv;}
+{\f8\froman\fcharset0\fprq2{\*\panose 02040503060506020304}New 
York;}{\f9\fswiss\fcharset0\fprq2{\*\panose 
}System;}{\f10\fnil\fcharset2\fprq2{\*\panose 
0500}Wingdings;}
+{\f11\froman\fcharset128\fprq1{\*\panose 02020609040205080304}MS 
Mincho{\*\falt ?l?r ??\'81\'66c};}{\f12\fnil\fcharset129\fprq1{\*\panose 
0203060101010101}Batang{\*\falt \'a2\'ae\'a1\'d7IoUAA};}
+{\f13\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt 
\'a8\'ac??};}{\f14\fnil\fcharset136\fprq2{\*\panose 
02010601000101010101}PMingLiU{\*\falt !Ps2OcuAe};}
+{\f15\fmodern\fcharset128\fprq1{\*\panose 020b0609070205080204}MS 
Gothic{\*\falt ?l?r ?S?V?b?N};}
+{\f16\fmodern\fcharset129\fprq1{\*\panose 020b060101010101}Dotum{\*\falt 
\'a1\'cb\'a2\'e7Ii\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a1\'cb\'a2\'e7e?o};}
+{\f17\fmodern\fcharset134\fprq1{\*\panose 02010600030101010101}SimHei{\*\falt 
o??\'a8\'ac2??\'a8\'ac??};}{\f0\fmodern\fcharset136\fprq1{\*\panose 
02010609000101010101}MingLiU{\*\falt 2OcuAe};}
+{\f19\froman\fcharset128\fprq1{\*\panose 7202762996549695502}Mincho{\*\falt 
??\'81\'66c};}
+{\f20\froman\fcharset129\fprq1{\*\panose 020b060101010101}Gulim{\*\falt 
\'a2\'aee\'a1\'cbc\'a2\'ae\'a1\'d7u\'a1\'cb\'a2\'e7\'a2\'ae\'a1\'bfu\'a1\'cb\'a2\'e7e\'a1\'cb\'a2\'e7\'a8\'cf\'a1\'a9\'a2\'ae\'a1\'d7I\'a1\'cb\'a2\'e7a};}
+{\f21\froman\fcharset0\fprq2{\*\panose 
02040603050705020303}Century;}{\f22\froman\fcharset0\fprq2{\*\panose 
02020603050405020304}Angsana New;}{\f23\fswiss\fcharset0\fprq2{\*\panose 
020b0304020202020204}Cordia New;}
+{\f24\fnil\fcharset1\fprq2{\*\panose 
0400}Mangal;}{\f25\fnil\fcharset1\fprq2{\*\panose 
02000400}Latha;}{\f26\froman\fcharset0\fprq2{\*\panose 
010a0502050306030303}Sylfaen;}
+{\f27\froman\fcharset1\fprq2{\*\panose 
0400}Vrinda;}{\f28\fnil\fcharset1\fprq2{\*\panose 
02000500}Raavi;}{\f29\fnil\fcharset1\fprq2{\*\panose 
02000500}Shruti;}
+{\f30\froman\fcharset1\fprq2{\*\panose 
0400}Sendnya;}{\f31\fnil\fcharset1\fprq2{\*\panose 
02000500}Gautami;}{\f32\fnil\fcharset1\fprq2{\*\panose 
0400}Tunga;}
+{\f33\fscript\fcharset1\fprq2{\*\panose 03080600}Estrangelo 
Edessa;}{\f34\froman\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial 
Unicode MS;}{\f35\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}
+{\f36\fnil\fcharset134\fprq2{\*\panose 
}@SimSun;}{\f37\froman\fcharset0\fprq2 Times New Roman 
CE;}{\f38\froman\fcharset0\fprq2 Times New Roman 
CYR;}{\f39\froman\fcharset0\fprq2 Times New Roman Greek;}
+{\f40\froman\fcharset0\fprq2 Times New Roman TUR;}{\f41\froman\fcharset0\fprq2 
Times New Roman Baltic;}{\f42\fswiss\fcharset0\fprq2{\*\panose 
020b0604030504040204}Verdana;}{\f43\fswiss\fcharset0\fprq2{\*\panose 
020b0603020202020204}Trebuchet MS;}
+{\f44\fswiss\fcharset0\fprq2{\*\panose 020e0802040304020204}Albertus Extra 
Bold;}{\f45\fswiss\fcharset0\fprq2{\*\panose 020e0602030304020304}Albertus 
Medium;}{\f46\fswiss\fcharset0\fprq2{\

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

[Libreoffice Gerrit user]

 sw/inc/fmtfollowtextflow.hxx   |   22 +++
 sw/inc/unomid.h|4 
 sw/inc/unoprnms.hxx|1 
 sw/qa/extras/layout/data/tdf115094.docx|binary
 sw/qa/extras/layout/layout.cxx |   29 +
 sw/qa/extras/ooxmlimport/data/tdf115094v2.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |8 +
 sw/source/core/attr/fmtfollowtextflow.cxx  |   58 
++
 sw/source/core/inc/anchoredobjectposition.hxx  |5 
 sw/source/core/inc/environmentofanchoredobject.hxx |7 +
 sw/source/core/objectpositioning/anchoredobjectposition.cxx|1 
 sw/source/core/objectpositioning/environmentofanchoredobject.cxx   |6 -
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |2 
 sw/source/core/unocore/unoframe.cxx|   17 ++
 sw/source/core/unocore/unomap.cxx  |3 
 sw/source/core/unocore/unomap1.cxx |3 
 sw/source/core/unocore/unomapproperties.hxx|3 
 sw/source/uibase/utlui/attrdesc.cxx|1 
 writerfilter/source/dmapper/GraphicImport.cxx  |5 
 writerfilter/source/dmapper/PropertyIds.cxx|1 
 writerfilter/source/dmapper/PropertyIds.hxx|1 
 21 files changed, 166 insertions(+), 11 deletions(-)

New commits:
commit c3c80b6b63e998fd3117b5039e65a2ee9df90954
Author: Patrick Jaap 
AuthorDate: Wed Nov 14 16:25:45 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 10 14:20:43 2018 +0100

tdf#115094 Part II: OOXML Feature: Add layoutInCell to Doc model

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

diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 6cbc6dfe39e9..ff3aa9f9b32b 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 #define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 
+#include 
 #include 
 #include "hintids.hxx"
 #include "format.hxx"
@@ -28,9 +29,19 @@ class IntlWrapper;
 
 class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
 {
+private:
+bool mbLayoutInCell = false;
+
 public:
+
 SwFormatFollowTextFlow( bool bFlag = false )
-: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
+: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
+{}
+
+SwFormatFollowTextFlow( bool bFlag, bool _bLayoutInCell  )
+: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag )
+, mbLayoutInCell( _bLayoutInCell )
+{}
 
 
 /// "pure virtual methods" of SfxPoolItem
@@ -41,7 +52,16 @@ public:
   OUString &rText,
   const IntlWrapper& rIntl ) const override;
 
+bool GetLayoutInCell() const { return mbLayoutInCell; }
+
+
+bool PutValue(const css::uno::Any& rVal, sal_uInt8 aInt) override;
+
+bool QueryValue(css::uno::Any& rVal, sal_uInt8 aInt = 0) const override;
+
 void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
+
+bool operator==(const SfxPoolItem& rItem) const override;
 };
 
 inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) 
const
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index 020da9d7e08e..06e84c99acb1 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -147,6 +147,10 @@
 // SwFormatWrapInfluenceOnObjPos
 #define MID_WRAP_INFLUENCE  0
 
+// SwFormatFollowTextFlow
+#define MID_FOLLOW_TEXT_FLOW0
+#define MID_FTF_LAYOUT_IN_CELL  1
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index a168bbc38498..3e0383961b7a 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -743,6 +743,7 @@
 #define UNO_NAME_IS_SPLIT_ALLOWED "IsSplitAllowed"
 #define UNO_NAME_CHAR_HIDDEN "CharHidden"
 #define UNO_NAME_IS_FOLLOWING_TEXT_FLOW "IsFollowingTextFlow"
+#define UNO_NAME_IS_LAYOUT_IN_CELL "IsLayoutInCell"
 #define UNO_NAME_WIDTH_TYPE "WidthType"
 #define UNO_NAME_SCRIPT_URL "ScriptURL"
 #define UNO_NAME_RUNTIME_UID "RuntimeUID"
diff --git a/sw/qa/extras/layout/data/tdf115094.docx 
b/sw/qa/extras/layout/data/tdf115094.docx
new file mode 100644
index ..49a7c9194f1a
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf115094.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 2fea76b5399a..633a31f3b30b 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -63,6 +63,7 @@ public:
 void testTdf1202

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 73/64f1749a8e25959aa580d7a4c2bc710a52ccbe

[Libreoffice Gerrit user]

 73/64f1749a8e25959aa580d7a4c2bc710a52ccbe |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dede9e8d981efa6737bbddd1c27a98ca633ec95a
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 13:26:18 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 13:26:18 2018 +

Notes added by 'git notes add'

diff --git a/73/64f1749a8e25959aa580d7a4c2bc710a52ccbe 
b/73/64f1749a8e25959aa580d7a4c2bc710a52ccbe
new file mode 100644
index ..005603ccd630
--- /dev/null
+++ b/73/64f1749a8e25959aa580d7a4c2bc710a52ccbe
@@ -0,0 +1 @@
+merged as: 0761fbdd146c306190e41d65b9d4eec03c39c1b8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3a/4bcd943f772f1c284cdd01d5865df47886900b

[Libreoffice Gerrit user]

 3a/4bcd943f772f1c284cdd01d5865df47886900b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91d3a8e9594f976836c30a1ed4af48dac64afe6f
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 13:26:43 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 13:26:43 2018 +

Notes added by 'git notes add'

diff --git a/3a/4bcd943f772f1c284cdd01d5865df47886900b 
b/3a/4bcd943f772f1c284cdd01d5865df47886900b
new file mode 100644
index ..a137d54fe694
--- /dev/null
+++ b/3a/4bcd943f772f1c284cdd01d5865df47886900b
@@ -0,0 +1 @@
+merged as: f1cf8cd8c34d51279f2870ef87a885bf3f2896b8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/Jenkins

[Libreoffice Gerrit user]

 distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 81434a0f9afea2185f5e59be09ac73f363baeb92
Author: Stephan Bergmann 
AuthorDate: Mon Dec 10 14:26:40 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 14:29:38 2018 +0100

Jenkins' lo_daily_update_gandalf needs --disable-werror too

...similar to d3f2c61e3b9faf577f692ece76cd830f0f74b028 "Make Jenkins
linux_gcc_release_64 pick up Developer Toolset 7":

> 
/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/sal/osl/unx/pipe.cxx:
 In function ‘oslPipeImpl* osl_psz_createPipe(const sal_Char*, oslPipeOptions, 
oslSecurity)’:
> 
/lo/home/tdf/lode/jenkins/workspace/lo_daily_update_gandalf/sal/osl/unx/pipe.cxx:248:12:
 error: ‘char* strncpy(char*, const char*, size_t)’ output may be truncated 
copying 107 bytes from a string of length 4096 [-Werror=stringop-truncation]
>  strncpy(addr.sun_path, name, sizeof(addr.sun_path) - 1);
>  ~~~^~~~

().

Change-Id: I443337969dfdcd02a350a171e68d5032b5be22a0

diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf 
b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
index f006518ce0c8..e5b5ebdc9110 100644
--- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
+++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
@@ -29,6 +29,7 @@
 --enable-python=internal
 --enable-online-update=mar
 --disable-dconf
+--disable-werror
 --with-lang=de es fr ar zh-CN
 --with-package-format=archive
 --with-update-config=~/updater.ini
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compiler baselines

[Stephan Bergmann]

On 08/12/2018 19:35, Markus Mohrhard wrote:
On Mon, Dec 3, 2018 at 2:24 PM Stephan Bergmann > wrote:

But enabling Developer Toolset 7 for specific Jenkins jobs by adding
CC/CXX to the corresponding distro/Jenkins/* files turns out to not be
the ideal solution either:  Jenkins' lo_tb_master_linux job was
serviced
by a heterogeneous set of nodes, most of which are CentOS-based, but
gandalf is not.  So I had to remove gandalf from Jenkins' TB_Rel label
now to adapt lo_tb_master_linux (see



"Enabling Developer Toolset 7 for Jenkins' lo_tb_master_linux").


Gandalf is not a CentOS based buildbot but the self-built gcc is now 
available under "/opt/rh/devtoolset-7/root/usr/bin/gcc" to reduce the 
differences between the different buildbots and make it easier to move 
jobs between different jenkins VMs. The only difference is that the gcc 
is version 8.2 instead of 7.3.


So I added gandalf back to Jenkins' TB_Rel label now; seen a successful 
"Tinderbox on Master for Linux" build on gandalf at 
.

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

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

[Libreoffice Gerrit user]

 include/svx/svdobj.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 725b6fe4ce09ec23e7b665a7ffee3b96da645cc0
Author: Stephan Bergmann 
AuthorDate: Mon Dec 10 12:50:42 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 14:40:10 2018 +0100

OutputDevice must be a complete type here

...on Windows for SVX_DLLPUBLIC SdrObjMacroHitRec with (implicitly) inline
special member functions and VclPtr member.

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

diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index db1f4d1acf1a..0177cec8ff3b 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -73,7 +74,6 @@ class SdrObjPlusData;
 class SdrGluePoint;
 class SdrGluePointList;
 class SdrLayerIDSet;
-class OutputDevice;
 class Fraction;
 
 namespace basegfx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/CODE-4-RC1'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1' created by Andras Timar  at 
2018-12-10 13:45 +

CODE-4-RC1

Changes since cp-6.0-7:
Adolfo Jayme Barrientos (1):
  .howtoget, now more Collabora-y

---
 help3xsl/default.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/CODE-4-RC1'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1' created by Andras Timar  at 
2018-12-10 13:45 +

CODE-4-RC1

Changes since cp-6.0-6:
Olivier R (1):
  French dictionary update (v6.3)

---
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |7 
 fr_FR/fr.dic  | 1032 --
 fr_FR/package-description.txt |2 
 5 files changed, 1003 insertions(+), 42 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/CODE-4-RC1'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1' created by Andras Timar  at 
2018-12-10 13:45 +

CODE-4-RC1

Changes since cp-6.0-12-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/CODE-4-RC1'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1' created by Andras Timar  at 
2018-12-10 13:45 +

CODE-4-RC1

Changes since cp-6.0-16-57:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 extras/source/templates/officorr/Modern_business_letter_serif/content.xml |   
30 +
 extras/source/templates/officorr/Modern_business_letter_serif/styles.xml  |   
58 +++---
 2 files changed, 29 insertions(+), 59 deletions(-)

New commits:
commit e949621d06a31dc727db96824779630cc7b579f9
Author: Laurent BP 
AuthorDate: Thu Nov 8 23:06:22 2018 +0100
Commit: Laurent BP 
CommitDate: Mon Dec 10 14:49:08 2018 +0100

tdf#121255 tdf#121164 Update Business letter serif template

Clean up of fonts and font sizes
Kerning enabled as default

Change-Id: I5772b6156173b3d70c637abe269364e266d515bc
Reviewed-on: https://gerrit.libreoffice.org/63141
Tested-by: Jenkins
Reviewed-by: Laurent BP 

diff --git 
a/extras/source/templates/officorr/Modern_business_letter_serif/content.xml 
b/extras/source/templates/officorr/Modern_business_letter_serif/content.xml
index b5dddb96b8d4..624e4b32781b 100644
--- a/extras/source/templates/officorr/Modern_business_letter_serif/content.xml
+++ b/extras/source/templates/officorr/Modern_business_letter_serif/content.xml
@@ -2,26 +2,12 @@
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="ht
 tp://openoffice.org/2004/office" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:css
 3t="http://www.w3.org/TR/css3-text/"; office:version="1.2">
   
   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
   
   
 
   
-  
 
 
 
@@ -51,30 +37,30 @@
 
 
   
-  
+  
 
 
   
 
 
   
-  
+  
 
 
-  
+  
 
 
   
 
 
 
-  
+  
 
 
-  
+  
 
 
-  
+  
 
 
   
diff --git 
a/extras/source/templates/officorr/Modern_business_letter_serif/styles.xml 
b/extras/source/templates/officorr/Modern_business_letter_serif/styles.xml
index 021acca93ae5..760e09b57f8b 100644
--- a/extras/source/templates/officorr/Modern_business_letter_serif/styles.xml
+++ b/extras/source/templates/officorr/Modern_business_letter_serif/styles.xml
@@ -1,21 +1,8 @@
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="htt
 p://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2">
   
-
-
-

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

[Libreoffice Gerrit user]

 svx/source/dialog/langbox.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit aaf7e843900b5fb995a7188f527552bd616baf9e
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 11:09:14 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 14:56:55 2018 +0100

Resolves: tdf#121520 duplicate languages in dropdown

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

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 69d1ab3a03af..fedbe1a5c4c1 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -551,12 +551,15 @@ void LanguageBox::AddLanguages(const std::vector< 
LanguageType >& rLanguageTypes
 if (lcl_isScriptTypeRequested( nLang, nLangList))
 {
 int nAt = ImplTypeToPos(nLang);
-if (nAt == -1)
-{
-rEntries.push_back(BuildEntry(nLang));
-if (rEntries.back().sString.isEmpty())
-rEntries.pop_back();
-}
+if (nAt != -1)
+continue;
+weld::ComboBoxEntry aNewEntry(BuildEntry(nLang));
+if (aNewEntry.sString.isEmpty())
+continue;
+if (std::find_if(rEntries.begin(), rEntries.end(),
+ [=](const weld::ComboBoxEntry& rEntry){ 
return rEntry.sId == aNewEntry.sId; }) != rEntries.end())
+continue;
+rEntries.push_back(aNewEntry);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/sidebar/MasterPageContainer.cxx |2 +-
 svl/source/items/itempool.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb38c6d5e0eb4093cf9612f18d22811812adab17
Author: Noel Grandin 
AuthorDate: Mon Dec 10 12:22:23 2018 +0200
Commit: Noel Grandin 
CommitDate: Mon Dec 10 15:08:43 2018 +0100

simplify some copy construction

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

diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx 
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 2a58f3619ff0..b806a91661e6 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -913,7 +913,7 @@ void 
MasterPageContainer::Implementation::FireContainerChange (
 MasterPageContainerChangeEvent::EventType eType,
 Token aToken)
 {
-::std::vector> 
aCopy(maChangeListeners.begin(),maChangeListeners.end());
+::std::vector> 
aCopy(maChangeListeners);
 MasterPageContainerChangeEvent aEvent;
 aEvent.meEventType = eType;
 aEvent.maChildToken = aToken;
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 614db99b1791..f40c1bca5578 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -352,7 +352,7 @@ void SfxItemPool::Free(SfxItemPool* pPool)
 return;
 
 // tell all the registered SfxItemPoolUsers that the pool is in destruction
-std::vector 
aListCopy(pPool->pImpl->maSfxItemPoolUsers.begin(), 
pPool->pImpl->maSfxItemPoolUsers.end());
+std::vector aListCopy(pPool->pImpl->maSfxItemPoolUsers);
 for(SfxItemPoolUser* pSfxItemPoolUser : aListCopy)
 {
 DBG_ASSERT(pSfxItemPoolUser, "corrupt SfxItemPoolUser list (!)");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/langbox.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit f6ad6eedfd21bc8f9de09d53d3be883bbc543cc7
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 11:09:14 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 15:09:24 2018 +0100

Resolves: tdf#121520 duplicate languages in dropdown

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

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 242753913641..ba244f38e4f6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -516,12 +516,15 @@ void LanguageBox::AddLanguages(const std::vector< 
LanguageType >& rLanguageTypes
 if (lcl_isScriptTypeRequested( nLang, nLangList))
 {
 int nAt = ImplTypeToPos(nLang);
-if (nAt == -1)
-{
-rEntries.push_back(BuildEntry(nLang));
-if (rEntries.back().sString.isEmpty())
-rEntries.pop_back();
-}
+if (nAt != -1)
+continue;
+weld::ComboBoxEntry aNewEntry(BuildEntry(nLang));
+if (aNewEntry.sString.isEmpty())
+continue;
+if (std::find_if(rEntries.begin(), rEntries.end(),
+ [=](const weld::ComboBoxEntry& rEntry){ 
return rEntry.sId == aNewEntry.sId; }) != rEntries.end())
+continue;
+rEntries.push_back(aNewEntry);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/handler/Map.WOPI.js |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7047b9b681942309403b31aaac07cf8440009cec
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 10 15:26:47 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 10 15:26:47 2018 +0100

Fix Show_Button / Hide_Button

Was broken with 131f3e9b6b3f3ee48de6be056a07e46b6bf40e94

Change-Id: I88e607cb005e3acfc80c12e87db1ac3e1258fb5a

diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index a8bc65fa9..1eb422cbc 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -196,14 +196,14 @@ L.Map.WOPI = L.Handler.extend({
console.log('No toolbar in readonly mode - 
ignoring Remove_Button request.');
return;
}
-   if (!w2ui['toolbar-up'].get(msg.Values.id)) {
+   if (!w2ui['editbar'].get(msg.Values.id)) {
console.error('Toolbar button with id "' + 
msg.Values.id + '" not found.');
return;
}
if (msg.MessageId === 'Show_Button') {
-   w2ui['toolbar-up'].show(msg.Values.id);
+   w2ui['editbar'].show(msg.Values.id);
} else {
-   w2ui['toolbar-up'].hide(msg.Values.id);
+   w2ui['editbar'].hide(msg.Values.id);
}
}
else if (msg.MessageId === 'Set_Settings') {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/map/handler/Map.WOPI.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 02e7a2680af111750d7fabd8eaa003d06eca42c5
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 10 15:29:29 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 10 15:29:29 2018 +0100

Remove reference to wrong function name

Change-Id: I7ee24cacfd7facb96419167643202a04ee7adaad

diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index 1eb422cbc..7120977d3 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -193,7 +193,7 @@ L.Map.WOPI = L.Handler.extend({
return;
}
if (this._map._permission !== 'edit') {
-   console.log('No toolbar in readonly mode - 
ignoring Remove_Button request.');
+   console.log('No toolbar in readonly mode - 
ignoring request.');
return;
}
if (!w2ui['editbar'].get(msg.Values.id)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/control/Signing.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3c4a24d2b008e38ab8efbf33add2e56cbf6338c
Author: Andras Timar 
AuthorDate: Mon Dec 10 15:49:10 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 10 15:49:10 2018 +0100

Revert "signing: update end point URL suffix to work again"

This reverts commit 37425878ea181f755233357d2dce834039c1f468.

diff --git a/loleaflet/src/control/Signing.js b/loleaflet/src/control/Signing.js
index 183d5ed88..d4113cc67 100644
--- a/loleaflet/src/control/Signing.js
+++ b/loleaflet/src/control/Signing.js
@@ -421,7 +421,7 @@ L.Map.include({
}
}
},
-   vereignURL + '/vcl/js/iframe'
+   vereignURL + '/api/js/iframe'
).then(function(lib) {
library = lib;
adjustUIState();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/Package_tplwizbitmap.mk extras/source wizards/source

[Libreoffice Gerrit user]

 dev/null |binary
 extras/Package_tplwizbitmap.mk   |   20 +-
 extras/source/templates/wizard/bitmap/Import_1.png   |binary
 extras/source/templates/wizard/bitmap/Import_3.png   |binary
 extras/source/templates/wizard/bitmap/Import_4.png   |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-1.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-2.png  |binary
 extras/source/templates/wizard/bitmap/MS-Import_2-3.png  |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-1.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-2.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-3.png |binary
 extras/source/templates/wizard/bitmap/XML-Import_2-4.png |binary
 wizards/source/importwizard/Main.xba |   29 ++-
 13 files changed, 23 insertions(+), 26 deletions(-)

New commits:
commit 7e5fd926adbd62148a1fdd6950ba5b33d12874a1
Author: Matthias Seidel 
AuthorDate: Thu Nov 8 15:58:53 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 15:49:33 2018 +0100

Cleaning up Document Converter wizard, moving graphics from bmp to png

(cherry picked from commit ab017c683002df7f76a792e369c00fd10e1024f0)

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

diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index 043e6de0794a..4ebdf03b2b5f 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -21,23 +21,23 @@ $(eval $(call 
gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/temp
ftpconnecting.gif \
ftperror.gif \
ftpunknown.gif \
-   Import_1.bmp \
-   Import_3.bmp \
-   Import_4.bmp \
+   Import_1.png \
+   Import_3.png \
+   Import_4.png \
maximize.bmp \
minimize.bmp \
-   MS-Import_2-1.bmp \
-   MS-Import_2-2.bmp \
-   MS-Import_2-3.bmp \
+   MS-Import_2-1.png \
+   MS-Import_2-2.png \
+   MS-Import_2-3.png \
okay_down.bmp \
okay_up.bmp \
report.bmp \
tutorial_background.gif \
up.bmp \
-   XML-Import_2-1.bmp \
-   XML-Import_2-2.bmp \
-   XML-Import_2-3.bmp \
-   XML-Import_2-4.bmp \
+   XML-Import_2-1.png \
+   XML-Import_2-2.png \
+   XML-Import_2-3.png \
+   XML-Import_2-4.png \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/templates/wizard/bitmap/Import_1.bmp 
b/extras/source/templates/wizard/bitmap/Import_1.bmp
deleted file mode 100644
index 98457094b3fd..
Binary files a/extras/source/templates/wizard/bitmap/Import_1.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_1.png 
b/extras/source/templates/wizard/bitmap/Import_1.png
new file mode 100644
index ..ea0942103e6a
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_1.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.bmp 
b/extras/source/templates/wizard/bitmap/Import_3.bmp
deleted file mode 100644
index 37802a50d744..
Binary files a/extras/source/templates/wizard/bitmap/Import_3.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_3.png 
b/extras/source/templates/wizard/bitmap/Import_3.png
new file mode 100644
index ..abffeb3b9a1d
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_3.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.bmp 
b/extras/source/templates/wizard/bitmap/Import_4.bmp
deleted file mode 100644
index 591c5ded5065..
Binary files a/extras/source/templates/wizard/bitmap/Import_4.bmp and /dev/null 
differ
diff --git a/extras/source/templates/wizard/bitmap/Import_4.png 
b/extras/source/templates/wizard/bitmap/Import_4.png
new file mode 100644
index ..6529f8e84871
Binary files /dev/null and b/extras/source/templates/wizard/bitmap/Import_4.png 
differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp
deleted file mode 100644
index 085feeca5ab8..
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-1.bmp and 
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-1.png 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png
new file mode 100644
index ..51da77a51f7d
Binary files /dev/null and 
b/extras/source/templates/wizard/bitmap/MS-Import_2-1.png differ
diff --git a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp 
b/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp
deleted file mode 100644
index 64fc93f1a579..
Binary files a/extras/source/templates/wizard/bitmap/MS-Import_2-2.bmp and 
/dev/

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ab/017c683002df7f76a792e369c00fd10e1024f0

[Libreoffice Gerrit user]

 ab/017c683002df7f76a792e369c00fd10e1024f0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit be1d7e6f26b5ff7670147b650e99476aa4e0b411
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 14:50:46 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 14:50:46 2018 +

Notes added by 'git notes add'

diff --git a/ab/017c683002df7f76a792e369c00fd10e1024f0 
b/ab/017c683002df7f76a792e369c00fd10e1024f0
new file mode 100644
index ..636fcd983b6c
--- /dev/null
+++ b/ab/017c683002df7f76a792e369c00fd10e1024f0
@@ -0,0 +1 @@
+merged as: 7e5fd926adbd62148a1fdd6950ba5b33d12874a1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/uitest/statistics/anova.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4fc353ef9226c8f37f97a095db8f829cb10e609a
Author: Zdeněk Crhonek 
AuthorDate: Sun Dec 9 20:26:30 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Dec 10 16:22:38 2018 +0100

uitest for bug tdf#80583

Change-Id: Ifcbab8c5745b86eaf2406e1fdb3ad368acbb6fe0
Reviewed-on: https://gerrit.libreoffice.org/64849
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/statistics/anova.py b/sc/qa/uitest/statistics/anova.py
index 158f5ee2b04c..135c091a2100 100644
--- a/sc/qa/uitest/statistics/anova.py
+++ b/sc/qa/uitest/statistics/anova.py
@@ -101,7 +101,7 @@ class anova(UITestCase):
 self.assertEqual(round(get_cell_by_position(document, 0, 6, 
9).getValue(),11), 1876.56832844573)
 self.assertEqual(round(get_cell_by_position(document, 0, 6, 
10).getValue(),10), 6025.1090909091)
 #bug 80583
-#self.assertEqual(round(get_cell_by_position(document, 0, 6, 
11).getValue(),11), 7901.67741935484)
+self.assertEqual(round(get_cell_by_position(document, 0, 6, 
11).getValue(),11), 7901.67741935484)
 
 self.assertEqual(get_cell_by_position(document, 0, 7, 3).getString(), 
"Sum")
 self.assertEqual(get_cell_by_position(document, 0, 7, 4).getValue(), 
461)
@@ -138,4 +138,4 @@ class anova(UITestCase):
 self.assertEqual(get_cell_by_position(document, 0, 5, 0).getString(), 
"")
 
 self.ui_test.close_doc()
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/column.hxx|1 
 sc/inc/document.hxx  |9 +
 sc/inc/table.hxx |2 +
 sc/source/core/data/column2.cxx  |   46 ++
 sc/source/core/data/document.cxx |   12 ++
 sc/source/core/data/table1.cxx   |   41 +++
 sc/source/core/tool/interpr1.cxx |   67 +++
 7 files changed, 178 insertions(+)

New commits:
commit 03b352b9599514e4e244e1907510713cf1331284
Author: Dennis Francis 
AuthorDate: Thu Dec 6 00:09:59 2018 +0530
Commit: Dennis Francis 
CommitDate: Mon Dec 10 16:25:16 2018 +0100

Find actual data area inside the main-range...

and trim all ranges to match this actual data area. Don't do
this optimization for COUNTIFS where there is no main-range.
This optimization is also turned off if any of the parameter
ranges are not double-refs.

Benefits in cases like -
=SUMIFS(A:A, B:B, ">=20", C:C, "<=10") and the is data only
in say A1:A1 and rest are empty. Range trimming in this
case saves lot of execution time and memory (for vConditions
and vRefArrayConditions).

Change-Id: I6b4ad91e23f89dc48603b98000bcef4dbdb03112
Reviewed-on: https://gerrit.libreoffice.org/64657
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit cb52b112c0d44d7a6849f773fd1ee4e863ab91da)
Reviewed-on: https://gerrit.libreoffice.org/64833
Reviewed-by: Dennis Francis 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0a328f001ce4..b1e890a6347c 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -222,6 +222,7 @@ public:
 bool bConsiderCellDrawObjects=false ) const;
 boolGetPrevDataPos(SCROW& rRow) const;
 boolGetNextDataPos(SCROW& rRow) const;
+boolTrimEmptyBlocks(SCROW& rRowStart, SCROW& rRowEnd) const;
 voidFindDataAreaPos(SCROW& rRow, bool bDown) const; // (without 
Broadcaster)
 voidFindUsed( SCROW nStartRow, SCROW nEndRow, 
mdds::flat_segment_tree& rUsed ) const;
 
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 04ff9a0c1319..31278f83798b 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1385,6 +1385,15 @@ public:
  SCCOL& rEndCol, SCROW& rEndRow,
  bool bIncludeOld, bool bOnlyDown 
) const;
 
+/**
+ * Returns true if there is a non-empty subrange in the range given as 
input.
+ * In that case it also modifies rRange to largest subrange that does not
+ * have empty col/row inrange-segments in the beginning/end.
+ * It returns false if rRange is completely empty and in this case rRange 
is
+ * left unmodified.
+*/
+boolGetDataAreaSubrange(ScRange& rRange) const;
+
 SC_DLLPUBLIC bool   GetCellArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow ) const;
 SC_DLLPUBLIC bool   GetTableArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow ) const;
 SC_DLLPUBLIC bool   GetPrintArea( SCTAB nTab, SCCOL& rEndCol, 
SCROW& rEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index aae436ea8756..e804a1ca9cc2 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -576,6 +576,8 @@ public:
 voidGetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& 
rEndCol, SCROW& rEndRow,
  bool bIncludeOld, bool bOnlyDown ) const;
 
+boolGetDataAreaSubrange( ScRange& rRange ) const;
+
 boolShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, 
SCROW& rStartRow,
   SCCOL& rEndCol, SCROW& rEndRow, bool 
bColumnsOnly,
   bool bStickyTopRow, bool bStickyLeftCol, 
bool bConsiderCellNotes,
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index d2e81de5de3b..c46f1a70ce8b 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1405,6 +1405,52 @@ bool ScColumn::GetNextDataPos(SCROW& rRow) const
// greater than rRow
 return true;
 }
 
+bool ScColumn::TrimEmptyBlocks(SCROW& rRowStart, SCROW& rRowEnd) const
+{
+assert(rRowStart <= rRowEnd);
+SCROW nRowStartNew = rRowStart, nRowEndNew = rRowEnd;
+
+// Trim down rRowStart first
+std::pair aPos = 
maCells.position(rRowStart);
+sc::CellStoreType::const_iterator it = aPos.first;
+if (it == maCells.end())
+return false;
+
+if (it->type == sc::element_type_empty)
+{
+// This block is empty. Skip ahead to the next block (if exists).
+nRowStartNew += it->size - aPos.second;
+if (nRowStartNew > rRowEnd)
+return false;
+++it;
+if (it == maCells.end())
+// No more next block.
+return false;
+}
+
+// Trim up rRowEnd next
+aPos = maCells.position(rRowEnd);
+

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

[Libreoffice Gerrit user]

 extras/source/templates/wizard/agenda/10grey.ott |binary
 extras/source/templates/wizard/agenda/1simple.ott|binary
 extras/source/templates/wizard/agenda/2elegant.ott   |binary
 extras/source/templates/wizard/agenda/3modern.ott|binary
 extras/source/templates/wizard/agenda/4classic.ott   |binary
 extras/source/templates/wizard/agenda/5blue.ott  |binary
 extras/source/templates/wizard/agenda/6orange.ott|binary
 extras/source/templates/wizard/agenda/7red.ott   |binary
 extras/source/templates/wizard/agenda/8green.ott |binary
 extras/source/templates/wizard/agenda/9colorful.ott  |binary
 extras/source/templates/wizard/agenda/aw-10grey.ott  |binary
 extras/source/templates/wizard/agenda/aw-1simple.ott |binary
 extras/source/templates/wizard/agenda/aw-2elegant.ott|binary
 extras/source/templates/wizard/agenda/aw-3modern.ott |binary
 extras/source/templates/wizard/agenda/aw-4classic.ott|binary
 extras/source/templates/wizard/agenda/aw-5blue.ott   |binary
 extras/source/templates/wizard/agenda/aw-6orange.ott |binary
 extras/source/templates/wizard/agenda/aw-7red.ott|binary
 extras/source/templates/wizard/agenda/aw-8green.ott  |binary
 extras/source/templates/wizard/agenda/aw-9colorful.ott   |binary
 extras/source/templates/wizard/desktop/html.stw  |binary
 extras/source/templates/wizard/desktop/idxexample.odt|binary
 extras/source/templates/wizard/fax/bus-classic-pri_f.ott |binary
 extras/source/templates/wizard/fax/bus-classic_f.ott |binary
 extras/source/templates/wizard/fax/bus-modern-pri_f.ott  |binary
 extras/source/templates/wizard/fax/bus-modern_f.ott  |binary
 extras/source/templates/wizard/fax/pri-bottle_f.ott  |binary
 extras/source/templates/wizard/fax/pri-fax_f.ott |binary
 extras/source/templates/wizard/fax/pri-lines_f.ott   |binary
 extras/source/templates/wizard/fax/pri-marine_f.ott  |binary
 extras/source/templates/wizard/letter/bus-elegant_l.ott  |binary
 extras/source/templates/wizard/letter/bus-modern_l.ott   |binary
 extras/source/templates/wizard/letter/bus-office_l.ott   |binary
 extras/source/templates/wizard/letter/off-elegant_l.ott  |binary
 extras/source/templates/wizard/letter/off-modern_l.ott   |binary
 extras/source/templates/wizard/letter/off-office_l.ott   |binary
 extras/source/templates/wizard/letter/pri-bottle_l.ott   |binary
 extras/source/templates/wizard/letter/pri-mail_l.ott |binary
 extras/source/templates/wizard/letter/pri-marine_l.ott   |binary
 extras/source/templates/wizard/letter/pri-redline_l.ott  |binary
 extras/source/templates/wizard/report/cnt-01.ott |binary
 extras/source/templates/wizard/report/cnt-011.ott|binary
 extras/source/templates/wizard/report/cnt-012.ott|binary
 extras/source/templates/wizard/report/cnt-02.ott |binary
 extras/source/templates/wizard/report/cnt-021.ott|binary
 extras/source/templates/wizard/report/cnt-022.ott|binary
 extras/source/templates/wizard/report/cnt-03.ott |binary
 extras/source/templates/wizard/report/cnt-031.ott|binary
 extras/source/templates/wizard/report/cnt-032.ott|binary
 extras/source/templates/wizard/report/cnt-04.ott |binary
 extras/source/templates/wizard/report/cnt-041.ott|binary
 extras/source/templates/wizard/report/cnt-042.ott|binary
 extras/source/templates/wizard/report/cnt-05.ott |binary
 extras/source/templates/wizard/report/cnt-051.ott|binary
 extras/source/templates/wizard/report/cnt-052.ott|binary
 extras/source/templates/wizard/report/cnt-06.ott |binary
 extras/source/templates/wizard/report/cnt-061.ott|binary
 extras/source/templates/wizard/report/cnt-062.ott|binary
 extras/source/templates/wizard/report/cnt-default.ott|binary
 extras/source/templates/wizard/report/stl-01.ott |binary
 extras/source/templates/wizard/report/stl-02.ott |binary
 extras/source/templates/wizard/report/stl-03.ott |binary
 extras/source/templates/wizard/report/stl-04.ott |binary
 extras/source/templates/wizard/report/stl-05.ott |binary
 extras/source/templates/wizard/report/stl-06.ott |binary
 extras/source/templates/wizard/report/stl-07.ott |binary
 extras/source/templates/wizard/report/stl-08.ott |binary
 extras/source/templates/wizard/report/stl-09.ott |binary
 extras/source/templates/wizard/report/stl-default.ott|binary
 extras/source/templates/wizard/styles/black_white.ots|binary
 extras/source/templates/wizard/styles/blackberry.ots |binary
 extras/source/templates/wizard/styles/default.ots|binary
 extras/source/templates/wizard/styles/diner.ots  |binary
 extras/source/templates/wizard/styles/fall.ots   |binary
 extras/source/templates/wizard/styles/glacier.ots|binary
 extras/source/templates/wizard/styles/green_grap

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

[Libreoffice Gerrit user]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |4 
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |4 
 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx|4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 8ff41a26caf51544699863c89598d37d93dc1b21
Author: Aleksei Nikiforov 
AuthorDate: Thu Nov 22 17:54:00 2018 +0300
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 16:50:38 2018 +0100

Fix build with poppler 0.71

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

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index ab74b36b4595..101e3bec731b 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
 printf( "restoreState\n" );
 }
 
+#if POPPLER_CHECK_VERSION(0, 71, 0)
+void PDFOutDev::setDefaultCTM(const double *pMat)
+#else
 void PDFOutDev::setDefaultCTM(double *pMat)
+#endif
 {
 assert(pMat);
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index a6135fac4d7f..98d8ede6418f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -173,7 +173,11 @@ namespace pdfi
 //- initialization and control
 
 // Set default transform matrix.
+#if POPPLER_CHECK_VERSION(0, 71, 0)
+virtual void setDefaultCTM(const double *ctm) override;
+#else
 virtual void setDefaultCTM(double *ctm) override;
+#endif
 
 // Start a page.
 virtual void startPage(int pageNum, GfxState *state
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index 0f4a35b77ac5..b0a6ac41ba94 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 
 // read config file
 globalParams = new GlobalParams();
-globalParams->setErrQuiet(gTrue);
+globalParams->setErrQuiet(true);
 #if defined(_MSC_VER)
 globalParams->setupBaseFonts(nullptr);
 #endif
@@ -145,7 +145,7 @@ int main(int argc, char **argv)
 i,
 PDFI_OUTDEV_RESOLUTION,
 PDFI_OUTDEV_RESOLUTION,
-0, gTrue, gTrue, gTrue);
+0, true, true, true);
 rDoc.processLinks(&aOutDev, i);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Bitmap.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7b1d57fa4e3d246ae81b89cc32ec4f78183db6d1
Author: Stephan Bergmann 
AuthorDate: Mon Dec 10 18:02:28 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 18:02:28 2018 +0100

missing includes

Change-Id: I1a393d402a066a42b066eb9f270cf1adf644c7e6

diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/Qt5Bitmap.cxx
index defd0280ac24..0c6a82f701e6 100644
--- a/vcl/qt5/Qt5Bitmap.cxx
+++ b/vcl/qt5/Qt5Bitmap.cxx
@@ -25,7 +25,9 @@
 #include 
 #include 
 
+#include 
 #include 
+#include 
 
 Qt5Bitmap::Qt5Bitmap() {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Compiler baselines

[Stephan Bergmann]

On 08/12/2018 19:35, Markus Mohrhard wrote:
Gandalf is not a CentOS based buildbot but the self-built gcc is now 
available under "/opt/rh/devtoolset-7/root/usr/bin/gcc" to reduce the 
differences between the different buildbots and make it easier to move 
jobs between different jenkins VMs. The only difference is that the gcc 
is version 8.2 instead of 7.3.


Additionally, I have now also used the same CC and CXX setting for the 
random config build bot 
(https://cgit.freedesktop.org/libreoffice/core/commit/?id=ceb32911f07b63fda074facba377eeb4d5946cdf). 
Based on that I think gandalf can be used again for the tinderbox job 
and therefore hopefully take a bit of load of the gerrit build machines.


But shared libs and executables built with that CXX, when executed 
during the build, will pick up an older libstdc++.so.6 from the system 
(and thus fail when they use functionality not present in the old 
libstdc++ version), no?

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

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

[Libreoffice Gerrit user]

 sw/qa/uitest/findReplace/tdf106099.py |   53 ++
 1 file changed, 53 insertions(+)

New commits:
commit ee855a377f962eb8dff2224bb6412c2243535fb0
Author: Zdeněk Crhonek 
AuthorDate: Mon Dec 10 16:54:34 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Dec 10 18:27:15 2018 +0100

uitest for bug tdf#106099

Change-Id: Id92e84c0eba019b5c5d9ed84703c1fb35871c64c
Reviewed-on: https://gerrit.libreoffice.org/64885
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/findReplace/tdf106099.py 
b/sw/qa/uitest/findReplace/tdf106099.py
new file mode 100644
index ..e22963ff66da
--- /dev/null
+++ b/sw/qa/uitest/findReplace/tdf106099.py
@@ -0,0 +1,53 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+
+#Bug 106099 - Find and replace by format, font color added by force
+
+class tdf106099(UITestCase):
+def test_tdf106099_find_format_underline(self):
+writer_doc = self.ui_test.create_doc_in_start_center("writer")
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#Find and replace
+
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+#2. Choose Format
+format = xDialog.getChild("format")
+def handle_format_dlg(dialog):
+#Font effects - Underline Single. OK.
+xTabs = dialog.getChild("tabcontrol")
+select_pos(xTabs, "1")  #tab font effects
+underlinelb = dialog.getChild("underlinelb")
+props = {"TEXT": "Single"}
+actionProps = mkPropertyValues(props)
+underlinelb.executeAction("SELECT", actionProps)
+xOkBtn = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOkBtn)
+
+self.ui_test.execute_blocking_action(format.executeAction, 
args=('CLICK', ()),
+dialog_handler=handle_format_dlg)
+#verify label searchdesc
+searchdesc = xDialog.getChild("searchdesc")
+print(get_state_as_dict(searchdesc))
+self.assertEqual(get_state_as_dict(searchdesc)["Text"], "Single 
underline")
+noformat = xDialog.getChild("noformat")
+noformat.executeAction("CLICK", tuple())   #click No format button
+self.assertEqual(get_state_as_dict(searchdesc)["Text"], "")
+xcloseBtn = xDialog.getChild("close")
+self.ui_test.close_dialog_through_button(xcloseBtn)
+
+self.ui_test.close_doc()
+# 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: desktop/qa desktop/source include/LibreOfficeKit

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   37 
 desktop/source/lib/init.cxx |   22 
 include/LibreOfficeKit/LibreOfficeKit.h |   10 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   23 +
 4 files changed, 92 insertions(+)

New commits:
commit 4f1a341bc312673b8d92e4474cc39bc3ab69aa5b
Author: Tor Lillqvist 
AuthorDate: Mon Dec 10 16:12:08 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 10 18:31:18 2018 +0100

Add a localisation API to LibreOfficeKitClass

Combines the LanguageTag::Create() and Translate::get() (or nget())
functionality.

Also add an ABI test for the Kit class in the LibreOfficeKit unit
test, and a test for the translation function.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 74e2c09bb5af..067541dd345d 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -118,6 +119,7 @@ public:
 void testCommentsImpress();
 void testCommentsCallbacksWriter();
 void testRunMacro();
+void testTranslate();
 void testExtractParameter();
 void testGetSignatureState_NonSigned();
 void testGetSignatureState_Signed();
@@ -165,6 +167,7 @@ public:
 CPPUNIT_TEST(testCommentsImpress);
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
+CPPUNIT_TEST(testTranslate);
 CPPUNIT_TEST(testExtractParameter);
 CPPUNIT_TEST(testGetSignatureState_Signed);
 CPPUNIT_TEST(testGetSignatureState_NonSigned);
@@ -2219,6 +,20 @@ void DesktopLOKTest::testRunMacro()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void DesktopLOKTest::testTranslate()
+{
+comphelper::LibreOfficeKit::setActive();
+
+LibLibreOffice_Impl aOffice;
+
+// Try translating to a non-existent locale, should return the English 
string
+char *translated = aOffice.m_pOfficeClass->translateGet(&aOffice, 
STR_DESCRIPTION_FACTORY_WRITER, "svt", "foo");
+CPPUNIT_ASSERT_EQUAL(0, strcmp(translated, "Text Document"));
+free(translated);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 void DesktopLOKTest::testExtractParameter()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -2463,6 +2480,11 @@ void DesktopLOKTest::testInsertCertificatePEM()
 
 namespace {
 
+constexpr size_t classOffset(int i)
+{
+return sizeof(static_cast(nullptr)->nSize) + 
i * sizeof(void*);
+}
+
 constexpr size_t documentClassOffset(int i)
 {
 return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
@@ -2473,6 +2495,21 @@ constexpr size_t documentClassOffset(int i)
 void DesktopLOKTest::testABI()
 {
 // STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
+
+CPPUNIT_ASSERT_EQUAL(classOffset(0), offsetof(struct _LibreOfficeKitClass, 
destroy));
+CPPUNIT_ASSERT_EQUAL(classOffset(1), offsetof(struct _LibreOfficeKitClass, 
documentLoad));
+CPPUNIT_ASSERT_EQUAL(classOffset(2), offsetof(struct _LibreOfficeKitClass, 
getError));
+CPPUNIT_ASSERT_EQUAL(classOffset(3), offsetof(struct _LibreOfficeKitClass, 
documentLoadWithOptions));
+CPPUNIT_ASSERT_EQUAL(classOffset(4), offsetof(struct _LibreOfficeKitClass, 
freeError));
+CPPUNIT_ASSERT_EQUAL(classOffset(5), offsetof(struct _LibreOfficeKitClass, 
registerCallback));
+CPPUNIT_ASSERT_EQUAL(classOffset(6), offsetof(struct _LibreOfficeKitClass, 
getFilterTypes));
+CPPUNIT_ASSERT_EQUAL(classOffset(7), offsetof(struct _LibreOfficeKitClass, 
setOptionalFeatures));
+CPPUNIT_ASSERT_EQUAL(classOffset(8), offsetof(struct _LibreOfficeKitClass, 
setDocumentPassword));
+CPPUNIT_ASSERT_EQUAL(classOffset(9), offsetof(struct _LibreOfficeKitClass, 
getVersionInfo));
+CPPUNIT_ASSERT_EQUAL(classOffset(10), offsetof(struct 
_LibreOfficeKitClass, runMacro));
+CPPUNIT_ASSERT_EQUAL(classOffset(11), offsetof(struct 
_LibreOfficeKitClass, translateGet));
+CPPUNIT_ASSERT_EQUAL(classOffset(12), offsetof(struct 
_LibreOfficeKitClass, translateNGet));
+
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 90994a92c257..cf9352f3b2cc 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1422,6 +1422,8 @@ static void
lo_setDocumentPassword(LibreOfficeKit* pThis,
const char* pPassword);
 static char*   lo_ge

[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4-RC1'

[Libreoffice Gerrit user]

Tag 'CODE-4-RC1' created by Andras Timar  at 
2018-12-10 17:33 +

CODE-4-RC1

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

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

[Libreoffice Gerrit user]

 include/LibreOfficeKit/LibreOfficeKit.hxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 5f0dda8e9f2e35e1fdb5750089a70543478fa8a1
Author: Tor Lillqvist 
AuthorDate: Mon Dec 10 19:41:08 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 10 19:41:08 2018 +0200

Add inline implementations of the C++ translate functions

Change-Id: I749fa9d647bf55925fad862152b673ced312ee34

diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index 93a0717ae588..923af7136b93 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -801,7 +801,10 @@ public:
  * @param pPrefixName the prefix passed to Translate::Create()
  * @param pBcp47LanguageTag the locale into which the string should be 
translated
  */
-char* translateGet( const char* pId, const char* pPrefixName, const char* 
pBcp47LanguageTag );
+char* translateGet( const char* pId, const char* pPrefixName, const char* 
pBcp47LanguageTag )
+{
+return mpThis->pClass->translateGet( mpThis, pId, pPrefixName, 
pBcp47LanguageTag );
+}
 
 /**
  * Fetch translation for a string corresponding to a specific number of 
something.
@@ -813,7 +816,10 @@ public:
  * @param pPrefixName the prefix passed to Translate::Create()
  * @param pBcp47LanguageTag the locale into which the string should be 
translated
  */
-char* translateNGet( const char* pId, int n, const char* pPrefixName, 
const char* pBcp47LanguageTag );
+char* translateNGet( const char* pId, int n, const char* pPrefixName, 
const char* pBcp47LanguageTag )
+{
+return mpThis->pClass->translateNGet( mpThis, pId, n, pPrefixName, 
pBcp47LanguageTag );
+}
 };
 
 /// Factory method to create a lok::Office instance.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/uitest/table/tdf81292.py  |   52 
 sw/qa/uitest/table/tdf99334.py  |   48 +
 sw/qa/uitest/writer_tests/data/tdf81292.odt |binary
 sw/qa/uitest/writer_tests/data/tdf99334.odt |binary
 4 files changed, 100 insertions(+)

New commits:
commit e34fd6f86f15c96bb42466cc4179f1288863a428
Author: Zdeněk Crhonek 
AuthorDate: Mon Dec 10 16:47:24 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Dec 10 18:51:53 2018 +0100

uitest for bug tdf#81292 and tdf#99334 - Sort table

Change-Id: Id43b223133cfc35875d6f2fc44582983120397be
Reviewed-on: https://gerrit.libreoffice.org/64884
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sw/qa/uitest/table/tdf81292.py b/sw/qa/uitest/table/tdf81292.py
new file mode 100644
index ..cfb9f9572dbe
--- /dev/null
+++ b/sw/qa/uitest/table/tdf81292.py
@@ -0,0 +1,52 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+import time
+from uitest.debug import sleep
+# import org.libreoffice.unotest
+# import pathlib
+from uitest.path import get_srcdir_url
+
+#Bug 81292 - TABLE: Crashes on sorting table
+
+def get_url_for_data_file(file_name):
+#return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+
+class tdf81292(UITestCase):
+
+   def test_tdf81292_table_sort(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf81292.odt"))
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#select whole table
+self.xUITest.executeCommand(".uno:SelectTable")
+#Tools - Sort
+self.ui_test.execute_dialog_through_command(".uno:SortDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xDown = xDialog.getChild("down1")
+xDown.executeAction("CLICK", tuple())
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+#verify
+tables = document.getTextTables()
+table = tables[0]
+tableText = table.getCellByName("B3")
+b3 = tableText.getString()
+tableTextc1 = table.getCellByName("C1").getString()
+self.assertEqual(b3, "https://www.hightail.com/";)
+self.assertEqual(tableTextc1, "inlognaam")
+#undo
+self.xUITest.executeCommand(".uno:Undo")
+b3 = tableText.getString()
+self.assertEqual(b3, "www.comicstripshop.com")
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/qa/uitest/table/tdf99334.py b/sw/qa/uitest/table/tdf99334.py
new file mode 100644
index ..49fbfc6506ec
--- /dev/null
+++ b/sw/qa/uitest/table/tdf99334.py
@@ -0,0 +1,48 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+import time
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+
+#Bug 99334 - Crashes when sorting table by columns with umlauts
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf99334(UITestCase):
+
+   def test_tdf99334_table_sort_umlauts(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf99334.odt"))
+document = self.ui_test.get_component()
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+#select whole table
+self.xUITest.executeCommand(".uno:SelectTable")
+#Tools - Sort
+self.ui_test.execute_dialog_through_command(".uno:SortDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+# xDown = xDialog.getChild("down1")
+# xDown.executeAction("CLICK", tuple())
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+#verify
+tables = document.getTextTables()
+table = tables[0]
+tableText = table.getCellByName("B1")
+b1 = tableText.getString()
+self.assertEqual(b1, "two")
+#undo
+se

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

[Libreoffice Gerrit user]

 desktop/source/app/app.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1173f5da013fa1652363ddaadbe8c0859f0050a2
Author: Stephan Bergmann 
AuthorDate: Mon Dec 10 19:07:01 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 10 19:07:01 2018 +0100

missing include (--enable-breakpad)

Change-Id: I9c720c109893fac671006ad7b3b2c58b397cc744

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2291aeb171f4..1d5554a49ce8 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -45,6 +45,7 @@
 #include "updater.hxx"
 #endif
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/Module_sc.mk   |1 
 sc/UITest_calc_tests7.mk  |   20 +
 sc/qa/uitest/calc_tests/data/tdf91425.ods |binary
 sc/qa/uitest/calc_tests7/tdf91425.py  |   43 ++
 4 files changed, 64 insertions(+)

New commits:
commit 489775e72fbfb1636eafd431cf40e50705ae80ec
Author: Zdeněk Crhonek 
AuthorDate: Mon Dec 10 16:38:52 2018 +0100
Commit: Zdenek Crhonek 
CommitDate: Mon Dec 10 19:56:01 2018 +0100

uitest for bug tdf#91425

Change-Id: I95057eb6a8db1bd141bfa53ff955cd72c2b20cd4
Reviewed-on: https://gerrit.libreoffice.org/64883
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 46f3ff9ad25f..a4fa70eb4abd 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -228,6 +228,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\
UITest_signatureLine \
UITest_inputLine \
UITest_hideShowSheet \
+   UITest_calc_tests7 \
 ))
 endif
 
diff --git a/sc/UITest_calc_tests7.mk b/sc/UITest_calc_tests7.mk
new file mode 100644
index ..65ff569a40f9
--- /dev/null
+++ b/sc/UITest_calc_tests7.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,calc_tests7))
+
+$(eval $(call gb_UITest_add_modules,calc_tests7,$(SRCDIR)/sc/qa/uitest,\
+   calc_tests7/ \
+))
+
+$(eval $(call gb_UITest_set_defs,calc_tests7, \
+TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/calc_tests/data/tdf91425.ods 
b/sc/qa/uitest/calc_tests/data/tdf91425.ods
new file mode 100644
index ..5a72f162d29b
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf91425.ods differ
diff --git a/sc/qa/uitest/calc_tests7/tdf91425.py 
b/sc/qa/uitest/calc_tests7/tdf91425.py
new file mode 100644
index ..cacd96726646
--- /dev/null
+++ b/sc/qa/uitest/calc_tests7/tdf91425.py
@@ -0,0 +1,43 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from libreoffice.calc.document import get_cell_by_position
+import time
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+
+
+#Bug 91425 - CRASH - Calc Insert Columns Left
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf91425(UITestCase):
+   def test_tdf91425_insert_columns_left(self):
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf91425.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+#1) Open test file provided in report
+#2) Move mouse pointer over Column A header, the right mouse button 
click
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+#3) Insert columns left
+self.xUITest.executeCommand(".uno:InsertColumnsBefore")
+#verify
+self.assertEqual(get_cell_by_position(document, 0, 3, 0).getString(), 
"C")
+#undo
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(get_cell_by_position(document, 0, 2, 0).getString(), 
"C")
+#redo
+self.xUITest.executeCommand(".uno:Redo")
+self.assertEqual(get_cell_by_position(document, 0, 3, 0).getString(), 
"C")
+
+self.ui_test.close_doc()
+# 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 'aoo/trunk' - extras/source

[Libreoffice Gerrit user]

 extras/source/templates/presnt/lang/lt/prs-novelty.otp  |binary
 extras/source/templates/presnt/lang/lt/prs-strategy.otp |binary
 2 files changed

New commits:
commit beddf238eec9fc9e40f688c9d4eb582da18501f5
Author: Matthias Seidel 
AuthorDate: Mon Dec 10 17:57:38 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Dec 10 17:57:38 2018 +

Localized presentations (lt) for Impress

Translation by: Aivaras Stepukonis

diff --git a/extras/source/templates/presnt/lang/lt/prs-novelty.otp 
b/extras/source/templates/presnt/lang/lt/prs-novelty.otp
new file mode 100644
index ..71ab742389e8
Binary files /dev/null and 
b/extras/source/templates/presnt/lang/lt/prs-novelty.otp differ
diff --git a/extras/source/templates/presnt/lang/lt/prs-strategy.otp 
b/extras/source/templates/presnt/lang/lt/prs-strategy.otp
new file mode 100644
index ..7a0a5b645289
Binary files /dev/null and 
b/extras/source/templates/presnt/lang/lt/prs-strategy.otp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   37 
 desktop/source/lib/init.cxx |   23 +
 include/LibreOfficeKit/LibreOfficeKit.h |   10 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   29 +
 4 files changed, 99 insertions(+)

New commits:
commit 36beb79184e5f4153c8cc92b176b21b697594228
Author: Tor Lillqvist 
AuthorDate: Mon Dec 10 16:12:08 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 10 21:39:03 2018 +0100

Add a localisation API to LibreOfficeKitClass

Combines the LanguageTag::Create() and Translate::get() functionality.

Also add an ABI test for the Kit class in the LibreOfficeKit unit
test, and a test for the translation function.

(In this branch there is no Translate::nget() so no such
functionality.)

Change-Id: I78c48a8bbb434d6f204869290822830288022a53
Reviewed-on: https://gerrit.libreoffice.org/64894
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 2b571921738c..7a5756e5ed35 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -117,6 +118,7 @@ public:
 void testCommentsImpress();
 void testCommentsCallbacksWriter();
 void testRunMacro();
+void testTranslate();
 void testExtractParameter();
 void testGetSignatureState_NonSigned();
 void testGetSignatureState_Signed();
@@ -164,6 +166,7 @@ public:
 CPPUNIT_TEST(testCommentsImpress);
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
+CPPUNIT_TEST(testTranslate);
 CPPUNIT_TEST(testExtractParameter);
 CPPUNIT_TEST(testGetSignatureState_Signed);
 CPPUNIT_TEST(testGetSignatureState_NonSigned);
@@ -2218,6 +2221,20 @@ void DesktopLOKTest::testRunMacro()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void DesktopLOKTest::testTranslate()
+{
+comphelper::LibreOfficeKit::setActive();
+
+LibLibreOffice_Impl aOffice;
+
+// Try translating to a non-existent locale, should return the English 
string
+char *translated = aOffice.m_pOfficeClass->translateGet(&aOffice, 
STR_DESCRIPTION_FACTORY_WRITER, "svt", "foo");
+CPPUNIT_ASSERT_EQUAL(0, strcmp(translated, "Text Document"));
+free(translated);
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 void DesktopLOKTest::testExtractParameter()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -2462,6 +2479,11 @@ void DesktopLOKTest::testInsertCertificatePEM()
 
 namespace {
 
+size_t classOffset(int i)
+{
+return sizeof(static_cast(nullptr)->nSize) + 
i * sizeof(void*);
+}
+
 size_t documentClassOffset(int i)
 {
 return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
@@ -2472,6 +2494,21 @@ size_t documentClassOffset(int i)
 void DesktopLOKTest::testABI()
 {
 // STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
+
+CPPUNIT_ASSERT_EQUAL(classOffset(0), offsetof(struct _LibreOfficeKitClass, 
destroy));
+CPPUNIT_ASSERT_EQUAL(classOffset(1), offsetof(struct _LibreOfficeKitClass, 
documentLoad));
+CPPUNIT_ASSERT_EQUAL(classOffset(2), offsetof(struct _LibreOfficeKitClass, 
getError));
+CPPUNIT_ASSERT_EQUAL(classOffset(3), offsetof(struct _LibreOfficeKitClass, 
documentLoadWithOptions));
+CPPUNIT_ASSERT_EQUAL(classOffset(4), offsetof(struct _LibreOfficeKitClass, 
freeError));
+CPPUNIT_ASSERT_EQUAL(classOffset(5), offsetof(struct _LibreOfficeKitClass, 
registerCallback));
+CPPUNIT_ASSERT_EQUAL(classOffset(6), offsetof(struct _LibreOfficeKitClass, 
getFilterTypes));
+CPPUNIT_ASSERT_EQUAL(classOffset(7), offsetof(struct _LibreOfficeKitClass, 
setOptionalFeatures));
+CPPUNIT_ASSERT_EQUAL(classOffset(8), offsetof(struct _LibreOfficeKitClass, 
setDocumentPassword));
+CPPUNIT_ASSERT_EQUAL(classOffset(9), offsetof(struct _LibreOfficeKitClass, 
getVersionInfo));
+CPPUNIT_ASSERT_EQUAL(classOffset(10), offsetof(struct 
_LibreOfficeKitClass, runMacro));
+CPPUNIT_ASSERT_EQUAL(classOffset(11), offsetof(struct 
_LibreOfficeKitClass, translateGet));
+CPPUNIT_ASSERT_EQUAL(classOffset(12), offsetof(struct 
_LibreOfficeKitClass, translateNGet));
+
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 42a06ce2be6c..2bb9ba95b3fd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1423,6 +1423,8 @@ static void
lo_setDocumentPassword(LibreOfficeKit* pThis,
const cha

[Libreoffice-commits] online.git: 2 commits - ios/Mobile

[Libreoffice Gerrit user]

 ios/Mobile/AppDelegate.h   |5 ++---
 ios/Mobile/AppDelegate.mm  |   14 +++---
 ios/Mobile/Document.mm |   12 ++--
 ios/Mobile/TemplateCollectionViewController.h  |1 +
 ios/Mobile/TemplateCollectionViewController.mm |   23 +--
 5 files changed, 33 insertions(+), 22 deletions(-)

New commits:
commit 8f1ed481452d7a69204ce69c9f838402349839d5
Author: Tor Lillqvist 
AuthorDate: Mon Dec 10 19:48:15 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 10 22:41:55 2018 +0200

Use the new LibreOfficeKit API to localise the template category headers

Change-Id: Icc91138cbe5de290103a746c8797e647259d5009

diff --git a/ios/Mobile/TemplateCollectionViewController.h 
b/ios/Mobile/TemplateCollectionViewController.h
index 50861a599..0668de966 100644
--- a/ios/Mobile/TemplateCollectionViewController.h
+++ b/ios/Mobile/TemplateCollectionViewController.h
@@ -12,6 +12,7 @@
 
 @interface TemplateCollectionViewController : 
UICollectionViewController
 {
 NSArray *templates[3];
+LibreOfficeKit *kit;
 }
 
 @property (copy) void (^ _Nullable importHandler)(NSURL * _Nullable, 
UIDocumentBrowserImportMode);
diff --git a/ios/Mobile/TemplateCollectionViewController.mm 
b/ios/Mobile/TemplateCollectionViewController.mm
index 94a922825..cdb6de60d 100644
--- a/ios/Mobile/TemplateCollectionViewController.mm
+++ b/ios/Mobile/TemplateCollectionViewController.mm
@@ -6,9 +6,12 @@
 // 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/.
 
+#import "svtools/strings.hrc"
+
 #import 
 #import 
 
+#import "AppDelegate.h"
 #import "TemplateCollectionViewController.h"
 #import "TemplateSectionHeaderView.h"
 
@@ -30,7 +33,9 @@ static NSString *mapTemplateExtensionToActual(NSString 
*templateName) {
 
 - (void)viewDidLoad {
 
-// Here we should scan for available templates.
+kit = lok_init_2(nullptr, nullptr);
+
+// Scan for available templates.
 
 templates[0] = [[NSBundle mainBundle] 
URLsForResourcesWithExtension:@".ott" subdirectory:@"Templates"];
 templates[1] = [[NSBundle mainBundle] 
URLsForResourcesWithExtension:@".ots" subdirectory:@"Templates"];
@@ -88,12 +93,20 @@ static NSString *mapTemplateExtensionToActual(NSString 
*templateName) {
 
 TemplateSectionHeaderView *header = [collectionView 
dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader 
withReuseIdentifier:@"SectionHeaderView" forIndexPath:indexPath];
 
+char *translatedHeader;
+
 if (index == 0)
-header.title.text = @"Document";
+translatedHeader = kit->pClass->translateGet(kit, 
STR_DESCRIPTION_FACTORY_WRITER, "svt", [app_locale UTF8String]);
 else if (index == 1)
-header.title.text = @"Spreadsheet";
+translatedHeader = kit->pClass->translateGet(kit, 
STR_DESCRIPTION_FACTORY_CALC, "svt", [app_locale UTF8String]);
 else if (index == 2)
-header.title.text = @"Presentation";
+translatedHeader = kit->pClass->translateGet(kit, 
STR_DESCRIPTION_FACTORY_IMPRESS, "svt", [app_locale UTF8String]);
+else
+abort();
+
+header.title.text = [NSString stringWithUTF8String:translatedHeader];
+
+free(translatedHeader);
 
 return header;
 }
@@ -107,12 +120,10 @@ static NSString *mapTemplateExtensionToActual(NSString 
*templateName) {
 
 // Load the template into LibreOffice core, save as the corresponding 
document type (with the
 // same basename), and then proceed to edit that.
-LibreOfficeKit *kit = lok_init_2(nullptr, nullptr);
 kit->pClass->registerCallback(kit, [](int, const char *, void*){}, 
nullptr);
 LibreOfficeKitDocument *doc = kit->pClass->documentLoad(kit, 
[[selectedTemplate absoluteString] UTF8String]);
 doc->pClass->saveAs(doc, [[newURL absoluteString] UTF8String], nullptr, 
nullptr);
 doc->pClass->destroy(doc);
-kit->pClass->destroy(kit);
 
 self.importHandler(newURL, UIDocumentBrowserImportModeMove);
 
commit c65f3e43a10f63aed735ee54b4ddab49a2679834
Author: Tor Lillqvist 
AuthorDate: Mon Dec 10 19:46:52 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 10 22:41:55 2018 +0200

Fetch the locale already in the AppDelegate's didFinishLaunchingWithOptions

It will be needed by code that runs before the Document object is
created.

Change-Id: I5c4646e08c670b88b6d3a4d38450cc80e11ec402

diff --git a/ios/Mobile/AppDelegate.h b/ios/Mobile/AppDelegate.h
index b373e8759..cc6d4a629 100644
--- a/ios/Mobile/AppDelegate.h
+++ b/ios/Mobile/AppDelegate.h
@@ -8,14 +8,13 @@
 
 #import 
 
-//#define LOK_USE_UNSTABLE_API
-//#import 
-
 @interface AppDelegate : UIResponder 
 
 @property (strong, nonatomic) UIWindow *window;
 
 @end
 
+extern NSString *app_locale;
+
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
 
diff --git a/ios/Mobile/AppDelegate.mm b/ios/Mobile/AppDelegate.mm
index 50d4b7

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

[Libreoffice Gerrit user]

 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc54afe74f6010f133ca94f7342d19da87d363f1
Author: Rene Engelhard 
AuthorDate: Mon Dec 10 21:57:55 2018 +0100
Commit: Rene Engelhard 
CommitDate: Mon Dec 10 21:59:36 2018 +0100

fix cut and paste error in new example in JdbcLongVarCharTest.java

Change-Id: I91e568896b1674e97cdf18eacc21538093765bd9

diff --git a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java 
b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
index 73f6ca2d5116..3817add48da6 100644
--- a/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
+++ b/connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java
@@ -60,7 +60,7 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 /* Get URL from environment variable.
 *
 * Example URL:
-* jdbc:mysql://localhost:3306/mysql?user=username?password=password
+* jdbc:mysql://localhost:3306/mysql?user=username&password=password
 */
 String url = System.getenv("CONNECTIVITY_TEST_MYSQL_DRIVER_JDBC");
 com.sun.star.beans.PropertyValue prop[] = new PropertyValue[1];
@@ -122,4 +122,4 @@ public class JdbcLongVarCharTest extends ComplexTestCase
 System.exit(0);
 }
 }
-}
\ No newline at end of file
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 dev/null |binary
 1 file changed

New commits:
commit 83e582be807e3c87b4855d840dbc9e8ae2f1e40a
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 14:45:20 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 22:04:14 2018 +0100

remove bmps which were changed to pngs

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

diff --git a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_1.bmp
deleted file mode 100644
index aa7cb4940d1d..
Binary files a/extras/source/templates/wizard/bitmap/FormWizard_1.bmp and 
/dev/null differ
diff --git a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp 
b/extras/source/templates/wizard/bitmap/FormWizard_2.bmp
deleted file mode 100644
index 347c8c36e52b..
Binary files a/extras/source/templates/wizard/bitmap/FormWizard_2.bmp and 
/dev/null differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/charmap.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 280a204b8230e2ea5626844e72f2d315cdecb931
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 14:06:09 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 22:03:50 2018 +0100

Resolves: tdf#121946 first time draw uses gray bg

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

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index ed525834a709..db400f99c9a2 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -623,6 +623,7 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& 
rRenderContext)
 if (mbUpdateBackground)
 {
 rRenderContext.SetBackground(rStyleSettings.GetWindowColor());
+rRenderContext.Erase();
 mbUpdateBackground = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/dialog/charmap.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f477d24127aacc849757f245a9bbd8a4c8561a6d
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 14:06:09 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 22:04:01 2018 +0100

Resolves: tdf#121946 first time draw uses gray bg

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

diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 0d8a869a63d6..81ecf1f30320 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -624,6 +624,7 @@ void SvxShowCharSet::InitSettings(vcl::RenderContext& 
rRenderContext)
 if (mbUpdateBackground)
 {
 rRenderContext.SetBackground(rStyleSettings.GetWindowColor());
+rRenderContext.Erase();
 mbUpdateBackground = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source extras/source

[Libreoffice Gerrit user]

 cui/source/tabpages/page.src  |   93 +-
 extras/source/templates/layout/lang/lt/lyt-aqua.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-blackandwhite.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-bluegrey.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-bluelinesgrad.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-bluetitledown.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-book.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-brown.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-charglow.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-forest.otp |binary
 extras/source/templates/layout/lang/lt/lyt-frepa.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-glacier.otp|binary
 extras/source/templates/layout/lang/lt/lyt-greengradlines.otp |binary
 extras/source/templates/layout/lang/lt/lyt-keyboard.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-movwaves.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-numdark.otp|binary
 extras/source/templates/layout/lang/lt/lyt-ocean.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-organic.otp|binary
 extras/source/templates/layout/lang/lt/lyt-paper.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-rededges.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-roundedrect.otp|binary
 extras/source/templates/layout/lang/lt/lyt-sunrise.otp|binary
 extras/source/templates/layout/lang/lt/lyt-techpoly.otp   |binary
 extras/source/templates/layout/lang/lt/lyt-tunnel.otp |binary
 extras/source/templates/layout/lang/lt/lyt-water.otp  |binary
 extras/source/templates/layout/lang/lt/lyt-wine.otp   |binary
 26 files changed, 47 insertions(+), 46 deletions(-)

New commits:
commit 4bda1394bafa8757f77bff4281632da9226256d7
Author: Matthias Seidel 
AuthorDate: Mon Dec 10 19:57:29 2018 +
Commit: Matthias Seidel 
CommitDate: Mon Dec 10 19:57:29 2018 +

Cleaned up resource file

diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 65a1f1fc7022..e9f15ff7013b 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -21,7 +21,7 @@
 
 
 
- // include ---
+// include ---
 
 #include 
 #include "helpid.hrc"
@@ -29,7 +29,7 @@
 #include "page.h"
 #include 
 
- // RID_SVXPAGE_PAGE --
+// RID_SVXPAGE_PAGE --
 
 TabPage RID_SVXPAGE_PAGE
 {
@@ -46,11 +46,11 @@ TabPage RID_SVXPAGE_PAGE
 {
 Pos = MAP_APPFONT ( 12, 16 ) ;
 Size = MAP_APPFONT ( 35, 8 ) ;
-Text [ en-US ] = "~Format";
+Text [ en-US ] = "~Format" ;
 };
 ListBox LB_PAPER_SIZE
 {
-HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE";
+HelpID = "cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE" ;
 Pos = MAP_APPFONT ( 50, 14 ) ;
 Size = MAP_APPFONT ( 75, 64 ) ;
 DropDown = TRUE ;
@@ -65,7 +65,7 @@ TabPage RID_SVXPAGE_PAGE
 };
 MetricField ED_PAPER_WIDTH
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH";
+HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH" ;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 50, 30 ) ;
 Size = MAP_APPFONT ( 40, 12 ) ;
@@ -87,7 +87,7 @@ TabPage RID_SVXPAGE_PAGE
 };
 MetricField ED_PAPER_HEIGHT
 {
-HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT";
+HelpID = "cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT" ;
 Border = TRUE ;
 Pos = MAP_APPFONT ( 50, 46 ) ;
 Size = MAP_APPFONT ( 40, 12 ) ;
@@ -104,11 +104,11 @@ TabPage RID_SVXPAGE_PAGE
 {
 Pos = MAP_APPFONT ( 12, 62 ) ;
 Size = MAP_APPFONT ( 35, 8 ) ;
-Text [ en-US ] = "Orientation";
+Text [ en-US ] = "Orientation" ;
 };
 RadioButton RB_PORTRAIT
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT";
+HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT" ;
 Pos = MAP_APPFONT ( 50, 62 ) ;
 Size = MAP_APPFONT ( 53, 10 ) ;
 Check = TRUE ;
@@ -116,10 +116,10 @@ TabPage RID_SVXPAGE_PAGE
 };
 RadioButton RB_LANDSCAPE
 {
-HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE";
+HelpID = "cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE" ;
 Pos = MAP_APPFONT ( 50, 74 ) ;
 Size = MAP_APPFONT ( 53, 10 ) ;
-Text [ en-US ] = "L~andscape";
+Text [ en-US ] = "L~andscape" ;
 };
 Window WN_BSP
 {
@@ -133,11 +133,11 @@ TabPage RID_SVXPAGE_PAGE
 Size = MAP_APPFONT ( 50, 8 ) ;
 Left = TRUE ;
 Hide = TRUE ;
-

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4b/da1394bafa8757f77bff4281632da9226256d7

[Libreoffice Gerrit user]

 4b/da1394bafa8757f77bff4281632da9226256d7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit afa61bfdd37974ec0c3c564465c6f88efcfffb65
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 21:25:43 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 21:25:43 2018 +

Notes added by 'git notes add'

diff --git a/4b/da1394bafa8757f77bff4281632da9226256d7 
b/4b/da1394bafa8757f77bff4281632da9226256d7
new file mode 100644
index ..82bf4b48f38a
--- /dev/null
+++ b/4b/da1394bafa8757f77bff4281632da9226256d7
@@ -0,0 +1 @@
+prefer: 9196de99ed4dff2c1f8708bfd68da9b6424ae53b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - be/ddf238eec9fc9e40f688c9d4eb582da18501f5 bf/763c74bc1caf53f9bfa8298fb6515cf75e984e

[Libreoffice Gerrit user]

 be/ddf238eec9fc9e40f688c9d4eb582da18501f5 |1 +
 bf/763c74bc1caf53f9bfa8298fb6515cf75e984e |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 64f8ec1ba86490c10c0abfe14b9850fba0831ced
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 21:26:57 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 21:26:57 2018 +

Notes added by 'git notes add'

diff --git a/bf/763c74bc1caf53f9bfa8298fb6515cf75e984e 
b/bf/763c74bc1caf53f9bfa8298fb6515cf75e984e
new file mode 100644
index ..abc27a023bb2
--- /dev/null
+++ b/bf/763c74bc1caf53f9bfa8298fb6515cf75e984e
@@ -0,0 +1 @@
+prefer: 71c5b530111a2150a42439d2c3f67cf1ad943c91
commit 14f35cbfa7a1c536c4f2e90172d34fcf4981ac6f
Author: Caolán McNamara 
AuthorDate: Mon Dec 10 21:26:43 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 10 21:26:43 2018 +

Notes added by 'git notes add'

diff --git a/be/ddf238eec9fc9e40f688c9d4eb582da18501f5 
b/be/ddf238eec9fc9e40f688c9d4eb582da18501f5
new file mode 100644
index ..abc27a023bb2
--- /dev/null
+++ b/be/ddf238eec9fc9e40f688c9d4eb582da18501f5
@@ -0,0 +1 @@
+prefer: 71c5b530111a2150a42439d2c3f67cf1ad943c91
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Katarina Behrens]

Hello world, 

> > New crashtest update available at
> > http://dev-builds.libreoffice.org/crashtest/ce696d57c3bb9185c7a9f326a7b00b
> > 662a04c9de/

> ./instdir/program/soffice.bin --headless --convert-to xlsx ooo55266-
> 3.ods has a reproducer null deref since...

Up for review: https://gerrit.libreoffice.org/#/c/64903/

-- 
Katarina Behrens

Senior Software-Entwicklerin FLOSS
–––
CIB software GmbH
Geschäftsstelle Hamburg
Flachsland 10
22083 Hamburg
–––
T +49 (40) / 28 48 42 -235
F +49 (40) / 28 48 42 -100

katarina.behr...@cib.de
www.cib.de
–––
Sitz: München
Registergericht München, HRB 123286
Geschäftsführer: Dipl.-Ing. Ulrich Brandner


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

[Libreoffice-commits] online.git: bundled/include

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKit.h   |   10 +++
 bundled/include/LibreOfficeKit/LibreOfficeKit.hxx |   29 ++
 2 files changed, 39 insertions(+)

New commits:
commit cd389cb6b0fffa4ba1b2a8c6428252715774f09a
Author: Tor Lillqvist 
AuthorDate: Tue Dec 11 00:23:25 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Tue Dec 11 00:23:25 2018 +0200

Update from core master

Change-Id: Iae9ae1d0227a40bfc6de95557bd99210c7e437fa

diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 4dd23a2cb..68074a637 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -94,6 +94,16 @@ struct _LibreOfficeKitClass
 @since LibreOffice 6.0
  */
 int (*runMacro) (LibreOfficeKit *pThis, const char* pURL);
+
+/** @see lok::Office::translateGet().
+@since LibreOffice 6.3
+ */
+char* (*translateGet) (LibreOfficeKit *pThis, const char* pId, const char* 
pPrefixName, const char* pBcp47LanguageTag);
+
+/** @see lok::Office::translateNGet().
+@since LibreOffice 6.3
+ */
+char* (*translateNGet) (LibreOfficeKit *pThis, const char* pId, int n, 
const char* pPrefixName, const char* pBcp47LanguageTag);
 };
 
 #define LIBREOFFICEKIT_DOCUMENT_HAS(pDoc,member) 
LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitDocumentClass,member,(pDoc)->pClass->nSize)
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index 5d7771cf8..923af7136 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -791,6 +791,35 @@ public:
 {
 return mpThis->pClass->runMacro( mpThis, pURL );
 }
+
+/**
+ * Fetch translation for a string.
+ *
+ * @since LibreOffice 6.3
+ * @returns the translated string, if available
+ * @param pId the context and string, separated by a '\004' character
+ * @param pPrefixName the prefix passed to Translate::Create()
+ * @param pBcp47LanguageTag the locale into which the string should be 
translated
+ */
+char* translateGet( const char* pId, const char* pPrefixName, const char* 
pBcp47LanguageTag )
+{
+return mpThis->pClass->translateGet( mpThis, pId, pPrefixName, 
pBcp47LanguageTag );
+}
+
+/**
+ * Fetch translation for a string corresponding to a specific number of 
something.
+ *
+ * @since LibreOffice 6.3
+ * @returns the translated string, if available
+ * @param pId the context and string, separated by a '\004' character
+ * @param n the number
+ * @param pPrefixName the prefix passed to Translate::Create()
+ * @param pBcp47LanguageTag the locale into which the string should be 
translated
+ */
+char* translateNGet( const char* pId, int n, const char* pPrefixName, 
const char* pBcp47LanguageTag )
+{
+return mpThis->pClass->translateNGet( mpThis, pId, n, pPrefixName, 
pBcp47LanguageTag );
+}
 };
 
 /// Factory method to create a lok::Office instance.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui |1 +
 sc/uiconfig/scalc/ui/notebookbar_compact.ui |2 ++
 sd/uiconfig/sdraw/ui/notebookbar.ui |2 ++
 sd/uiconfig/simpress/ui/notebookbar.ui  |1 +
 4 files changed, 6 insertions(+)

New commits:
commit 34d5e910adba4094bba1303284f9552028d0b019
Author: andreas kainz 
AuthorDate: Mon Dec 10 23:18:34 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 11 00:27:46 2018 +0100

tdf#121677 missing item name check for updates

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 2fc30b8453b6..f4efe6df47f9 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -623,6 +623,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
index a65b903df599..ac6e9c0f97d9 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui
@@ -854,6 +854,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
@@ -1674,6 +1675,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 0fabfc3526d4..bf497332dac1 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -608,6 +608,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
@@ -1793,6 +1794,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 1471d568cd34..07f3136682ec 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -608,6 +608,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
+_Check for Updates...
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'meta/config'

[Libreoffice Gerrit user]

New branch 'meta/config' available with the following commits:
commit 9ee0a647e126054b73594bfc70ddb05d42f03aa8
Author: Thorsten Behrens 
Date:   Mon Dec 10 13:45:00 2018 +0100

Permit merge commits on distro branches

Change-Id: I602e3080b7acacb5921290c85f9806f13262d560

commit b0da13ca0918fbe7d138cac4ff9b0d3d55d45011
Author: Norbert Thiebaud 
Date:   Fri Oct 30 03:13:31 2015 +

Modify access rules

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

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

[Libreoffice Gerrit user]

 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx   |2 +-
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |4 ++--
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b8b2a7b85653aed203603f00287654cc62a053d7
Author: Eike Rathke 
AuthorDate: Sat Dec 8 18:19:12 2018 +0100
Commit: Markus Mohrhard 
CommitDate: Tue Dec 11 01:33:33 2018 +0100

Resolves: tdf#80583 create range list string with proper delimiter

... which is the to be used function parameter separator here. The
current document's grammar (from which the separator is obtained
in ScRangeList::Format() if not specified) may differ from the
forced English grammar later when compiling the formula, and all
formula expressions to be inserted use the language independent
';' semicolon function parameter separator.

Change-Id: I7a3deb6d50fc57ed434ede1f00bbe8c5c1361e0f
Reviewed-on: https://gerrit.libreoffice.org/64819
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 470a91cb041782e29664212d096bb16873ba57a0)
Reviewed-on: https://gerrit.libreoffice.org/64824
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 89d65f96128edf3055aaa5cebdaf78d893d01187)
Reviewed-on: https://gerrit.libreoffice.org/64853
Reviewed-by: Dennis Francis 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 
b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
index 66672b095831..c31fc9fb4c09 100644
--- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx
@@ -334,7 +334,7 @@ void 
ScAnalysisOfVarianceDialog::AnovaSingleFactor(AddressWalkerWriter& output,
 
 // Sum of Squares
 aTemplate.setTemplate("=DEVSQ(%RANGE_LIST%)");
-aTemplate.applyRangeList("%RANGE_LIST%", aRangeList);
+aTemplate.applyRangeList("%RANGE_LIST%", aRangeList, ';');
 output.writeFormula(aTemplate.getTemplate());
 output.nextColumn();
 
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx 
b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index 5200e541a8f5..b774f0525789 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -66,10 +66,10 @@ void FormulaTemplate::applyRange(const OUString& aVariable, 
const ScRange& aRang
 mTemplate = mTemplate.replaceAll(aVariable, aString);
 }
 
-void FormulaTemplate::applyRangeList(const OUString& aVariable, const 
ScRangeList& aRangeList)
+void FormulaTemplate::applyRangeList(const OUString& aVariable, const 
ScRangeList& aRangeList, sal_Unicode cDelimiter)
 {
 OUString aString;
-aRangeList.Format(aString, ScRefFlags::RANGE_ABS_3D, mpDoc, 
mpDoc->GetAddressConvention());
+aRangeList.Format(aString, ScRefFlags::RANGE_ABS_3D, mpDoc, 
mpDoc->GetAddressConvention(), cDelimiter);
 mTemplate = mTemplate.replaceAll(aVariable, aString);
 }
 
diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx 
b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
index 9c00bf31e351..578d39665168 100644
--- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
+++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
@@ -46,7 +46,7 @@ public:
 void  autoReplaceUses3D(bool bUse3D) { mbUse3D = bUse3D; }
 
 void  applyRange(const OUString& aVariable, const ScRange& aRange, 
bool b3D = true);
-void  applyRangeList(const OUString& aVariable, const ScRangeList& 
aRangeList);
+void  applyRangeList(const OUString& aVariable, const ScRangeList& 
aRangeList, sal_Unicode cDelimiter );
 void  applyAddress(const OUString& aVariable, const ScAddress& 
aAddress, bool b3D = true);
 void  applyString(const OUString& aVariable, const OUString& aValue);
 void  applyNumber(const OUString& aVariable, sal_Int32 aValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'meta/config' - 0 commits -

[Libreoffice Gerrit user]

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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 10 commits - jurt/source libreofficekit/qa rsc/source sal/osl sal/rtl sc/qa sc/source sfx2/source stoc/source vcl/unx

[Libreoffice Gerrit user]

 jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection.c |4 
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |4 
 rsc/source/rscpp/cpp1.c |3 
 rsc/source/rscpp/cpp2.c |1 
 rsc/source/rscpp/cpp4.c |3 
 rsc/source/rscpp/cpp5.c |1 
 rsc/source/rscpp/cpp6.c |2 
 sal/osl/unx/file_volume.cxx |9 +
 sal/rtl/alloc_arena.cxx |7 +
 sc/qa/unit/subsequent_export-test.cxx   |   59 
--
 sc/qa/unit/subsequent_filters-test.cxx  |   28 
 sc/source/filter/xml/xmlimprt.cxx   |   21 +++
 sfx2/source/doc/new.cxx |2 
 sfx2/source/doc/objcont.cxx |2 
 stoc/source/security/permissions.cxx|2 
 vcl/unx/generic/app/saldisp.cxx |2 
 16 files changed, 107 insertions(+), 43 deletions(-)

New commits:
commit cf0434852ea379754affb04d302757c7b16ab90c
Author: Thorsten Behrens 
AuthorDate: Tue Dec 11 01:53:36 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 11 01:53:36 2018 +0100

-Werror=deprecated-declarations (GCC 7)

Change-Id: I99d3250c30c6279cbeedfa2d0a91a9f41031892b

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 8a3099ebd8ad..eb6b9e0d236d 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -29,6 +29,10 @@
 #define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
 #endif
 
+#if defined __GNUC__ && __GNUC__ >= 7
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 static int help()
 {
 fprintf(stderr, "Usage: gtktiledviewer 
  
[ ... ]\n\n");
commit af4c3d361a091f9608f31f0b2c1c266ad0641f89
Author: Stephan Bergmann 
AuthorDate: Fri Jan 27 15:46:47 2017 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 11 01:51:44 2018 +0100

-Werror=int-in-bool-context (GCC 7)

Change-Id: I69f31a94f3e57b3488c576f8d8e0569f459a2117

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 673c9f01a0f2..7585db5e7c96 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -73,7 +73,7 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& 
rRenderContext, const Rect
 rRenderContext.DrawRect(Rectangle(Point(0,0), 
rRenderContext.GetOutputSize()));
 
 Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1, 1);
-DBG_ASSERT(aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, 
override GetFirstPageSize or set vis-area!");
+DBG_ASSERT(aTmpSize.Height() != 0 && aTmpSize.Width() != 0, "size of first 
page is 0, override GetFirstPageSize or set vis-area!");
 
 #define FRAME 4
 
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 7219e3fbefd8..a8ff890844c2 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -151,7 +151,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool 
bFullContent ) const
 }
 
 xFile->SetPrefSize( aTmpSize );
-DBG_ASSERT( aTmpSize.Height()*aTmpSize.Width(),
+DBG_ASSERT( aTmpSize.Height() != 0 && aTmpSize.Width() != 0,
 "size of first page is 0, override GetFirstPageSize or set vis-area!" 
);
 
 xFile->Record( pDevice );
commit 2d354c31b22175ac4d56551d4c123ab45208b4ab
Author: Stephan Bergmann 
AuthorDate: Wed May 3 10:12:45 2017 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Dec 11 01:48:21 2018 +0100

Work around GCC 7 mis-feature

 "Poor support to 
silence
-Wformat-truncation=1"

Change-Id: I486f8a3a12896df3d9506f53bca44a318e23c991

diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 654cd2f1dbfa..b18a55fc1a97 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -669,6 +669,10 @@ rtl_arena_destructor (void * obj)
 
 /** rtl_arena_activate()
  */
+#if defined __GNUC__ && __GNUC__ >= 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
 rtl_arena_type *
 rtl_arena_activate (
 rtl_arena_type *   arena,
@@ -716,6 +720,9 @@ rtl_arena_activate (
 {
 size = i * arena->m_quantum;
 (void) snprintf (namebuf, sizeof(namebuf), "%s_%" 
SAL_PRIuUINTPTR, arena->m_name, size);
+#if defined __GNUC__ && __GNUC__ >= 7
+#pragma GCC diagnostic pop
+#endif
 arena->m_qcache_ptr[i - 1] = rtl_cache_create(namebuf, size, 
0, nullptr, nullptr, nullptr, null

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

[Libreoffice Gerrit user]

 compilerplugins/clang/useuniqueptr.cxx  |   11 ++-
 vcl/inc/svdata.hxx  |2 
 vcl/source/app/svapp.cxx|   16 +---
 vcl/source/app/svdata.cxx   |1 
 vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx |   71 
 vcl/source/bitmap/BitmapEmbossGreyFilter.cxx|8 +-
 vcl/source/bitmap/BitmapMedianFilter.cxx|   47 +
 vcl/source/bitmap/BitmapMosaicFilter.cxx|7 -
 vcl/source/bitmap/BitmapPopArtFilter.cxx|   57 +++-
 vcl/source/bitmap/BitmapSobelGreyFilter.cxx |8 +-
 vcl/source/bitmap/bitmap.cxx|   21 ++---
 vcl/source/gdi/bitmapex.cxx |8 +-
 vcl/source/gdi/impvect.cxx  |   37 --
 vcl/source/gdi/pdfwriter_impl.cxx   |6 -
 vcl/source/gdi/print.cxx|   24 ++
 15 files changed, 142 insertions(+), 182 deletions(-)

New commits:
commit 1cd32bcf1b92bd53320717626601135623dadd55
Author: Noel Grandin 
AuthorDate: Mon Dec 10 11:28:59 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 11 06:26:48 2018 +0100

loplugin:useuniqueptr in vcl

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

diff --git a/compilerplugins/clang/useuniqueptr.cxx 
b/compilerplugins/clang/useuniqueptr.cxx
index 1f0f9d649317..71f842bde07e 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -477,14 +477,15 @@ void UseUniquePtr::CheckDeleteLocalVar(const 
FunctionDecl* functionDecl, const C
 // linked list
 if (parentName == "ScFunctionList" || parentName == "SwNodes"
 || parentName == "SwUnoCursor" || parentName == "SortedResultSet"
-|| parentName == "Atom")
+|| parentName == "Atom" || parentName == "RegionBand" || parentName == 
"WMFWriter"
+|| parentName == "Scheduler" || parentName == "OpenGLContext")
 return;
 // manual ref counting
 if (parentName == "ScBroadcastAreaSlot")
 return;
 // complicated
 if (parentName == "SwFormatField" || parentName == "FontPropertyBox" || 
parentName == "SdFontPropertyBox"
-|| parentName == "SwHTMLParser")
+|| parentName == "SwHTMLParser" || parentName == "PDFWriterImpl")
 return;
 
 if (functionDecl->getIdentifier())
@@ -516,6 +517,12 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* 
functionDecl, const C
 // very dodgy
 if (name == "UCBStorage::OpenStorage_Impl")
 return;
+// complicated ownership
+if (name == "ParseCMAP" || name == "OpenGLSalBitmap::CreateTexture" || 
name == "X11SalGraphicsImpl::drawAlphaBitmap")
+return;
+// complicated delete
+if (name == "X11SalObject::CreateObject")
+return;
 }
 
 report(
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 208e180ceeba..beb877f728ff 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -191,7 +191,7 @@ struct ImplSVGDIData
 OpenGLContext*  mpLastContext = nullptr;// Last 
OpenGLContext
 VclPtr mpFirstPrinter; // First Printer
 VclPtr mpLastPrinter;  // Last Printer
-ImplPrnQueueList*   mpPrinterQueueList = nullptr;   // List of all 
printer queue
+std::unique_ptr mpPrinterQueueList;   // List of all 
printer queue
 std::shared_ptr mxScreenFontList; // 
Screen-Font-List
 std::shared_ptr mxScreenFontCache;   // 
Screen-Font-Cache
 ImplDirectFontSubstitution* mpDirectFontSubst = nullptr; // 
Font-Substitutions defined in Tools->Options->Fonts
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 41a342635437..c73769ebcc8a 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -813,19 +813,17 @@ ImplSVEvent * Application::PostKeyEvent( VclEventId 
nEvent, vcl::Window *pWin, K
 
 if( pWin && pKeyEvent )
 {
-ImplPostEventData* pPostEventData = new ImplPostEventData( nEvent, 
pWin, *pKeyEvent );
+std::unique_ptr pPostEventData(new 
ImplPostEventData( nEvent, pWin, *pKeyEvent ));
 
 nEventId = PostUserEvent(
LINK( nullptr, Application, PostEventHandler ),
-   pPostEventData );
+   pPostEventData.get() );
 
 if( nEventId )
 {
 pPostEventData->mnEventId = nEventId;
-ImplGetSVData()->maAppData.maPostedEventList.emplace_back( pWin, 
pPostEventData );
+ImplGetSVData()->maAppData.maPostedEventList.emplace_back( pWin, 
pPostEventData.release() );
 }
-else
-delete pPostEventData;
 }
 
 return nEventId;
@@ -846,19 +844,17 @@ ImplSVE

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

[Libreoffice Gerrit user]

 svtools/source/contnr/imivctl.hxx  |   52 +---
 svtools/source/contnr/imivctl1.cxx |  114 ++---
 svtools/source/contnr/imivctl2.cxx |   20 +++---
 svtools/source/contnr/ivctrl.cxx   |2 
 4 files changed, 61 insertions(+), 127 deletions(-)

New commits:
commit 9955770183ce3239dc2a074a8aa344233cab
Author: Noel Grandin 
AuthorDate: Mon Dec 10 14:13:24 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 11 07:33:08 2018 +0100

loplugin:useuniqueptr in SvxIconChoiceCtrl_Impl

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

diff --git a/svtools/source/contnr/imivctl.hxx 
b/svtools/source/contnr/imivctl.hxx
index b02ab4539b07..b0a8530787bd 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -97,45 +97,6 @@ struct LocalFocus
 };
 
 
-// Entry-List
-
-class EntryList_Impl
-{
-private:
-std::vector< SvxIconChoiceCtrlEntry* > maIconChoiceCtrlEntryList;
-SvxIconChoiceCtrl_Impl* _pOwner;
-
-public:
-explicit EntryList_Impl( SvxIconChoiceCtrl_Impl* );
-~EntryList_Impl();
-
-voidclear();
-
-size_t  size()
-{
-return maIconChoiceCtrlEntryList.size();
-}
-size_t  size() const
-{
-return maIconChoiceCtrlEntryList.size();
-}
-
-SvxIconChoiceCtrlEntry* operator[]( size_t nPos )
-{
-return  ( nPos < 
maIconChoiceCtrlEntryList.size() )
-? maIconChoiceCtrlEntryList[ nPos ]
-: nullptr;
-}
-SvxIconChoiceCtrlEntry* operator[]( size_t nPos ) const
-{
-return  ( nPos < 
maIconChoiceCtrlEntryList.size() )
-? maIconChoiceCtrlEntryList[ nPos ]
-: nullptr;
-}
-voidinsert( size_t nPos, SvxIconChoiceCtrlEntry* 
pEntry );
-};
-
-
 // Implementation-class of IconChoiceCtrl
 
 
@@ -145,11 +106,10 @@ typedef std::vector 
SvxIconChoiceCtrlEntryPtrVec;
 class SvxIconChoiceCtrl_Impl
 {
 friend class IcnCursor_Impl;
-friend class EntryList_Impl;
 friend class IcnGridMap_Impl;
 
 boolbChooseWithCursor;
-EntryList_Impl  aEntries;
+std::vector< std::unique_ptr > maEntries;
 VclPtr   aVerSBar;
 VclPtr   aHorSBar;
 VclPtraScrBarBox;
@@ -177,7 +137,7 @@ class SvxIconChoiceCtrl_Impl
 ImplSVEvent *   nUserEventAdjustScrBars;
 SvxIconChoiceCtrlEntry* pCurHighlightFrame;
 boolbHighlightFramePressed;
-SvxIconChoiceCtrlEntry* pHead;  // top left entry
+SvxIconChoiceCtrlEntry* pHead = nullptr;// top left entry
 SvxIconChoiceCtrlEntry* pCursor;
 SvxIconChoiceCtrlEntry* pHdlEntry;
 VclPtr   pDDDev;
@@ -302,7 +262,7 @@ public:
 voidClear( bool bInCtor );
 voidSetStyle( WinBits nWinStyle );
 WinBits GetStyle() const { return nWinBits; }
-voidInsertEntry( SvxIconChoiceCtrlEntry*, size_t nPos );
+voidInsertEntry( std::unique_ptr, 
size_t nPos );
 voidCreateAutoMnemonics( MnemonicGenerator* _pGenerator );
 voidFontModified();
 voidSelectAll();
@@ -421,14 +381,14 @@ public:
 SvxIconChoiceCtrlEntry* pEntry
 );
 #endif
-size_t  GetEntryCount() const { return aEntries.size(); }
+size_t  GetEntryCount() const { return maEntries.size(); }
 SvxIconChoiceCtrlEntry* GetEntry( size_t nPos )
 {
-return aEntries[ nPos ];
+return maEntries[ nPos ].get();
 }
 SvxIconChoiceCtrlEntry* GetEntry( size_t nPos ) const
 {
-return aEntries[ nPos ];
+return maEntries[ nPos ].get();
 }
 SvxIconChoiceCtrlEntry* GetFirstSelectedEntry() const;
 voidSetSelectionMode( SelectionMode eMode ) { 
eSelectionMode=eMode; }
diff --git a/svtools/source/contnr/imivctl1.cxx 
b/svtools/source/contnr/imivctl1.cxx
index ca8f3a124611..8c867d5d2904 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -56,7 +56,6 @@ Sv

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

[Libreoffice Gerrit user]

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7263d223ddf42cc39d10a501159c7b04ef48df96
Author: Mike Kaganski 
AuthorDate: Tue Dec 11 07:08:20 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Dec 11 08:17:34 2018 +0100

tdf#121685: also apply DeclareDPIAware manifest to console applications

There's no reason not to; and now soffice.bin itself is built as a console
application.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 327d2ae54542..18db567bfc50 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -190,7 +190,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then 
rm -f $(1); exit 42; fi) \
$(if $(filter Library,$(TARGETTYPE)),&& if [ -f 
$(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest 
$(WORKDIR)/LinkTarget/$(2).manifest 
$(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest 
-outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest 
$(ILIBTARGET); fi) \
$(if $(filter Executable,$(TARGETTYPE)),&& if [ -f 
$(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest 
$(WORKDIR)/LinkTarget/$(2).manifest 
$(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest 
-outputresource:$(1)\;1 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest; 
fi) \
-   $(if $(filter YES,$(TARGETGUI)),&& mt.exe $(MTFLAGS) -nologo -manifest 
$(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest 
-updateresource:$(1)\;1 ) \
+   $(if $(filter Executable,$(TARGETTYPE)),&& mt.exe $(MTFLAGS) -nologo 
-manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest 
-updateresource:$(1)\;1 ) \
$(if $(filter Library,$(TARGETTYPE)),&& \
echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && 
\
$(if $(filter 
YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   74 ++--
 vcl/win/gdi/gdiimpl.hxx |3 +
 2 files changed, 44 insertions(+), 33 deletions(-)

New commits:
commit 216cbcec6b0361986593e49837f8420e84032d6f
Author: Dmitriy Shilin 
AuthorDate: Sun Dec 9 16:57:23 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Dec 11 08:44:58 2018 +0100

tdf#107792 vcl: simplify SetLineColor()

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

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 72f2f58e524a..2200dbda000a 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -1361,50 +1361,58 @@ void WinSalGraphicsImpl::SetLineColor()
 mbStockPen  = TRUE;
 }
 
-void WinSalGraphicsImpl::SetLineColor( Color nColor )
+void WinSalGraphicsImpl::SetLineColor(Color nColor)
 {
+COLORREF nPenColor = PALETTERGB(nColor.GetRed(),
+nColor.GetGreen(),
+nColor.GetBlue());
+bool bStockPen = false;
+
+HPEN hNewPen = SearchStockPen(nPenColor);
+if (hNewPen)
+bStockPen = true;
+else
+hNewPen = MakePen(nColor, nPenColor);
+
+ResetPen(hNewPen);
+
+// set new data
+mnPenColor  = nPenColor;
 maLineColor = nColor;
-COLORREFnPenColor = PALETTERGB( nColor.GetRed(),
-nColor.GetGreen(),
-nColor.GetBlue() );
-HPENhNewPen = nullptr;
-boolbStockPen = FALSE;
+mbPen   = TRUE;
+mbStockPen  = bStockPen;
+}
 
-// search for stock pen (only screen, because printer have problems,
-// when we use stock objects)
-if ( !mrParent.isPrinter() )
+HPEN WinSalGraphicsImpl::SearchStockPen(COLORREF nPenColor)
+{
+// Only screen, because printer has problems, when we use stock objects.
+if (mrParent.isPrinter())
 {
-SalData* pSalData = GetSalData();
-for ( sal_uInt16 i = 0; i < pSalData->mnStockPenCount; i++ )
-{
-if ( nPenColor == pSalData->maStockPenColorAry[i] )
-{
-hNewPen = pSalData->mhStockPenAry[i];
-bStockPen = TRUE;
-break;
-}
-}
+return nullptr;
 }
 
-// create new pen
-if ( !hNewPen )
+const SalData* pSalData = GetSalData();
+
+for (sal_uInt16 i = 0; i < pSalData->mnStockPenCount; i++)
 {
-if ( !mrParent.isPrinter() )
+if (nPenColor == pSalData->maStockPenColorAry[i])
+return pSalData->mhStockPenAry[i];
+}
+
+return nullptr;
+}
+
+HPEN WinSalGraphicsImpl::MakePen(Color nColor, COLORREF nPenColor)
+{
+if (!mrParent.isPrinter())
+{
+if (GetSalData()->mhDitherPal && ImplIsSysColorEntry(nColor))
 {
-if ( GetSalData()->mhDitherPal && ImplIsSysColorEntry( nColor ) )
-nPenColor = PALRGB_TO_RGB( nPenColor );
+nPenColor = PALRGB_TO_RGB(nPenColor);
 }
-
-hNewPen = CreatePen( PS_SOLID, mrParent.mnPenWidth, nPenColor );
-bStockPen = FALSE;
 }
 
-ResetPen(hNewPen);
-
-// set new data
-mnPenColor  = nPenColor;
-mbPen   = TRUE;
-mbStockPen  = bStockPen;
+return CreatePen(PS_SOLID, mrParent.mnPenWidth, nPenColor);
 }
 
 void WinSalGraphicsImpl::ResetPen(HPEN hNewPen)
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 3673b0ca5055..24c904f9ab54 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -52,7 +52,10 @@ private:
 bool tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& 
rSrcBitmap);
 void drawPixelImpl( long nX, long nY, COLORREF crColor );
 
+HPEN SearchStockPen(COLORREF nPenColor);
+HPEN MakePen(Color nColor, COLORREF nPenColor);
 void ResetPen(HPEN hNewPen);
+
 void ResetBrush(HBRUSH hNewBrush);
 public:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 icon-themes/breeze/cmd/lc_scriptorganizer.png  |binary
 icon-themes/breeze/cmd/sc_scriptorganizer.png  |binary
 icon-themes/breeze_dark/cmd/lc_scriptorganizer.png |binary
 icon-themes/breeze_dark/cmd/sc_scriptorganizer.png |binary
 icon-themes/breeze_svg/cmd/lc_scriptorganizer.svg  |6 ++
 icon-themes/breeze_svg/cmd/sc_scriptorganizer.svg  |7 +++
 icon-themes/sifr/cmd/lc_scriptorganizer.png|binary
 icon-themes/sifr/cmd/sc_scriptorganizer.png|binary
 icon-themes/sifr_dark/cmd/lc_scriptorganizer.png   |binary
 icon-themes/sifr_dark/cmd/sc_scriptorganizer.png   |binary
 10 files changed, 13 insertions(+)

New commits:
commit 0c2d0f3197490c5b1dfd374eec7382263f0a6b38
Author: andreas kainz 
AuthorDate: Tue Dec 11 00:12:13 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 11 08:57:43 2018 +0100

tdf#121581 add scriptorganizer icon to breeze and sifr

now scriptorganizer icon is available in all icon themes

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

diff --git a/icon-themes/breeze/cmd/lc_scriptorganizer.png 
b/icon-themes/breeze/cmd/lc_scriptorganizer.png
new file mode 100644
index ..49cae024b0d5
Binary files /dev/null and b/icon-themes/breeze/cmd/lc_scriptorganizer.png 
differ
diff --git a/icon-themes/breeze/cmd/sc_scriptorganizer.png 
b/icon-themes/breeze/cmd/sc_scriptorganizer.png
new file mode 100644
index ..7f8d14018948
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_scriptorganizer.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_scriptorganizer.png 
b/icon-themes/breeze_dark/cmd/lc_scriptorganizer.png
new file mode 100644
index ..5a3d1ff0642e
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_scriptorganizer.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/sc_scriptorganizer.png 
b/icon-themes/breeze_dark/cmd/sc_scriptorganizer.png
new file mode 100644
index ..cdaf0a323f2b
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_scriptorganizer.png 
differ
diff --git a/icon-themes/breeze_svg/cmd/lc_scriptorganizer.svg 
b/icon-themes/breeze_svg/cmd/lc_scriptorganizer.svg
new file mode 100644
index ..855047a13a35
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/lc_scriptorganizer.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ 
+ 
diff --git a/icon-themes/breeze_svg/cmd/sc_scriptorganizer.svg 
b/icon-themes/breeze_svg/cmd/sc_scriptorganizer.svg
new file mode 100644
index ..8ba8eb07eb70
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/sc_scriptorganizer.svg
@@ -0,0 +1,7 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 16 16">
+ />
+ 
+ 
diff --git a/icon-themes/sifr/cmd/lc_scriptorganizer.png 
b/icon-themes/sifr/cmd/lc_scriptorganizer.png
new file mode 100644
index ..d2d25406072f
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_scriptorganizer.png differ
diff --git a/icon-themes/sifr/cmd/sc_scriptorganizer.png 
b/icon-themes/sifr/cmd/sc_scriptorganizer.png
new file mode 100644
index ..173b26a5edf1
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_scriptorganizer.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_scriptorganizer.png 
b/icon-themes/sifr_dark/cmd/lc_scriptorganizer.png
new file mode 100644
index ..6983aa5cb1b8
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_scriptorganizer.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/sc_scriptorganizer.png 
b/icon-themes/sifr_dark/cmd/sc_scriptorganizer.png
new file mode 100644
index ..ca4bb8d07180
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_scriptorganizer.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/notebookbar.ui |   57 +-
 1 file changed, 23 insertions(+), 34 deletions(-)

New commits:
commit d11dcb1b5810585b90cd6a678e081652b31e3bac
Author: andreas kainz 
AuthorDate: Tue Dec 11 00:28:43 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 11 08:58:37 2018 +0100

tdf#121898 add toggle numbered list command in home tab of writer

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

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 847a01b4fa65..fb64b7fbe871 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3362,23 +3362,10 @@
   
 
 
-  
+  
 True
 False
-.uno:SetOutline
-  
-  
-False
-True
-  
-
-
-  
-True
-False
-center
-True
-.uno:IncrementIndent
+.uno:DefaultNumbering
   
   
 False
@@ -3386,12 +3373,10 @@
   
 
 
-  
+  
 True
 False
-center
-True
-.uno:DecrementIndent
+.uno:SetOutline
   
   
 False
@@ -3427,12 +3412,25 @@
 icons
 False
 
-  
+  
 True
 False
 center
 True
-.uno:BackgroundColor
+.uno:IncrementIndent
+  
+  
+False
+True
+  
+
+
+  
+True
+False
+center
+True
+.uno:DecrementIndent
   
   
 False
@@ -3592,21 +3590,12 @@
   
 
 
-  
-True
-False
-.uno:ParaspaceIncrease
-  
-  
-False
-True
-  
-
-
-  
+  
 True
 False
-.uno:ParaspaceDecrease
+center
+True
+.uno:BackgroundColor
   
   
 False
_