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

[Andras Timar (via logerrit)]

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 06:57 +

co-6.0-32

Changes since co-6.0-24:
Andras Timar (1):
  tdf#123500 double '~' character in translation

---
 source/fr/officecfg/registry/data/org/openoffice/Office/UI.po |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/co-6.0-32'

[Andras Timar (via logerrit)]

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 06:57 +

co-6.0-32

Changes since cp-6.0-19:
Andras Timar (1):
  remove executable bit from *.aff and *.dic files

---
 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/co-6.0-32'

[Andras Timar (via logerrit)]

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 06:57 +

co-6.0-32

Changes since cp-6.0-31-62:
---
 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/co-6.0-32'

[Adolfo Jayme Barrientos (via logerrit)]

Tag 'co-6.0-32' created by Andras Timar  at 
2019-06-05 06:57 +

co-6.0-32

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: Branch 'distro/collabora/cp-6.0' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 74217d6f8fa85bcdde36545553a732db1cae4ff8
Author: Andras Timar 
AuthorDate: Wed Jun 5 08:55:22 2019 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 5 08:55:56 2019 +0200

Bump version to 6.0-32

Change-Id: Ic1eeb36584144785f1ec5c502140ea0405020cac

diff --git a/configure.ac b/configure.ac
index 29661fe7749f..c90fe5e14c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.0.10.31],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.0.10.32],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 3ced4cd5f31dfca8198ab583cebe487ef1f2a809
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 08:13:47 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 08:14:14 2019 +0300

Accept also iOS SDK 13.0

Change-Id: Ibbc731f998b00a0ea1235a961290746a849f81cf

diff --git a/configure.ac b/configure.ac
index 2122bf97d41c..37f9b6ff62e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2982,7 +2982,7 @@ dnl 
===
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
 current_sdk_ver=12.2
-older_sdk_vers="12.1 12.0 11.4"
+older_sdk_vers="13.0 12.1 12.0 11.4"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=11.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/source/component/GroupManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff22834795711df14e8ad20c503afc2598884880
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:26 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jun 5 07:09:39 2019 +0200

Fix typo

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

diff --git a/forms/source/component/GroupManager.cxx 
b/forms/source/component/GroupManager.cxx
index 35fd716a47a2..a98cceb075d5 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -270,7 +270,7 @@ void SAL_CALL OGroupManager::propertyChange(const 
PropertyChangeEvent& evt)
 else if (evt.PropertyName == PROPERTY_GROUP_NAME) {
 evt.OldValue >>= sGroupName;
 if (sGroupName.isEmpty()) {
-// No prior GroupName; fallback to Nme
+// No prior GroupName; fallback to Name
 xSet->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/source/component/EventThread.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f97f545dd9764e0861be07c204029cadbdfcf76
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:28 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jun 5 07:08:56 2019 +0200

Fix typo

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

diff --git a/forms/source/component/EventThread.hxx 
b/forms/source/component/EventThread.hxx
index 363bf94acc6e..eb3062080d73 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -68,7 +68,7 @@ protected:
 
 // Edit an Event:
 // The mutex is not locked, but pCompImpl stays valid in any case.
-// pEvt can be a derrived type, namely the one that cloneEvent returns.
+// pEvt can be a derived type, namely the one that cloneEvent returns.
 // rControl is only set, if a Control has been passed in addEvent.
 // Because the Control is only held as a WeakRef, it can disappear in the 
meantime.
 virtual void processEvent( ::cppu::OComponentHelper* _pCompImpl,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/source/component/FormattedField.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f26419865d5f3c772264d3efe655116745ebbbd
Author: Andrea Gelmini 
AuthorDate: Tue May 14 21:23:27 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jun 5 07:07:59 2019 +0200

Fix typo

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

diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index 171387dbc026..0e5d7f157d56 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -514,7 +514,7 @@ void OFormattedModel::loaded(const EventObject& rEvent)
 {
 // HACK: our onConnectedDbColumn accesses our NumberFormatter which locks 
the solar mutex (as it doesn't have
 // an own one). To prevent deadlocks with other threads which may request 
a property from us in an
-// UI-triggered action (e.g. an tooltip) we lock the solar mutex _here_ 
before our base class locks
+// UI-triggered action (e.g. a tooltip) we lock the solar mutex _here_ 
before our base class locks
 // its own mutex (which is used for property requests)
 // alternative a): we use two mutexes, one which is passed to the 
OPropertysetHelper and used for
 // property requests and one for our own code. This would need a lot of 
code rewriting
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sfx2/source/dialog/tabdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b89a6da298502e5b0d48ba36d22c4d8448b6a2cf
Author: Andrea Gelmini 
AuthorDate: Tue Jun 4 15:03:32 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jun 5 07:07:20 2019 +0200

Fix typo

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

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index f75b78a1a9f7..9cc1161769ff 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -862,7 +862,7 @@ void SfxTabDialogController::SavePosAndId()
 }
 
 /*
-Adds a page to the dialog. The Name must correspond to a entry in the
+Adds a page to the dialog. The Name must correspond to an entry in the
 TabControl in the dialog .ui
 */
 void SfxTabDialogController::AddTabPage(const OString &rName /* Page ID */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 0 files changed

New commits:
commit 0ec8233fe9c210e999f1b8db48e8b645e1029eeb
Author: Andrea Gelmini 
AuthorDate: Tue Jun 4 20:26:41 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jun 5 07:06:52 2019 +0200

Removed executable permission on file

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf125657.docx 
b/sw/qa/extras/ooxmlexport/data/tdf125657.docx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - configure.ac extensions/source fpicker/source sd/Library_sd.mk sfx2/source sw/Module_sw.mk vcl/osx

[Tor Lillqvist (via logerrit)]

 configure.ac  |   21 +++---
 extensions/source/macosx/spotlight/OOoContentDataParser.m |2 -
 extensions/source/macosx/spotlight/OOoMetaDataParser.m|2 -
 fpicker/source/aqua/SalAquaFilePicker.mm  |2 -
 sd/Library_sd.mk  |5 ++-
 sfx2/source/appl/shutdowniconaqua.mm  |4 +-
 sw/Module_sw.mk   |4 ++
 vcl/osx/salframe.cxx  |5 ---
 8 files changed, 30 insertions(+), 15 deletions(-)

New commits:
commit 1d47a33d8874ea28e054c873d7c0c712be9dda78
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 07:13:18 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 07:44:57 2019 +0300

CppunitTest_sw_uiwriter always fails on my Retina iMac, so skip on macOS

Change-Id: I95ee6786a7a7ac0e8c62b634c8de3c25bd68bb70

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c6a0c5f4fa0f..644649206b1f 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -94,7 +94,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_odfexport \
 CppunitTest_sw_odfimport \
 CppunitTest_sw_txtexport \
-CppunitTest_sw_uiwriter \
+$(if $(filter-out MACOSX,$(OS)), \
+CppunitTest_sw_uiwriter \
+) \
 CppunitTest_sw_layoutwriter \
 CppunitTest_sw_mailmerge \
 CppunitTest_sw_globalfilter \
commit 1e95c8dd006147f7a94e24135396277ee2f469b8
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 02:06:00 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 07:44:57 2019 +0300

The Bluetooth code doesn't compile with macOS SDK 10.15

Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324

diff --git a/configure.ac b/configure.ac
index f03615124aa4..2122bf97d41c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10354,6 +10354,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 ENABLE_SDREMOTE=TRUE
 AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
 
+if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+# The Bluetooth code doesn't compile with macOS SDK 10.15
+enable_sdremote_bluetooth=no
+fi
 # If not explicitly enabled or disabled, default
 if test -z "$enable_sdremote_bluetooth"; then
 case "$OS" in
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a38184c07673..85953e285575 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -517,6 +517,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/OSXNetworkService \
 ))
 
+$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
+   Foundation \
+))
+
 else # OS!=MACSOX
 
 ifeq ($(ENABLE_AVAHI),TRUE)
@@ -565,7 +569,6 @@ $(eval $(call gb_Library_add_libs,sd,\
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
-   Foundation \
IOBluetooth \
 ))
 
commit c6ab40a2dd25d94786bda82aed85f086f00f050b
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 01:19:13 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 07:44:56 2019 +0300

-[NSWindow setRestorable:] is present since 10.7

No need to use objc_msgSend().

Change-Id: I56c824e3206c37be4b60fb7d82b65c9d5e89958b

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 761f7898d6ad..2a60c8d85f81 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -224,10 +224,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
 [mpNSWindow setDelegate: static_cast >(mpNSWindow)];
 
-if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
-{
-objc_msgSend(mpNSWindow, @selector(setRestorable:), NO);
-}
+[mpNSWindow setRestorable:NO];
 const NSRect aRect = { NSZeroPoint, NSMakeSize( maGeometry.nWidth, 
maGeometry.nHeight )};
 mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView 
userData: nil assumeInside: NO];
 
commit 4d3628ca769ce07c93e8c4629075eeb7c8dc317e
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 01:17:56 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 07:44:56 2019 +0300

The macOS SDK 10.15 has a tighter declaration of objc_msgSend()

Change-Id: I51734b92965a9fa1f06aa18017d39b4b0d532456

diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m 
b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index 89d92a8c126a..d3ecf16ffaab 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -52,7 +52,7 @@
 // So instead of this:
 // [parser setDelegate:self];
 // do this:
-objc_msgSend(parser, @selector(setDelegate:), self);
+((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), 
self);
 
 [parser setShouldResolveExternalEntities:NO];
 [parser parse];
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - solenv/bin

[Tor Lillqvist (via logerrit)]

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

New commits:
commit f0b9b1305fd77990e0cc3015b0d5b38fe501bbf1
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:58:20 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 06:39:09 2019 +0200

Add css_comp_Impress_oox_PowerPointExport

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9160dece3961..aa3a03d3fd20 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -391,6 +391,8 @@ draw_constructor_list = [
 
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
 # sd/util/sdd.component
 "com_sun_star_comp_draw_FormatDetector_get_implementation",
+# sd/util/sdfilt.component
+"css_comp_Impress_oox_PowerPointExport",
 # writerperfect/source/draw/wpftdraw.component
 "com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
 ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source

[Tor Lillqvist (via logerrit)]

 vcl/source/filter/graphicfilter.cxx |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 36d1d9c826b6a4a82cd4c99aabfe000c5ba89153
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:20:45 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jun 5 06:38:49 2019 +0200

Fix "external" graphic filter code for the DISABLE_DYNLOADING case

The DISABLE_DYNLOADING case in ImpFilterLibCacheEntry::GetImportFunction()
had apparently been broken from the start, but nobody never noticed as
the common formats (PNG, JPEG, GIF etc) use a more "internal"code
path. The problem was noticed now with a TIFF image in a presentation.

The fix for the import case seems to work, but I could not test the
fix for the export case.

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

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 1307f31817bf..61c38ec51067 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -721,27 +721,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
 else if (maFormatName == "iti")
 mpfnImport = 
reinterpret_cast(maLibrary.getFunctionSymbol("itiGraphicImport"));
  #else
-if (maFiltername ==  "icd")
+if (maFormatName ==  "icd")
 mpfnImport = icdGraphicImport;
-else if (maFiltername ==  "idx")
+else if (maFormatName ==  "idx")
 mpfnImport = idxGraphicImport;
-else if (maFiltername ==  "ime")
+else if (maFormatName ==  "ime")
 mpfnImport = imeGraphicImport;
-else if (maFiltername ==  "ipb")
+else if (maFormatName ==  "ipb")
 mpfnImport = ipbGraphicImport;
-else if (maFiltername ==  "ipd")
+else if (maFormatName ==  "ipd")
 mpfnImport = ipdGraphicImport;
-else if (maFiltername ==  "ips")
+else if (maFormatName ==  "ips")
 mpfnImport = ipsGraphicImport;
-else if (maFiltername ==  "ipt")
+else if (maFormatName ==  "ipt")
 mpfnImport = iptGraphicImport;
-else if (maFiltername ==  "ipx")
+else if (maFormatName ==  "ipx")
 mpfnImport = ipxGraphicImport;
-else if (maFiltername ==  "ira")
+else if (maFormatName ==  "ira")
 mpfnImport = iraGraphicImport;
-else if (maFiltername ==  "itg")
+else if (maFormatName ==  "itg")
 mpfnImport = itgGraphicImport;
-else if (maFiltername ==  "iti")
+else if (maFormatName ==  "iti")
 mpfnImport = itiGraphicImport;
  #endif
 }
@@ -1893,9 +1893,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
 
 FilterConfigItem aConfigItem( pFilterData );
 OUString aFilterName( pConfig->GetExportFilterName( nFormat ) );
-#ifndef DISABLE_DYNLOADING
 OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, 
true));
-#endif
 ErrCode nStatus = ERRCODE_NONE;
 GraphicType eType;
 Graphic aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem );
@@ -2187,11 +2185,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
  #else
 --nIdx; // Just one iteration
 PFilterCall pFunc = NULL;
-if (aFilterName == "egi")
+if (aExternalFilterName == "egi")
 pFunc = egiGraphicExport;
-else if (aFilterName == "eps")
+else if (aExternalFilterName == "eps")
 pFunc = epsGraphicExport;
-else if (aFilterName == "eti")
+else if (aExternalFilterName == "eti")
 pFunc = etiGraphicExport;
  #endif
 if( pFunc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Jay Bingham (via logerrit)]

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

New commits:
commit c30ea50dd2b1c557dfbefc1a4c660fbf2402a604
Author: Jay Bingham 
AuthorDate: Mon Jun 3 13:59:33 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 5 00:58:43 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Refactor RegExp Help page with improved contents

1) Mute some l10n strings

Change-Id: Ia7a2c1898491c0f0352c9c8df519bba057b3bab6
Reviewed-on: https://gerrit.libreoffice.org/73408
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 9a0f4fb18ab7..41a83520a0f8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9a0f4fb18ab7832dbafb4b789279411f5aa8cecd
+Subproject commit 41a83520a0f8a1a84619324291d3b1c1e2a2ee15
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jay Bingham (via logerrit)]

 source/text/shared/01/0211.xhp |  257 -
 1 file changed, 167 insertions(+), 90 deletions(-)

New commits:
commit 41a83520a0f8a1a84619324291d3b1c1e2a2ee15
Author: Jay Bingham 
AuthorDate: Mon Jun 3 13:59:33 2019 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 5 00:58:43 2019 +0200

Refactor RegExp Help page with improved contents

1) Mute some l10n strings

Change-Id: Ia7a2c1898491c0f0352c9c8df519bba057b3bab6
Reviewed-on: https://gerrit.libreoffice.org/73408
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index b4d037dd5..1f4b2dc77 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -27,6 +27,11 @@
 
 
 regular expressions; list of
+regular expressions; new line
+regular expressions; empty paragraph
+regular expressions; begin of word
+regular expressions; begin of paragraph
+regular expressions; end of paragraph
 lists; regular expressions
 replacing; tab stops (regular expressions)
 tab stops; regular expressions
@@ -37,10 +42,10 @@
 
   
 
-  Character
+  Term
 
 
-  Result/Use
+  Representation/Use
 
   
   
@@ -48,96 +53,100 @@
   Any 
character
 
 
-  Represents the given character unless otherwise 
specified.
+The given character unless it is a regular expression meta 
character, which follow in this table.
 
   
   
 
-  .
+  .
 
 
-  Represents any single character except for a line break or 
paragraph break. For example, the search term "sh.rt" returns both "shirt" and 
"short".
+Any 
single character except a line break or a paragraph break. For example, the 
search term "sh.rt" matches both "shirt" and "short".
 
   
   
 
-^
+^
 
 
-  Only 
finds the search term if the term is at the beginning of a paragraph. Special 
objects such as empty fields or character-anchored frames, at the beginning of 
a paragraph are ignored. Example: "^Peter".
+The 
beginning of a paragraph or cell. Special objects such as empty fields or 
character-anchored frames, at the beginning of a paragraph are ignored. 
Example: "^Peter" matches the word "Peter" only when it is the first word of a 
paragraph.
+
 
   
   
 
-$
+$
 
 
-  Only 
finds the search term if the term appears at the end of a paragraph. Special 
objects such as empty fields or character-anchored frames at the end of a 
paragraph are ignored. Example: "Peter$".
+The 
end of a paragraph or cell. Special objects such as empty fields or 
character-anchored frames at the end of a paragraph are ignored. Example: 
"Peter$" matches only when the word "Peter" is the last word of a paragraph, 
note "Peter" cannot be followed by a period.
   $ on 
its own matches the end of a paragraph. This way it is possible to search and 
replace paragraph breaks.
 
   
   
 
-*
+*
 
 
-  Finds 
zero or more of the characters in front of the "*". For example, "Ab*c" finds 
"Ac", "Abc", "Abbc", "Abbbc", and so on.
+Zero or more of the regular expression term immediately 
preceding it. For example, "Ab*c" matches "Ac", "Abc", "Abbc", "Abbbc", and so 
on.
+
 
   
   
 
-+
++
 
 
-  Finds 
one or more of the characters in front of the "+". For example, "AX.+4" finds 
"AXx4", but not "AX4".
-  The 
longest possible string that matches this search pattern in a paragraph is 
always found. If the paragraph contains the string "AX 4 AX4", the entire 
passage is highlighted.
+One 
or more of the regular expression term immediately preceding it. For example, 
"AX.+4" finds "AXx4", but not "AX4".
+The 
longest possible string that matches this regular expression in a paragraph is 
always matched. If the paragraph contains the string "AX 4 AX4", the entire 
passage is highlighted.
 
   
   
 
-?
+?
 
 
-  Finds 
zero or one of the characters in front of the "?". For example, "Texts?" finds 
"Text" and "Texts" and "x(ab|c)?y" finds "xy", "xaby", or "xcy".
+Zero or one of the regular expression term immediately 
preceding it. For example, "Texts?" matches "Text" and "Texts" and "x(ab|c)?y" 
finds "xy", "xaby", or "xcy".
 
   
   
 
-\
+\
 
 
-  Search interprets the special character that follows the 
"\" as a normal character and not as a regular expression (except for the 
combinations \n, \t, \>, and \<). For example, "tree\." finds "tree.", 
not "treed" or "trees".
+The 
special character that follows it is interpreted as a normal character and not 
as a regular expression meta character (except for the combinations "\n", "\t", 
"\b", "\>" and "\<"). For example, "tree\." matches "tree.", not "treed"

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 13 commits - brand/cib configure.ac desktop/source download.lst external/curl icon-themes/cib instsetoo_native/inc_common instseto

[Marina Latini (CIB) (via logerrit)]

Rebased ref, commits from common ancestor:
commit 4e61eb25cc3013ce7b48f2eafc7784bf880b9395
Author: Marina Latini (CIB) 
AuthorDate: Mon May 20 15:18:34 2019 +0200
Commit: Katarina Behrens 
CommitDate: Tue Jun 4 16:23:01 2019 +0200

Final CIB branding and last edits to config files

Change-Id: Id583453910f50839dbe1f114afc5c6a4aa6c2e07

diff --git a/brand/cib/Image.svg b/brand/cib/Image.svg
new file mode 100644
index ..369941585b61
--- /dev/null
+++ b/brand/cib/Image.svg
@@ -0,0 +1,306 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 162 312"
+   xml:space="preserve"
+   id="svg3336"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="Image.svg"
+   width="162"
+   height="312"
+   
inkscape:export-filename="C:\cygwin\home\Marina\lode\dev\FLOSS-194\instsetoo_native\inc_common\windows\msi_templates\Binary\ImageBanner.bmp.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+
+   .st0{display:none;}
+   .st1{display:inline;}
+   .st2{fill:#5FA243;}
+   .st3{fill:#FF;}
+   .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF;}
+   .st5{fill:#C12521;}
+   .st6{clip-path:url(#SVGID_2_);fill:#FF;}
+   .st7{display:inline;fill:#5FA243;}
+   .st8{display:inline;fill:#C12521;}
+   .st9{display:inline;fill:#FF;}
+   .st10{clip-path:url(#SVGID_4_);fill:#FF;}
+   .st11{font-family:'CIBUnit';}
+   .st12{font-size:17px;}
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   powered
 by
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/brand/cib/banner.svg b/brand/cib/banner.svg
new file mode 100644
index ..9b03d38ea183
--- /dev/null
+++ b/brand/cib/banner.svg
@@ -0,0 +1,306 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 499 58"
+   xml:space="preserve"
+   id="svg3336"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="banner.svg"
+   width="499"
+   height="58"
+   
inkscape:export-filename="C:\cygwin\home\Marina\lode\dev\FLOSS-194\brand\cib\intro-highres.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage"; 
/>
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+  .cls-1 {
+fill: #961e29;
+  }
+
+  .cls-2 {
+fill: #fff;
+  }
+
+
+   .st0{display:none;}
+   .st1{display:inline;}
+   .st2{fill:#5FA243;}
+   .st3{fill:#FF;}
+   .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FF;}
+   .st5{fill:#C12521;}
+   .st6{clip-path:url(#SVGID_2_);fill:#FF;}
+   .st7{display:inline;fill:#5FA243;}
+   .st8{display:inline;fill:#C12521;}
+   .st9{display:inline;fill:#FF;}
+   .st10{clip-path:url(#SVGID_4_);fill:#FF;}
+   .st11{font-family:'CIBUnit';}
+   .st12{font-size:17px;}
+
+
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - default_images/sfx2

[Matthias Seidel (via logerrit)]

 dev/null |binary
 1 file changed

New commits:
commit 2e0153f530d6c23649e01ca7a1f1e12a5093e1e5
Author: Matthias Seidel 
AuthorDate: Tue Jun 4 21:56:10 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 4 21:56:10 2019 +

Remove unused animated graphics (StarDivision logo?)

diff --git a/default_images/sfx2/res/an01.png b/default_images/sfx2/res/an01.png
deleted file mode 100644
index b9dfc058c0a2..
Binary files a/default_images/sfx2/res/an01.png and /dev/null differ
diff --git a/default_images/sfx2/res/an02.png b/default_images/sfx2/res/an02.png
deleted file mode 100644
index 752ec39bf8e9..
Binary files a/default_images/sfx2/res/an02.png and /dev/null differ
diff --git a/default_images/sfx2/res/an03.png b/default_images/sfx2/res/an03.png
deleted file mode 100644
index ce195e595fb6..
Binary files a/default_images/sfx2/res/an03.png and /dev/null differ
diff --git a/default_images/sfx2/res/an04.png b/default_images/sfx2/res/an04.png
deleted file mode 100644
index 8c0de0f47493..
Binary files a/default_images/sfx2/res/an04.png and /dev/null differ
diff --git a/default_images/sfx2/res/an05.png b/default_images/sfx2/res/an05.png
deleted file mode 100644
index b61b012b0a17..
Binary files a/default_images/sfx2/res/an05.png and /dev/null differ
diff --git a/default_images/sfx2/res/an06.png b/default_images/sfx2/res/an06.png
deleted file mode 100644
index b72d8ba80608..
Binary files a/default_images/sfx2/res/an06.png 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: Branch 'libreoffice-6-3' - sw/qa sw/source

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf125657.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   25 +
 sw/source/filter/ww8/docxattributeoutput.cxx |8 
 3 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 66a5ab79b0a67e67ce196557ae4e768460807d98
Author: Mike Kaganski 
AuthorDate: Tue Jun 4 17:08:04 2019 +1000
Commit: Mike Kaganski 
CommitDate: Tue Jun 4 23:31:35 2019 +0200

tdf#125657: restore conversion of a:srcRect attributes to integers

Regression from commit 1fe24bb1e2fbe44a4bf2c03297e259b3a18b1235

Change-Id: I5597fe6a7f7c54ad9bf2634eba5245e2e4a1efbf
Reviewed-on: https://gerrit.libreoffice.org/73430
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 166aafde5b716dfeb5325e7d1bee1c163ab56b12)
Reviewed-on: https://gerrit.libreoffice.org/73452

diff --git a/sw/qa/extras/ooxmlexport/data/tdf125657.docx 
b/sw/qa/extras/ooxmlexport/data/tdf125657.docx
new file mode 100755
index ..eeaad7a4bb3d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf125657.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index edbc0964685d..804d25b9612e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -323,6 +323,31 @@ DECLARE_OOXMLIMPORT_TEST(testTdf121784, "tdf121784.docx")
 CPPUNIT_ASSERT_EQUAL( OUString( "i" ), getRun( getParagraph( 2 ), 3 
)->getString());
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125657, "tdf125657.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+auto checkAttrIsInt = [&](const OString& sAttrName) {
+OUString sAttr = getXPath(pXmlDoc,
+  
"/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:inline/a:graphic/"
+  
"a:graphicData/pic:pic/pic:blipFill/a:srcRect",
+  sAttrName);
+OString sAssertMsg("Attribute " + sAttrName + " value " + 
sAttr.toUtf8()
+   + " is not a valid integer");
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), !sAttr.isEmpty());
+// Only decimal characters allowed, optionally prepended with '-'; no 
'.'
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(),
+   sAttr[0] == '-' || (sAttr[0] >= '0' && sAttr[0] 
<= '9'));
+for (sal_Int32 i = 1; i < sAttr.getLength(); ++i)
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[i] >= '0' && 
sAttr[i] <= '9');
+};
+// check that we export all coordinates of srcRect as integers
+checkAttrIsInt("l");
+checkAttrIsInt("t");
+checkAttrIsInt("r");
+checkAttrIsInt("b");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6e7fa0632e0d..472649c7585a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4668,10 +4668,10 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj, const SwFrameFo
 double  widthMultiplier  = 10.0/aOriginalSize.Width();
 double  heightMultiplier = 10.0/aOriginalSize.Height();
 
-double left   = nCropL * widthMultiplier;
-double right  = nCropR * widthMultiplier;
-double top= nCropT * heightMultiplier;
-double bottom = nCropB * heightMultiplier;
+sal_Int32 left   = static_cast(rtl::math::round(nCropL * 
widthMultiplier));
+sal_Int32 right  = static_cast(rtl::math::round(nCropR * 
widthMultiplier));
+sal_Int32 top= static_cast(rtl::math::round(nCropT * 
heightMultiplier));
+sal_Int32 bottom = static_cast(rtl::math::round(nCropB * 
heightMultiplier));
 
 m_pSerializer->singleElementNS( XML_a, XML_srcRect,
  XML_l, OString::number(left),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 88194, which changed state.

Bug 88194 Summary: freeze when paste into lots of cells (cell with comment)
https://bugs.documentfoundation.org/show_bug.cgi?id=88194

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Regina Henschel (via logerrit)]

 sw/qa/extras/ww8export/data/tdf118375_240degClockwise.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   23 ++
 sw/source/filter/ww8/wrtw8esh.cxx |   30 ++
 sw/source/filter/ww8/ww8graf.cxx  |   11 +
 4 files changed, 64 insertions(+)

New commits:
commit 4977bf684097247d7121a43d6d3e9374684b0d07
Author: Regina Henschel 
AuthorDate: Tue Apr 2 21:36:57 2019 +0200
Commit: Aron Budea 
CommitDate: Tue Jun 4 22:55:20 2019 +0200

tdf#118375, tdf#70838 correct position of rotated shape in doc

Word relates the position to the unrotated shape in legacy doc
format. Writer uses the rotated shape. The patch corrects the
difference on import and export.

Reviewed-on: https://gerrit.libreoffice.org/70152
Tested-by: Jenkins
Reviewed-by: Regina Henschel 
(cherry picked from commit 421e6fc3cd2e6fe37afbef341e2d0ad7b8edde37)

Change-Id: I25537123656e62d6ffae5118ee8d621a4b5c5be0

diff --git a/sw/qa/extras/ww8export/data/tdf118375_240degClockwise.doc 
b/sw/qa/extras/ww8export/data/tdf118375_240degClockwise.doc
new file mode 100644
index ..99d15e20cea5
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf118375_240degClockwise.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 84f9e2f2d6cf..32b4197452b1 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -106,6 +106,29 @@ DECLARE_WW8EXPORT_TEST(testTdf94009_zeroPgMargin, 
"tdf94009_zeroPgMargin.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(defaultStyle, 
"TopMargin"));
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf118375export, "tdf118375_240degClockwise.doc")
+{
+// The input document has one custom shape, which is rotated 240deg. Check
+// that it has the same position as in Word.
+uno::Reference xDrawPagesSupplier(mxComponent,
+   
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", 
xDrawPagesSupplier.is());
+uno::Reference 
xDrawPages(xDrawPagesSupplier->getDrawPages());
+uno::Reference xDrawPage(xDrawPages->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("Could not get xDrawPage", xDrawPage.is());
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get xShape", xShape.is());
+uno::Reference xShapeProps(xShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT_MESSAGE("Could not get the shape properties", 
xShapeProps.is());
+sal_Int32 nPosX, nPosY;
+xShapeProps->getPropertyValue("HoriOrientPosition") >>= nPosX;
+xShapeProps->getPropertyValue("VertOrientPosition") >>= nPosY;
+// Allow some tolerance because rounding errors through integer arithmethic
+// in rotation.
+CPPUNIT_ASSERT_DOUBLES_EQUAL(5200.0, static_cast(nPosX), 1.0);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1152.0, static_cast(nPosY), 1.0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 0ae92a2aec2d..e1655946c80c 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -663,6 +663,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
 WinwordAnchoring::ConvertPosition( rHOr, rVOr, rFormat );
 
 Point aObjPos;
+bool bHasHeightWidthSwapped(false);
 if (RES_FLYFRMFMT == rFormat.Which())
 {
 SwRect aLayRect(rFormat.FindLayoutRect(false, &aObjPos));
@@ -698,6 +699,7 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
 const long nHeight = aRect.getHeight();
 aRect.setWidth( nHeight );
 aRect.setHeight( nWidth );
+bHasHeightWidthSwapped = true;
 }
 }
 }
@@ -759,6 +761,34 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
 //Nasty swap for bidi if necessary
 rWrt.MiserableRTLFrameFormatHack(nLeft, nRight, rFrameFormat);
 
+// tdf#70838. Word relates the position to the unrotated rectangle,
+// Writer to the rotated one. Because the rotation is around 
center,
+// the difference counts half.
+if(pObj && pObj->GetRotateAngle())
+{
+SwTwips nXOff;
+SwTwips nYOff;
+SwTwips nSnapWidth = pObj->GetSnapRect().getWidth();
+SwTwips nSnapHeight = pObj->GetSnapRect().getHeight();
+SwTwips nLogicWidth = pObj->GetLogicRect().getWidth();
+SwTwips nLogicHeight = pObj->GetLogicRect().getHeight();
+// +1 for to compensate integer arithmetic rounding errors
+if(bHas

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source cui/uiconfig

[Caolán McNamara (via logerrit)]

 cui/source/inc/optlingu.hxx  |   41 +--
 cui/source/options/optlingu.cxx  |  432 ---
 cui/uiconfig/ui/editmodulesdialog.ui |  103 +++-
 3 files changed, 269 insertions(+), 307 deletions(-)

New commits:
commit 2ca64f0f29970616b3b4c3833d473f72e7d702a2
Author: Caolán McNamara 
AuthorDate: Sun Jun 2 20:46:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 4 22:18:39 2019 +0200

weld SvxEditModulesDlg

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

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 77e016d0b154..8478f9bc45e0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -50,18 +50,8 @@ class SvxLinguData_Impl;
 
 // forward ---
 
-class SvxEditModulesDlg : public ModalDialog
+class SvxEditModulesDlg : public weld::GenericDialogController
 {
-VclPtr m_pLanguageLB;
-
-VclPtrm_pModulesCLB;
-VclPtr m_pPrioUpPB;
-VclPtr m_pPrioDownPB;
-VclPtr m_pBackPB;
-VclPtr m_pMoreDictsLink;
-
-VclPtrm_pClosePB;
-
 OUStringsSpell;
 OUStringsHyph;
 OUStringsThes;
@@ -70,23 +60,26 @@ class SvxEditModulesDlg : public ModalDialog
 std::unique_ptr  pDefaultLinguData;
 SvxLinguData_Impl&  rLinguData;
 
-std::unique_ptr   m_xCheckButtonData;
-
-SvTreeListEntry*CreateEntry(OUString& rTxt, sal_uInt16 nCol);
+std::unique_ptr m_xModulesCLB;
+std::unique_ptr m_xPrioUpPB;
+std::unique_ptr m_xPrioDownPB;
+std::unique_ptr m_xBackPB;
+std::unique_ptr m_xMoreDictsLink;
+std::unique_ptr m_xClosePB;
+std::unique_ptr m_xLanguageLB;
 
-DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void );
-DECL_LINK( UpDownHdl_Impl, Button*, void );
-DECL_LINK( ClickHdl_Impl, Button*, void );
-DECL_LINK( BackHdl_Impl, Button*, void );
-DECL_LINK( LangSelectListBoxHdl_Impl, ListBox&, void );
-DECL_LINK( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void );
-DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
-void LangSelectHdl_Impl(ListBox const *);
+DECL_LINK( SelectHdl_Impl, weld::TreeView&, void );
+DECL_LINK( UpDownHdl_Impl, weld::Button&, void );
+DECL_LINK( ClickHdl_Impl, weld::Button&, void );
+DECL_LINK( BackHdl_Impl, weld::Button&, void );
+DECL_LINK( LangSelectListBoxHdl_Impl, weld::ComboBox&, void );
+typedef std::pair row_col;
+DECL_LINK( BoxCheckButtonHdl_Impl, const row_col&, void );
+void LangSelectHdl_Impl(const LanguageBox* pBox);
 
 public:
-SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData);
+SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& rData);
 virtual ~SvxEditModulesDlg() override;
-virtual void dispose() override;
 };
 
 // class SvxLinguTabPage -
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5be9468fef0d..ed8b59ed5644 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -78,9 +78,6 @@ using namespace css::uno;
 using namespace css::linguistic2;
 using namespace css::beans;
 
-#define CBCOL_FIRST 0
-#define CBCOL_SECOND1
-
 static const sal_Char cSpell[]   = SN_SPELLCHECKER;
 static const sal_Char cGrammar[] = SN_GRAMMARCHECKER;
 static const sal_Char cHyph[]= SN_HYPHENATOR;
@@ -88,29 +85,6 @@ static const sal_Char cThes[]= SN_THESAURUS;
 
 // static 
 
-static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( const Sequence< 
Locale > &rSeq )
-{
-sal_Int32 nLen = rSeq.getLength();
-std::vector aRes;
-aRes.reserve(nLen);
-const Locale *pSeq = rSeq.getConstArray();
-for (sal_Int32 i = 0;  i < nLen;  ++i)
-{
-aRes.push_back( LanguageTag::convertToLanguageType( pSeq[i] ) );
-}
-return aRes;
-}
-
-
-static bool lcl_SeqHasLang( const std::vector< LanguageType > &rSeq, 
LanguageType nLang )
-{
-for (auto const & i : rSeq)
-if (i == nLang)
-return true;
-return false;
-}
-
-
 static sal_Int32 lcl_SeqGetEntryPos(
 const Sequence< OUString > &rSeq, const OUString &rEntry )
 {
@@ -214,49 +188,6 @@ DicUserData::DicUserData(
 (static_cast(bDeletable ? 1 : 0)<< 10);
 }
 
-static void lcl_SetCheckButton( SvTreeListEntry* pEntry, bool bCheck )
-{
-SvLBoxButton* pItem = 
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
-
-DBG_ASSERT(pItem,"SetCheckButton:Item not found");
-if (pItem && pItem->GetType() == SvLBoxItemType::Button)
-{
-if (bCheck)
-pItem->SetStateChecked();
-else
-pItem->SetStateUnch

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - Repository.mk scp2/source setup_native/Library_reg_dlls.mk setup_native/Module_setup_native.mk setup_native/source

[Mike Kaganski (via logerrit)]

 Repository.mk |1 
 scp2/source/calc/module_calc.scp  |2 
 scp2/source/draw/module_draw.scp  |2 
 scp2/source/impress/module_impress.scp|2 
 scp2/source/ooo/windowscustomaction_ooo.scp   |   41 +
 scp2/source/writer/module_writer.scp  |2 
 setup_native/Library_reg_dlls.mk  |   40 +
 setup_native/Module_setup_native.mk   |1 
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx |  281 ++
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.def |5 
 10 files changed, 373 insertions(+), 4 deletions(-)

New commits:
commit 7f0ef81cec7e4f64c7fbfce04372d84871244b11
Author: Mike Kaganski 
AuthorDate: Wed May 22 19:17:44 2019 +0300
Commit: Aron Budea 
CommitDate: Tue Jun 4 21:58:30 2019 +0200

Register spsupp*.dll during installation

This registers SharePoint integration libraries using regsvr.exe.
Both 32-bit and 64-bit libraries are registered; registration of
SharePoint.OpenDocuments is unconditional (subject to ActiveX
feature install state), substituting respective MSO component.

This only works for 32-bit MSI, because in case of 64-bit MSI, only
64-bit SharePoint DLL is included; this makes the library ~useless
in case of 64-bit MSI, because IE needs 32-bit component absent there.
Proper solution will be created for master branch.

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

diff --git a/Repository.mk b/Repository.mk
index ca4b1031131c..889643183942 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -668,6 +668,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta
instooofiltmsi \
inst_msu_msi \
qslnkmsi \
+   reg_dlls \
reg4allmsdoc \
sdqsmsi \
sellangmsi \
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index dd31007bb5ca..0f83dec54352 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -74,7 +74,7 @@ Module gid_Module_Prg_Calc_MSO_Reg
 Name = "gid_Module_Prg_Calc_MSO_Reg";
 Description = "gid_Module_Prg_Calc_MSO_Reg";
 Styles = (HIDDEN_ROOT);
-Default = YES;
+Default = NO;
 End
 
 Module gid_Module_Prg_Calc_Other_Reg
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 87375797e1c6..c4c835b4ccc1 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -64,7 +64,7 @@ Module gid_Module_Prg_Draw_MSO_Reg
 Name = "gid_Module_Prg_Draw_MSO_Reg";
 Description = "gid_Module_Prg_Draw_MSO_Reg";
 Styles = (HIDDEN_ROOT);
-Default = YES;
+Default = NO;
 End
 
 Module gid_Module_Prg_Draw_Other_Reg
diff --git a/scp2/source/impress/module_impress.scp 
b/scp2/source/impress/module_impress.scp
index ca335d6973d9..42d62dd9e7c6 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -66,7 +66,7 @@ Module gid_Module_Prg_Impress_MSO_Reg
 Name = "gid_Module_Prg_Impress_MSO_Reg";
 Description = "gid_Module_Prg_Impress_MSO_Reg";
 Styles = (HIDDEN_ROOT);
-Default = YES;
+Default = NO;
 End
 
 Module gid_Module_Prg_Impress_Other_Reg
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index bc7201b9b2b4..f98296ca48dc 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -221,3 +221,44 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
 End
 
 #endif /* HAVE_WINDOWS_SDK */
+
+/* Deferred not-impersonated actions that will call regsvr32 to (un)register 
DLLs.
+   Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+   + 64 (msidbCustomActionTypeContinue) + 1024 (msidbCustomActionTypeInScript)
+   + 2048 (msidbCustomActionTypeNoImpersonate).
+   Since deferred actions don't have access to current DB, the actions depend 
on
+   immediate-executed action prep_reg_unreg_dlls (see below) that precedes it, 
and
+   sets this action's CustomActionData property.
+*/
+
+WindowsCustomAction gid_Customaction_reg_dlls
+   Name = "reg_dlls";
+   Typ = "3137";
+   Source = "reg_dlls.dll";
+   Target = "RegDLLs";
+   Inbinarytable = 1;
+   Assignment1 = ("InstallExecuteSequence", "reg_dlls", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_unreg_dlls
+   Name = "unreg_dlls";
+   Typ = "3137";
+   Source = "reg_dlls.dll";
+   Target = "UnregDLLs";
+   Inbinarytable = 1;
+   Assignment1 = ("InstallExecuteSequence", "unreg_dlls

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 88194, which changed state.

Bug 88194 Summary: freeze when paste into lots of cells (cell with comment)
https://bugs.documentfoundation.org/show_bug.cgi?id=88194

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|WORKSFORME  |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 17fdf034c144c64d6a9ebd3d8ace6096c9867944
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 21:00:27 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 21:01:04 2019 +0300

tdf#11: Bin apparently unnecessary early return

Removing these few lines of code fixes the problem on iOS, as far as I
can see. Let's hope it doesn't introduce any new issue in the iOS app.
In this branch, I didn't have the clout to remove them for macOS, too.

Change-Id: I2380d010ba223a698acfe916fca4580a1502be98

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index fbd49f60d459..5940b12b8343 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -571,11 +571,13 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& 
rTR,
const SalBitmap& rSrcBitmap,
const SalBitmap& rAlphaBmp )
 {
+#ifndef IOS
 if (rTR.mnSrcWidth != rTR.mnDestWidth || rTR.mnSrcHeight != 
rTR.mnDestHeight)
 {
 // TODO - would be better to scale it by the native code
 return false;
 }
+#endif
 
 // An image mask can't have a depth > 8 bits (should be 1 to 8 bits)
 if( rAlphaBmp.GetBitCount() > 8 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 9c8478d428293c6223c8d1bdd1e93f7729b6d952
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 18:58:56 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 20:52:50 2019 +0300

tdf#11: Bin apparently unnecessary early return

Removing these few lines of code fixes the problem on iOS, and has no
apparent ill effect on macOS. But sure, I didn't check that thoroughly
on macOS, so in case this has a bad effect on macOS after all, need to
reinstate the few lines but make them #ifndef IOS.

(Still passes make check.)

Change-Id: I2380d010ba223a698acfe916fca4580a1502be98

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 333c23c93035..af70708eb0f2 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -587,12 +587,6 @@ bool AquaSalGraphics::drawAlphaBitmap( const SalTwoRect& 
rTR,
const SalBitmap& rSrcBitmap,
const SalBitmap& rAlphaBmp )
 {
-if (rTR.mnSrcWidth != rTR.mnDestWidth || rTR.mnSrcHeight != 
rTR.mnDestHeight)
-{
-// TODO - would be better to scale it by the native code
-return false;
-}
-
 // An image mask can't have a depth > 8 bits (should be 1 to 8 bits)
 if( rAlphaBmp.GetBitCount() > 8 )
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |3 +++
 sc/source/ui/view/gridwin.cxx|6 ++
 2 files changed, 9 insertions(+)

New commits:
commit a92dd896b003ded7f5c4347a8370624ee9d77dbd
Author: Miklos Vajna 
AuthorDate: Tue Jun 4 14:11:33 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 19:39:57 2019 +0200

tdf#101086 sc autofilter popup: avoid flicker

Regression from commit a4cb27f61376d8f2d8faed0022c291af68d437bd
(refactor ScMenuFloatingWindow to use RenderContext, 2015-05-14), the
problem was that the change had two effects:

1) It removed incremental rendering that now causes flicker.

2) It added support for painting into a rendercontext, not on the window
itself.

Given that here a hierarchy of widgets have to be painted at once (to
avoid flicker), use vcl::Window::RequestDoubleBuffering() instead of the
much simpler vcl::BufferDevice.

This improves the situation on Windows, but explicitly blacklist the
focus rectangle case (gtk3) which is currently not compatible with this
higher level double-buffering (and there we already have lower-level
double-buffering anyway, similar to OpenGL).

(cherry picked from commit 4dadbff74eff5f8ad00df99c659f8a2b914e09a1)

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index e735ad62f7e6..8383738967a5 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1164,6 +1164,9 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool 
bSet)
 if (!pEntry)
 return;
 maChecks->CheckEntry(pEntry, bSet );
+
+// Make sure all checkboxes are invalidated.
+Invalidate();
 }
 
 IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void )
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ea51223772ec..e043cfc4d857 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -645,6 +645,12 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
+
+// Avoid flicker when hovering over the menu items.
+if (!IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Focus))
+// If NWF renders the focus rects itself, that breaks double-buffering.
+mpAutoFilterPopup->RequestDoubleBuffering(true);
+
 if (comphelper::LibreOfficeKit::isActive())
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, 
AutoFilterMode::Normal));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Need for new x86 Jenkin's Bot

[Jan-Marek Glogowski]

Hi everyone,

Am 04.06.19 um 17:01 schrieb Luke Benes:
> The decision was to demote release builds, but NOT to remove x86
> compatibility. If you take this as an excuse to also end x86 CI testing bots,
> you are effectively killing x86 through bit rot. This is not a hypothetical.
> As you know, @87 just recently caught a regression introduced by an easyHack
> to convert use of sal_uLong to better integer types. Without CI testing,
> these bugs will pile up effectively removing x86 compatibility.

IMHO we should "just" switch one of the Jenkins Linux builds to 32bit, not have
an other one. Preferable the gcc release one, as that has smaller object size,
if that is a concern for 32bit (linking etc). Should be fine just to cross-build
on 64bit in a 32bit chroot.

I remember there were some problems because of a missing 32bit Red Hat Developer
Toolset needed for the build, which was AFAIK the real reason to get rid of the
32bit builds - aehmm. Not sure that is now available.

And I / Rene was bitten a few times by broken 32bit builds, last was the
QVariant constructor ambiguity, so generally I'm all for it, if possible.

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

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

[László Németh (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 222f6a1c43b7ae7bf8e2f1fbc1dbe6457e611ab7
Author: László Németh 
AuthorDate: Tue Jun 4 15:00:19 2019 +0200
Commit: László Németh 
CommitDate: Tue Jun 4 18:44:08 2019 +0200

tdf#70234 DOCX export: fix only expanded fields

The commit caf2f5fff39caf06204f71d0c2276b415ef047c3
"tdf#70234 DOCX: export tracked deletion of fields"
must handle only the fields with multiple runs
(expanded fields).

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

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5a0b1708c6f5..9fdd2b94d575 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1917,8 +1917,6 @@ void DocxAttributeOutput::StartField_Impl( const 
SwTextNode* pNode, sal_Int32 nP
 }
 else
 {
-m_bWritingField = true;
-
 // Write the field start
 if ( rInfos.pField && (rInfos.pField->Which() == 
SwFieldIds::DateTime) && rInfos.pField->GetSubType() & FIXEDFLD )
 {
@@ -1944,6 +1942,8 @@ void DocxAttributeOutput::StartField_Impl( const 
SwTextNode* pNode, sal_Int32 nP
 // normally in the text run
 if ( !rInfos.pField )
 CmdField_Impl( pNode, nPos, rInfos, bWriteRun );
+else
+m_bWritingField = true;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Grzegorz Araminowicz (via logerrit)]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   22 +++--
 sd/qa/unit/data/pptx/smartart-bullet-list.pptx  |binary
 sd/qa/unit/import-tests-smartart.cxx|   32 +++-
 3 files changed, 43 insertions(+), 11 deletions(-)

New commits:
commit 1e1535d46f9d89a2584409d88f35b57ef920eefa
Author: Grzegorz Araminowicz 
AuthorDate: Tue Jun 4 13:51:40 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 17:23:32 2019 +0200

SmartArt: bullet list improvements

by default start bullet list at second level
use stBulletLvl parameter to change this behaviour

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

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 4d0c18c27561..2c612233251d 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1227,27 +1227,30 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 nBaseLevel = aParagraph->getProperties().getLevel();
 }
 
+// Start bullets at:
+// 1 - top level
+// 2 - with children (default)
+int nStartBulletsAtLevel = 2;
 ParamMap::const_iterator aBulletLvl = maMap.find(XML_stBulletLvl);
-int nStartBulletsAtLevel = 0;
 if (aBulletLvl != maMap.end())
-{
-nBaseLevel -= aBulletLvl->second;
 nStartBulletsAtLevel = aBulletLvl->second;
-}
+nStartBulletsAtLevel--;
 
+bool isBulletList = false;
 for (auto & aParagraph : pTextBody->getParagraphs())
 {
-sal_Int32 nLevel = aParagraph->getProperties().getLevel();
-aParagraph->getProperties().setLevel(nLevel - nBaseLevel);
-if (nStartBulletsAtLevel > 0 && nLevel >= nStartBulletsAtLevel)
+sal_Int32 nLevel = aParagraph->getProperties().getLevel() - 
nBaseLevel;
+aParagraph->getProperties().setLevel(nLevel);
+if (nLevel >= nStartBulletsAtLevel)
 {
 // It is not possible to change the bullet style for text.
-sal_Int32 nLeftMargin = 285750 * (nLevel - 
nStartBulletsAtLevel) / EMU_PER_HMM;
+sal_Int32 nLeftMargin = 285750 * (nLevel - 
nStartBulletsAtLevel + 1) / EMU_PER_HMM;
 aParagraph->getProperties().getParaLeftMargin() = 
nLeftMargin;
 aParagraph->getProperties().getFirstLineIndentation() = 
-285750 / EMU_PER_HMM;
 OUString aBulletChar = OUString::fromUtf8(u8"•");
 
aParagraph->getProperties().getBulletList().setBulletChar(aBulletChar);
 
aParagraph->getProperties().getBulletList().setSuffixNone();
+isBulletList = true;
 }
 }
 
@@ -1260,8 +1263,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 for (auto & aParagraph : pTextBody->getParagraphs())
 aParagraph->getProperties().setParaAdjust(aAlignment);
 }
-else if (std::all_of(pTextBody->getParagraphs().begin(), 
pTextBody->getParagraphs().end(),
-[](const std::shared_ptr& aParagraph) { return 
aParagraph->getProperties().getLevel() == 0; }))
+else if (!isBulletList)
 {
 // if not list use default alignment - centered
 for (auto & aParagraph : pTextBody->getParagraphs())
diff --git a/sd/qa/unit/data/pptx/smartart-bullet-list.pptx 
b/sd/qa/unit/data/pptx/smartart-bullet-list.pptx
new file mode 100644
index ..d95bdb769140
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-bullet-list.pptx 
differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 722cb142fbfc..775411c57bba 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -78,6 +78,7 @@ public:
 void testCenterCycle();
 void testFontSize();
 void testVerticalBlockList();
+void testBulletList();
 
 CPPUNIT_TEST_SUITE(SdImportTestSmartArt);
 
@@ -117,6 +118,7 @@ public:
 CPPUNIT_TEST(testCenterCycle);
 CPPUNIT_TEST(testFontSize);
 CPPUNIT_TEST(testVerticalBlockList);
+CPPUNIT_TEST(testBulletList);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -674,7 +676,7 @@ void SdImportTestSmartArt::testAccentProcess()
 
 uno::Reference 
xRules(xPara->getPropertyValue("NumberingRules"),
uno::UNO_QUERY);
-comphelper::SequenceAsHashMap aRule(xRules->getByIndex(1));
+comphelper::SequenceAsHashMap aRule(xRules->getByIndex(0));
 CPPUNIT_ASSE

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

For now we continue using the public jitsi server:

https://meet.jit.si/tdfesc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ run the certification script (Kendy)
+ make Qt5 backend experimental (Jmux)
+ commit access
   + GSOC mentors ask students (all)
   + communication issue wrt. Help (Sophie)

* Release Engineering update (Xisco)
+ 6.2.5 rc1 week 24 (June 10-16) - 1 week out.
+ 6.3.0 beta1 / libreoffice-6-3 branch / feature freeze:
  + so far no reviews required on each side, but no features either:
  + late features
 + Apple notarization feature for 10.4.15 (Christian)
+ basic framework is running, but missing gathering
of entitlements for features eg. integrate with AppleScript
 + Zip parallelism (Lubos)
+ should give a nice win for big ODS file saving
+ see tdf#113042
-
https://dev-builds.libreoffice.org/crashtest/a42291d0abd14c6c763962a5ae60b02a8552f641/backtraces/task947-core.20261.backtrace.txt
related ?
+ working on the bugs ...
 + Online / Sidebar merge – core + online (Ash)
+ extraordinarily busy - would but like to get it in.
 + HSQLDB vs. Firebird ? (Caolan)
+ do we re-visit this for 6.3 ? what is the state ?
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
251(251) (topicUI) bugs open, 201(201) (needsUXEval) needs to be
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months12 months
 added  2(-2)10(-2) 23(-12)  71(-12)
 commented 24(-7)   146(-56)   438(-114)   1378(-103)
   removed  0(0)  3(0)  12(-2)   25(-1)
  resolved  1(-2)10(-3) 40(-4)  134(0)
+ top 10 contributors:
  Tietze, Heiko made 95 changes in 1 month, and 603 changes in 1
year
  Thomas Lendo made 25 changes in 1 month, and 226 changes in 1 year
  dieterp made 23 changes in 1 month, and 126 changes in 1 year
  Xisco Faulí made 21 changes in 1 month, and 252 changes in 1 year
  Kainz, Andreas made 20 changes in 1 month, and 200 changes in
1 year
  Foote, V Stuart made 13 changes in 1 month, and 193 changes in
1 year
  kompilainenn made 12 changes in 1 month, and 196 changes in 1 year
  Cor Nouws made 9 changes in 1 month, and 112 changes in 1 year
  Wagner, Thorsten made 8 changes in 1 month, and 8 changes in 1
year
  Mehrbrodt, Samuel made 8 changes in 1 month, and 68 changes in
1 year

* Crash Testing (Caolan)
+ Crash testing:
  + 46(+5) import failure, 10(+5) export failures
  + most are calc crashers.
  + some in the zip area - assuming they are threading related (?)
+ Google / ossfuzz:
  + ?? 7 failures, none critical.
+ waiting for coverity
  + until new version that supports c++17(?)

* Crash Reporting (Xisco)
  + http://crashreport.libreoffice.org/stats/version/6.1.5.2
+ 1460 (-297)
  + http://crashreport.libreoffice.org/stats/version/6.1.6.3
+ 293 (+16)
  + http://crashreport.libreoffice.org/stats/version/6.2.2.2
+ 1295 (-237)
  + http://crashreport.libreoffice.org/stats/version/6.2.3.2
+ 2428 (-444)
  + http://crashreport.libreoffice.org/stats/version/6.2.4.2
+ 929 (+810)
  + numbers looking good.

* Hackfests & Events (Sophie)
   + this year hackfests coming up:
+ Paris in Summer (Sophie)
  + first week of July Fri/Sat 5th / 6th
+ near Gare de Nord, La Mouette working on communication
  + designing a flier – avoids stomping on exams at end of June
  + https://wiki.documentfoundation.org/Hackfest/Paris2019
  + hope to have a Hackfest NG setup again – mentees, please
speak up!
  + people are adding themselves to the wiki already.
+ tentative Dresden: late autumn (past mid-October, for having
students)
  + Brussels Hackathon (Thorsten)
  + pending October hackfest – needs confirmation
  + conflicts with Dresden – need a decision in May or so; pending …
  => plan to go ahead & confirm with Dresden
   + hope to have one each quarter.

* Conference (Sophie)
   + CfP deadline is end of June
   + https://conference.libreoffice.org/2019/call-for-papers/

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + Project page:
 https://summerofcode.withgoogle.com/organizations/5557591040589824/
   + currently: coding has started!
   + Mentors, please make sure students are active & communicating!
  + weekly reports are not optional
   + next deadline: June 28, 1st eval milestone

* C++ lectures (

Need for new x86 Jenkin's Bot

[Luke Benes]

Christian,


The decision was to demote release builds, but NOT to remove x86 compatibility. 
If you take this as an excuse to also end x86 CI testing bots, you are 
effectively killing x86 through bit rot. This is not a hypothetical. As you 
know, @87 just recently caught a regression introduced by an easyHack to 
convert use of sal_uLong to better integer types. Without CI testing, these 
bugs will pile up effectively removing x86 compatibility.


In a past job, I have seen how building code against multiple architectures 
uncovers latent bugs and code portability. This philosophy made ARM and RISC 
ports much easier along with higher quality software.


If we chose to go down the path of killing x86, we should discuss it. While I 
agree that overhead of x86 release build may not be worth it, the advantages of 
maintaining a working x86 build are clear.  My suggestion would be to upgrade 
@87 to CentOS 7 or Debian 9.0 before bit rot makes this a difficult task. 
Currently master has no problem building on 32-bit Fedora 30.


-Luke


From: Christian Lohmaier 
Sent: Tuesday, June 4, 2019 6:17 AM
To: Luke Benes
Subject: Re: @87 reboot?

Hi Luke,

On Sun, Apr 14, 2019 at 6:40 PM Luke Benes  wrote:
>
> Christian,
> No rush, just a polite ping. Looks like @87 is stuck.

It's not really stuck per se, it is just that the old baseline is no
longer suitable for master/libreoffice-6-3 (glib2 requirement not
fullfilled) - with 6.2 we demoted 32bit linux builds provided by TDF
(they for example already don't include all vclplugins, most notably
gtk3) and stated that 6.2 will be last line with 32bit builds provided
by TDF (of course distros continue to provide buidls, and 32bit
support in sourcecode is not removed).

So unless there's an outcry of users there won't be master buidls by
that box anymore - (well even if there is there won't be, but rather
32bit version then would be cross-compiled from a 64bit host)

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

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

[Eike Rathke (via logerrit)]

 sax/source/tools/fastserializer.cxx |   43 +++-
 1 file changed, 33 insertions(+), 10 deletions(-)

New commits:
commit 70f872a211a296ef6b45828e0fe92cd752a89bb3
Author: Eike Rathke 
AuthorDate: Wed May 29 21:08:38 2019 +0200
Commit: Aron Budea 
CommitDate: Tue Jun 4 16:35:57 2019 +0200

Resolves: tdf#125279 do not double _x005F_ escapement

Reading OOXML _x005F_ escaped content may not get unescaped, so
when writing back to OOXML do not attempt to escape it again, i.e.
write _x005F_x_ as is and not as _x005F_x005F_x_.

This is more a workaround, the proper fix would be to unescape
_x005F_ content upon read. But then the entire "invalid XML
character" escapement and handling control characters rat tail
would come into play.

Change-Id: I3d31dc84a362753c23a8c89f7a5d7bfd06e4367b
Reviewed-on: https://gerrit.libreoffice.org/73187
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit f677885fec59f252f36673ee4d8c0b4863625a4d)

diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index a0ae255b36eb..87b23b45e17c 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -199,6 +199,7 @@ namespace sax_fastparser {
 default:
 if (mbXescape)
 {
+char c1, c2, c3, c4;
 // Escape characters not valid in XML 1.0 as
 // _x_. A literal "_x_" has to be
 // escaped as _x005F_x_ (effectively
@@ -209,22 +210,44 @@ namespace sax_fastparser {
 if (c == '_' && i >= nNextXescape && i <= nLen 
- kXescapeLen &&
 pStr[i+6] == '_' &&
 ((pStr[i+1] | 0x20) == 'x') &&
-isHexDigit( pStr[i+2] ) &&
-isHexDigit( pStr[i+3] ) &&
-isHexDigit( pStr[i+4] ) &&
-isHexDigit( pStr[i+5] ))
+isHexDigit( c1 = pStr[i+2] ) &&
+isHexDigit( c2 = pStr[i+3] ) &&
+isHexDigit( c3 = pStr[i+4] ) &&
+isHexDigit( c4 = pStr[i+5] ))
 {
 // OOXML has the odd habit to write some
 // names using this that when re-saving
 // should *not* be escaped, specifically
 // _x0020_ for blanks in w:xpath values.
-if (strncmp( pStr+i+2, "0020", 4) != 0)
+if (!(c1 == '0' && c2 == '0' && c3 == '2' 
&& c4 == '0'))
 {
-writeBytes( "_x005F_", kXescapeLen);
-// Remember this escapement so in
-// _x_x_ only the first '_' is
-// escaped.
-nNextXescape = i + kXescapeLen;
+// When encountering "_x005F_x_"
+// assume that is an already escaped
+// sequence that was not unescaped and
+// shall be written as is, to not end
+// up with "_x005F_x005F_x_" and
+// repeated..
+if (c1 == '0' && c2 == '0' && c3 == 
'5' && (c4 | 0x20) == 'f' &&
+i + kXescapeLen <= nLen - 6 &&
+pStr[i+kXescapeLen+5] == '_' &&
+((pStr[i+kXescapeLen+0] | 
0x20) == 'x') &&
+isHexDigit( 
pStr[i+kXescapeLen+1] ) &&
+isHexDigit( 
pStr[i+kXescapeLen+2] ) &&
+isHexDigit( 
pStr[i+kXescapeLen+3] ) &&
+isHexDigit( 
pStr[i+kXescapeLen+4] ))
+{
+writeBytes( &c, 1 );
+// Remember this fake escapement.
+nNextXescape = i + kXescapeLen + 6;
+}
+else
+   

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

[Caolán McNamara (via logerrit)]

 cui/source/inc/optlingu.hxx  |   41 +--
 cui/source/options/optlingu.cxx  |  432 ---
 cui/uiconfig/ui/editmodulesdialog.ui |  103 +++-
 3 files changed, 269 insertions(+), 307 deletions(-)

New commits:
commit 8caa7d1824ff87a82ba2f6f16351dfab5b219f63
Author: Caolán McNamara 
AuthorDate: Sun Jun 2 20:46:52 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Jun 4 16:12:12 2019 +0200

weld SvxEditModulesDlg

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

diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 77e016d0b154..8478f9bc45e0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -50,18 +50,8 @@ class SvxLinguData_Impl;
 
 // forward ---
 
-class SvxEditModulesDlg : public ModalDialog
+class SvxEditModulesDlg : public weld::GenericDialogController
 {
-VclPtr m_pLanguageLB;
-
-VclPtrm_pModulesCLB;
-VclPtr m_pPrioUpPB;
-VclPtr m_pPrioDownPB;
-VclPtr m_pBackPB;
-VclPtr m_pMoreDictsLink;
-
-VclPtrm_pClosePB;
-
 OUStringsSpell;
 OUStringsHyph;
 OUStringsThes;
@@ -70,23 +60,26 @@ class SvxEditModulesDlg : public ModalDialog
 std::unique_ptr  pDefaultLinguData;
 SvxLinguData_Impl&  rLinguData;
 
-std::unique_ptr   m_xCheckButtonData;
-
-SvTreeListEntry*CreateEntry(OUString& rTxt, sal_uInt16 nCol);
+std::unique_ptr m_xModulesCLB;
+std::unique_ptr m_xPrioUpPB;
+std::unique_ptr m_xPrioDownPB;
+std::unique_ptr m_xBackPB;
+std::unique_ptr m_xMoreDictsLink;
+std::unique_ptr m_xClosePB;
+std::unique_ptr m_xLanguageLB;
 
-DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void );
-DECL_LINK( UpDownHdl_Impl, Button*, void );
-DECL_LINK( ClickHdl_Impl, Button*, void );
-DECL_LINK( BackHdl_Impl, Button*, void );
-DECL_LINK( LangSelectListBoxHdl_Impl, ListBox&, void );
-DECL_LINK( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void );
-DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
-void LangSelectHdl_Impl(ListBox const *);
+DECL_LINK( SelectHdl_Impl, weld::TreeView&, void );
+DECL_LINK( UpDownHdl_Impl, weld::Button&, void );
+DECL_LINK( ClickHdl_Impl, weld::Button&, void );
+DECL_LINK( BackHdl_Impl, weld::Button&, void );
+DECL_LINK( LangSelectListBoxHdl_Impl, weld::ComboBox&, void );
+typedef std::pair row_col;
+DECL_LINK( BoxCheckButtonHdl_Impl, const row_col&, void );
+void LangSelectHdl_Impl(const LanguageBox* pBox);
 
 public:
-SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData);
+SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& rData);
 virtual ~SvxEditModulesDlg() override;
-virtual void dispose() override;
 };
 
 // class SvxLinguTabPage -
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 5be9468fef0d..ed8b59ed5644 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -78,9 +78,6 @@ using namespace css::uno;
 using namespace css::linguistic2;
 using namespace css::beans;
 
-#define CBCOL_FIRST 0
-#define CBCOL_SECOND1
-
 static const sal_Char cSpell[]   = SN_SPELLCHECKER;
 static const sal_Char cGrammar[] = SN_GRAMMARCHECKER;
 static const sal_Char cHyph[]= SN_HYPHENATOR;
@@ -88,29 +85,6 @@ static const sal_Char cThes[]= SN_THESAURUS;
 
 // static 
 
-static std::vector< LanguageType > lcl_LocaleSeqToLangSeq( const Sequence< 
Locale > &rSeq )
-{
-sal_Int32 nLen = rSeq.getLength();
-std::vector aRes;
-aRes.reserve(nLen);
-const Locale *pSeq = rSeq.getConstArray();
-for (sal_Int32 i = 0;  i < nLen;  ++i)
-{
-aRes.push_back( LanguageTag::convertToLanguageType( pSeq[i] ) );
-}
-return aRes;
-}
-
-
-static bool lcl_SeqHasLang( const std::vector< LanguageType > &rSeq, 
LanguageType nLang )
-{
-for (auto const & i : rSeq)
-if (i == nLang)
-return true;
-return false;
-}
-
-
 static sal_Int32 lcl_SeqGetEntryPos(
 const Sequence< OUString > &rSeq, const OUString &rEntry )
 {
@@ -214,49 +188,6 @@ DicUserData::DicUserData(
 (static_cast(bDeletable ? 1 : 0)<< 10);
 }
 
-static void lcl_SetCheckButton( SvTreeListEntry* pEntry, bool bCheck )
-{
-SvLBoxButton* pItem = 
static_cast(pEntry->GetFirstItem(SvLBoxItemType::Button));
-
-DBG_ASSERT(pItem,"SetCheckButton:Item not found");
-if (pItem && pItem->GetType() == SvLBoxItemType::Button)
-{
-if (bCheck)
-pItem->SetStateChecked();
-else
-pItem->SetStateUnch

Re: Saving documents with broken zip streams (Re: minutes of ESC call ...)

[Luboš Luňák]

On Monday 03 of June 2019, Jan-Marek Glogowski wrote:
> Am 03.06.19 um 21:52 schrieb Luboš Luňák:
> >  Ok, so it's not a problem with my code, my changes just happened to show
> > the problem, and the problem is that those documents are broken. If you
> > try to unzip the documents, it will complain about incorrect CRC
...
> >  Any idea what to do about that? Is it really ok that we just refuse to
> > save it? Or should we save it even though the contents may be broken?
>
> IMHO the only sane solution would be to detect the broken CRCs on read and
> report a broken file to the user.

 That's not so easy. We do not detect broken CRCs on load, because we load on 
demand. And removing that seems like a bad trade-off. Finding that a CRC 
stream has a broken CRCs means uncompressing everything and checking, even 
things we otherwise do not care about. I think we do not want to make loading 
of everything possibly slower just to detect that virtually all documents are 
correct.

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann (via logerrit)]

 scripting/source/stringresource/stringresource.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 36ce4fff0f96d711d185b0da60ed3d71e3a10d7a
Author: Stephan Bergmann 
AuthorDate: Fri Jan 12 20:16:56 2018 +0100
Commit: Aron Budea 
CommitDate: Tue Jun 4 15:27:30 2019 +0200

More loplugin:cstylecast: scripting

auto-rewrite with  "Enable
loplugin:cstylecast for some more cases" plus
solenv/clang-format/reformat-formatted-files

Change-Id: I52e58aa38c600faf677e932cb3caad07547ccbb7
(cherry picked from commit 02416cc1ce1f5d64265d509a0c1b149d11b5a3cb)

diff --git a/scripting/source/stringresource/stringresource.cxx 
b/scripting/source/stringresource/stringresource.cxx
index 88becc349103..c4180f0e3247 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -1220,7 +1220,7 @@ Sequence< ::sal_Int8 > BinaryOutput::closeAndGetData()
 if( !xSeekable.is() )
 return aRetSeq;
 
-sal_Int32 nSize = (sal_Int32)xSeekable->getPosition();
+sal_Int32 nSize = static_cast(xSeekable->getPosition());
 
 Reference< io::XInputStream> xInputStream( m_xTempFile, UNO_QUERY );
 if( !xInputStream.is() )
@@ -1287,8 +1287,8 @@ Sequence< sal_Int8 > 
StringResourcePersistenceImpl::exportBinary(  )
 }
 
 // Write header
-sal_Int16 nLocaleCount16 = (sal_Int16)nLocaleCount;
-sal_Int16 iDefault16 = (sal_Int16)iDefault;
+sal_Int16 nLocaleCount16 = static_cast(nLocaleCount);
+sal_Int16 iDefault16 = static_cast(iDefault);
 aOut.writeInt16( 0 ); // nVersion
 aOut.writeInt16( nLocaleCount16 );
 aOut.writeInt16( iDefault16 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef2a96fb236369271cb0f06451f02f0cca4d1569
Author: Olivier Hallot 
AuthorDate: Tue May 28 12:58:21 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jun 4 15:18:10 2019 +0200

TOTD: Fix tip contents

Draw and Impress have different menus names

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

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index d1788a2ef814..39d4161821b4 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -130,7 +130,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Apply Heading paragraph styles in Writer 
with shortcut keys: Ctrl+1 applies Heading 1, Ctrl+2 applies Heading 2, etc."), 
"", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Mix portrait and landscape orientations in 
a Calc spreadsheet by applying different page styles on sheets."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a 
presentation template: View > Master Slide and Slide > New Master (or per 
toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Use Format > Page > 'Fit object to paper 
format' in Draw/Impress to resize the objects so that they fit on your chosen 
paper format."), "", "tipoftheday_d.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Use Page/Slide > Properties > 'Fit object 
to paper format' in Draw/Impress to resize the objects so that they fit on your 
chosen paper format."), "", "tipoftheday_d.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "To modify an AutoPlay presentation, open it 
and after it starts, right click and select Edit in the context menu."), "", 
"tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Rename your slides in Impress to help you 
define 'Go to page' interactions and to have a summary more explicit than 
Slide1, Slide2…"), "", "tipoftheday_i.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Play music throughout a slideshow by 
assigning the sound to the first slide transition without clicking the ‘Apply 
to All Slides’ button."), "", "tipoftheday_i.png"},
___
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' - sw/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8import/ww8import.cxx |   16 ++--
 sw/source/filter/ww8/ww8par.cxx  |2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 676ce0ce2a278a75c92fb5916f4add373f46f88d
Author: Justin Luth 
AuthorDate: Fri Jan 11 13:01:26 2019 +0300
Commit: Aron Budea 
CommitDate: Tue Jun 4 14:46:40 2019 +0200

tdf#120145 ww8import: ignoreCols if section is inserted

Otherwise, the column setting is duplicated both in the section
and in the page style.

Change-Id: I14383c646e709a3653f1054f0d4170a2963529c1
Reviewed-on: https://gerrit.libreoffice.org/66151
Tested-by: Jenkins
Reviewed-by: Justin Luth 
(cherry picked from commit 84fefd7c295fc05499ca222dff50c2fe4e0fb27e)
Reviewed-on: https://gerrit.libreoffice.org/66217
Reviewed-by: Miklos Vajna 
(cherry picked from commit 0e863f5529318e07f46568150e489cb0bef9b616)

diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 31cfce841d3c..abbdedbea194 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -9,6 +9,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -33,12 +34,23 @@ DECLARE_WW8IMPORT_TEST(testFloatingTableSectionMargins, 
"floating-table-section-
 {
 sal_Int32 pageLeft = parseDump("/root/page[2]/infos/bounds", 
"left").toInt32();
 sal_Int32 pageWidth = parseDump("/root/page[2]/infos/bounds", 
"width").toInt32();
-sal_Int32 tableLeft = 
parseDump("/root/page[2]/body/column/body/section/column/body/txt[2]/anchored/fly/tab/infos/bounds",
 "left").toInt32();
-sal_Int32 tableWidth = 
parseDump("/root/page[2]/body/column/body/section/column/body/txt[2]/anchored/fly/tab/infos/bounds",
 "width").toInt32();
+sal_Int32 tableLeft = parseDump("//tab/infos/bounds", "left").toInt32();
+sal_Int32 tableWidth = parseDump("//tab/infos/bounds", "width").toInt32();
 CPPUNIT_ASSERT( pageWidth > 0 );
 CPPUNIT_ASSERT( tableWidth > 0 );
 // The table's resulting position should be roughly centered.
 CPPUNIT_ASSERT( abs(( pageLeft + pageWidth / 2 ) - ( tableLeft + 
tableWidth / 2 )) < 20 );
+
+uno::Reference xTextSection = getProperty< 
uno::Reference >(getParagraph(2), "TextSection");
+CPPUNIT_ASSERT(xTextSection.is());
+uno::Reference xTextColumns = getProperty< 
uno::Reference >(xTextSection, "TextColumns");
+OUString pageStyleName = getProperty(getParagraph(2), 
"PageStyleName");
+uno::Reference pageStyle( 
getStyles("PageStyles")->getByName(pageStyleName), uno::UNO_QUERY);
+uno::Reference 
xPageStyle(getStyles("PageStyles")->getByName(pageStyleName), uno::UNO_QUERY);
+uno::Reference xPageColumns = getProperty< 
uno::Reference >(xPageStyle, "TextColumns");
+
+//either one or the other should get the column's, not both.
+CPPUNIT_ASSERT( xTextColumns->getColumnCount() != 
xPageColumns->getColumnCount());
 }
 
 DECLARE_WW8IMPORT_TEST(testN816593, "n816593.doc")
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index b09cf7ded47f..ad340445d383 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4480,7 +4480,7 @@ void wwSectionManager::InsertSegments()
  descriptor.
 */
 
-bool bIgnoreCols = false;
+bool bIgnoreCols = bInsertSection;
 bool bThisAndNextAreCompatible = (aNext == aEnd) ||
 ((aIter->GetPageWidth() == aNext->GetPageWidth()) &&
  (aIter->GetPageHeight() == aNext->GetPageHeight()) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek (via logerrit)]

 sw/qa/uitest/writer_tests6/tdf44837.py |   46 +
 1 file changed, 46 insertions(+)

New commits:
commit 5c96421607dadca284902d127004fcc12fd89b84
Author: Zdeněk Crhonek 
AuthorDate: Mon Jun 3 19:08:29 2019 +0200
Commit: Zdenek Crhonek 
CommitDate: Tue Jun 4 15:15:53 2019 +0200

uitest for bug tdf#44837

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

diff --git a/sw/qa/uitest/writer_tests6/tdf44837.py 
b/sw/qa/uitest/writer_tests6/tdf44837.py
new file mode 100644
index ..73d30be0e65c
--- /dev/null
+++ b/sw/qa/uitest/writer_tests6/tdf44837.py
@@ -0,0 +1,46 @@
+#
+# 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 select_pos, get_state_as_dict, type_text
+from com.sun.star.uno import RuntimeException
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+#Bug 44837 - EDITING 'Replace All' clears current selection
+
+class tdf44837(UITestCase):
+
+def test_tdf448373_Replace_All_clears_current_selection(self):
+self.ui_test.create_doc_in_start_center("writer")
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+
+type_text(xWriterEdit, "asd asd")
+self.xUITest.executeCommand(".uno:SelectAll")
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+searchterm = xDialog.getChild("searchterm")
+searchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+searchterm.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+searchterm.executeAction("TYPE", mkPropertyValues({"TEXT":"a"}))
+replaceterm = xDialog.getChild("replaceterm")
+replaceterm.executeAction("TYPE", mkPropertyValues({"TEXT":"b"})) 
#replace textbox
+
+selectionOnly = xDialog.getChild("selection")
+selectionOnly.executeAction("CLICK", tuple())
+replaceall = xDialog.getChild("replaceall")
+replaceall.executeAction("CLICK", tuple())
+xcloseBtn = xDialog.getChild("close")
+self.ui_test.close_dialog_through_button(xcloseBtn)
+
+self.assertEqual(document.Text.String[0:8], "bsd bsd")
+self.assertEqual(len(document.CurrentSelection.getByIndex(0).String) > 
1, True)
+#follow-up bug 125663
+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: sc/source

[Miklos Vajna (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |3 +++
 sc/source/ui/view/gridwin.cxx|6 ++
 2 files changed, 9 insertions(+)

New commits:
commit 4dadbff74eff5f8ad00df99c659f8a2b914e09a1
Author: Miklos Vajna 
AuthorDate: Tue Jun 4 14:11:33 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 14:59:54 2019 +0200

tdf#101086 sc autofilter popup: avoid flicker

Regression from commit a4cb27f61376d8f2d8faed0022c291af68d437bd
(refactor ScMenuFloatingWindow to use RenderContext, 2015-05-14), the
problem was that the change had two effects:

1) It removed incremental rendering that now causes flicker.

2) It added support for painting into a rendercontext, not on the window
itself.

Given that here a hierarchy of widgets have to be painted at once (to
avoid flicker), use vcl::Window::RequestDoubleBuffering() instead of the
much simpler vcl::BufferDevice.

This improves the situation on Windows, but explicitly blacklist the
focus rectangle case (gtk3) which is currently not compatible with this
higher level double-buffering (and there we already have lower-level
double-buffering anyway, similar to OpenGL).

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index e735ad62f7e6..8383738967a5 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1164,6 +1164,9 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool 
bSet)
 if (!pEntry)
 return;
 maChecks->CheckEntry(pEntry, bSet );
+
+// Make sure all checkboxes are invalidated.
+Invalidate();
 }
 
 IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void )
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ea51223772ec..e043cfc4d857 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -645,6 +645,12 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW 
nRow)
 
 mpAutoFilterPopup.disposeAndClear();
 mpAutoFilterPopup.reset(VclPtr::Create(this, pDoc));
+
+// Avoid flicker when hovering over the menu items.
+if (!IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Focus))
+// If NWF renders the focus rects itself, that breaks double-buffering.
+mpAutoFilterPopup->RequestDoubleBuffering(true);
+
 if (comphelper::LibreOfficeKit::isActive())
 mpAutoFilterPopup->SetLOKNotifier(SfxViewShell::Current());
 mpAutoFilterPopup->setOKAction(new AutoFilterAction(this, 
AutoFilterMode::Normal));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 emfio/inc/mtftools.hxx   |1 +
 emfio/source/reader/mtftools.cxx |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ee6dd4d39e9169283e74a9210ace0b8f7f897da4
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 14:37:37 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 4 14:55:46 2019 +0200

Avoid truncation of ±1E20 to long

With -fsanitize=float-cast-overflow, opening doc/abi5309-1.doc as obtained 
by
bin/get-bugzilla-attachments-by-mimetype (i.e., the attachment at
) fails with

> include/tools/helpers.hxx:76:79: runtime error: 1e+20 is outside the 
range of representable values of type 'long'
>  #0 in FRound(double) at include/tools/helpers.hxx:76:79 
(instdir/program/libtllo.so +0x3c13dd)
>  #1 in ImplPolygon::ImplPolygon(basegfx::B2DPolygon const&) at 
tools/source/generic/poly.cxx:474:30 (instdir/program/libtllo.so +0x40f35f)
>  #2 in tools::Polygon::Polygon(basegfx::B2DPolygon const&) at 
tools/source/generic/poly.cxx:1849:72 (instdir/program/libtllo.so +0x42c9ff)
>  #3 in ImplPolyPolygon::ImplPolyPolygon(basegfx::B2DPolyPolygon const&) 
at tools/source/generic/poly2.cxx:482:28 (instdir/program/libtllo.so +0x45561e)
>  #4 in tools::PolyPolygon::PolyPolygon(basegfx::B2DPolyPolygon const&) at 
tools/source/generic/poly2.cxx:463:25 (instdir/program/libtllo.so +0x45512d)
>  #5 in emfio::MtfTools::DrawPolygon(tools::Polygon, bool) at 
emfio/source/reader/mtftools.cxx:1287:17 
(instdir/program/../program/libemfiolo.so +0x1828d3)
>  #6 in emfio::WmfReader::ReadRecordParams(unsigned short) at 
emfio/source/reader/wmfreader.cxx:367:21 
(instdir/program/../program/libemfiolo.so +0x1cffde)
>  #7 in emfio::WmfReader::ReadWMF() at 
emfio/source/reader/wmfreader.cxx:1425:29 
(instdir/program/../program/libemfiolo.so +0x1f7567)
>  #8 in 
emfio::emfreader::XEmfParser::getDecomposition(com::sun::star::uno::Reference
 const&, rtl::OUString const&, 
com::sun::star::uno::Sequence const&) at 
emfio/source/emfuno/xemfparser.cxx:152:108 
(instdir/program/../program/libemfiolo.so +0x13795a)
>  #9 in non-virtual thunk to 
emfio::emfreader::XEmfParser::getDecomposition(com::sun::star::uno::Reference
 const&, rtl::OUString const&, 
com::sun::star::uno::Sequence const&) at 
emfio/source/emfuno/xemfparser.cxx (instdir/program/../program/libemfiolo.so 
+0x138735)
>  #10 in VectorGraphicData::ensureSequenceAndRange() at 
vcl/source/gdi/vectorgraphicdata.cxx:172:137 (instdir/program/libvcllo.so 
+0x86bdadf)
>  #11 in VectorGraphicData::ensureReplacement() at 
vcl/source/gdi/vectorgraphicdata.cxx:138:5 (instdir/program/libvcllo.so 
+0x86bcb94)
>  #12 in VectorGraphicData::getReplacement() const at 
vcl/source/gdi/vectorgraphicdata.cxx:286:45 (instdir/program/libvcllo.so 
+0x86c0a04)
>  #13 in ImpGraphic::ImplSetPrefSize(Size const&) at 
vcl/source/gdi/impgraph.cxx:956:45 (instdir/program/libvcllo.so +0x7d05433)
>  #14 in Graphic::SetPrefSize(Size const&) at 
vcl/source/gdi/graph.cxx:388:19 (instdir/program/libvcllo.so +0x7ca7e26)
>  #15 in SvxMSDffManager::GetBLIPDirect(SvStream&, Graphic&, 
tools::Rectangle*) at filter/source/msfilter/msdffimp.cxx:6616:26 
(instdir/program/../program/libmsfilterlo.so +0x9617bc)
>  #16 in SvxMSDffManager::GetBLIP(unsigned long, Graphic&, 
tools::Rectangle*) at filter/source/msfilter/msdffimp.cxx:6453:23 
(instdir/program/../program/libmsfilterlo.so +0x95f368)
>  #17 in SvxMSDffManager::ImportGraphic(SvStream&, SfxItemSet&, DffObjData 
const&) at filter/source/msfilter/msdffimp.cxx:3821:24 
(instdir/program/../program/libmsfilterlo.so +0x990678)
>  #18 in SvxMSDffManager::ImportShape(DffRecordHeader const&, SvStream&, 
SvxMSDffClientData&, tools::Rectangle&, tools::Rectangle const&, int, int*) at 
filter/source/msfilter/msdffimp.cxx:4368:28 
(instdir/program/../program/libmsfilterlo.so +0x9a221a)
>  #19 in SvxMSDffManager::ImportObj(SvStream&, SvxMSDffClientData&, 
tools::Rectangle&, tools::Rectangle const&, int, int*) at 
filter/source/msfilter/msdffimp.cxx:4073:16 
(instdir/program/../program/libmsfilterlo.so +0x9972d8)
>  #20 in SvxMSDffManager::GetShape(unsigned long, SdrObject*&, 
SvxMSDffImportData&) at filter/source/msfilter/msdffimp.cxx:6377:23 
(instdir/program/../program/libmsfilterlo.so +0x9dde0c)
>  #21 in SwWW8ImplReader::Read_GrafLayer(long) at 
sw/source/filter/ww8/ww8graf.cxx:2567:34 
(instdir/program/../program/libmswordlo.so +0x2c51a1f)
>  #22 in SwWW8ImplReader::ReadChar(long, long) at 
sw/source/filter/ww8/ww8par.cxx:3697:17 
(instdir/program/../program/libmswordlo.so +0x2db3a07)
>  #23 in SwWW8ImplReader::ReadChars(int&, int, long, long) at 
sw/source/filter/ww8/ww8par.cxx:3484:27 
(instdir/program/../program/libmswordlo.so +0x2dafba2)
>  #24 in SwWW8ImplReader::ReadText(int, int, ManTypes) at 
sw/source/filter/ww8/ww8par.cxx:4045:22 
(instdir/

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 wsd/LOOLWSD.cpp |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 230aa62d17e4237e344fcf7d95491dbbd97ec660
Author: Jan Holesovsky 
AuthorDate: Tue Jun 4 14:45:26 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jun 4 14:55:08 2019 +0200

Answer 404 when the file to download does not exist.

This gives a better idea what has happened to those using the
Download_As postMessage.  Without this, the attempted download just gets
stuck.

Change-Id: Ic23bbca3761d795251664cf09956468fab13ed80
Reviewed-on: https://gerrit.libreoffice.org/73448
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 00c02138645c89560130be759500cfa0dad86fa8)
Reviewed-on: https://gerrit.libreoffice.org/73450
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 80f657b22..01780a86a 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2540,7 +2540,6 @@ private:
 + JAILED_DOCUMENT_ROOT + tokens[4] + "/" + 
fileName);
 const std::string filePathAnonym = 
LOOLWSD::anonymizeUrl(filePath.toString());
 LOG_INF("HTTP request for: " << filePathAnonym);
-bool responded = false;
 if (filePath.isAbsolute() && File(filePath).exists())
 {
 const Poco::URI postRequestUri(request.getURI());
@@ -2565,7 +2564,6 @@ private:
 try
 {
 HttpHelper::sendFile(socket, filePath.toString(), 
contentType, response);
-responded = true;
 }
 catch (const Exception& exc)
 {
@@ -2578,8 +2576,15 @@ private:
 else
 {
 LOG_ERR("Download file [" << filePathAnonym << "] not found.");
+std::ostringstream oss;
+oss << "HTTP/1.1 404 Not Found\r\n"
+<< "Date: " << 
Poco::DateTimeFormatter::format(Poco::Timestamp(), 
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
+<< "Content-Length: 0\r\n"
+<< "\r\n";
+socket->send(oss.str());
+socket->shutdown();
 }
-(void)responded;
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/reference.html loleaflet/src wsd/DocumentBroker.cpp wsd/reference.md wsd/Storage.cpp wsd/Storage.hpp

[Jan Holesovsky (via logerrit)]

 loleaflet/reference.html  |   18 ++
 loleaflet/src/layer/tile/TileLayer.js |5 -
 loleaflet/src/map/handler/Map.WOPI.js |2 ++
 wsd/DocumentBroker.cpp|1 +
 wsd/Storage.cpp   |4 +++-
 wsd/Storage.hpp   |6 ++
 wsd/reference.md  |7 +++
 7 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit 3c45a0abab883dadc8d1733f24bff36150648c88
Author: Jan Holesovsky 
AuthorDate: Tue Jun 4 13:57:53 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Jun 4 14:54:36 2019 +0200

Introduce Download_As postmessage & a CheckFileInfo entry to enables that.

The Download_As is emitted when the user chooses 'Print' or 'Show
slideshow' or 'Download As [some type'] and the integration indicates
via DownloadAsPostMessage in the CheckFileInfo that it wants to handle
the downloading of pdf for printing or svg for slideshows or experted
document.

This is particularly useful in situations when the integration cannot
rely on browser's support for downloading like in mobile apps that use
the Online in a WebView.

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

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index b0f62caaf..27f969bfd 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3240,6 +3240,24 @@ Note that they usually don't change but there is no 
guarantee that they are stab



+   Download_As
+   
+   Type: 'print'|'slideshow'|'export'
+   URL: 
+   
+   
+ This event is emitted when the user chooses 'Print' or 'Show
+ slideshow' or 'Download As [some type'] and the integration
+ indicates via DownloadAsPostMessage in the CheckFileInfo that 
it
+ wants to handle the downloading of pdf for printing or svg for
+ slideshows or experted document.
+
+ This is in situations when the integration cannot rely on 
browser's
+ support for downloading like in mobile apps that use the 
Online in
+ a WebView.
+   
+   
+   
UI_CreateFile


diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6dc66544e..b936cad94 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -583,7 +583,10 @@ L.TileLayer = L.GridLayer.extend({
encodeURIComponent(this._map.options.doc) + '/' + 
command.jail + '/' + command.dir + '/' + command.name + wopiSrc;
 
this._map.hideBusy();
-   if (command.id === 'print') {
+   if (this._map['wopi'].DownloadAsPostMessage) {
+   this._map.fire('postMessage', {msgId: 'Download_As', 
args: {Type: command.id, URL: url}});
+   }
+   else if (command.id === 'print') {
if (L.Browser.gecko || L.Browser.edge || 
this._map.options.print === false) {
// the print dialog doesn't work well on firefox
// due to a pdf.js issue - 
https://github.com/mozilla/pdf.js/issues/5397
diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index bff0a062f..97b4c7176 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -19,6 +19,7 @@ L.Map.WOPI = L.Handler.extend({
DisableExport: false,
DisableCopy: false,
DisableInactiveMessages: false,
+   DownloadAsPostMessage: false,
UserCanNotWriteRelative: true,
EnableInsertRemoteImage: false,
EnableShare: false,
@@ -83,6 +84,7 @@ L.Map.WOPI = L.Handler.extend({
this.DisableExport = !!wopiInfo['DisableExport'];
this.DisableCopy = !!wopiInfo['DisableCopy'];
this.DisableInactiveMessages = 
!!wopiInfo['DisableInactiveMessages'];
+   this.DownloadAsPostMessage = 
!!wopiInfo['DownloadAsPostMessage'];
this.UserCanNotWriteRelative = 
!!wopiInfo['UserCanNotWriteRelative'];
this.EnableInsertRemoteImage = 
!!wopiInfo['EnableInsertRemoteImage'];
this.SupportsRename = !!wopiInfo['SupportsRename'];
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fefe15ccd..e45f6bff0 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -570,6 +570,7 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 wopiInfo->set("DisableExport", wopifileinfo->getDisableExport());
 wopiInfo->set(

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

[Tor Lillqvist (via logerrit)]

 solenv/bin/native-code.py   |2 ++
 vcl/source/filter/graphicfilter.cxx |   30 ++
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 80457313b4cf9e9d846c5c694500edb71cccb8d7
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:58:20 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 15:49:51 2019 +0300

Add css_comp_Impress_oox_PowerPointExport

Change-Id: I17d95cce0dd69e2ba8b4ebc7045544fc5659a249

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 9160dece3961..aa3a03d3fd20 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -391,6 +391,8 @@ draw_constructor_list = [
 
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
 # sd/util/sdd.component
 "com_sun_star_comp_draw_FormatDetector_get_implementation",
+# sd/util/sdfilt.component
+"css_comp_Impress_oox_PowerPointExport",
 # writerperfect/source/draw/wpftdraw.component
 "com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
 ]
commit a4807544be6a8d042883796386eb7a651d576238
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:20:45 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 15:49:51 2019 +0300

Fix "external" graphic filter code for the DISABLE_DYNLOADING case

The DISABLE_DYNLOADING case in ImpFilterLibCacheEntry::GetImportFunction()
had apparently been broken from the start, but nobody never noticed as
the common formats (PNG, JPEG, GIF etc) use a more "internal"code
path. The problem was noticed now with a TIFF image in a presentation.

The fix for the import case seems to work, but I could not test the
fix for the export case.

Change-Id: Icbd33c7cb654136a562f18b06d5b0896e701bf3d

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 1307f31817bf..61c38ec51067 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -721,27 +721,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
 else if (maFormatName == "iti")
 mpfnImport = 
reinterpret_cast(maLibrary.getFunctionSymbol("itiGraphicImport"));
  #else
-if (maFiltername ==  "icd")
+if (maFormatName ==  "icd")
 mpfnImport = icdGraphicImport;
-else if (maFiltername ==  "idx")
+else if (maFormatName ==  "idx")
 mpfnImport = idxGraphicImport;
-else if (maFiltername ==  "ime")
+else if (maFormatName ==  "ime")
 mpfnImport = imeGraphicImport;
-else if (maFiltername ==  "ipb")
+else if (maFormatName ==  "ipb")
 mpfnImport = ipbGraphicImport;
-else if (maFiltername ==  "ipd")
+else if (maFormatName ==  "ipd")
 mpfnImport = ipdGraphicImport;
-else if (maFiltername ==  "ips")
+else if (maFormatName ==  "ips")
 mpfnImport = ipsGraphicImport;
-else if (maFiltername ==  "ipt")
+else if (maFormatName ==  "ipt")
 mpfnImport = iptGraphicImport;
-else if (maFiltername ==  "ipx")
+else if (maFormatName ==  "ipx")
 mpfnImport = ipxGraphicImport;
-else if (maFiltername ==  "ira")
+else if (maFormatName ==  "ira")
 mpfnImport = iraGraphicImport;
-else if (maFiltername ==  "itg")
+else if (maFormatName ==  "itg")
 mpfnImport = itgGraphicImport;
-else if (maFiltername ==  "iti")
+else if (maFormatName ==  "iti")
 mpfnImport = itiGraphicImport;
  #endif
 }
@@ -1893,9 +1893,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
 
 FilterConfigItem aConfigItem( pFilterData );
 OUString aFilterName( pConfig->GetExportFilterName( nFormat ) );
-#ifndef DISABLE_DYNLOADING
 OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, 
true));
-#endif
 ErrCode nStatus = ERRCODE_NONE;
 GraphicType eType;
 Graphic aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem );
@@ -2187,11 +2185,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
  #else
 --nIdx; // Just one iteration
 PFilterCall pFunc = NULL;
-if (aFilterName == "egi")
+if (aExternalFilterName == "egi")
 pFunc = egiGraphicExport;
-else if (aFilterName == "eps")
+else if (aExternalFilterName == "eps")
 pFunc = epsGraphicExport;
-else if (aFilterName == "eti")
+else if (aExternalFilterName == "eti")
 pFunc = etiGraphicExport;
  #endif
 if( pFunc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffi

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

[Olivier Hallot (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27cd31a75ba3db4871ca47bda46cc0f915221914
Author: Olivier Hallot 
AuthorDate: Sat Jun 1 14:56:55 2019 +0200
Commit: Olivier Hallot 
CommitDate: Tue Jun 4 14:48:30 2019 +0200

TOTD Specify that tip is for Calc

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

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 40385e1d4b4a..d1788a2ef814 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -197,7 +197,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "Don't get lost in large documents. Use the 
Navigator (F5) to find your way through the content."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can use styles to make the tables in 
your document consistent. Choose one from the predefined per Styles (F11) or  
via Table > AutoFormat."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to select a large range of cells 
without scrolling? Type the range reference (e.g. A1:A1000) in the name box 
then Enter"), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Want to center cells on a printed page? 
Format > Page, Page > Layout settings > Table alignment."), "", 
"tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Want to center cells on a printed page in 
Calc? Format > Page, Page > Layout settings > Table alignment."), "", 
"tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can show formulas instead of results 
with View > Show Formula (or Tools > Options > %PRODUCTNAME Calc > View > 
Display > Formulas)."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to jump to a particular page by its 
number? Click the left-most statusbar entry or use Edit > Go To Page… or press 
Ctrl+G."), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "With Tools > AutoText > AutoText > Import 
you can select Word document or template containing the AutoText entries that 
you want to import."), "", "tipoftheday_w.png"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny (via logerrit)]

 vcl/source/gdi/CommonSalLayout.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 8736cc0f5c6d4cb80ccb39ca6797d2f4490dade9
Author: Khaled Hosny 
AuthorDate: Tue Jun 4 03:57:00 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Jun 4 14:46:24 2019 +0200

Use ICU UCHAR_VERTICAL_ORIENTATION when available

Starting from ICU 63, the vertical orientation property is provided by ICU 
so
we use it instead of our inyternal, and potentially outdated data file. Old
code is kept until support for ICU < 63 is dropped.

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

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index e146fb245131..90c519385bd2 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -121,6 +121,14 @@ namespace vcl {
 } // namespace vcl
 
 namespace {
+#if U_ICU_VERSION_MAJOR_NUM >= 63
+enum class VerticalOrientation {
+Upright= U_VO_UPRIGHT,
+Rotated= U_VO_ROTATED,
+TransformedUpright = U_VO_TRANSFORMED_UPRIGHT,
+TransformedRotated = U_VO_TRANSFORMED_ROTATED
+};
+#else
 #include "VerticalOrientationData.cxx"
 
 // These must match the values in the file included above.
@@ -130,6 +138,7 @@ namespace {
 TransformedUpright = 2,
 TransformedRotated = 3
 };
+#endif
 
 VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh, const 
LanguageTag& rTag)
 {
@@ -140,6 +149,9 @@ namespace {
 && rTag.getLanguage() == "zh")
 return VerticalOrientation::TransformedUpright;
 
+#if U_ICU_VERSION_MAJOR_NUM >= 63
+int32_t nRet = u_getIntPropertyValue(cCh, UCHAR_VERTICAL_ORIENTATION);
+#else
 uint8_t nRet = 1;
 
 if (cCh < 0x1)
@@ -158,6 +170,7 @@ namespace {
 // Default value for unassigned
 SAL_WARN("vcl.gdi", "Getting VerticalOrientation for codepoint 
outside Unicode range");
 }
+#endif
 
 return VerticalOrientation(nRet);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Christian Lohmaier]

 check.php |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4fc666eafacc8af3d5c10d146a75949cbaa85f31
Author: Christian Lohmaier 
AuthorDate: Tue Jun 4 14:27:58 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Tue Jun 4 14:27:58 2019 +0200

add campaign keyword for matomo

diff --git a/check.php b/check.php
index f131352..9fd07ff 100644
--- a/check.php
+++ b/check.php
@@ -755,7 +755,7 @@ function print_update_xml($buildid, $os, $arch, $lang, 
$pkgfmt) {
   ' . $arch . '
   ' . $new['version'] . '
   
-  
+  
 
 ';
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Tamás Zolnai (via logerrit)]

 cui/source/dialogs/cuicharmap.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 391d83edb3e5b179968372bff83d828e13fa17ab
Author: Tamás Zolnai 
AuthorDate: Sat Jun 1 13:28:36 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 4 14:21:42 2019 +0200

tdf#125576: Empty recent characters in special characters dialog...

... for bullet customization

Change-Id: Ica66dcc0d3f379886788d426941b98d170444799
Reviewed-on: https://gerrit.libreoffice.org/73306
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 7dc6525fddc418359eefa2cd7c7ecbbd1269e8f6)
Reviewed-on: https://gerrit.libreoffice.org/73318
Reviewed-by: Andras Timar 

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 7999aaba15a2..61899ea50a8c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -921,8 +921,12 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchCharSelectHdl, 
SvxShowCharSet*, void)
 
 IMPL_LINK_NOARG(SvxCharacterMap, InsertClickHdl, weld::Button&, void)
 {
-   insertCharToDoc(m_aShowChar.GetText());
-   m_xDialog->response(RET_OK);
+OUString sChar = m_aShowChar.GetText();
+insertCharToDoc(sChar);
+// Need to update recent character list, when OK button does not insert
+if(!m_xFrame.is())
+updateRecentCharacterList(sChar, aFont.GetFamilyName());
+m_xDialog->response(RET_OK);
 }
 
 IMPL_LINK_NOARG(SvxCharacterMap, FavSelectHdl, weld::Button&, void)
___
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' - cui/source

[Tamás Zolnai (via logerrit)]

 cui/source/dialogs/cuicharmap.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 4531b32e0b58933179408fcff779aabe659e50a9
Author: Tamás Zolnai 
AuthorDate: Sat Jun 1 13:28:36 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Jun 4 14:21:52 2019 +0200

tdf#125576: Empty recent characters in special characters dialog...

... for bullet customization

Change-Id: Ica66dcc0d3f379886788d426941b98d170444799
Reviewed-on: https://gerrit.libreoffice.org/73306
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 7dc6525fddc418359eefa2cd7c7ecbbd1269e8f6)
Reviewed-on: https://gerrit.libreoffice.org/73310
Reviewed-by: Andras Timar 

diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 807b772fdbcd..4994582c250c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -921,8 +921,12 @@ IMPL_LINK_NOARG(SvxCharacterMap, SearchCharSelectHdl, 
SvxShowCharSet*, void)
 
 IMPL_LINK_NOARG(SvxCharacterMap, InsertClickHdl, weld::Button&, void)
 {
-   insertCharToDoc(m_aShowChar.GetText());
-   m_xDialog->response(RET_OK);
+OUString sChar = m_aShowChar.GetText();
+insertCharToDoc(sChar);
+// Need to update recent character list, when OK button does not insert
+if(!m_xFrame.is())
+updateRecentCharacterList(sChar, aFont.GetFamilyName());
+m_xDialog->response(RET_OK);
 }
 
 IMPL_LINK_NOARG(SvxCharacterMap, FavSelectHdl, weld::Button&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - dictionaries

[wishawa (via logerrit)]

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

New commits:
commit 60398a79d439d799e65724e12f2624c816a20e94
Author: wishawa 
AuthorDate: Thu May 30 23:29:24 2019 +0700
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 14:19:59 2019 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-6-3'
  - Remove abbreviations from Thai hunspell dictionary.

Reasons:
1. They are not present in other spellcheck dictionaries (such as en).
2. To add all abreviations would not be much different from adding all
possible combinations of 2-3 Thai consonants. This would make misspelled
abbreviations come as correct to the spellcheck anyway.
3. Adding only the most common ones can cause confusion to those using
less common ones, as the spellchecker will suggest the more common
abbreviation. It is also nearly impossible to determine if an 
abbreviation
is common that it should be added or not.
Change-Id: I8b7bce70f552ab3b356e1ab2c101e9e31a8ec271
Reviewed-on: https://gerrit.libreoffice.org/73216
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit e122922802e82eef43a6e17762b2e80b66ce6f1c)
Reviewed-on: https://gerrit.libreoffice.org/73443

diff --git a/dictionaries b/dictionaries
index 0e34c006e590..f076e661247f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 0e34c006e590251047ec22bea3606b0abf04573c
+Subproject commit f076e661247f721fd21cd430083c16617f80cfa4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-3' - th_TH/README_th_TH.txt th_TH/th_TH.dic

[wishawa (via logerrit)]

 th_TH/README_th_TH.txt |2 
 th_TH/th_TH.dic|  375 -
 2 files changed, 2 insertions(+), 375 deletions(-)

New commits:
commit f076e661247f721fd21cd430083c16617f80cfa4
Author: wishawa 
AuthorDate: Thu May 30 23:29:24 2019 +0700
Commit: Andras Timar 
CommitDate: Tue Jun 4 14:19:59 2019 +0200

Remove abbreviations from Thai hunspell dictionary.

Reasons:
1. They are not present in other spellcheck dictionaries (such as en).
2. To add all abreviations would not be much different from adding all
possible combinations of 2-3 Thai consonants. This would make misspelled
abbreviations come as correct to the spellcheck anyway.
3. Adding only the most common ones can cause confusion to those using
less common ones, as the spellchecker will suggest the more common
abbreviation. It is also nearly impossible to determine if an abbreviation
is common that it should be added or not.
Change-Id: I8b7bce70f552ab3b356e1ab2c101e9e31a8ec271
Reviewed-on: https://gerrit.libreoffice.org/73216
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit e122922802e82eef43a6e17762b2e80b66ce6f1c)
Reviewed-on: https://gerrit.libreoffice.org/73443

diff --git a/th_TH/README_th_TH.txt b/th_TH/README_th_TH.txt
index d84eb04..131592f 100644
--- a/th_TH/README_th_TH.txt
+++ b/th_TH/README_th_TH.txt
@@ -1,5 +1,5 @@
 name   :  th_TH version of the thai dictionary
-date   :  2019.04.11
+date   :  2019.05.30
 License:  LGPL
 
 This dictionary, Thai wordlist are compound from 
diff --git a/th_TH/th_TH.dic b/th_TH/th_TH.dic
index 4d7fdfd..f0e8795 100644
--- a/th_TH/th_TH.dic
+++ b/th_TH/th_TH.dic
@@ -1,26 +1,12 @@
-52055
-ก.
-ก.ค.
-ก.ต.
-ก.ป.ส.
-ก.พ.
-ก.พ.ด.
-ก.ม.
-ก.ร.
-ก.ล.ต.
-ก.ว.
+51683
 กก
-กก.
 กกกอด
 กกขนาก
-กกจ.
 กกช้าง
-กกท.
 กกธูป
 กกหู
 กกุธภัณฑ์
 กค
-กคช.
 กง
 กงกอน
 กงการ
@@ -112,33 +98,24 @@
 กถามรรคเทศนา
 กถามุข
 กถิกาจารย์
-กทท.
-กทธ.
-กทพ.
-กทม.
 กทรรป
 กทลี
 กน
-กน.
 กนก
-กนข.
 กนน
 กนนเชอ
 กนนเหิม
-กนอ.
 กนิษฐ
 กนิษฐภคินี
 กนิษฐภาดา
 กนิษฐา
 กนิษฐ์
 กบ
-กบข.
 กบฏ
 กบดาน
 กบทู
 กบทูด
 กบบัว
-กบว.
 กบาล
 กบินทร์
 กบิล
@@ -150,24 +127,12 @@
 กบเลือกนาย
 กบเหลาดินสอ
 กบไสไม้
-กปจ.
-กปช.
 กปณ
 กปณก
 กปณา
-กปน.
-กปภ.
-กปร.
-กปส.
-กปอ.
 กปิ
 กปิตัน
-กพร.
-กฟน.
-กฟผ.
-กฟภ.
 กม
-กม.
 กมณฑลาภิเษก
 กมณฑโลทก
 กมล
@@ -216,7 +181,6 @@
 กรนนเช้า
 กรบ
 กรบูร
-กรป.กลาง
 กรพินธุ์
 กรภุม
 กรม
@@ -415,7 +379,6 @@
 กรสาปน์
 กรสุทธิ์
 กรอ
-กรอ.
 กรอก
 กรอกรุย
 กรอกแกรก
@@ -2009,11 +1972,6 @@
 กว้านซื้อ
 กว้าว
 กว๊าน
-กศ.ด.
-กศ.บ.
-กศ.ม.
-กศก.
-กศน.
 กษ
 กษณะ
 กษมา
@@ -2042,12 +2000,6 @@
 กษีระ
 กษีรามพุ
 กษีรารณพ
-กส.บ.
-กสช.
-กสท.
-กสร.
-กสส.
-กสอ.
 กสานติ์
 กสิ
 กสิกร
@@ -2057,7 +2009,6 @@
 กหังปายา
 กหาปณะ
 กอ
-กอ.รมน.
 กอก
 กอง
 กองกลาง
@@ -5012,9 +4963,6 @@
 ขษัย
 ขษีณาศรพ
 ขษีร
-ขส.ทบ.
-ขส.ทร.
-ขส.มก.
 ขอ
 ขอก
 ขอขมา
@@ -5960,9 +5908,6 @@
 ข้าเจ้า
 ข้าแผ่นดิน
 ฃวด
-ค.บ.
-ค.ร.น.
-ค.ศ.
 คค
 คคน
 คคนะ
@@ -5988,7 +5933,6 @@
 คงแก่เรียน
 คงไคย
 คงไว้
-คจก.
 คช
 คชกรรม
 คชบาล
@@ -6313,7 +6257,6 @@
 คบไฟ
 คบไม่ได้
 คบไม้
-คปอส.
 คม
 คมกริบ
 คมกล้า
@@ -6345,7 +6288,6 @@
 ครบเกณฑ์
 ครบเกษียณ
 ครบเครื่อง
-ครม.
 ครรชิต
 ครรภ
 ครรภ์
@@ -7626,7 +7568,6 @@
 คว้าแชมป์
 คว้าโอกาสที่ดี
 คว้าไขว่
-คสช.
 คห
 คหกรรม
 คหกรรมศาสตร์
@@ -7656,8 +7597,6 @@
 คอตั้งบ่า
 คอตีบ
 คอต่อ
-คอท.
-คอทส.
 คอทองแดง
 คอน
 คอนกรีต
@@ -7796,7 +7735,6 @@
 คอลเลจ
 คอลเล็กชั่น
 คอวี
-คอส.
 คอสตาริกา
 คอสติกโซดา
 คอสตูม
@@ -9029,9 +8967,6 @@
 ง้าง
 ง้าว
 ง้ำ
-จ.
-จ.ม.
-จ.ศ.
 จก
 จง
 จงกรม
@@ -9091,7 +9026,6 @@
 จตุลังคบาท
 จตุสดมภ์
 จตุโลกบาล
-จท.
 จน
 จนกรอบ
 จนกระทั่ง
@@ -9103,7 +9037,6 @@
 จนตาย
 จนถึง
 จนถึงที่สุด
-จนท.
 จนบัดนี้
 จนปัญญา
 จนมุม
@@ -9137,7 +9070,6 @@
 จมูกไว
 จมเบ้า
 จมไม่ลง
-จยย.
 จยุติ
 จร
 จรกลู่
@@ -10318,8 +10250,6 @@
 ฉ้อฉล
 ฉ้อราษฎร์บังหลวง
 ฉ้อโกง
-ช.ค.
-ช.ค.บ.
 ชก
 ชกต่อย
 ชกมวย
@@ -10393,7 +10323,6 @@
 ชบา
 ชปโยค
 ชม
-ชม.
 ชมชอบ
 ชมดชม้อย
 ชมนาด
@@ -11423,7 +11352,6 @@
 ช้ำเลือดช้ำหนอง
 ช้ำใจ
 ช๊อปปิ้ง
-ซ.
 ซก
 ซกมก
 ซงดำ
@@ -11433,7 +11361,6 @@
 ซบ
 ซบเซา
 ซม
-ซม.
 ซมซาน
 ซรอกซรัง
 ซวด
@@ -11718,7 +11645,6 @@
 ซิ่น
 ซิ้ม
 ซี
-ซี.ไอ.เอ
 ซีก
 ซีกโลก
 ซีคอน
@@ -11969,7 +11895,6 @@
 ซ้ำแล้วซ้ำอีก
 ซ้ำแล้วซ้ำเล่า
 ซ้ำไปซ้ำมา
-ฌกส.
 ฌาน
 ฌาปน
 ฌาปนกิจ
@@ -12036,8 +11961,6 @@
 ณรงค์
 ณัฐวุฒิ
 ณเดชน์
-ด.ช.
-ด.ญ.
 ดก
 ดกดื่น
 ดง
@@ -12063,7 +11986,6 @@
 ดมไร
 ดยุก
 ดยุค
-ดร.
 ดรงค์
 ดรณี
 ดรรชนี
@@ -12798,8 +12720,6 @@
 ด้ายหลอด
 ด้าว
 ด้ำ
-ต.
-ต.ช.ด.
 ตก
 ตกกระ
 ตกกระป๋อง
@@ -12894,7 +12814,6 @@
 ตงฉิน
 ตงิด
 ตงุ่น
-ตชด.
 ตด
 ตติย
 ตถตา
@@ -12918,13 +12837,10 @@
 ตบแผละ
 ตปนียะ
 ตม
-ตม.
 ตมูก
 ตยาค
 ตยาคี
 ตยุติ
-ตร.
-ตร.ว.
 ตรง
 ตรงกลาง
 ตรงกัน
@@ -14638,8 +14554,6 @@
 ต๋อง
 ต๋อม
 ต๋าว
-ถ.
-ถ.พ.
 ถก
 ถกปัญหา
 ถกผ้า
@@ -15105,14 +15019,7 @@
 ถ้ำชา
 ถ้ำมอง
 ถ้ำยาดม
-ท.ญ.
-ท.ทบ.
-ท.บ.
-ท.พ.
-ท.ร.ท.
-ทกท.
 ทกล้า
-ทค.
 ทงคัตสึ
 ทงัน
 ทชี
@@ -15127,7 +15034,6 @@
 ทดเลข
 ทดแทน
 ทดโทร่ห
-ททท.
 ทธิ
 ทน
 ทนง
@@ -15148,7 +15054,6 @@
 ทนไฟ
 ทนไม่ไหว
 ทบ
-ทบ.
 ทบต้น
 ทบทวน
 ทบวง
@@ -15166,7 +15071,6 @@
 ทยอย
 ทยาลุ
 ทยาลุก

[Libreoffice-commits] core.git: dictionaries

[wishawa (via logerrit)]

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

New commits:
commit fce79b2347d93b74310775dc9dcd080674579435
Author: wishawa 
AuthorDate: Thu May 30 23:29:24 2019 +0700
Commit: Gerrit Code Review 
CommitDate: Tue Jun 4 14:18:16 2019 +0200

Update git submodules

* Update dictionaries from branch 'master'
  - Remove abbreviations from Thai hunspell dictionary.

Reasons:
1. They are not present in other spellcheck dictionaries (such as en).
2. To add all abreviations would not be much different from adding all
possible combinations of 2-3 Thai consonants. This would make misspelled
abbreviations come as correct to the spellcheck anyway.
3. Adding only the most common ones can cause confusion to those using
less common ones, as the spellchecker will suggest the more common
abbreviation. It is also nearly impossible to determine if an 
abbreviation
is common that it should be added or not.
Change-Id: I8b7bce70f552ab3b356e1ab2c101e9e31a8ec271
Reviewed-on: https://gerrit.libreoffice.org/73216
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index 547d7a6839fa..e122922802e8 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 547d7a6839fa289ca52c2a241f9923e0359aee2f
+Subproject commit e122922802e82eef43a6e17762b2e80b66ce6f1c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: th_TH/README_th_TH.txt th_TH/th_TH.dic

[wishawa (via logerrit)]

 th_TH/README_th_TH.txt |2 
 th_TH/th_TH.dic|  375 -
 2 files changed, 2 insertions(+), 375 deletions(-)

New commits:
commit e122922802e82eef43a6e17762b2e80b66ce6f1c
Author: wishawa 
AuthorDate: Thu May 30 23:29:24 2019 +0700
Commit: Andras Timar 
CommitDate: Tue Jun 4 14:18:16 2019 +0200

Remove abbreviations from Thai hunspell dictionary.

Reasons:
1. They are not present in other spellcheck dictionaries (such as en).
2. To add all abreviations would not be much different from adding all
possible combinations of 2-3 Thai consonants. This would make misspelled
abbreviations come as correct to the spellcheck anyway.
3. Adding only the most common ones can cause confusion to those using
less common ones, as the spellchecker will suggest the more common
abbreviation. It is also nearly impossible to determine if an abbreviation
is common that it should be added or not.
Change-Id: I8b7bce70f552ab3b356e1ab2c101e9e31a8ec271
Reviewed-on: https://gerrit.libreoffice.org/73216
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/th_TH/README_th_TH.txt b/th_TH/README_th_TH.txt
index d84eb04..131592f 100644
--- a/th_TH/README_th_TH.txt
+++ b/th_TH/README_th_TH.txt
@@ -1,5 +1,5 @@
 name   :  th_TH version of the thai dictionary
-date   :  2019.04.11
+date   :  2019.05.30
 License:  LGPL
 
 This dictionary, Thai wordlist are compound from 
diff --git a/th_TH/th_TH.dic b/th_TH/th_TH.dic
index 4d7fdfd..f0e8795 100644
--- a/th_TH/th_TH.dic
+++ b/th_TH/th_TH.dic
@@ -1,26 +1,12 @@
-52055
-ก.
-ก.ค.
-ก.ต.
-ก.ป.ส.
-ก.พ.
-ก.พ.ด.
-ก.ม.
-ก.ร.
-ก.ล.ต.
-ก.ว.
+51683
 กก
-กก.
 กกกอด
 กกขนาก
-กกจ.
 กกช้าง
-กกท.
 กกธูป
 กกหู
 กกุธภัณฑ์
 กค
-กคช.
 กง
 กงกอน
 กงการ
@@ -112,33 +98,24 @@
 กถามรรคเทศนา
 กถามุข
 กถิกาจารย์
-กทท.
-กทธ.
-กทพ.
-กทม.
 กทรรป
 กทลี
 กน
-กน.
 กนก
-กนข.
 กนน
 กนนเชอ
 กนนเหิม
-กนอ.
 กนิษฐ
 กนิษฐภคินี
 กนิษฐภาดา
 กนิษฐา
 กนิษฐ์
 กบ
-กบข.
 กบฏ
 กบดาน
 กบทู
 กบทูด
 กบบัว
-กบว.
 กบาล
 กบินทร์
 กบิล
@@ -150,24 +127,12 @@
 กบเลือกนาย
 กบเหลาดินสอ
 กบไสไม้
-กปจ.
-กปช.
 กปณ
 กปณก
 กปณา
-กปน.
-กปภ.
-กปร.
-กปส.
-กปอ.
 กปิ
 กปิตัน
-กพร.
-กฟน.
-กฟผ.
-กฟภ.
 กม
-กม.
 กมณฑลาภิเษก
 กมณฑโลทก
 กมล
@@ -216,7 +181,6 @@
 กรนนเช้า
 กรบ
 กรบูร
-กรป.กลาง
 กรพินธุ์
 กรภุม
 กรม
@@ -415,7 +379,6 @@
 กรสาปน์
 กรสุทธิ์
 กรอ
-กรอ.
 กรอก
 กรอกรุย
 กรอกแกรก
@@ -2009,11 +1972,6 @@
 กว้านซื้อ
 กว้าว
 กว๊าน
-กศ.ด.
-กศ.บ.
-กศ.ม.
-กศก.
-กศน.
 กษ
 กษณะ
 กษมา
@@ -2042,12 +2000,6 @@
 กษีระ
 กษีรามพุ
 กษีรารณพ
-กส.บ.
-กสช.
-กสท.
-กสร.
-กสส.
-กสอ.
 กสานติ์
 กสิ
 กสิกร
@@ -2057,7 +2009,6 @@
 กหังปายา
 กหาปณะ
 กอ
-กอ.รมน.
 กอก
 กอง
 กองกลาง
@@ -5012,9 +4963,6 @@
 ขษัย
 ขษีณาศรพ
 ขษีร
-ขส.ทบ.
-ขส.ทร.
-ขส.มก.
 ขอ
 ขอก
 ขอขมา
@@ -5960,9 +5908,6 @@
 ข้าเจ้า
 ข้าแผ่นดิน
 ฃวด
-ค.บ.
-ค.ร.น.
-ค.ศ.
 คค
 คคน
 คคนะ
@@ -5988,7 +5933,6 @@
 คงแก่เรียน
 คงไคย
 คงไว้
-คจก.
 คช
 คชกรรม
 คชบาล
@@ -6313,7 +6257,6 @@
 คบไฟ
 คบไม่ได้
 คบไม้
-คปอส.
 คม
 คมกริบ
 คมกล้า
@@ -6345,7 +6288,6 @@
 ครบเกณฑ์
 ครบเกษียณ
 ครบเครื่อง
-ครม.
 ครรชิต
 ครรภ
 ครรภ์
@@ -7626,7 +7568,6 @@
 คว้าแชมป์
 คว้าโอกาสที่ดี
 คว้าไขว่
-คสช.
 คห
 คหกรรม
 คหกรรมศาสตร์
@@ -7656,8 +7597,6 @@
 คอตั้งบ่า
 คอตีบ
 คอต่อ
-คอท.
-คอทส.
 คอทองแดง
 คอน
 คอนกรีต
@@ -7796,7 +7735,6 @@
 คอลเลจ
 คอลเล็กชั่น
 คอวี
-คอส.
 คอสตาริกา
 คอสติกโซดา
 คอสตูม
@@ -9029,9 +8967,6 @@
 ง้าง
 ง้าว
 ง้ำ
-จ.
-จ.ม.
-จ.ศ.
 จก
 จง
 จงกรม
@@ -9091,7 +9026,6 @@
 จตุลังคบาท
 จตุสดมภ์
 จตุโลกบาล
-จท.
 จน
 จนกรอบ
 จนกระทั่ง
@@ -9103,7 +9037,6 @@
 จนตาย
 จนถึง
 จนถึงที่สุด
-จนท.
 จนบัดนี้
 จนปัญญา
 จนมุม
@@ -9137,7 +9070,6 @@
 จมูกไว
 จมเบ้า
 จมไม่ลง
-จยย.
 จยุติ
 จร
 จรกลู่
@@ -10318,8 +10250,6 @@
 ฉ้อฉล
 ฉ้อราษฎร์บังหลวง
 ฉ้อโกง
-ช.ค.
-ช.ค.บ.
 ชก
 ชกต่อย
 ชกมวย
@@ -10393,7 +10323,6 @@
 ชบา
 ชปโยค
 ชม
-ชม.
 ชมชอบ
 ชมดชม้อย
 ชมนาด
@@ -11423,7 +11352,6 @@
 ช้ำเลือดช้ำหนอง
 ช้ำใจ
 ช๊อปปิ้ง
-ซ.
 ซก
 ซกมก
 ซงดำ
@@ -11433,7 +11361,6 @@
 ซบ
 ซบเซา
 ซม
-ซม.
 ซมซาน
 ซรอกซรัง
 ซวด
@@ -11718,7 +11645,6 @@
 ซิ่น
 ซิ้ม
 ซี
-ซี.ไอ.เอ
 ซีก
 ซีกโลก
 ซีคอน
@@ -11969,7 +11895,6 @@
 ซ้ำแล้วซ้ำอีก
 ซ้ำแล้วซ้ำเล่า
 ซ้ำไปซ้ำมา
-ฌกส.
 ฌาน
 ฌาปน
 ฌาปนกิจ
@@ -12036,8 +11961,6 @@
 ณรงค์
 ณัฐวุฒิ
 ณเดชน์
-ด.ช.
-ด.ญ.
 ดก
 ดกดื่น
 ดง
@@ -12063,7 +11986,6 @@
 ดมไร
 ดยุก
 ดยุค
-ดร.
 ดรงค์
 ดรณี
 ดรรชนี
@@ -12798,8 +12720,6 @@
 ด้ายหลอด
 ด้าว
 ด้ำ
-ต.
-ต.ช.ด.
 ตก
 ตกกระ
 ตกกระป๋อง
@@ -12894,7 +12814,6 @@
 ตงฉิน
 ตงิด
 ตงุ่น
-ตชด.
 ตด
 ตติย
 ตถตา
@@ -12918,13 +12837,10 @@
 ตบแผละ
 ตปนียะ
 ตม
-ตม.
 ตมูก
 ตยาค
 ตยาคี
 ตยุติ
-ตร.
-ตร.ว.
 ตรง
 ตรงกลาง
 ตรงกัน
@@ -14638,8 +14554,6 @@
 ต๋อง
 ต๋อม
 ต๋าว
-ถ.
-ถ.พ.
 ถก
 ถกปัญหา
 ถกผ้า
@@ -15105,14 +15019,7 @@
 ถ้ำชา
 ถ้ำมอง
 ถ้ำยาดม
-ท.ญ.
-ท.ทบ.
-ท.บ.
-ท.พ.
-ท.ร.ท.
-ทกท.
 ทกล้า
-ทค.
 ทงคัตสึ
 ทงัน
 ทชี
@@ -15127,7 +15034,6 @@
 ทดเลข
 ทดแทน
 ทดโทร่ห
-ททท.
 ทธิ
 ทน
 ทนง
@@ -15148,7 +15054,6 @@
 ทนไฟ
 ทนไม่ไหว
 ทบ
-ทบ.
 ทบต้น
 ทบทวน
 ทบวง
@@ -15166,7 +15071,6 @@
 ทยอย
 ทยาลุ
 ทยาลุก
-ทร.
 ทรกรรม
 ทรง
 ทรงกระบอก
@@ -15396,7 +15300,6 @@
 ทศ
 ทศกัณฐ์
 ทศชาติ
-ทศท.
 ทศทิศ
 ทศนิยม
 ทศพร
@@ -15408,7 +15311,6 @@
 

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

[Matthias Seidel (via logerrit)]

 cui/source/tabpages/frmdirlbox.src |   38 ++---
 scripting/README   |4 +--
 2 files changed, 9 insertions(+), 33 deletions(-)

New commits:
commit 1f21ba2f2a1bc287cd869b0a03eac6e8a90eb21f
Author: Matthias Seidel 
AuthorDate: Tue Jun 4 11:10:30 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 4 11:10:30 2019 +

Fixed typo

diff --git a/scripting/README b/scripting/README
index 686e4ad30f25..bcf92f38fa11 100644
--- a/scripting/README
+++ b/scripting/README
@@ -1,6 +1,6 @@
 This module provides the source code for the Scripting Framework. For
 more information on the Scripting Framework, see the project web page:
-http://framework.openoffice.org/scripting/
+https://framework.openoffice.org/scripting/
 
 Source Code Structure
 =
@@ -31,7 +31,7 @@ UNO dialogs from various languages
 - java/com/sun/star/script/framework/provider
 
 Implementation of an abstract base class ScriptProvider which provides
-core methods for implementing Java based LanguageScriptProvider implemetations
+core methods for implementing Java based LanguageScriptProvider implementations
 
 - java/com/sun/star/script/framework/provider/*
 
commit 99c696980cf2a97ea08ed630cf1be2af795a3b0b
Author: Matthias Seidel 
AuthorDate: Tue Jun 4 11:07:44 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jun 4 11:07:44 2019 +

Cleaned up whitespace

diff --git a/cui/source/tabpages/frmdirlbox.src 
b/cui/source/tabpages/frmdirlbox.src
index a90758f1a442..816820609c42 100644
--- a/cui/source/tabpages/frmdirlbox.src
+++ b/cui/source/tabpages/frmdirlbox.src
@@ -27,63 +27,39 @@
 
 String RID_SVXSTR_FRAMEDIR_LTR
 {
-Text [ en-US ] = "Left-to-right";
+Text [ en-US ] = "Left-to-right" ;
 };
 
 String RID_SVXSTR_FRAMEDIR_RTL
 {
-Text [ en-US ] = "Right-to-left";
+Text [ en-US ] = "Right-to-left" ;
 };
 
 String RID_SVXSTR_FRAMEDIR_SUPER
 {
-Text [ en-US ] = "Use superordinate object settings";
+Text [ en-US ] = "Use superordinate object settings" ;
 };
 
 // page direction -
 
 String RID_SVXSTR_PAGEDIR_LTR_HORI
 {
-Text [ en-US ] = "Left-to-right (horizontal)";
+Text [ en-US ] = "Left-to-right (horizontal)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_RTL_HORI
 {
-Text [ en-US ] = "Right-to-left (horizontal)";
+Text [ en-US ] = "Right-to-left (horizontal)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_RTL_VERT
 {
-Text [ en-US ] = "Right-to-left (vertical)";
+Text [ en-US ] = "Right-to-left (vertical)" ;
 };
 
 String RID_SVXSTR_PAGEDIR_LTR_VERT
 {
-Text [ en-US ] = "Left-to-right (vertical)";
+Text [ en-US ] = "Left-to-right (vertical)" ;
 };
 
 // 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |   10 --
 sw/source/filter/ww8/docxattributeoutput.cxx |   25 +
 sw/source/filter/ww8/docxattributeoutput.hxx |3 +++
 3 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit caf2f5fff39caf06204f71d0c2276b415ef047c3
Author: László Németh 
AuthorDate: Tue Jun 4 13:06:33 2019 +0200
Commit: László Németh 
CommitDate: Tue Jun 4 14:09:31 2019 +0200

tdf#70234 DOCX: export tracked deletion of fields

Multiple runs of a field weren't exported as
tracked deletion, resulting bad DOCX export
with reappearing deleted fields in LO and
invalid document in MSO.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index f7e69073085c..3864ecede42f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -852,8 +852,14 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, "tdf70234.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-// import fields with tracked deletion
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:fldChar");
+// import field with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r[1]/w:fldChar");
+
+// export multiple runs of a field with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r", 6);
+
+// export w:delInstrText
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:delInstrText");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 472649c7585a..5a0b1708c6f5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1502,6 +1502,7 @@ void DocxAttributeOutput::EndRun(const SwTextNode* pNode, 
sal_Int32 nPos, bool /
 m_pSerializer->endElementNS( XML_w, XML_r );
 
 // if there is some redlining in the document, output it
+// (except in the case of fields with multiple runs)
 EndRedline( m_pRedlineData );
 
 // enclose in a sdt block, if necessary: if one is already started, then 
don't do it for now
@@ -1543,7 +1544,10 @@ void DocxAttributeOutput::EndRun(const SwTextNode* 
pNode, sal_Int32 nPos, bool /
 
 WritePendingPlaceholder();
 
-m_pRedlineData = nullptr;
+if ( !m_bWritingField )
+{
+m_pRedlineData = nullptr;
+}
 
 if ( m_closeHyperlinkInThisRun )
 {
@@ -1602,6 +1606,11 @@ void DocxAttributeOutput::EndRun(const SwTextNode* 
pNode, sal_Int32 nPos, bool /
 }
 }
 
+if ( m_pRedlineData )
+{
+EndRedline( m_pRedlineData );
+m_pRedlineData = nullptr;
+}
 
 DoWriteBookmarksStart(m_rFinalBookmarksStart);
 DoWriteBookmarksEnd(m_rFinalBookmarksEnd);
@@ -1908,6 +1917,8 @@ void DocxAttributeOutput::StartField_Impl( const 
SwTextNode* pNode, sal_Int32 nP
 }
 else
 {
+m_bWritingField = true;
+
 // Write the field start
 if ( rInfos.pField && (rInfos.pField->Which() == 
SwFieldIds::DateTime) && rInfos.pField->GetSubType() & FIXEDFLD )
 {
@@ -1946,9 +1957,13 @@ void DocxAttributeOutput::DoWriteCmd( const OUString& 
rCmd )
 m_aSeqBookmarksNames[sSeqName].push_back(m_sLastOpenedBookmark);
 }
 // Write the Field command
-m_pSerializer->startElementNS(XML_w, XML_instrText);
+sal_Int32 nTextToken = XML_instrText;
+if ( m_pRedlineData && m_pRedlineData->GetType() == RedlineType::Delete )
+nTextToken = XML_delInstrText;
+
+m_pSerializer->startElementNS(XML_w, nTextToken);
 m_pSerializer->writeEscaped( rCmd );
-m_pSerializer->endElementNS( XML_w, XML_instrText );
+m_pSerializer->endElementNS( XML_w, nTextToken );
 
 }
 
@@ -2147,6 +2162,7 @@ void DocxAttributeOutput::EndField_Impl( const 
SwTextNode* pNode, sal_Int32 nPos
 // Write the Field end
 if ( rInfos.bClose  )
 {
+m_bWritingField = false;
 m_pSerializer->startElementNS(XML_w, XML_r);
 DoWriteFieldRunProperties( pNode, nPos );
 m_pSerializer->singleElementNS(XML_w, XML_fldChar, FSNS(XML_w, 
XML_fldCharType), "end");
@@ -3041,7 +3057,7 @@ void DocxAttributeOutput::StartRedline( const 
SwRedlineData * pRedlineData )
 
 void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData )
 {
-if ( !pRedlineData )
+if ( !pRedlineData || m_bWritingField )
 return;
 
 switch ( pRedlineData->GetType() )
@@ -9082,6 +9098,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport 
&rExport, const FSHelperPtr

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin

[Tor Lillqvist (via logerrit)]

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

New commits:
commit df91a0f2b3adad089982a07d80acddae17ba41c4
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:58:20 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 14:58:20 2019 +0300

Add css_comp_Impress_oox_PowerPointExport

Change-Id: I17d95cce0dd69e2ba8b4ebc7045544fc5659a249

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 5d038e1f9080..7cafe1557d3f 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -351,6 +351,8 @@ draw_constructor_list = [
 
"com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation",
 # sd/util/sdd.component
 "com_sun_star_comp_draw_FormatDetector_get_implementation",
+# sd/util/sdfilt.component
+"css_comp_Impress_oox_PowerPointExport",
 # writerperfect/source/draw/wpftdraw.component
 "com_sun_star_comp_Draw_VisioImportFilter_get_implementation",
 ]
___
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' - vcl/source

[Tor Lillqvist (via logerrit)]

 vcl/source/filter/graphicfilter.cxx |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

New commits:
commit b60ac2d6fc46aa5e44c1c9375aa37825ee07683f
Author: Tor Lillqvist 
AuthorDate: Tue Jun 4 14:20:45 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 4 14:37:33 2019 +0300

Fix "external" graphic filter code for the DISABLE_DYNLOADING case

The DISABLE_DYNLOADING case in ImpFilterLibCacheEntry::GetImportFunction()
had apparently been broken from the start, but nobody never noticed as
the common formats (PNG, JPEG, GIF etc) use a more "internal"code
path. The problem was noticed now with a TIFF image in a presentation.

The fix for the import case seems to work, but I could not test the
fix for the export case.

Change-Id: Icbd33c7cb654136a562f18b06d5b0896e701bf3d

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 7a869a7aee4b..bef80fb94b24 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -976,27 +976,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
 else if (maFormatName == "iti")
 mpfnImport = 
reinterpret_cast(maLibrary.getFunctionSymbol("itiGraphicImport"));
  #else
-if (maFiltername ==  "icd")
+if (maFormatName ==  "icd")
 mpfnImport = icdGraphicImport;
-else if (maFiltername ==  "idx")
+else if (maFormatName ==  "idx")
 mpfnImport = idxGraphicImport;
-else if (maFiltername ==  "ime")
+else if (maFormatName ==  "ime")
 mpfnImport = imeGraphicImport;
-else if (maFiltername ==  "ipb")
+else if (maFormatName ==  "ipb")
 mpfnImport = ipbGraphicImport;
-else if (maFiltername ==  "ipd")
+else if (maFormatName ==  "ipd")
 mpfnImport = ipdGraphicImport;
-else if (maFiltername ==  "ips")
+else if (maFormatName ==  "ips")
 mpfnImport = ipsGraphicImport;
-else if (maFiltername ==  "ipt")
+else if (maFormatName ==  "ipt")
 mpfnImport = iptGraphicImport;
-else if (maFiltername ==  "ipx")
+else if (maFormatName ==  "ipx")
 mpfnImport = ipxGraphicImport;
-else if (maFiltername ==  "ira")
+else if (maFormatName ==  "ira")
 mpfnImport = iraGraphicImport;
-else if (maFiltername ==  "itg")
+else if (maFormatName ==  "itg")
 mpfnImport = itgGraphicImport;
-else if (maFiltername ==  "iti")
+else if (maFormatName ==  "iti")
 mpfnImport = itiGraphicImport;
  #endif
 }
@@ -1925,9 +1925,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
 
 FilterConfigItem aConfigItem( pFilterData );
 OUString aFilterName( pConfig->GetExportFilterName( nFormat ) );
-#ifndef DISABLE_DYNLOADING
 OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, 
true));
-#endif
 ErrCode nStatus = ERRCODE_NONE;
 GraphicType eType;
 Graphic aGraphic( rGraphic );
@@ -2226,11 +2224,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
  // Execute dialog in DLL
  #else
 PFilterCall pFunc = NULL;
-if (aFilterName == "egi")
+if (aExternalFilterName == "egi")
 pFunc = egiGraphicExport;
-else if (aFilterName == "eps")
+else if (aExternalFilterName == "eps")
 pFunc = epsGraphicExport;
-else if (aFilterName == "eti")
+else if (aExternalFilterName == "eti")
 pFunc = etiGraphicExport;
  #endif
 if( pFunc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/compressedarray.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit cabaadf278ba099c53ed2b7a32f1e11bc632ad3a
Author: Noel Grandin 
AuthorDate: Mon Jun 3 16:52:02 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Jun 4 13:15:01 2019 +0200

tdf#121094 Opening xlxs with many rows takes several minutes

Use a more useful expansion strategy when re-sizing the array, we use
this 150% in a lot of other places.

This takes the opening time from more than 4m (I lost patience) to under
5s.

Change-Id: I8511662947d737c26ec49503a75af8d4cf447f67
Reviewed-on: https://gerrit.libreoffice.org/73394
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 79927a934b8a27bd4dee7a263171981e6ca22f8a)
Reviewed-on: https://gerrit.libreoffice.org/73433
Reviewed-by: Xisco Faulí 

diff --git a/sc/source/core/data/compressedarray.cxx 
b/sc/source/core/data/compressedarray.cxx
index f02956b6a27d..2016478d9194 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -20,8 +20,6 @@
 #include 
 #include 
 
-static const size_t nScCompressedArrayDelta = 4;
-
 template< typename A, typename D >
 ScCompressedArray::ScCompressedArray( A nMaxAccessP, const D& rValue )
 : nCount(1)
@@ -84,7 +82,7 @@ void ScCompressedArray::SetValue( A nStart, A nEnd, 
const D& rValue )
 size_t nNeeded = nCount + 2;
 if (nLimit < nNeeded)
 {
-nLimit += nScCompressedArrayDelta;
+nLimit *= 1.5;
 if (nLimit < nNeeded)
 nLimit = nNeeded;
 std::unique_ptr pNewData(new DataEntry[nLimit]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf125657.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   25 +
 sw/source/filter/ww8/docxattributeoutput.cxx |8 
 3 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 166aafde5b716dfeb5325e7d1bee1c163ab56b12
Author: Mike Kaganski 
AuthorDate: Tue Jun 4 17:08:04 2019 +1000
Commit: Mike Kaganski 
CommitDate: Tue Jun 4 13:06:14 2019 +0200

tdf#125657: restore conversion of a:srcRect attributes to integers

Regression from commit 1fe24bb1e2fbe44a4bf2c03297e259b3a18b1235

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf125657.docx 
b/sw/qa/extras/ooxmlexport/data/tdf125657.docx
new file mode 100755
index ..eeaad7a4bb3d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf125657.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index edbc0964685d..804d25b9612e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -323,6 +323,31 @@ DECLARE_OOXMLIMPORT_TEST(testTdf121784, "tdf121784.docx")
 CPPUNIT_ASSERT_EQUAL( OUString( "i" ), getRun( getParagraph( 2 ), 3 
)->getString());
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125657, "tdf125657.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+auto checkAttrIsInt = [&](const OString& sAttrName) {
+OUString sAttr = getXPath(pXmlDoc,
+  
"/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:inline/a:graphic/"
+  
"a:graphicData/pic:pic/pic:blipFill/a:srcRect",
+  sAttrName);
+OString sAssertMsg("Attribute " + sAttrName + " value " + 
sAttr.toUtf8()
+   + " is not a valid integer");
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), !sAttr.isEmpty());
+// Only decimal characters allowed, optionally prepended with '-'; no 
'.'
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(),
+   sAttr[0] == '-' || (sAttr[0] >= '0' && sAttr[0] 
<= '9'));
+for (sal_Int32 i = 1; i < sAttr.getLength(); ++i)
+CPPUNIT_ASSERT_MESSAGE(sAssertMsg.getStr(), sAttr[i] >= '0' && 
sAttr[i] <= '9');
+};
+// check that we export all coordinates of srcRect as integers
+checkAttrIsInt("l");
+checkAttrIsInt("t");
+checkAttrIsInt("r");
+checkAttrIsInt("b");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6e7fa0632e0d..472649c7585a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4668,10 +4668,10 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* 
pSdrObj, const SwFrameFo
 double  widthMultiplier  = 10.0/aOriginalSize.Width();
 double  heightMultiplier = 10.0/aOriginalSize.Height();
 
-double left   = nCropL * widthMultiplier;
-double right  = nCropR * widthMultiplier;
-double top= nCropT * heightMultiplier;
-double bottom = nCropB * heightMultiplier;
+sal_Int32 left   = static_cast(rtl::math::round(nCropL * 
widthMultiplier));
+sal_Int32 right  = static_cast(rtl::math::round(nCropR * 
widthMultiplier));
+sal_Int32 top= static_cast(rtl::math::round(nCropT * 
heightMultiplier));
+sal_Int32 bottom = static_cast(rtl::math::round(nCropB * 
heightMultiplier));
 
 m_pSerializer->singleElementNS( XML_a, XML_srcRect,
  XML_l, OString::number(left),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 sc/inc/compiler.hxx  |3 ++-
 sc/source/core/tool/compiler.cxx |   34 +++---
 2 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit c4eb7dddf047a613fee78188a65b36f5215b4c21
Author: Eike Rathke 
AuthorDate: Mon Jun 3 23:55:11 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 4 12:58:08 2019 +0200

Resolves: tdf#123752 allow group separator in formula values if possible

If possible here means if it can't be an operator (is not an ASCII
value) and is not any other separator. This restores the "working
by chance" behaviour for some locales that use NO-BREAK SPACE as
group separator. It never worked for locales that use one of the
"ordinary" comma or dot or apostrophe group separator and will
not.

Change-Id: I8b7ba1b502b6b7367ffb2199d2f3922ab605a659
Reviewed-on: https://gerrit.libreoffice.org/73422
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 4e3e0c6744b3fc33c7f4da7bd48136b861e9ed58)
Reviewed-on: https://gerrit.libreoffice.org/73436

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index d2500a7e0440..b93afa3909d4 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -198,7 +198,8 @@ public:
 virtual css::i18n::ParseResult
 parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const = 0;
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const = 0;
 
 /**
  * Parse the symbol string and pick up the file name and the external
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 57880f95c140..320198151ef3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -709,7 +709,8 @@ struct Convention_A1 : public ScCompiler::Convention
 
 ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 ParseResult aRet;
 if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
@@ -721,7 +722,9 @@ struct Convention_A1 : public ScCompiler::Convention
 // '?' allowed in range names because of Xcl :-/
 static const char aAddAllowed[] = "?#";
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
+aAddAllowed );
 }
 
 virtual ScCharFlags getCharTableFlags( sal_Unicode c, sal_Unicode 
/*cLast*/ ) const override
@@ -1317,7 +1320,8 @@ struct ConventionXL_A1 : public Convention_A1, public 
ConventionXL
 
 virtual ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const 
override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 parseExternalDocName(rFormula, nSrcPos);
 
@@ -1331,7 +1335,9 @@ struct ConventionXL_A1 : public Convention_A1, public 
ConventionXL
 // '?' allowed in range names
 const OUString aAddAllowed("?!");
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
+aAddAllowed );
 }
 
 virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const 
override
@@ -1627,7 +1633,8 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 
 ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 parseExternalDocName(rFormula, nSrcPos);
 
@@ -1642,7 +1649,9 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 const OUString aAddAllowed("?-[]!");
 
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTo

[Libreoffice-commits] core.git: Changes to 'distro/lhm/libreoffice-6-4+backports'

[Balazs Varga (via logerrit)]

New branch 'distro/lhm/libreoffice-6-4+backports' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 sc/inc/compiler.hxx  |3 ++-
 sc/source/core/tool/compiler.cxx |   34 +++---
 2 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit 4e3e0c6744b3fc33c7f4da7bd48136b861e9ed58
Author: Eike Rathke 
AuthorDate: Mon Jun 3 23:55:11 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Jun 4 12:14:27 2019 +0200

Resolves: tdf#123752 allow group separator in formula values if possible

If possible here means if it can't be an operator (is not an ASCII
value) and is not any other separator. This restores the "working
by chance" behaviour for some locales that use NO-BREAK SPACE as
group separator. It never worked for locales that use one of the
"ordinary" comma or dot or apostrophe group separator and will
not.

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

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index d2500a7e0440..b93afa3909d4 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -198,7 +198,8 @@ public:
 virtual css::i18n::ParseResult
 parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const = 0;
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const = 0;
 
 /**
  * Parse the symbol string and pick up the file name and the external
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 57880f95c140..320198151ef3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -709,7 +709,8 @@ struct Convention_A1 : public ScCompiler::Convention
 
 ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 ParseResult aRet;
 if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) )
@@ -721,7 +722,9 @@ struct Convention_A1 : public ScCompiler::Convention
 // '?' allowed in range names because of Xcl :-/
 static const char aAddAllowed[] = "?#";
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
+aAddAllowed );
 }
 
 virtual ScCharFlags getCharTableFlags( sal_Unicode c, sal_Unicode 
/*cLast*/ ) const override
@@ -1317,7 +1320,8 @@ struct ConventionXL_A1 : public Convention_A1, public 
ConventionXL
 
 virtual ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const 
override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 parseExternalDocName(rFormula, nSrcPos);
 
@@ -1331,7 +1335,9 @@ struct ConventionXL_A1 : public Convention_A1, public 
ConventionXL
 // '?' allowed in range names
 const OUString aAddAllowed("?!");
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
+aAddAllowed );
 }
 
 virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const 
override
@@ -1627,7 +1633,8 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 
 ParseResult parseAnyToken( const OUString& rFormula,
sal_Int32 nSrcPos,
-   const CharClass* pCharClass) const override
+   const CharClass* pCharClass,
+   bool bGroupSeparator) const override
 {
 parseExternalDocName(rFormula, nSrcPos);
 
@@ -1642,7 +1649,9 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 const OUString aAddAllowed("?-[]!");
 
 return pCharClass->parseAnyToken( rFormula,
-nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
+nSrcPos, nStartFlags, aAddAllowed,
+(bGroupSeparator ? nContFlags | 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER : nContFlags),
+aAddAllowed );
 }
 
 virtual sal_Unicode getSpecialSymb

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/htmlimport/data/tdf122789.html |7 +++
 sw/qa/extras/htmlimport/htmlimport.cxx  |   11 +++
 sw/source/filter/html/htmlgrin.cxx  |4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 8fa88c4b90c8b9e8abadded1a724a6ebdfa44d63
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 21:15:18 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 12:03:31 2019 +0200

tdf#122789 sw HTML import: fix handling of images with relative sizes

Relative size should have priority over image size from image headers.

(cherry picked from commit a628c01e783b8970ec6d1a4499f01981c077e607)

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

diff --git a/sw/qa/extras/htmlimport/data/tdf122789.html 
b/sw/qa/extras/htmlimport/data/tdf122789.html
new file mode 100644
index ..7ee6552013c7
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/tdf122789.html
@@ -0,0 +1,7 @@
+
+
+   
+   
+
+
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 7669cf86431a..6ab84cf1c7df 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -342,6 +342,17 @@ DECLARE_HTMLIMPORT_TEST(testImageSize, "image-size.html")
 CPPUNIT_ASSERT_EQUAL(static_cast(aExpected.getHeight()), 
aSize.Height);
 }
 
+DECLARE_HTMLIMPORT_TEST(testTdf122789, "tdf122789.html")
+{
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rFormats.size());
+// This failed, the image had an absolute size, not a relative one.
+CPPUNIT_ASSERT_EQUAL(static_cast(70), 
rFormats[0]->GetAttrSet().GetFrameSize().GetWidthPercent());
+}
+
 DECLARE_HTMLIMPORT_TEST(testReqIfPageStyle, "reqif-page-style.xhtml")
 {
 // Without the accompanying fix in place, this test would have failed with
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 92f0e37c1228..c4ffa075c620 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -644,7 +644,9 @@ IMAGE_SETEVENT:
 bool bSetScaleImageMap = false;
 sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
 
-if ((!nWidth || !nHeight) && allowAccessLink(*m_xDoc))
+// bPrcWidth / bPrcHeight means we have a percent size.  If that's not the 
case and we have no
+// size from nWidth / nHeight either, then inspect the image header.
+if ((!bPrcWidth && !nWidth) && (!bPrcHeight && !nHeight) && 
allowAccessLink(*m_xDoc))
 {
 GraphicDescriptor aDescriptor(aGraphicURL);
 if (aDescriptor.Detect(/*bExtendedInfo=*/true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Question about Bug 124686

[Andreas Heinisch]

Hello,
I am trying to solve this bug: 
https://bugs.documentfoundation.org/show_bug.cgi?id=124686
But I have a few questions regarding it:   
   - Should there be just a small change for the user interface including the 
menu? Or should there be a big change including all the function calls, names 
etc.?
   - I can't find the location where the menu is updated :( Currently, I am 
working at /core/sw/source/uibase/uno/unomod.cxx  but a change in this file 
does not effect the writer behaviour.
   - I can't find the right place to insert the new translation.
Any help would be highly appreciated.
Best regards___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Balazs Varga (via logerrit)]

 chart2/source/view/axes/VCartesianAxis.cxx |   43 ++---
 1 file changed, 21 insertions(+), 22 deletions(-)

New commits:
commit a2554ac1f0173b0904032f4f8a70bb2231d0d934
Author: Balazs Varga 
AuthorDate: Tue Jun 4 10:11:29 2019 +0200
Commit: László Németh 
CommitDate: Tue Jun 4 11:37:23 2019 +0200

Related: tdf#48041 Chart: vertical value axis labels

Do not duplicate vertical axis labels and gridlines
if same value labels follow each other, because of
the number format and rounding.
Supplement of commit: 7f373a4c88961348f35e4f990182628488878efe

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

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 99eb1b085185..a70551bf8518 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1554,33 +1554,32 @@ sal_Int32 
VCartesianAxis::estimateMaximumAutoMainIncrementCount()
 sal_Int32 nSingleNeeded = m_nMaximumTextHeightSoFar;
 sal_Int32 nMaxSameLabel = 0;
 
-//for horizontal axis:
-if( (m_nDimensionIndex == 0 && !m_aAxisProperties.m_bSwapXAndY)
-|| (m_nDimensionIndex == 1 && m_aAxisProperties.m_bSwapXAndY) )
+// tdf#48041: do not duplicate the value labels because of rounding
+if (m_aAxisProperties.m_nAxisType != css::chart2::AxisType::DATE)
 {
-if (m_aAxisProperties.m_nAxisType != css::chart2::AxisType::DATE)
+FixedNumberFormatter 
aFixedNumberFormatterTest(m_xNumberFormatsSupplier, 
m_aAxisLabelProperties.nNumberFormatKey);
+OUString sPreviousValueLabel;
+sal_Int32 nSameLabel = 0;
+for (sal_Int32 nLabel = 0; nLabel < 
static_cast(m_aAllTickInfos[0].size()); ++nLabel)
 {
-// tdf#48041: do not duplicate the value labels because of rounding
-FixedNumberFormatter 
aFixedNumberFormatterTest(m_xNumberFormatsSupplier, 
m_aAxisLabelProperties.nNumberFormatKey);
-OUString sPreviousValueLabel;
-sal_Int32 nSameLabel = 0;
-for (sal_Int32 nLabel = 0; nLabel < 
static_cast(m_aAllTickInfos[0].size()); ++nLabel)
+Color nColor = COL_AUTO;
+bool bHasColor = false;
+OUString sValueLabel = 
aFixedNumberFormatterTest.getFormattedString(m_aAllTickInfos[0][nLabel].fScaledTickValue,
 nColor, bHasColor);
+if (sValueLabel == sPreviousValueLabel)
 {
-Color nColor = COL_AUTO;
-bool bHasColor = false;
-OUString sValueLabel = 
aFixedNumberFormatterTest.getFormattedString(m_aAllTickInfos[0][nLabel].fScaledTickValue,
 nColor, bHasColor);
-if (sValueLabel == sPreviousValueLabel)
-{
-nSameLabel++;
-if (nSameLabel > nMaxSameLabel)
-nMaxSameLabel = nSameLabel;
-}
-else
-nSameLabel = 0;
-sPreviousValueLabel = sValueLabel;
+nSameLabel++;
+if (nSameLabel > nMaxSameLabel)
+nMaxSameLabel = nSameLabel;
 }
+else
+nSameLabel = 0;
+sPreviousValueLabel = sValueLabel;
 }
-
+}
+//for horizontal axis:
+if( (m_nDimensionIndex == 0 && !m_aAxisProperties.m_bSwapXAndY)
+|| (m_nDimensionIndex == 1 && m_aAxisProperties.m_bSwapXAndY) )
+{
 nTotalAvailable = nMaxWidth;
 nSingleNeeded = m_nMaximumTextWidthSoFar;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf70234.docx   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|7 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |1 +
 3 files changed, 8 insertions(+)

New commits:
commit d160bca0dcb80f1b517b79221d5c3a43bbad8639
Author: László Németh 
AuthorDate: Mon Jun 3 17:26:16 2019 +0200
Commit: László Németh 
CommitDate: Tue Jun 4 11:13:08 2019 +0200

tdf#70234 DOCX: import tracked deletion of fields

Deleted fields in tracked changes, for example page
number fields, imported as not deleted text fields.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf70234.docx 
b/sw/qa/extras/ooxmlexport/data/tdf70234.docx
new file mode 100644
index ..33ef99430bda
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf70234.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 70b6e79bc04d..f7e69073085c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -849,6 +849,13 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTrackChangesEmptyParagraphsInADeletion,
 assertXPath(pXmlDoc, "/w:document/w:body/w:p[" + OString::number(i) + 
"]/w:pPr/w:rPr/w:del");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf70234, "tdf70234.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// import fields with tracked deletion
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:del/w:r/w:fldChar");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
 {
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index eb852bf943d4..f03ee6f8271b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5195,6 +5195,7 @@ void DomainMapper_Impl::PopFieldContext()
 aMap.InsertProps(m_pLastCharacterContext);
 aMap.InsertProps(m_aFieldStack.top()->getProperties());
 appendTextContent(xToInsert, aMap.GetPropertyValues());
+CheckRedline( xToInsert->getAnchor( ) );
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze (via logerrit)]

 svx/source/dialog/srchdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5cfac16dbd4af456a7fb6d52c8953c69a72ba2ba
Author: heiko tietze 
AuthorDate: Fri May 17 12:08:18 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jun 4 11:00:10 2019 +0200

Resolves tdf#125333 - Crash with FindReplaceRememberedSearches=0

Zero remembered searches crash the app when no result is found
minimum set to 1

Change-Id: Ib2b4b195d018f0f11238699458066f4d128f8997
Reviewed-on: https://gerrit.libreoffice.org/72459
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit def76a088dea12dfd9d9b796e975e742cbe44ce1)
Reviewed-on: https://gerrit.libreoffice.org/73431

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 07dd53d75708..791116324361 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -332,6 +332,8 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 
 //tdf#122322
 nRememberSize = 
officecfg::Office::Common::Misc::FindReplaceRememberedSearches::get();
+if (nRememberSize<1)
+nRememberSize = 1; //0 crashes with no results found
 
 auto nTermWidth = m_xSearchLB->get_approximate_digit_width() * 28;
 m_xSearchLB->set_size_request(nTermWidth, -1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/tools/poly.hxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 9dd38caceabfcfaf428cc8490dd1ce25696ff789
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 16:06:58 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Jun 4 10:43:15 2019 +0200

Remove unused, broken operator<< for PolyPolygon

...which apparently wants to internally call some operator<< for Polygon
(rPolyPoly.GetObject(i)), but which doesn't exist (and appears to not have
existed when this operator<< for PolyPolygon was added with
e4be770ec8218d80dcc9f1e38fd1c69717beb4fb "add std::ostream operators for 
Region
and PolyPolygon"), so uses the non-explicit PolyPolygon ctor that takes a
Polygon, and causes infinite recursion for any non-empty PolyPolygon

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

diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 94d06856e428..b0c6190b6eb8 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -265,18 +265,6 @@ public:
 
 typedef std::vector< tools::PolyPolygon > PolyPolyVector;
 
-
-template
-inline std::basic_ostream & operator <<(
-std::basic_ostream & stream, const tools::PolyPolygon& 
rPolyPoly)
-{
-if (!rPolyPoly.Count())
-stream << "EMPTY";
-for (sal_uInt16 i = 0; i < rPolyPoly.Count(); ++i)
-stream << "[" << i << "] " << rPolyPoly.GetObject(i);
-return stream;
-}
-
 #endif
 
 /* 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' - vcl/quartz

[Xisco Fauli (via logerrit)]

 vcl/quartz/salgdicommon.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b6a3d0566628e2d8416708d0410193435a3b8e53
Author: Xisco Fauli 
AuthorDate: Sat Jun 1 19:45:53 2019 +0200
Commit: Katarina Behrens 
CommitDate: Tue Jun 4 10:21:14 2019 +0200

tdf#125506 tdf#121241: only use rObjectToDevice if needed

Use same logic as in vcl/unx/generic/gdi/gdiimpl.cxx

Reviewed-on: https://gerrit.libreoffice.org/73319
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 93477d1a963e38e3319013e43835a8ffef200972)
Reviewed-on: https://gerrit.libreoffice.org/73328

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

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 2e22d6077a2e..aaed9261064d 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -864,8 +864,10 @@ bool AquaSalGraphics::drawPolyLine(
 return false;
 #endif
 
-// Transform to DeviceCoordinates, get DeviceLineWidth, execute 
PixelSnapHairline
-const basegfx::B2DVector aLineWidths(rObjectToDevice * rLineWidths);
+// need to check/handle LineWidth when ObjectToDevice transformation is 
used
+const basegfx::B2DVector aDeviceLineWidths(rObjectToDevice * rLineWidths);
+const bool bCorrectLineWidth(aDeviceLineWidths.getX() < 1.0 && 
rLineWidths.getX() >= 1.0);
+const basegfx::B2DVector aLineWidths(bCorrectLineWidth ? rLineWidths : 
aDeviceLineWidths);
 
 // #i101491# Aqua does not support B2DLineJoin::NONE; return false to use
 // the fallback (own geometry preparation)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/reference.html

[Michael Meeks (via logerrit)]

 loleaflet/reference.html |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 54eaf516851450ceb4a69a1ad1ec929c6556bff9
Author: Michael Meeks 
AuthorDate: Tue Jun 4 09:15:21 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Jun 4 09:15:38 2019 +0100

Document Grab_Focus.

Change-Id: Ic3deb0aeac9782250f50cb975cfb67712f032c2d

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 4bcaaeb67..b0f62caaf 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3200,6 +3200,16 @@ Editor to WOPI host
Shows the menu bar.


+   
+   Grab_Focus
+   
+   
+   This restores focus to the application, activating it, 
and removing any overlay
+   indicating quiescence, and re-connecting to the server if 
necessary. Useful after leaving
+   the application for a lengthy period, or when wanting to 
restore browser focus after
+   presenting an overlayed dialog.
+   
+   
 
 
 Finding toolbar button IDs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[heiko tietze (via logerrit)]

 svx/source/dialog/srchdlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit def76a088dea12dfd9d9b796e975e742cbe44ce1
Author: heiko tietze 
AuthorDate: Fri May 17 12:08:18 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jun 4 10:06:22 2019 +0200

Resolves tdf#125333 - Crash with FindReplaceRememberedSearches=0

Zero remembered searches crash the app when no result is found
minimum set to 1

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

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 07dd53d75708..791116324361 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -332,6 +332,8 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 
 //tdf#122322
 nRememberSize = 
officecfg::Office::Common::Misc::FindReplaceRememberedSearches::get();
+if (nRememberSize<1)
+nRememberSize = 1; //0 crashes with no results found
 
 auto nTermWidth = m_xSearchLB->get_approximate_digit_width() * 28;
 m_xSearchLB->set_size_request(nTermWidth, -1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sumit Chauhan (via logerrit)]

 include/vcl/notebookbar.hxx|3 +++
 vcl/source/control/notebookbar.cxx |   24 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 889a4fed08aecfd45e5706af27510e40932f2732
Author: Sumit Chauhan 
AuthorDate: Wed May 15 00:57:09 2019 +0530
Commit: Szymon Kłos 
CommitDate: Tue Jun 4 09:48:41 2019 +0200

Rendering notebookbar*.ui file from user/share directory

This patch will get the modified customized notebookbar*.ui
files from user directory(if present) otherwise the files will be rendered
from default shared directory.

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

diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index b2e9b8cf9f28..5ca3798587c4 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace com { namespace sun { namespace star { namespace ui { class 
XContextChangeEventListener; } } } }
@@ -57,6 +58,8 @@ private:
 
 void UpdateDefaultSettings();
 void UpdatePersonaSettings();
+static OUString getCustomizedUIRootDir();
+static bool doesFileExist(const OUString& sUIDir, const OUString& sUIFile);
 
 };
 
diff --git a/vcl/source/control/notebookbar.cxx 
b/vcl/source/control/notebookbar.cxx
index e55ea57547c3..1865af605799 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -15,6 +15,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 /**
@@ -38,7 +39,11 @@ NotebookBar::NotebookBar(Window* pParent, const OString& 
rID, const OUString& rU
 : Control(pParent), m_pEventListener(new 
NotebookBarContextChangeEventListener(this))
 {
 SetStyle(GetStyle() | WB_DIALOGCONTROL);
-m_pUIBuilder.reset( new VclBuilder(this, getUIRootDir(), 
rUIXMLDescription, rID, rFrame) );
+OUString sUIDir = getUIRootDir();
+bool doesCustomizedUIExist = doesFileExist(getCustomizedUIRootDir(), 
rUIXMLDescription);
+if ( doesCustomizedUIExist )
+sUIDir = getCustomizedUIRootDir();
+m_pUIBuilder.reset( new VclBuilder(this, sUIDir, rUIXMLDescription, rID, 
rFrame));
 mxFrame = rFrame;
 // In the Notebookbar's .ui file must exist control handling context
 // - implementing NotebookbarContextControl interface with id 
"ContextContainer"
@@ -251,4 +256,19 @@ void NotebookBar::UpdatePersonaSettings()
 aAllSettings.SetStyleSettings(aStyleSet);
 PersonaSettings = aAllSettings;
 }
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
+OUString NotebookBar::getCustomizedUIRootDir()
+{
+OUString sShareLayer("$BRAND_BASE_DIR/user/config/soffice.cfg/");
+rtl::Bootstrap::expandMacros(sShareLayer);
+return sShareLayer;
+}
+
+bool NotebookBar::doesFileExist(const OUString& sUIDir, const OUString& 
sUIFile)
+{
+OUString sUri = sUIDir + sUIFile;
+osl::File file(sUri);
+sal_uInt32 flag = 0;
+return( file.open(flag) == osl::FileBase::E_None );
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ 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: Branch 'libreoffice-6-3' - include/o3tl

[Noel Grandin (via logerrit)]

 include/o3tl/lru_map.hxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 4abdaf4afb2245d404f6709124b3c627b07b8a3c
Author: Noel Grandin 
AuthorDate: Mon Jun 3 16:07:40 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:35:47 2019 +0200

fix crash in lru_map/SalBitmap on shutdown

When we shut down, we destroy the various caches, in the process of
which SalBitmap calls back into it's owning cache, causing a SIGSEGV.

Found while loading files from tdf#83426

Change-Id: I53db1621a0fdb75a8e66582662b0e2666499192b
Reviewed-on: https://gerrit.libreoffice.org/73387
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c27e92b29efe573e2cda9844e9ca38965f502443)
Reviewed-on: https://gerrit.libreoffice.org/73415

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 003da59551b5..54378a319ece 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -69,6 +69,14 @@ public:
 lru_map(size_t nMaxSize)
 : mMaxSize(nMaxSize ? nMaxSize : std::min(mLruMap.max_size(), 
mLruList.max_size()))
 {}
+~lru_map()
+{
+// Some code .e.g. SalBitmap likes to remove itself from a cache 
during it's destructor, which means we
+// get calls into lru_map while we are in destruction, so use the 
swap-and-clear idiom to avoid those problems.
+mLruMap.clear();
+list_t aLruListTemp;
+aLruListTemp.swap(mLruList);
+}
 
 void insert(key_value_pair_t& rPair)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sal/osl

[Noel Grandin (via logerrit)]

 sal/osl/unx/file.cxx |8 +---
 sal/osl/w32/file.cxx |9 ++---
 2 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 49a17e9ba500451929a2c4cb63c30e50e989886c
Author: Noel Grandin 
AuthorDate: Mon Jun 3 11:27:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:35:23 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part4

WPXSvInputStreamImpl was hammering on getFilePos pretty hard, and
getFilePos uses a mutex, which is slow when it is called from every
single read. So switch to using std::atomic to access position.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 8s to 4s.

Change-Id: Iab707a374359e2ee0e92425b2d9a903d67cb53d4
Reviewed-on: https://gerrit.libreoffice.org/73377
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 0d04315c17a6df9f971237d45d9e5e8af765dd17)
Reviewed-on: https://gerrit.libreoffice.org/73401

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 1f04802aa9e6..0ee0b8887dd4 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -36,6 +36,7 @@
 #include "unixerrnostring.hxx"
 
 #include 
+#include 
 #include 
 #include 
 
@@ -84,7 +85,8 @@ struct FileHandle_Impl
 
 sal_uInt64   m_size;/*< file size */
 off_tm_offset;  /*< physical offset from begin of file */
-off_tm_fileptr; /*< logical offset from begin of file */
+// m_fileptr is hit hard in some situations, where the overhead of a mutex 
starts to show up, so use an atomic
+std::atomic m_fileptr; /*< logical offset from begin of file */
 
 off_tm_bufptr;  /*< buffer offset from begin of file */
 size_t   m_buflen;  /*< buffer filled [0, m_bufsiz - 1] */
@@ -224,7 +226,7 @@ size_t FileHandle_Impl::getpagesize()
 
 sal_uInt64 FileHandle_Impl::getPos() const
 {
-return sal::static_int_cast< sal_uInt64 >(m_fileptr);
+return sal::static_int_cast< sal_uInt64 >(m_fileptr.load());
 }
 
 void FileHandle_Impl::setPos(sal_uInt64 uPos)
@@ -1421,7 +1423,7 @@ oslFileError SAL_CALL osl_getFilePos(oslFileHandle 
Handle, sal_uInt64* pPos)
 if ((!pImpl) || ((pImpl->m_kind == FileHandle_Impl::KIND_FD) && 
(pImpl->m_fd == -1)) || (!pPos))
 return osl_File_E_INVAL;
 
-FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
+// no need to lock because pos is atomic
 *pPos = pImpl->getPos();
 
 return osl_File_E_None;
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index a3600844fd29..7fda6107adeb 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -29,6 +29,7 @@
 #include "file_url.hxx"
 #include "file_error.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -60,7 +61,8 @@ struct FileHandle_Impl
 
 sal_uInt64m_size;/*< file size */
 LONGLONG  m_offset;  /*< physical offset from begin of file */
-LONGLONG  m_filepos; /*< logical offset from begin of file */
+// m_filepos is hit hard in some situations, where the overhead of a mutex 
starts to show up, so use an atomic
+std::atomic m_filepos; /*< logical offset from begin of file */
 
 LONGLONG  m_bufptr;  /*< buffer offset from begin of file */
 SIZE_Tm_buflen;  /*< buffer filled [0, m_bufsiz - 1] */
@@ -185,7 +187,7 @@ SIZE_T FileHandle_Impl::getpagesize()
 
 sal_uInt64 FileHandle_Impl::getPos() const
 {
-return sal::static_int_cast< sal_uInt64 >(m_filepos);
+return sal::static_int_cast< sal_uInt64 >(m_filepos.load());
 }
 
 oslFileError FileHandle_Impl::setPos(sal_uInt64 uPos)
@@ -946,8 +948,9 @@ oslFileError SAL_CALL osl_getFilePos(oslFileHandle Handle, 
sal_uInt64 *pPos)
 if ((!pImpl) || !IsValidHandle(pImpl->m_hFile) || (!pPos))
 return osl_File_E_INVAL;
 
-FileHandle_Impl::Guard lock(&(pImpl->m_mutex));
+// no need to lock because pos is atomic
 *pPos = pImpl->getPos();
+
 return osl_File_E_None;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - include/sfx2 sfx2/source ucb/source

[Noel Grandin (via logerrit)]

 include/sfx2/docfile.hxx   |6 +++---
 sfx2/source/doc/docfile.cxx|   14 +++---
 ucb/source/ucp/file/filstr.cxx |8 
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 77219c88ac0a44b3ed5dada67d0d9ca52fa3adec
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:03:34 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:35:00 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part2

SfxMedium was creating a temporary file and copying the input file, when
CloseInStream_Impl was called from the destructor. Very very bad for
performance.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 16.1s to 9s.

Change-Id: If52f8e0587c7b11666893f6cb79b3180d45cce43
Reviewed-on: https://gerrit.libreoffice.org/73375
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit c0d372d7c0d9284aad8b0d5142dff7c34c062fa9)
Reviewed-on: https://gerrit.libreoffice.org/73399

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index a8fae8409bb9..77950a473197 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -60,9 +60,9 @@ class SFX2_DLLPUBLIC SfxMedium : public SvRefBase
 std::unique_ptr< SfxMedium_Impl > pImpl;
 
 SAL_DLLPRIVATE void SetIsRemote_Impl();
-SAL_DLLPRIVATE void CloseInStream_Impl();
+SAL_DLLPRIVATE void CloseInStream_Impl(bool bInDestruction = false);
 SAL_DLLPRIVATE void CloseOutStream_Impl();
-SAL_DLLPRIVATE void CloseStreams_Impl();
+SAL_DLLPRIVATE void CloseStreams_Impl(bool bInDestruction = false);
 
 SAL_DLLPRIVATE void SetEncryptionDataToStorage_Impl();
 
@@ -121,7 +121,7 @@ public:
 const OUString& GetOrigURL() const;
 
 SfxItemSet  *   GetItemSet() const;
-voidClose();
+voidClose(bool bInDestruction = false);
 voidCloseAndRelease();
 voidReOpen();
 voidCompleteReOpen();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 177104414099..265fd4edd5b4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -593,7 +593,7 @@ void SfxMedium::CloseInStream()
 CloseInStream_Impl();
 }
 
-void SfxMedium::CloseInStream_Impl()
+void SfxMedium::CloseInStream_Impl(bool bInDestruction)
 {
 // if there is a storage based on the InStream, we have to
 // close the storage, too, because otherwise the storage
@@ -604,7 +604,7 @@ void SfxMedium::CloseInStream_Impl()
 CloseStorage();
 }
 
-if ( pImpl->m_pInStream && !GetContent().is() )
+if ( pImpl->m_pInStream && !GetContent().is() && !bInDestruction )
 {
 CreateTempFile();
 return;
@@ -2905,14 +2905,14 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const 
OUString& aPasswd, bool
 }
 
 
-void SfxMedium::Close()
+void SfxMedium::Close(bool bInDestruction)
 {
 if ( pImpl->xStorage.is() )
 {
 CloseStorage();
 }
 
-CloseStreams_Impl();
+CloseStreams_Impl(bInDestruction);
 
 UnlockFile( false );
 }
@@ -3081,9 +3081,9 @@ void SfxMedium::CloseAndReleaseStreams_Impl()
 }
 
 
-void SfxMedium::CloseStreams_Impl()
+void SfxMedium::CloseStreams_Impl(bool bInDestruction)
 {
-CloseInStream_Impl();
+CloseInStream_Impl(bInDestruction);
 CloseOutStream_Impl();
 
 if ( pImpl->m_pSet )
@@ -3326,7 +3326,7 @@ SfxMedium::~SfxMedium()
 // if there is a requirement to clean the backup this is the last 
possibility to do it
 ClearBackup_Impl();
 
-Close();
+Close(/*bInDestruction*/true);
 
 if( !pImpl->bIsTemp || pImpl->m_aName.isEmpty() )
 return;
commit 6fdd1dc34f497fce28f85807126e56432a3cb7d2
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:00:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:34:44 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part1

Skip creating an intermediary buffer in XStream_impl::readBytes, and
just read directly into the destination.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 17.1s to 16.1s.

Change-Id: Iaa7d38c6a90a3b3f01a4b748c4512dd8fda690c7
Reviewed-on: https://gerrit.libreoffice.org/73374
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 1439a09a13516f72baa735e5af332b0647d0cff7)
Reviewed-on: https://gerrit.libreoffice.org/73398

diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index a2419042de45..8b23813abdc4 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -130,10 +130,9 @@ XStream_impl::readBytes(
 if( ! m_nIsOpen )
 throw io::I

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

[Noel Grandin (via logerrit)]

 sc/source/filter/orcus/filterdetect.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e4513e2b4e32926354d745ecf08fdf440392a75
Author: Noel Grandin 
AuthorDate: Mon Jun 3 10:04:58 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:35:11 2019 +0200

tdf#67538 XTypeDetection::queryTypeByDescriptor poor performance, part3

Size the OUStringBuffer in OrcusFormatDetect::detect better at
construction, to avoid re-alloc.

This is specifically fixing the performance of queryTypeByDescriptor
when called from a basic macro on a local test file.

This takes my test macro from 9s to 8s

Change-Id: Id4c2bf386de172b1deed98efece8c1f040c599a5
Reviewed-on: https://gerrit.libreoffice.org/73376
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 7bf2515fc48ed0d4c436aef298fa9c35e573352b)
Reviewed-on: https://gerrit.libreoffice.org/73400

diff --git a/sc/source/filter/orcus/filterdetect.cxx 
b/sc/source/filter/orcus/filterdetect.cxx
index a9b064b01fbb..fb142d86b579 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -68,11 +68,11 @@ OUString 
OrcusFormatDetect::detect(css::uno::Sequence
 return OUString();
 
 css::uno::Reference 
xInputStream(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], 
css::uno::UNO_QUERY );
+OStringBuffer aContent(xInputStream->available());
 
 static const sal_Int32 nBytes = 4096;
 css::uno::Sequence aSeq(nBytes);
 bool bEnd = false;
-OStringBuffer aContent;
 while(!bEnd)
 {
 sal_Int32 nReadBytes = xInputStream->readBytes(aSeq, nBytes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/inc sw/inc

[Roman Kuznetsov (via logerrit)]

 cui/inc/tipoftheday.hrc |2 +-
 sw/inc/strings.hrc  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 51c0985d861f90ffb363659f2194d573df07f0bb
Author: Roman Kuznetsov 
AuthorDate: Sun May 19 14:06:19 2019 +0200
Commit: Heiko Tietze 
CommitDate: Tue Jun 4 09:28:58 2019 +0200

tdf#124582 Change Outline Numbering to Chapter Numbering

on Outline & Numbering tab in Paragraph style dialog

Change-Id: I2e97dfae832c497c5d08f00eb8c6e6b97884b717
Reviewed-on: https://gerrit.libreoffice.org/72551
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 7d49e64c2aad701d2903af8a451a31d90005d257)
Reviewed-on: https://gerrit.libreoffice.org/73350
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 332757156eeb..1b314e36ed04 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -233,7 +233,7 @@ const std::tuple 
TIPOFTHEDAY_STRINGARRAY[] =
  { NC_("RID_CUI_TIPOFTHEDAY", "You can set a color for each tab: 
right-click the tab or use Sheet > Sheet Tab Color."), "", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You want to start working with %PRODUCTNAME 
basic macros? Take a look at the examples under Tools > Macros > Edit 
Macros."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "To remove the page number from your table 
of contents go to Insert > Table of Contents (or right-click and Edit the 
previously inserted index). At the Entries tab delete the page number (#) from 
Structure line."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Outline numbering lets you set text to be 
displayed before the chapter number. For example, type 'Chapter ' to display 
'Chapter 1'"), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Chapter numbering dialog lets you set text 
to be displayed before the chapter number. For example, type 'Chapter ' to 
display 'Chapter 1'"), "", "tipoftheday_w.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "Want to know if a cell is referred in 
formulas of other cells? Tools > Detective > Trace Dependents (Shift+F5)."), 
"", "tipoftheday_c.png"},
  { NC_("RID_CUI_TIPOFTHEDAY", "You can customize the middle mouse button 
per Tools > Options > %PRODUCTNAME > View > Middle Mouse button."), "", ""},
  { NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use 
Format > Print Ranges > Edit."), "", "tipoftheday_c.png"},
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 88171b13d638..1de4f3303db8 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -287,7 +287,7 @@
 #define STR_REDLINE_UNKNOWN_AUTHOR  
NC_("STR_REDLINE_UNKNOWN_AUTHOR", "Unknown Author")
 #define STR_DELETE_NOTE_AUTHOR  NC_("STR_DELETE_NOTE_AUTHOR", 
"Delete ~All Comments by $1")
 #define STR_HIDE_NOTE_AUTHORNC_("STR_HIDE_NOTE_AUTHOR", 
"H~ide All Comments by $1")
-#define STR_OUTLINE_NUMBERING   NC_("STR_OUTLINE_NUMBERING", 
"Outline Numbering")
+#define STR_OUTLINE_NUMBERING   NC_("STR_OUTLINE_NUMBERING", 
"Chapter Numbering")
 /* To translators: $1 == will be replaced by STR_WORDCOUNT_WORDARG, and $2 by 
STR_WORDCOUNT_COLARG
e.g. Selected: 1 word, 2 characters */
 #define STR_WORDCOUNT   NC_("STR_WORDCOUNT", 
"Selected: $1, $2")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/compressedarray.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 79927a934b8a27bd4dee7a263171981e6ca22f8a
Author: Noel Grandin 
AuthorDate: Mon Jun 3 16:52:02 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Jun 4 09:22:57 2019 +0200

tdf#121094 Opening xlxs with many rows takes several minutes

Use a more useful expansion strategy when re-sizing the array, we use
this 150% in a lot of other places.

This takes the opening time from more than 4m (I lost patience) to under
5s.

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

diff --git a/sc/source/core/data/compressedarray.cxx 
b/sc/source/core/data/compressedarray.cxx
index f02956b6a27d..2016478d9194 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -20,8 +20,6 @@
 #include 
 #include 
 
-static const size_t nScCompressedArrayDelta = 4;
-
 template< typename A, typename D >
 ScCompressedArray::ScCompressedArray( A nMaxAccessP, const D& rValue )
 : nCount(1)
@@ -84,7 +82,7 @@ void ScCompressedArray::SetValue( A nStart, A nEnd, 
const D& rValue )
 size_t nNeeded = nCount + 2;
 if (nLimit < nNeeded)
 {
-nLimit += nScCompressedArrayDelta;
+nLimit *= 1.5;
 if (nLimit < nNeeded)
 nLimit = nNeeded;
 std::unique_ptr pNewData(new DataEntry[nLimit]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sfx2/source/view/viewfrm.cxx |   24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 22005041f829d85e675ea27bdee1770af58a1ea0
Author: Stephan Bergmann 
AuthorDate: Mon Jun 3 16:21:24 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 09:22:07 2019 +0200

AppendInfoBar can return null

e.g., when opening the old help window ("Help - LibreOffice Help" in a build
configured with --with-help to "build the old local help" (configure.ac))

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

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 5620f4396e8f..ed8ffa200ef6 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1239,16 +1239,20 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, 
const SfxHint& rHint )
 if ((iCurrent > iLast) && 
!Application::IsHeadlessModeEnabled() && !bIsUITest)
 {
 VclPtr pInfoBar = 
AppendInfoBar("whatsnew", SfxResId(STR_WHATSNEW_TEXT), InfoBarType::Info);
-VclPtrInstance 
xWhatsNewButton(&GetWindow());
-
xWhatsNewButton->SetText(SfxResId(STR_WHATSNEW_BUTTON));
-
xWhatsNewButton->SetSizePixel(xWhatsNewButton->GetOptimalSize());
-xWhatsNewButton->SetClickHdl(LINK(this, SfxViewFrame, 
WhatsNewHandler));
-pInfoBar->addButton(xWhatsNewButton);
-
-//update lastversion
-std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Setup::Product::ooSetupLastVersion::set(sSetupVersion, batch);
-batch->commit();
+if (pInfoBar)
+{
+VclPtrInstance 
xWhatsNewButton(&GetWindow());
+
xWhatsNewButton->SetText(SfxResId(STR_WHATSNEW_BUTTON));
+
xWhatsNewButton->SetSizePixel(xWhatsNewButton->GetOptimalSize());
+xWhatsNewButton->SetClickHdl(LINK(this, 
SfxViewFrame, WhatsNewHandler));
+pInfoBar->addButton(xWhatsNewButton);
+
+//update lastversion
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+officecfg::Setup::Product::ooSetupLastVersion::set(
+sSetupVersion, batch);
+batch->commit();
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 kit/Kit.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54e5a1000be777dbb9732b0f9c921983b6cc119c
Author: Miklos Vajna 
AuthorDate: Tue Jun 4 09:14:26 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 09:15:38 2019 +0200

kit: mark Document as final

Document has to be final: its constructor calls sendTextFrame(), which
calls the virtual sendFrame(). So the only situation where this code
works correctly is when Document is never subclassed.

Change-Id: I7c13abdae57d9e1ba3416ec1963b58bce0d42e6f

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 99d34bf73..b18e62c74 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -855,7 +855,7 @@ public:
 /// per process. But for security reasons don't.
 /// However, we could have a loolkit instance
 /// per user or group of users (a trusted circle).
-class Document : public DocumentManagerInterface
+class Document final : public DocumentManagerInterface
 {
 public:
 /// We have two types of password protected documents
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/htmlimport/data/tdf122789.html |7 +++
 sw/qa/extras/htmlimport/htmlimport.cxx  |   11 +++
 sw/source/filter/html/htmlgrin.cxx  |4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit a628c01e783b8970ec6d1a4499f01981c077e607
Author: Miklos Vajna 
AuthorDate: Mon Jun 3 21:15:18 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 4 09:13:33 2019 +0200

tdf#122789 sw HTML import: fix handling of images with relative sizes

Relative size should have priority over image size from image headers.

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

diff --git a/sw/qa/extras/htmlimport/data/tdf122789.html 
b/sw/qa/extras/htmlimport/data/tdf122789.html
new file mode 100644
index ..7ee6552013c7
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/tdf122789.html
@@ -0,0 +1,7 @@
+
+
+   
+   
+
+
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 7669cf86431a..6ab84cf1c7df 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -342,6 +342,17 @@ DECLARE_HTMLIMPORT_TEST(testImageSize, "image-size.html")
 CPPUNIT_ASSERT_EQUAL(static_cast(aExpected.getHeight()), 
aSize.Height);
 }
 
+DECLARE_HTMLIMPORT_TEST(testTdf122789, "tdf122789.html")
+{
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rFormats.size());
+// This failed, the image had an absolute size, not a relative one.
+CPPUNIT_ASSERT_EQUAL(static_cast(70), 
rFormats[0]->GetAttrSet().GetFrameSize().GetWidthPercent());
+}
+
 DECLARE_HTMLIMPORT_TEST(testReqIfPageStyle, "reqif-page-style.xhtml")
 {
 // Without the accompanying fix in place, this test would have failed with
diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 92f0e37c1228..c4ffa075c620 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -644,7 +644,9 @@ IMAGE_SETEVENT:
 bool bSetScaleImageMap = false;
 sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
 
-if ((!nWidth || !nHeight) && allowAccessLink(*m_xDoc))
+// bPrcWidth / bPrcHeight means we have a percent size.  If that's not the 
case and we have no
+// size from nWidth / nHeight either, then inspect the image header.
+if ((!bPrcWidth && !nWidth) && (!bPrcHeight && !nHeight) && 
allowAccessLink(*m_xDoc))
 {
 GraphicDescriptor aDescriptor(aGraphicURL);
 if (aDescriptor.Detect(/*bExtendedInfo=*/true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/reference.html loleaflet/src

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/css/leaflet.css|   12 ++--
 loleaflet/reference.html |   17 -
 loleaflet/src/control/Control.Toolbar.js |2 +-
 loleaflet/src/map/handler/Map.WOPI.js|   15 +++
 4 files changed, 38 insertions(+), 8 deletions(-)

New commits:
commit 43f09f284ca9be50913a3799c0c98137a1fdf42c
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 28 15:39:48 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:10:12 2019 +0200

Use LO branding colors for loading progress bar

From https://wiki.documentfoundation.org/Marketing/Branding

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

diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 4ddd1cdf4..74cdc3418 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -729,14 +729,14 @@ input.clipboard {
margin: 0 -1px;
height: 100%;
text-align: right;
-   background: #5c3dcc;
+   background: #18A303;
border: 1px solid;
-   border-color: #4422bf #5435c4;
+   border-color: #106802;
border-radius: 10px;
-   background-image: -webkit-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: -moz-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: -o-linear-gradient(top, #745dc6, #6549cc 70%, 
#5c3dcc);
-   background-image: linear-gradient(to bottom, #745dc6, #6549cc 70%, 
#5c3dcc);
+   background-image: -webkit-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: -moz-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: -o-linear-gradient(top, #92E285, #43C330 70%, 
#18A303);
+   background-image: linear-gradient(to bottom, #92E285, #43C330 70%, 
#18A303);
-webkit-box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px 
rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px rgba(255, 255, 255, 0.3), 0 1px 2px rgba(0, 0, 
0, 0.2);
}
commit 3f31de251edc2df7df9bf8a94e3e38852686a8b2
Author: Samuel Mehrbrodt 
AuthorDate: Thu May 23 14:52:11 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:10:00 2019 +0200

Add API method to remove elements from statusbar

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

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 7cb520ab9..4bcaaeb67 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3177,6 +3177,16 @@ Editor to WOPI host



+   Remove_Statusbar_Element
+   
+   id: 
+   
+   
+   Removes an element from the statusbar.
+   id is the element ID (see Finding statusbar element IDs).
+   
+   
+   
Hide_Menubar


@@ -3194,7 +3204,12 @@ Editor to WOPI host
 
 Finding toolbar button IDs
 Toolbar button IDs are defined in the https://opengrok.libreoffice.org/search?project=online&q=&defs=createToolbar";>createToolbar
-function in https://opengrok.libreoffice.org/xref/online/loleaflet/js/toolbar.js";>loleaflet/js/toolbar.js.
+function in https://opengrok.libreoffice.org/xref/online/loleaflet/src/control/Control.Toolbar.js";>Control.Toolbar.js.
+Note that they usually don't change but there is no guarantee that they are 
stable.
+
+Finding statusbar element IDs
+Statusbar button IDs are defined in the https://opengrok.libreoffice.org/search?project=online&q=&defs=onDocLayerInit";>onDocLayerInit
+function in https://opengrok.libreoffice.org/xref/online/loleaflet/src/control/Control.Toolbar.js";>Control.Toolbar.js.
 Note that they usually don't change but there is no guarantee that they are 
stable.
 
 Editor to WOPI host
diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 956465f24..8839f259b 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1055,7 +1055,7 @@ function initNormalToolbar() {

map['wopi'].HideUserList !== undefined &&

$.inArray('true', map['wopi'].HideUserList) < 0 &&

$.inArray('desktop', map['wopi'].HideUserList) < 0;
-   if (this.get('userlist').hidden == true && 
showInDesktop) {
+   if (this.get('userlist') && 
this.get('userlist').hidden == true && showInDesktop) {
  

[Libreoffice-commits] online.git: 2 commits - common/Log.hpp loleaflet/src

[Samuel Mehrbrodt (via logerrit)]

 common/Log.hpp   |2 +
 loleaflet/src/control/Control.Toolbar.js |   52 +--
 2 files changed, 44 insertions(+), 10 deletions(-)

New commits:
commit b40cf51181ecf6d65f25238b84da0f98176fc249
Author: Samuel Mehrbrodt 
AuthorDate: Wed May 22 08:31:59 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:09:37 2019 +0200

Log fatal errors also to stderr

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

diff --git a/common/Log.hpp b/common/Log.hpp
index 50881f941..5b7e77f91 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -15,6 +15,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -341,6 +342,7 @@ namespace Log
 #define LOG_FTL(X)  \
 do  \
 {   \
+std::cerr << X << std::endl;\
 auto &log_ = Log::logger(); \
 if (log_.fatal())   \
 {   \
commit e4b39f6811fa4f060e200a20ba9a6936b4b1b7e2
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 28 10:05:12 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:09:26 2019 +0200

Add dropdown to switch doc language to statusbar

instead of just having a label displaying the current language.

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

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index e69761152..956465f24 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1437,9 +1437,8 @@ function onDocLayerInit() {
html: ' '
},
{type: 'break', id: 'break4', tablet: false},
-   {
-   type: 'html', id: 'LanguageStatus', 
mobile: false, tablet: false,
-   html: ' '
+   {type: 'menu-radio', id: 'LanguageStatus',
+   mobile: false
},
{type: 'break', id: 'break5', tablet: false},
{
@@ -1499,9 +1498,8 @@ function onDocLayerInit() {
html: ' '
},
{type: 'break', id: 'break7', mobile: false, 
tablet: false},
-   {
-   type: 'html', id: 'LanguageStatus', 
mobile: false, tablet: false,
-   html: ' '
+   {type: 'menu-radio', id: 'LanguageStatus',
+   mobile: false
},
{type: 'break', id: 'break8', mobile: false}
]);
@@ -1521,9 +1519,8 @@ function onDocLayerInit() {
html: ' '
},
{type: 'break', id: 'break2', mobile: false, 
tablet: false},
-   {
-   type: 'html', id: 'LanguageStatus', 
mobile: false, tablet: false,
-   html: ' '
+   {type: 'menu-radio', id: 'LanguageStatus',
+   mobile: false
},
{type: 'break', id: 'break8', mobile: false}
]);
@@ -1689,7 +1686,7 @@ function onCommandStateChanged(e) {
}
}
else if (commandName === '.uno:LanguageStatus') {
-   updateToolbarItem(statusbar, 'LanguageStatus', 
$('#LanguageStatus').html(_(state)).parent().html());
+   statusbar.set('LanguageStatus', {text: _(state), selected: 
state});
}
else if (commandName === '.uno:ModifiedStatus') {
if (e.state === 'true') {
@@ -1782,6 +1779,40 @@ function onCommandStateChanged(e) {
}
 }
 
+function onCommandValues(e) {
+   if (e.commandName === '.uno:LanguageStatus' && 
L.Util.isArray(e.commandValues)) {
+   var translated, neutral;
+   var constLang = '.uno:LanguageStatus?Language:string=';
+   var constDefault = 'Default_RESET_LANGUAGES';
+   var constNone = 'Default_LANGUAGE_NONE';
+   var resetLang = _('Reset to Default Language')

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

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/css/loleaflet.css  |4 
 loleaflet/src/control/Control.Menubar.js |   11 ++-
 loleaflet/src/control/Ruler.js   |1 +
 loleaflet/src/map/Map.js |   21 +
 4 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 0576a3cced4c27be940a831d6735ece533a2a47d
Author: Samuel Mehrbrodt 
AuthorDate: Mon May 13 21:13:15 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:08:30 2019 +0200

Add "Show ruler" menu entry

Also add some space between the ruler and the document frame

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

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 576931f8d..55a64dae3 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -30,6 +30,10 @@
cursor: default;
 }
 
+.hasruler {
+   padding-top: 16px;
+}
+
 .scroll-container .mCSB_scrollTools.mCSB_1_scrollbar {
position: absolute;
z-index: 1000;
diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 4da0b7d51..bb2e32c7f 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -61,6 +61,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ZoomPlus', 'text'), id: 
'zoomin', type: 'action'},
{name: _UNO('.uno:ZoomMinus', 'text'), id: 
'zoomout', type: 'action'},
{name: _('Reset zoom'), id: 'zoomreset', type: 
'action'},
+   {name: _('Show Ruler'), id: 'showruler', type: 
'action'},
{type: 'separator'},
{uno: '.uno:ControlCodes'}
]
@@ -646,12 +647,12 @@ L.Control.Menubar = L.Control.extend({
var aItem = this;
var type = $(aItem).data('type');
var id = $(aItem).data('id');
+   var constChecked = 'lo-menu-item-checked';
if (self._map._permission === 'edit') {
if (type === 'unocommand') { // enable all 
depending on stored commandStates
var data, lang;
var constUno = 'uno';
var constState = 'stateChangeHandler';
-   var constChecked = 
'lo-menu-item-checked';
var constLanguage = 
'.uno:LanguageStatus';
var constPageHeader = 
'.uno:InsertPageHeader';
var constPageFooter = 
'.uno:InsertPageFooter';
@@ -694,6 +695,12 @@ L.Control.Menubar = L.Control.extend({
if (index > 0) {

self.options.allowedViewModeActions.splice(index, 1);
}
+   } else if (id === 'showruler') {
+   if (self._map.isRulerVisible()) 
{
+   
$(aItem).addClass(constChecked);
+   } else {
+   
$(aItem).removeClass(constChecked);
+   }
} else {

$(aItem).removeClass('disabled');
}
@@ -751,6 +758,8 @@ L.Control.Menubar = L.Control.extend({
this._map.setZoom(this._map.options.zoom);
} else if (id === 'fullscreen') {
L.toggleFullScreen();
+   } else if (id === 'showruler') {
+   this._map.toggleRuler();
} else if (id === 'fullscreen-presentation' && 
this._map.getDocType() === 'presentation') {
this._map.fire('fullscreen');
} else if (id === 'insertpage') {
diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index a48dacb6f..029b690a0 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -26,6 +26,7 @@ L.Control.Ruler = L.Control.extend({
map.on('docsize', this._updatePaintTimer, this);
map.on('scrolloffset resize', this._fixOffset, this);
map.on('updatepermission', this._changeInteractions, this);
+   $('#map').addClass('hasruler');
this._map = map;
 
return this._initLayout();
diff --git a/loleafle

[Libreoffice-commits] online.git: wsd/README.vars

[Samuel Mehrbrodt (via logerrit)]

 wsd/README.vars |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit a3481d8e235625c9e2345ee98231b8106bae4ce3
Author: Samuel Mehrbrodt 
AuthorDate: Tue May 28 18:13:58 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jun 4 09:07:47 2019 +0200

Remove unused env vars from README.vars

Change-Id: Ia0b239f37d98534f278fa7e828ad5e4192b26f31
Reviewed-on: https://gerrit.libreoffice.org/73119
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/wsd/README.vars b/wsd/README.vars
index e1f81773d..fcbc87156 100644
--- a/wsd/README.vars
+++ b/wsd/README.vars
@@ -25,13 +25,6 @@ SLEEPKITFORDEBUGGER 
 to allow a 'sudo gdb' session to attach and debug that
 process.
 
-LOOL_WS_DELAY  
-   sleep atleast  seconds when sending and receiving websocket frames
-
-LOOL_WS_JITTER 
-   Maximum Jitter in millseconds which is added to delay in
-   websocket communication.
-
 LOOL_STORAGE_COOKIE 
Sets a cookie to all the requests made to storage. This is extremely 
useful for
debugging WOPI implementations. For eg: Using XDebug with 
OwnCloud/NextCloud.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source chart2/source dbaccess/source drawinglayer/source extensions/source forms/source framework/source include/toolkit sc/source sd/source sfx2/source starmath

[Arkadiy Illarionov (via logerrit)]

 basctl/source/basicide/basicrenderable.cxx  |2 
 chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx |2 
 chart2/source/controller/main/ChartController.cxx   |2 
 chart2/source/controller/main/ChartController_Window.cxx|2 
 dbaccess/source/ui/browser/genericcontroller.cxx|2 
 dbaccess/source/ui/uno/ColumnControl.cxx|2 
 drawinglayer/source/primitive2d/controlprimitive2d.cxx  |2 
 extensions/source/bibliography/bibload.cxx  |2 
 extensions/source/propctrlr/propcontroller.cxx  |2 
 forms/source/richtext/richtextcontrol.cxx   |2 
 forms/source/solar/component/navbarcontrol.cxx  |2 
 framework/source/layoutmanager/layoutmanager.cxx|4 -
 framework/source/uielement/controlmenucontroller.cxx|6 +-
 framework/source/uielement/fontmenucontroller.cxx   |2 
 framework/source/uielement/fontsizemenucontroller.cxx   |2 
 framework/source/uielement/headermenucontroller.cxx |2 
 framework/source/uielement/langselectionmenucontroller.cxx  |2 
 framework/source/uielement/macrosmenucontroller.cxx |2 
 framework/source/uielement/newmenucontroller.cxx|6 +-
 framework/source/uielement/objectmenucontroller.cxx |2 
 framework/source/uielement/popuptoolbarcontroller.cxx   |4 -
 framework/source/uielement/recentfilesmenucontroller.cxx|2 
 framework/source/uielement/resourcemenucontroller.cxx   |8 +--
 framework/source/uielement/thesaurusmenucontroller.cxx  |2 
 framework/source/uielement/toolbarmodemenucontroller.cxx|4 -
 framework/source/uielement/toolbarsmenucontroller.cxx   |8 +--
 include/toolkit/awt/vclxbitmap.hxx  |5 --
 include/toolkit/awt/vclxdevice.hxx  |5 --
 include/toolkit/awt/vclxfont.hxx|5 --
 include/toolkit/awt/vclxgraphics.hxx|5 --
 include/toolkit/awt/vclxmenu.hxx|5 --
 include/toolkit/awt/vclxpointer.hxx |5 --
 include/toolkit/awt/vclxregion.hxx  |5 --
 include/toolkit/awt/vclxwindow.hxx  |5 --
 include/toolkit/helper/macros.hxx   |   27 
 sc/source/ui/unoobj/docuno.cxx  |2 
 sd/source/ui/unoidl/unomodel.cxx|2 
 sd/source/ui/view/DocumentRenderer.cxx  |2 
 sfx2/source/control/dispatch.cxx|2 
 sfx2/source/doc/guisaveas.cxx   |2 
 sfx2/source/notebookbar/NotebookbarTabControl.cxx   |2 
 starmath/source/unomodel.cxx|2 
 svtools/source/hatchwindow/hatchwindow.cxx  |2 
 svx/source/fmcomp/fmgridif.cxx  |2 
 svx/source/mnuctrls/smarttagmenu.cxx|2 
 sw/source/core/view/printdata.cxx   |2 
 sw/source/uibase/uno/unotxdoc.cxx   |2 
 toolkit/source/awt/vclxbitmap.cxx   |2 
 toolkit/source/awt/vclxdevice.cxx   |2 
 toolkit/source/awt/vclxfont.cxx |2 
 toolkit/source/awt/vclxgraphics.cxx |4 -
 toolkit/source/awt/vclxmenu.cxx |5 --
 toolkit/source/awt/vclxpointer.cxx  |3 -
 toolkit/source/awt/vclxregion.cxx   |2 
 toolkit/source/awt/vclxtoolkit.cxx  |2 
 toolkit/source/awt/vclxtopwindow.cxx|2 
 toolkit/source/awt/vclxwindow.cxx   |   24 --
 toolkit/source/controls/stdtabcontroller.cxx|2 
 toolkit/source/controls/unocontrolmodel.cxx |   20 
 toolkit/source/helper/unowrapper.cxx|2 
 toolkit/source/helper/vclunohelper.cxx  |   16 +++
 61 files changed, 108 insertions(+), 149 deletions(-)

New commits:
commit 32eeb405d7fd6788aaa34e1bf8a04388d7a3958f
Author: Arkadiy Illarionov 
AuthorDate: Tue Jun 4 02:29:43 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Tue Jun 4 09:06:43 2019 +0200

tdf#39593 remove IMPL_XUNOTUNNEL* macros

Replace with UNO3_GETIMPLEMENTATION* macros.
Replace single usage of IMPL_XUNOTUNNEL_MINIMAL with it's body.

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

diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 3537e9

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - dtrans/test sal/osl sfx2/source

[Mike Kaganski (via logerrit)]

 dtrans/test/win32/dnd/atlwindow.cxx  |2 +-
 sal/osl/w32/dllentry.cxx |6 +-
 sfx2/source/appl/shutdowniconw32.cxx |2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 0ae5ee9341f2dbd4b272b6d1302decaad0f9e152
Author: Mike Kaganski 
AuthorDate: Fri Sep 7 07:05:32 2018 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Tue Jun 4 09:02:23 2019 +0200

Cppcheck: release the handle that CreateThread returns

Change-Id: I4d6d04873d69d2ff1e5409372b353e0bb9a5d68d
Reviewed-on: https://gerrit.libreoffice.org/60120
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit aef44b5a71d6d2bd8e399d2cb35bce6d6023fbf8)
Reviewed-on: https://gerrit.libreoffice.org/73429
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/dtrans/test/win32/dnd/atlwindow.cxx 
b/dtrans/test/win32/dnd/atlwindow.cxx
index 7aa0df7ce0ac..9e1e2e1fc693 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.cxx
@@ -181,7 +181,7 @@ LRESULT AWindow::OnTimer(UINT uMsg, WPARAM wParam, LPARAM 
lParam, BOOL& bHandled
 
 data.evtThreadReady= CreateEvent( NULL, FALSE, FALSE, NULL);
 
-HANDLE hThread= CreateThread( NULL, 0, MTAFunc, &data, 0, 
&mtaThreadId);
+CloseHandle(CreateThread(NULL, 0, MTAFunc, &data, 0, 
&mtaThreadId));
 // We must wait until the thread copied the ThreadData 
structure
 WaitForSingleObject( data.evtThreadReady, INFINITE);
 CloseHandle( data.evtThreadReady);
diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx
index ffdaeb80dac9..5dd8151a58c3 100644
--- a/sal/osl/w32/dllentry.cxx
+++ b/sal/osl/w32/dllentry.cxx
@@ -222,13 +222,17 @@ BOOL WINAPI DllMain( HINSTANCE, DWORD fdwReason, LPVOID )
 {
 // No error check, it works or it does not
 // Thread should only be started for headless mode, see 
desktop/win32/source/officeloader.cxx
-CreateThread( nullptr, 0, ParentMonitorThreadProc, 
reinterpret_cast(dwParentProcessId), 0, &dwThreadId );
+HANDLE hThread
+= CreateThread(nullptr, 0, ParentMonitorThreadProc,
+   
reinterpret_cast(dwParentProcessId), 0, &dwThreadId);
 // Note: calling CreateThread in DllMain is discouraged
 // but this is only done in the headless mode and in
 // that case no other threads should be running at startup
 // when sal3.dll is loaded; also there is no
 // synchronization with the spawned thread, so there
 // does not appear to be a real risk of deadlock here
+if (hThread)
+CloseHandle(hThread);
 }
 }
 
diff --git a/sfx2/source/appl/shutdowniconw32.cxx 
b/sfx2/source/appl/shutdowniconw32.cxx
index f96968186948..37fc3a30e88d 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -527,7 +527,7 @@ void win32_init_sys_tray()
 );
 
 DWORD   dwThreadId;
-CreateThread( nullptr, 0, SystrayThread, nullptr, 0, &dwThreadId );
+CloseHandle(CreateThread(nullptr, 0, SystrayThread, nullptr, 0, 
&dwThreadId));
 }
 }
 
___
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' - dtrans/source onlineupdate/source vcl/opengl vcl/win

[Jan-Marek Glogowski (via logerrit)]

 dtrans/source/win32/misc/ImplHelper.cxx|2 -
 onlineupdate/source/update/updater/updater.cxx |   32 -
 vcl/opengl/win/WinDeviceInfo.cxx   |2 -
 vcl/win/app/salinst.cxx|2 -
 vcl/win/window/salframe.cxx|4 +--
 5 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 6a48679fc4a38f34f8bf0c1ff0a4ef7bad384b9c
Author: Jan-Marek Glogowski 
AuthorDate: Fri Sep 7 16:09:50 2018 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Tue Jun 4 09:01:56 2019 +0200

Fix some std::unique_ptr array allocs

Found by reviewing the output of and the code around
git grep -n "unique_ptr.*new.*\[.*\]" | grep -v "\[\]"

The onlineupdater code needs a little bit more attention.

Change-Id: I8b70c7da7db60af52bfac12314a21602ede8bfc0
Reviewed-on: https://gerrit.libreoffice.org/60162
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit b18747fcee1ba8744e5cd63791dc9f3eb6848a56)
Reviewed-on: https://gerrit.libreoffice.org/73428
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/dtrans/source/win32/misc/ImplHelper.cxx 
b/dtrans/source/win32/misc/ImplHelper.cxx
index 4b98b4850006..f933701ce961 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -95,7 +95,7 @@ OUString getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 
 if ( nResult )
 {
-std::unique_ptr buff( new wchar_t[nResult] );
+std::unique_ptr buff( new wchar_t[nResult] );
 // Now get the actual data
 nResult = GetLocaleInfoW( lcid, lctype, buff.get(), nResult );
 
diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 1782804eff15..a05fd075bd3a 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -1119,8 +1119,8 @@ public:
 void Finish(int status);
 
 private:
-std::unique_ptr mFile;
-std::unique_ptr mRelPath;
+std::unique_ptr mFile;
+std::unique_ptr mRelPath;
 int mSkip;
 };
 
@@ -1247,8 +1247,8 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mDir;
-std::unique_ptr mRelPath;
+std::unique_ptr mDir;
+std::unique_ptr mRelPath;
 int mSkip;
 };
 
@@ -1260,6 +1260,7 @@ RemoveDir::Parse(NS_tchar *line)
 NS_tchar* validPath = get_valid_path(&line, true);
 if (!validPath)
 return PARSE_ERROR;
+
 mRelPath.reset(new NS_tchar[MAXPATHLEN]);
 NS_tstrcpy(mRelPath.get(), validPath);
 
@@ -1371,8 +1372,8 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mFile;
-std::unique_ptr mRelPath;
+std::unique_ptr mFile;
+std::unique_ptr mRelPath;
 bool mAdded;
 ArchiveReader& mArchiveReader;
 };
@@ -1387,7 +1388,6 @@ AddFile::Parse(NS_tchar *line)
 return PARSE_ERROR;
 
 mRelPath.reset(new NS_tchar[MAXPATHLEN]);
-
 NS_tstrcpy(mRelPath.get(), validPath);
 
 mFile.reset(get_full_path(validPath));
@@ -1799,7 +1799,7 @@ public:
 virtual void Finish(int status);
 
 protected:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 AddIfFile::AddIfFile(ArchiveReader& archiveReader):
@@ -1866,7 +1866,7 @@ public:
 virtual void Finish(int status);
 
 protected:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 AddIfNotFile::AddIfNotFile(ArchiveReader& archiveReader):
@@ -1933,7 +1933,7 @@ public:
 virtual void Finish(int status);
 
 private:
-std::unique_ptr mTestFile;
+std::unique_ptr mTestFile;
 };
 
 PatchIfFile::PatchIfFile(ArchiveReader& archiveReader):
@@ -2323,7 +2323,7 @@ CopyInstallDirToDestDir()
 #endif
 copy_recursive_skiplist skiplist;
 
-std::unique_ptr pUserProfile(new NS_tchar[MAXPATHLEN]);
+std::unique_ptr pUserProfile(new NS_tchar[MAXPATHLEN]);
 NS_tstrcpy(pUserProfile.get(), gPatchDirPath);
 NS_tchar *slash = (NS_tchar *) NS_tstrrchr(pUserProfile.get(), NS_T('/'));
 if (slash)
@@ -4036,7 +4036,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 
 NS_tsnprintf(searchspec, sizeof(searchspec)/sizeof(searchspec[0]),
  NS_T("%s*"), dirpath);
-std::unique_ptr pszSpec(get_full_path(searchspec));
+std::unique_ptr pszSpec(get_full_path(searchspec));
 
 hFindFile = FindFirstFileW(pszSpec.get(), &finddata);
 if (hFindFile != INVALID_HANDLE_VALUE)
@@ -4116,7 +4116,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 char chars[MAXNAMLEN];
 } ent_buf;
 struct dirent* ent;
-std::unique_ptr searchpath(get_full_path(dirpath));
+std::unique_ptr searchpath(get_full_path(dirpath));
 
 DIR* dir = opendir(searchpath.get());
 if (!dir)
@@ -4206,7 +4206,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList 
*list)
 int rv = OK;
  

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - dtrans/source

[Mike Kaganski (via logerrit)]

 dtrans/source/win32/dtobj/DOTransferable.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5deaeab8705e43189d3541b55a41fe853e230c2e
Author: Mike Kaganski 
AuthorDate: Wed Oct 10 16:37:15 2018 +0200
Commit: Juergen Funk (CIB) 
CommitDate: Tue Jun 4 09:01:20 2019 +0200

Properly check HRESULT

Although the IEnumFORMATETC::Next documentation only mentions S_OK and
S_FALSE, there are error codes that also may be returned: e.g.,
0x800706BA RPC server unavailable (encountered locally in a unit test).
In that case, this used to loop infinitely.

We are only interested in S_OK result, so check for it.

Change-Id: I062e409e84efb68353321f7c48d922ec83191f73
Reviewed-on: https://gerrit.libreoffice.org/61621
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 9eb489da4682a89ab96b0d6a8ba13418aac4ca9d)
Reviewed-on: https://gerrit.libreoffice.org/73427
Reviewed-by: Juergen Funk (CIB) 
Tested-by: Juergen Funk (CIB) 

diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx 
b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 2b3f5ff2e890..db70196e18a3 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -281,7 +281,7 @@ void CDOTransferable::initFlavorList( )
 pEnumFormatEtc->Reset( );
 
 FORMATETC fetc;
-while ( S_FALSE != pEnumFormatEtc->Next( 1, &fetc, nullptr ) )
+while ( S_OK == pEnumFormatEtc->Next( 1, &fetc, nullptr ) )
 {
 // we use locales only to determine the
 // charset if there is text on the cliboard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits