[Libreoffice-commits] core.git: oox/CppunitTest_oox_shape.mk oox/Module_oox.mk oox/qa oox/source

[Miklos Vajna (via logerrit)]

 oox/CppunitTest_oox_shape.mk|   45 +++
 oox/Module_oox.mk   |1 
 oox/qa/unit/data/multiple-group-shapes.docx |binary
 oox/qa/unit/shape.cxx   |   84 
 oox/source/shape/ShapeContextHandler.cxx|1 
 5 files changed, 131 insertions(+)

New commits:
commit 5960c6f4ca9dd6ab4b4081d3be7253468cd212c4
Author: Miklos Vajna 
AuthorDate: Mon Jan 13 20:08:54 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Jan 14 08:50:52 2020 +0100

tdf#129516 DOCX import: fix incorrect z-order with textboxes

Commit 3272c1eb5563f3bda2caa24f32b1018372622109 (related tdf#100074:
prepare group shapes text input via writerfilter, 2018-10-01) tweaked
the oox code, so that later it'll be able to call back to writerfilter
to parse group shape text. That makes sense, but it also removed the
reset of the group shape context, which means that two subsequent group
shapes are now imported as a single group shape with a merged child
list.

Reset the group shape context again when writerfilter asks for the
XShape from oox. If this causes a problem for the above scenario later,
then it could be considered to handle this in
ShapeContextHandler::endFastElement().

Change-Id: I14f7f0bab2c66c8430313d5b2daffe3160a58c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86712
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/oox/CppunitTest_oox_shape.mk b/oox/CppunitTest_oox_shape.mk
new file mode 100644
index ..9ae7bbd634cd
--- /dev/null
+++ b/oox/CppunitTest_oox_shape.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_externals,oox_shape,\
+   boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,oox_shape, \
+oox/qa/unit/shape \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,oox_shape, \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_ure,oox_shape))
+$(eval $(call gb_CppunitTest_use_vcl,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_rdb,oox_shape,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,oox_shape,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,oox_shape))
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index a40c46aaebbc..ed85ee68da2d 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_check_targets,oox,\
CppunitTest_oox_mathml \
CppunitTest_oox_drawingml \
CppunitTest_oox_vml \
+   CppunitTest_oox_shape \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/oox/qa/unit/data/multiple-group-shapes.docx 
b/oox/qa/unit/data/multiple-group-shapes.docx
new file mode 100644
index ..c751bcdf650b
Binary files /dev/null and b/oox/qa/unit/data/multiple-group-shapes.docx differ
diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx
new file mode 100644
index ..27d26aa91b57
--- /dev/null
+++ b/oox/qa/unit/shape.cxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+char const DATA_DIRECTORY[] = "/oox/qa/unit/data/";
+
+/// oox shape tests.
+class OoxShapeTest : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+void load(const OUString& rURL);
+};
+
+void OoxShapeTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void OoxShapeTest::tearDown()
+{
+if (mxCompon

[Libreoffice-commits] core.git: i18npool/inc idlc/inc idl/inc jvmfwk/inc l10ntools/inc linguistic/inc

[Noel Grandin (via logerrit)]

 i18npool/inc/breakiterator_cjk.hxx  |2 +-
 i18npool/inc/breakiterator_th.hxx   |2 +-
 i18npool/inc/calendar_gregorian.hxx |   10 +-
 i18npool/inc/calendar_hijri.hxx |4 ++--
 i18npool/inc/calendar_jewish.hxx|4 ++--
 i18npool/inc/cclass_unicode.hxx |2 +-
 i18npool/inc/chaptercollator.hxx|2 +-
 i18npool/inc/characterclassificationImpl.hxx|2 +-
 i18npool/inc/chartonum.hxx  |2 +-
 i18npool/inc/defaultnumberingprovider.hxx   |2 +-
 i18npool/inc/indexentrysupplier_asian.hxx   |2 +-
 i18npool/inc/indexentrysupplier_default.hxx |2 +-
 i18npool/inc/indexentrysupplier_ja_phonetic.hxx |2 +-
 i18npool/inc/inputsequencechecker_hi.hxx|2 +-
 i18npool/inc/inputsequencechecker_th.hxx|2 +-
 i18npool/inc/localedata.hxx |2 +-
 i18npool/inc/nativenumbersupplier.hxx   |2 +-
 i18npool/inc/numberformatcode.hxx   |2 +-
 i18npool/inc/numtochar.hxx  |2 +-
 i18npool/inc/numtotext_cjk.hxx  |2 +-
 i18npool/inc/ordinalsuffix.hxx  |2 +-
 i18npool/inc/textToPronounce_zh.hxx |2 +-
 i18npool/inc/textconversion.hxx |4 ++--
 i18npool/inc/textconversionImpl.hxx |2 +-
 i18npool/inc/texttonum.hxx  |2 +-
 i18npool/inc/transliterationImpl.hxx|2 +-
 i18npool/inc/transliteration_Ignore.hxx |8 
 i18npool/inc/transliteration_OneToOne.hxx   |   10 +-
 i18npool/inc/transliteration_body.hxx   |   12 ++--
 i18npool/inc/unoscripttypedetector.hxx  |2 +-
 idl/inc/database.hxx|2 +-
 idl/inc/module.hxx  |2 +-
 idl/inc/types.hxx   |8 
 idlc/inc/astattribute.hxx   |2 +-
 idlc/inc/astbasetype.hxx|2 +-
 idlc/inc/astconstant.hxx|2 +-
 idlc/inc/astconstants.hxx   |2 +-
 idlc/inc/astenum.hxx|2 +-
 idlc/inc/astexception.hxx   |2 +-
 idlc/inc/astinterfacemember.hxx |2 +-
 idlc/inc/astneeds.hxx   |2 +-
 idlc/inc/astobserves.hxx|2 +-
 idlc/inc/astoperation.hxx   |2 +-
 idlc/inc/astparameter.hxx   |2 +-
 idlc/inc/astsequence.hxx|2 +-
 idlc/inc/astservice.hxx |2 +-
 idlc/inc/astservicemember.hxx   |2 +-
 idlc/inc/aststructinstance.hxx  |2 +-
 idlc/inc/asttypedef.hxx |2 +-
 jvmfwk/inc/vendorbase.hxx   |2 +-
 l10ntools/inc/po.hxx|2 +-
 l10ntools/inc/xmlparse.hxx  |4 ++--
 l10ntools/inc/xrmmerge.hxx  |7 +++
 linguistic/inc/iprcache.hxx |2 +-
 54 files changed, 79 insertions(+), 80 deletions(-)

New commits:
commit e73b99b8dda36545116ac5b5f00c210642c2e3a6
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:29:03 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jan 14 07:12:31 2020 +0100

loplugin:finalclasses in i18npool..linguistic

Change-Id: Ib903fb2fdb4c4c25f73053065b828dade8b63785
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86687
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/inc/breakiterator_cjk.hxx 
b/i18npool/inc/breakiterator_cjk.hxx
index a088bd3d94c7..5b8e2693f69c 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -49,7 +49,7 @@ protected:
 };
 
 #define BREAKITERATOR_CJK( lang ) \
-class BreakIterator_##lang : public BreakIterator_CJK {\
+class BreakIterator_##lang final : public BreakIterator_CJK {\
 public:\
 BreakIterator_##lang (); \
 };
diff --git a/i18npool/inc/breakiterator_th.hxx 
b/i18npool/inc/breakiterator_th.hxx
index 347eb68b1138..c694e79e2575 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -25,7 +25,7 @@ namespace i18npool {
 
 
 
-class BreakIterator_th : public BreakIterator_Unicode
+class BreakIterator_th final : public BreakIterator_Unicode
 {
 public:
 BreakIterator_th();
diff --git a/i18npool/inc/calendar_gregorian.hxx 
b/i18npool/inc/calendar_gregorian.hxx
index d579ee735f00..10bde05b2027 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -146,7 +146,7 @@ private:
 
 
 
-class Calendar_hanja : public Calendar_gregorian
+class Calendar_hanja final : public Calendar_gregorian
 {
 public:
 // Constructors
@@ -157,7 +157,7 @@ public:
 
 
 
-class C

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

[Noel Grandin (via logerrit)]

 reportdesign/source/filter/xml/xmlfilter.cxx |   25 +++--
 1 file changed, 15 insertions(+), 10 deletions(-)

New commits:
commit 7ae61449ccbeaf6a0b2aa8e81aad394b18565943
Author: Noel Grandin 
AuthorDate: Mon Jan 13 19:08:39 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Jan 14 07:10:37 2020 +0100

use FastParser in reportdesign

Change-Id: Ib012e7c814184eaeaab57200107e8bf4887058f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86707
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 2a510dee12af..917dd5209411 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -130,21 +130,15 @@ static ErrCode ReadThroughComponent(
 OSL_ENSURE(xModelComponent.is(), "document missing");
 OSL_ENSURE(rContext.is(), "factory missing");
 
-// prepare ParserInputSrouce
+// prepare Parser InputSource
 InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
-// get parser
-uno::Reference< XParser > xParser = xml::sax::Parser::create(rContext);
-SAL_INFO( "reportdesign", "parser created" );
 // get filter
-OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." );
+SAL_WARN_IF( !_xFilter.is(), "reportdesign", "Can't instantiate filter 
component." );
 if( !_xFilter.is() )
 return ErrCode(1);
 
-// connect parser and filter
-xParser->setDocumentHandler( _xFilter );
-
 // connect model and filter
 uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
 xImporter->setTargetDocument( xModelComponent );
@@ -152,11 +146,20 @@ static ErrCode ReadThroughComponent(
 // finally, parser the stream
 try
 {
-xParser->parseStream( aParserInput );
+uno::Reference < XFastParser > xFastParser( _xFilter, UNO_QUERY );\
+if (xFastParser.is())
+xFastParser->parseStream( aParserInput );
+else
+{
+uno::Reference< XParser > xParser = 
xml::sax::Parser::create(rContext);
+// connect parser and filter
+xParser->setDocumentHandler( _xFilter );
+xParser->parseStream( aParserInput );
+}
 }
 catch (const SAXParseException&)
 {
-TOOLS_WARN_EXCEPTION( "reportdesign", "SAX parse exception caught 
while importing");
+TOOLS_WARN_EXCEPTION( "reportdesign", "");
 return ErrCode(1);
 }
 catch (const SAXException&)
@@ -169,10 +172,12 @@ static ErrCode ReadThroughComponent(
 }
 catch (const IOException&)
 {
+TOOLS_WARN_EXCEPTION( "reportdesign", "");
 return ErrCode(1);
 }
 catch (const Exception&)
 {
+TOOLS_WARN_EXCEPTION( "reportdesign", "");
 return ErrCode(1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/addsignatureline.xhp  |2 +-
 source/text/shared/01/signsignatureline.xhp |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5a44291fac8fe16731bf0dff05ed40ae582f3461
Author: Olivier Hallot 
AuthorDate: Mon Jan 13 23:30:20 2020 -0300
Commit: Olivier Hallot 
CommitDate: Tue Jan 14 04:10:17 2020 +0100

Signature lines are for text and spreadsheets

Remove reference to Writer in signature line Help pages

Change-Id: I8f454c67277af2236bf52bb290fcd5d606093a45
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86722
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/addsignatureline.xhp 
b/source/text/shared/01/addsignatureline.xhp
index f45d2fb33..9a4e7db6c 100644
--- a/source/text/shared/01/addsignatureline.xhp
+++ b/source/text/shared/01/addsignatureline.xhp
@@ -11,7 +11,7 @@
 
 
 
-Adding Signature Line in Text 
Documents
+Adding Signature Line in 
Documents
 /text/shared/01/addsignatureline.xhp
 
 
diff --git a/source/text/shared/01/signsignatureline.xhp 
b/source/text/shared/01/signsignatureline.xhp
index a4dc90ff0..06663c442 100644
--- a/source/text/shared/01/signsignatureline.xhp
+++ b/source/text/shared/01/signsignatureline.xhp
@@ -22,8 +22,8 @@
 digital signature;sign signature 
linesignature line;signing
 
 Digitally Signing the Signature Line
-%PRODUCTNAME Writer lets you sign digitally a signature 
line.
-On 
signing a signature line, %PRODUCTNAME Writer fills the line with the name of 
signer, adds the digital certificate issuer information and optionally insert 
the date of signature.
+%PRODUCTNAME lets you sign digitally a signature line in your 
document.
+On 
signing a signature line, %PRODUCTNAME fills the line with the name of signer, 
adds the digital certificate issuer information and optionally insert the date 
of signature.
 
 Select the signature line graphic object context menu. Choose 
Sign Signature Line.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 0dc1611ac1c2c4ad57346131394d3c7035021259
Author: Olivier Hallot 
AuthorDate: Tue Jan 14 00:10:17 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Jan 14 04:10:17 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5a44291fac8fe16731bf0dff05ed40ae582f3461
  - Signature lines are for text and spreadsheets

Remove reference to Writer in signature line Help pages

Change-Id: I8f454c67277af2236bf52bb290fcd5d606093a45
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86722
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 8a54ad38c542..5a44291fac8f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8a54ad38c542ed005ad11cd18579b6645ca21b23
+Subproject commit 5a44291fac8fe16731bf0dff05ed40ae582f3461
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tabstpge.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0839896894f4a6ea615325ffa517750e970ab04f
Author: Caolán McNamara 
AuthorDate: Fri Jan 10 21:13:04 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Jan 14 02:19:08 2020 +0100

Resolves: tdf#127417 delete-all tabs doesn't work

since...

commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46
Date:   Thu Apr 18 19:25:06 2019 +0200

WIP: Further preparations for deeper Item changes

because since then aNewTabs is cloned, but on delete-all
aNewTabs is reset to a SvxTabStopItem with a 0 WhichId
so its clones are useless

Change-Id: I725bec90d8915b3546afeed590f21ebdbbdaa355
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86579
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit dfb60d3b80ca8459505ab7e4599eb9406f1bfb3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86631
Reviewed-by: Michael Stahl 
Reviewed-by: Xisco Faulí 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index f9b7205247cb..9e7001c44404 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, 
weld::Button&, void)
 {
 if ( aNewTabs->Count() )
 {
-aNewTabs = std::make_unique( 0 );
+aNewTabs = 
std::make_unique(GetWhich(SID_ATTR_TABSTOP));
 InitTabPos_Impl();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muhammet Kara (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 7b94981b7d73626af6cdcab7ce694781b07b5e4a
Author: Muhammet Kara 
AuthorDate: Mon Jan 13 09:24:29 2020 +0300
Commit: Henry Castro 
CommitDate: Mon Jan 13 23:15:52 2020 +0100

Show hyperlink pop-up on cell selection

Change-Id: I59f3301bd94c4d898ec2ff82fd91d3c611122d3a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86651
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 8d31a7647..0d64ded2d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2843,6 +2843,29 @@ L.TileLayer = L.GridLayer.extend({
this._map.removeLayer(this._cellCursorMarker);
}
this._removeDropDownMarker();
+
+   //hyperlink pop-up from here
+   if (this._lastFormula && this._cellCursorMarker && 
this._lastFormula.substring(1, 10) == 'HYPERLINK')
+   {
+   var formula = this._lastFormula;
+   var targetURL = formula.substring(11, formula.length - 
1).split(',')[0];
+   targetURL = targetURL.split('"').join('');
+   targetURL = this._map.makeURLFromStr(targetURL);
+
+   this._map.closePopup(this._map.hyperlinkPopup);
+   this._map.hyperlinkPopup = null;
+   if (targetURL) {
+   this._map.hyperlinkPopup = new 
L.Popup({className: 'hyperlink-popup', closeButton: false, closeOnClick: false})
+   .setContent('' + targetURL + '')
+   
.setLatLng(this._cellCursorMarker._bounds._northEast)
+   .openOn(this._map);
+   }
+
+   }
+   else if (this._map.hyperlinkPopup)
+   {
+   this._map.closePopup(this._map.hyperlinkPopup);
+   }
},
 
_onValidityListButtonMsg: function(textMsg) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/inc/svdata.hxx|6 ++
 vcl/source/app/svmain.cxx |9 +
 vcl/source/treelist/transfer2.cxx |   23 +++
 3 files changed, 38 insertions(+)

New commits:
commit 974ea67a7c345a8be98c5aaa59baf9b07959b708
Author: Stephan Bergmann 
AuthorDate: Fri Jan 10 17:23:44 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 13 23:03:02 2020 +0100

tdf#129930: Dispose SystemClipboard service early enough

At least on Windows, the related
CMtaOleClipboard::m_hClipboardChangedNotifierThread thread would otherwise 
still
run during cppuhelper::ServiceManager::disposing (but could try to create 
other
UNO services, which then throws a DeploymentException).

(There is also a GetSystemPrimarySelection similar to GetSystemClipboard in
include/vcl/transfer.hxx, which might or might not turn out to have a 
similar
issue.)

Change-Id: Ia64e708cf0578e3a127c1a56fbace577ecf4ee1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a0def514557e..c91a6e4139ae 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -102,6 +102,8 @@ class UITestLogger;
 #define SV_ICON_ID_DATABASE12
 #define SV_ICON_ID_FORMULA 13
 
+namespace com::sun::star::datatransfer::clipboard { class XClipboard; }
+
 namespace vcl
 {
 class DisplayConnectionDispatch;
@@ -372,6 +374,10 @@ struct ImplSVData
 
 css::uno::Reference m_xCharClass;
 
+#if defined _WIN32
+css::uno::Reference 
m_xSystemClipboard;
+#endif
+
 Link maDeInitHook;
 
 // LOK & headless backend specific hooks
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index ace085e89632..bfa5279ca4ca 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -484,6 +484,15 @@ void DeInitVCL()
 pSVData->maCtrlData.mpDisclosureMinus.reset();
 pSVData->mpDefaultWin.disposeAndClear();
 
+#if defined _WIN32
+// See GetSystemClipboard (vcl/source/treelist/transfer2.cxx):
+if (auto const comp = css::uno::Reference(
+pSVData->m_xSystemClipboard, css::uno::UNO_QUERY))
+{
+comp->dispose();
+}
+#endif
+
 #ifndef NDEBUG
 DbgGUIDeInitSolarMutexCheck();
 #endif
diff --git a/vcl/source/treelist/transfer2.cxx 
b/vcl/source/treelist/transfer2.cxx
index 0a6f7528b252..fbb4c2a82768 100644
--- a/vcl/source/treelist/transfer2.cxx
+++ b/vcl/source/treelist/transfer2.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -32,6 +33,7 @@
 #include 
 #include 
 
+#include 
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -462,6 +464,26 @@ void TransferDataContainer::DragFinished( sal_Int8 
nDropAction )
 
 Reference GetSystemClipboard()
 {
+// On Windows, the css.datatransfer.clipboard.SystemClipboard UNO service 
is implemented as a
+// single-instance service (sysdtrans_component_getFactory,
+// dtrans/source/win32/clipb/wcbentry.cxx) that needs timely disposing to 
join a spawned thread
+// (done in DeInitVCL, vcl/source/app/svmain.cxx), while on other 
platforms it is implemented as
+// a mutli-instance service (ClipboardFactory, 
vcl/source/components/dtranscomp.cxx) so we
+// should not hold on to a single instance here:
+#if defined _WIN32
+DBG_TESTSOLARMUTEX();
+auto const data = ImplGetSVData();
+if (!data->m_xSystemClipboard.is())
+{
+try
+{
+data->m_xSystemClipboard = 
css::datatransfer::clipboard::SystemClipboard::create(
+comphelper::getProcessComponentContext());
+}
+catch (DeploymentException const &) {}
+}
+return data->m_xSystemClipboard;
+#else
 Reference xClipboard;
 try
 {
@@ -470,6 +492,7 @@ Reference GetSystemClipboard()
 }
 catch (DeploymentException const &) {}
 return xClipboard;
+#endif
 }
 
 Reference GetSystemPrimarySelection()
___
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.2' - sc/source

[Muhammet Kara (via logerrit)]

 sc/source/ui/drawfunc/fuins2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 174e03a19e08846ee38fc4ff638ad7f3aad9934d
Author: Muhammet Kara 
AuthorDate: Mon Jan 13 23:42:54 2020 +0300
Commit: Michael Meeks 
CommitDate: Mon Jan 13 22:41:51 2020 +0100

lok: Unlock chart contollers after insertion on mobile view

The chart controllers were locked until the dialog finishes
its execution, but at some point, dialog is disabled for mobile
view, and seems like it was forgotten to unlock the controllers.

Change-Id: Ib1e5799f5c84ef8b3ebc0f538909b4f8b586ff1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86716
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 760b2229c7d8..3ece0c405d6a 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -747,6 +747,8 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh, 
vcl::Window* pWin, ScDrawV
 }
 }
 }
+else if( xChartModel.is() )
+xChartModel->unlockControllers();
 }
 
 /* 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: basegfx/source

[Caolán McNamara (via logerrit)]

 basegfx/source/polygon/b2dlinegeometry.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 76a8746ea40965547c3d0fd9d56a8649f26ef756
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 19:42:15 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 21:35:57 2020 +0100

crashtesting: downgrade assert to a warning

its asserts since...

commit 5291c3ef56948a91166a597033f3e48e00d57403
Date:   Sun Dec 1 05:41:43 2019 +1100
tdf#43157 basegfx: remove OSL_ENSURE preconditions

on e.g. export of tdf12500-2.wmf to odg

but its unclear what a fix might look like

Change-Id: I26c1b1426a0d5ca7f25ca69cf1b720fe3344ce69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86714
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 007ff8b4811d..91769a833ff5 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -698,7 +699,7 @@ namespace basegfx
 double fMiterMinimumAngle,
 basegfx::triangulator::B2DTriangleVector* pTriangles)
 {
-assert((fHalfLineWidth > 0.0) && "createAreaGeometryForJoin: 
LineWidth too small (!)");
+SAL_WARN_IF(fHalfLineWidth <= 
0.0,"basegfx","createAreaGeometryForJoin: LineWidth too small (!)");
 assert((eJoin != B2DLineJoin::NONE) && "createAreaGeometryForJoin: 
B2DLineJoin::NONE not allowed (!)");
 
 // LineJoin from tangent rPerpendPrev to tangent rPerpendEdge in 
rPoint
___
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' - oox/source

[Xisco Fauli (via logerrit)]

 oox/source/drawingml/chart/plotareaconverter.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 242506ba9abcbd86f368e57bc4b046aa58e33651
Author: Xisco Fauli 
AuthorDate: Thu Jan 9 13:00:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 21:12:38 2020 +0100

oox: add missing nullptr checks

See

http://crashreport.libreoffice.org/stats/signature/oox::drawingml::chart::PlotAreaConverter::convertFromModel(oox::drawingml::chart::View3DModel%20&)

Regression from 11473832b5717cb3222ce72baee885bc9e8e2386

Change-Id: I6cf08582fb384203ca1ce5736b88b85c11ff56da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86483
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit aa499120c4cb3935cd942751859b6d5d3689ea43)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86524
Reviewed-by: Caolán McNamara 

diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx 
b/oox/source/drawingml/chart/plotareaconverter.cxx
index 24ab5f0bfd3e..af3139618824 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -415,7 +415,8 @@ void PlotAreaConverter::convertFromModel( View3DModel& 
rView3DModel )
 bool bSupportsVaryColorsByPoint = mrModel.maTypeGroups.size() == 1;
 
 // convert all axes sets, and check which axis is attached to the first 
maTypeGroups
-sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && 
aAxesSets[0]->maAxes[1]->mnAxisId != rValAxisIds[0] ) ? 1 : 0;
+sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && aAxesSets.size() > 
0 && aAxesSets[0]->maAxes.count( API_Y_AXIS )
+&& aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] 
) ? 1 : 0;
 sal_Int32 nAxesSetIdx = nStartAxesSetIdx;
 
 for (auto const& axesSet : aAxesSets)
___
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' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 35d57c1c8e5ad59b1fc43ff5f4a2bd5ff2542614
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 12:12:19 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 21:11:08 2020 +0100

ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted element

Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86686
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index ca958de9a5ad..4c5b90780817 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5105,8 +5105,13 @@ SvxMSDffImportRec* SvxMSDffImportData::find(const 
SdrObject* pObj)
 
 void SvxMSDffImportData::insert(std::unique_ptr pImpRec)
 {
-m_ObjToRecMap[pImpRec->pObj] = pImpRec.get();
-m_Records.insert(std::move(pImpRec));
+auto aRet = m_Records.insert(std::move(pImpRec));
+bool bSuccess = aRet.second;
+if (bSuccess)
+{
+SvxMSDffImportRec* pRec = aRet.first->get();
+m_ObjToRecMap[pRec->pObj] = pRec;
+}
 }
 
 void SvxMSDffImportData::NotifyFreeObj(SdrObject* pObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/cypress_integration' - 3 commits - cypress_test/integration_tests cypress_test/package.json cypress_test/README

[Tamás Zolnai (via logerrit)]

 cypress_test/README  |   27 +-
 cypress_test/integration_tests/desktop/example_desktop_test_spec.js  |4 
 cypress_test/integration_tests/desktop/example_desktop_test_spec2.js |4 
 cypress_test/integration_tests/mobile/toolbar_spec.js|   99 
+-
 cypress_test/package.json|4 
 5 files changed, 122 insertions(+), 16 deletions(-)

New commits:
commit e4d13f2a188bbd42c82018ab0cf175f9d20ec698
Author: Tamás Zolnai 
AuthorDate: Mon Jan 13 21:01:01 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Jan 13 21:08:41 2020 +0100

cypress: mobile: Add some tests about pushing toolbar items.

Change-Id: I2b40dbee18fa04fbece4f4da0630e3ac619e0968

diff --git a/cypress_test/integration_tests/mobile/toolbar_spec.js 
b/cypress_test/integration_tests/mobile/toolbar_spec.js
index 24838aeb8..83851f976 100644
--- a/cypress_test/integration_tests/mobile/toolbar_spec.js
+++ b/cypress_test/integration_tests/mobile/toolbar_spec.js
@@ -95,4 +95,99 @@ describe('Toolbar tests', function() {
 cy.get('#tb_actionbar_item_redo')
   .should('not.have.class', 'disabled')
   })
+
+  it('Open and close mobile wizard by toolbar item.', function() {
+// Click on edit button
+cy.get('#mobile-edit-button').click()
+
+// Click on mobile wizard toolbar item
+cy.get('#tb_actionbar_item_mobile_wizard')
+  .should('not.have.class', 'disabled')
+  .click()
+
+// Mobile wizard is opened and it has any content
+cy.get('#mobile-wizard-content')
+  .should('not.be.empty');
+
+// Toolbar button is checked
+cy.get('#tb_actionbar_item_mobile_wizard table')
+  .should('have.class', 'checked')
+
+cy.get('#tb_actionbar_item_mobile_wizard')
+  .click()
+
+// Mobile wizard is closed
+cy.get('#mobile_wizard')
+  .should('not.be.visible');
+
+cy.get('#tb_actionbar_item_mobile_wizard table')
+  .should('not.have.class', 'checked')
+
+// Open mobile wizard again
+cy.get('#tb_actionbar_item_mobile_wizard')
+  .click()
+
+// Mobile wizard is opened and it has any content
+// TODO: fix this bug
+/*cy.get('#mobile-wizard-content')
+  .should('not.be.empty'); */
+  })
+
+  it('Open and close insertion mobile wizard by toolbar item.', function() {
+// Click on edit button
+cy.get('#mobile-edit-button').click()
+
+// Click on toolbar item
+cy.get('#tb_actionbar_item_insertion_mobile_wizard')
+  .should('not.have.class', 'disabled')
+  .click()
+
+// Mobile wizard is opened and it has any content
+cy.get('#mobile-wizard-content')
+  .should('not.be.empty');
+
+// Toolbar button is checked
+cy.get('#tb_actionbar_item_insertion_mobile_wizard table')
+  .should('have.class', 'checked')
+
+// Click on toolbar item again
+cy.get('#tb_actionbar_item_insertion_mobile_wizard')
+  .click()
+
+// Mobile wizard is closed
+cy.get('#mobile_wizard')
+  .should('not.be.visible');
+
+cy.get('#tb_actionbar_item_insertion_mobile_wizard table')
+  .should('not.have.class', 'checked')
+
+// Open mobile wizard again
+cy.get('#tb_actionbar_item_insertion_mobile_wizard')
+  .click()
+
+// Mobile wizard is opened and it has any content
+cy.get('#mobile-wizard-content')
+  .should('not.be.empty');
+  })
+
+  it('Open insert comment dialog by toolbar item.', function() {
+// Click on edit button
+cy.get('#mobile-edit-button').click()
+
+// Click on toolbar item
+cy.get('#tb_actionbar_item_insertcomment')
+  .should('not.have.class', 'disabled')
+  .click()
+
+// Comment insertion dialog is opened
+cy.get('.loleaflet-annotation-table')
+  .should('be.visible');
+
+// Close the dialog
+cy.contains('Cancel')
+  .click()
+
+cy.get('.loleaflet-annotation-table')
+  .should('be.not.visible');
+  })
 })
commit 0b72f9e81f2084fd225522913e1ea9826b75479f
Author: Tamás Zolnai 
AuthorDate: Mon Jan 13 20:20:30 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Jan 13 21:08:35 2020 +0100

cypress: Update README about test execution.

Change-Id: I6c7b7fd8c77f89289630a06f9dbaf94ae5082aa8

diff --git a/cypress_test/README b/cypress_test/README
index aebd3fa34..efeb6e10a 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -5,38 +5,49 @@ Running tests
 --
 
 All tests are part of the make check build. So you can
-just execute it in the top folder.
+just execute it from the root folder of online repository.
 
 make check
 
 To run only cypress test cases, you need to start loolwsd
-server first and then run the given cyrun command.
+server first. To do that you can call make run on a separate
+command line window, so LibreOffice online is started.
+
+After the server is running you can execute the test,
+calling the given run command. You need to run the
+command und

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/htmlexport/data/reqif-chinese.odt |binary
 sw/qa/extras/htmlexport/htmlexport.cxx |   22 ++
 sw/source/filter/html/htmlatr.cxx  |   10 +-
 sw/source/filter/html/htmlbas.cxx  |4 ++--
 sw/source/filter/html/htmlfldw.cxx |5 ++---
 sw/source/filter/html/htmlflywriter.cxx|2 +-
 sw/source/filter/html/htmlforw.cxx |6 +++---
 sw/source/filter/html/htmlftn.cxx  |4 ++--
 sw/source/filter/html/wrthtml.cxx  |4 ++--
 sw/source/filter/html/wrthtml.hxx  |2 +-
 10 files changed, 40 insertions(+), 19 deletions(-)

New commits:
commit 186ef501a305d452da1f36aa51106dba181dc324
Author: Miklos Vajna 
AuthorDate: Mon Jan 13 17:07:34 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 13 20:56:34 2020 +0100

sw reqif-xhtml export: fix non-well-formed output on Chinese text

And also search for the '"<" OOO_something' pattern, and fix up all
cases where we forgot to call GetNamespace() when opening an element.

Change-Id: I015e807c1ad0f96c7c4aaa97f7f61ae134cf3754
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86701
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/htmlexport/data/reqif-chinese.odt 
b/sw/qa/extras/htmlexport/data/reqif-chinese.odt
new file mode 100644
index ..b99c57caee10
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/reqif-chinese.odt 
differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index c2ef9bc7961b..0bf573039813 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -761,6 +761,28 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testRTFOLEMimeType)
 aType);
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testChinese)
+{
+// Load a document with Chinese text in it.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"reqif-chinese.odt";
+mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
+
+// Export it.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML 
(StarWriter)")),
+comphelper::makePropertyValue("FilterOptions", 
OUString("xhtmlns=reqif-xhtml")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+
+// Without the accompanying fix in place, this test would have failed as 
the output was not
+// well-formed.
+CPPUNIT_ASSERT(pDoc);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 7c1258ae90bd..8b501b0e894f 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -781,7 +781,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& 
rFormat,
 // The align=... attribute does behave strange in netscape
 // if there are controls in a paragraph, because the control and
 // all text behind the control does not recognize this attribute.
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_division;
+OString sOut = "<" + rHWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_division;
 rWrt.Strm().WriteOString( sOut );
 
 rHWrt.m_bTextAttr = false;
@@ -2648,7 +2648,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const 
SfxPoolItem& rHt )
 }
 else
 {
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " "
+OString sOut = "<" + rHTMLWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_font " "
 OOO_STRING_SVTOOLS_HTML_O_color "=";
 rWrt.Strm().WriteOString( sOut );
 HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor ).WriteChar( '>' );
@@ -2708,7 +2708,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const 
SfxPoolItem& rHt )
 }
 else
 {
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " "
+OString sOut = "<" + rHTMLWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_font " "
 OOO_STRING_SVTOOLS_HTML_O_face "=\"";
 rWrt.Strm().WriteOString( sOut );
 HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, 
rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters )
@@ -2748,7 +2748,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const 
SfxPoolItem& rHt )
 }
 else
 {
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font;
+OString sOut = "<" + rHTMLWrt.GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_font;
 
 sal_uInt32 nHeight = static_cast(rHt).GetHeight();
 sal_uInt16 nSize = rHTMLWrt

Re: LOOL master make check fail

[Shivansh Handa]

Hi Miklos, all,
Thanks for the reply. I was able to pass the
"HTTPWSTest::testReloadWhileDisconnecting" test, probably after adding
proof keys in "/usr/local/etc/loolwsd/".
But still, the make check fails. Heres a small part of the output log
https://pastebin.com/xJZaFMAc
Theres no test name in the log for which the check fails.

Thank You

Sincerely,
Shivansh Handa

On Mon, Jan 13, 2020 at 2:18 PM Miklos Vajna  wrote:

> Hi Shivansh,
>
> On Sat, Jan 11, 2020 at 08:11:58PM +0530, Shivansh Handa <
> avihs...@gmail.com> wrote:
> > I built against the master branch with the last commit hash
> > 7c29eb06ea2b8dad91a7836be3c387565658ad45, the last commit for core master
> > branch is 2ab481b038b62b1ff576ac4d49d03c1798cd7f84.
> >
> > The test that it is failing on is
> HTTPWSTest::testReloadWhileDisconnecting.
> > I have uploaded a part of the log file, which should be able to cover the
> > required logs(unable to paste it as file size exceed), If any other log
> is
> > needed please let me know.
> > Please help me out, log seems quite overwhelming.
>
> Did you try running the test once more?
>
> make check CPPUNIT_TEST_NAME="HTTPWSTest::testReloadWhileDisconnecting"
>
> should be able to run just that test.
>
> Sadly the online.git tests are less stable than the core.git ones, but
> AFAIK the top of online.git master and core.git master has no
> always-fail tests on the online side currently.
>
> If it consistently fails for you, then it would be great to debug what
> is the reason and improve the test.
>
> Regards,
>
> Miklos
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara (via logerrit)]

 svx/source/form/databaselocationinput.cxx   |1 -
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 
 2 files changed, 5 deletions(-)

New commits:
commit b3185eb977042347106b92a5062ea695ef4b82ef
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 14:35:27 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 20:30:33 2020 +0100

remove some unneeded includes

Change-Id: I6d9cde8f8dad5be52e79946b4d0ec12989bb9ee3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86696
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/form/databaselocationinput.cxx 
b/svx/source/form/databaselocationinput.cxx
index 6d49c7dd2eff..4688d1cab7af 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -35,7 +35,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index fb4798920ce4..d902c27d84c2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -36,13 +36,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 62ad8f6f42a5f8c0150770b3490988bac62178e9
Author: Michael Meeks 
AuthorDate: Mon Jan 13 16:24:06 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 20:01:17 2020 +0100

mobile: escape JSON for function wizard, and emit only on mobile.

Otherwise typing "-> wa" into a cell gives JS exceptions.

Change-Id: I5303186fe9f84e055d65cf1929ccf5a7a20cae35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86706
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 52e2ee5bb546..acf924de9397 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -26,6 +26,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1281,9 +1282,21 @@ bool ScInputHandler::GetFuncName( OUString& aStart, 
OUString& aResult )
 return true;
 }
 
+namespace {
+/// Rid ourselves of unwanted " quoted json characters.
+OString escapeJSON(const OUString &aStr)
+{
+OUString aEscaped = aStr;
+aEscaped = aEscaped.replaceAll("\n", " ");
+aEscaped = aEscaped.replaceAll("\"", "'");
+return OUStringToOString(aEscaped, RTL_TEXTENCODING_UTF8);
+}
+}
+
 void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & 
rFuncStrVec )
 {
-if (comphelper::LibreOfficeKit::isActive())
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
 {
 SfxViewShell* pViewShell = SfxViewShell::Current();
 if (pViewShell && rFuncStrVec.size())
@@ -1315,12 +1328,10 @@ void ScInputHandler::ShowFuncList( const ::std::vector< 
OUString > & rFuncStrVec
 {
 aPayload.append("{");
 aPayload.append("\"signature\": \"");
-OUString aSignature = ppFDesc->getSignature();
-aPayload.append(OUStringToOString(aSignature, 
RTL_TEXTENCODING_UTF8));
+aPayload.append(escapeJSON(ppFDesc->getSignature()));
 aPayload.append("\", ");
 aPayload.append("\"description\": \"");
-OUString aFuncDescr = ppFDesc->getDescription();
-aPayload.append(OUStringToOString(aFuncDescr, 
RTL_TEXTENCODING_UTF8));
+aPayload.append(escapeJSON(ppFDesc->getDescription()));
 aPayload.append("\"}, ");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js  |   40 +++---
 loleaflet/src/layer/tile/CalcTileLayer.js |2 -
 2 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 1cf5bde981941f2ac2920819e93fb55a7ca3bac1
Author: Michael Meeks 
AuthorDate: Mon Jan 13 17:57:22 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 20:01:37 2020 +0100

Toolbar color buttons should track transparent state as well as colors.

Change-Id: I727ff4f942b7059da4f17216fe523dd1bbb04cd2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86710
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 0d1daef7b..0074e9585 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1818,13 +1818,13 @@ function onCommandStateChanged(e) {
color = 'transparent';
}
else {
-
color = color.toString(16);
color = '#' + Array(7 - color.length).join('0') + color;
-   $('#tb_editbar_item_fontcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
-   $('#tb_editbar_item_fontcolor 
.w2ui-tb-down').css('display', 'none');
-   $('#tb_editbar_item_fontcolor 
.w2ui-tb-caption').css('display', 'none');
}
+   $('#tb_editbar_item_fontcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
+   $('#tb_editbar_item_fontcolor .w2ui-tb-down').css('display', 
'none');
+   $('#tb_editbar_item_fontcolor .w2ui-tb-caption').css('display', 
'none');
+
div = L.DomUtil.get('fontcolorindicator');
if (div) {
L.DomUtil.setStyle(div, 'background', color);
@@ -1839,15 +1839,16 @@ function onCommandStateChanged(e) {
else {
color = color.toString(16);
color = '#' + Array(7 - color.length).join('0') + color;
-   //writer
-   $('#tb_editbar_item_backcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
-   $('#tb_editbar_item_backcolor 
.w2ui-tb-down').css('display', 'none');
-   $('#tb_editbar_item_backcolor 
.w2ui-tb-caption').css('display', 'none');
-   //calc?
-   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
-   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-down').css('display', 'none');
-   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-caption').css('display', 'none');
}
+   //writer
+   $('#tb_editbar_item_backcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
+   $('#tb_editbar_item_backcolor .w2ui-tb-down').css('display', 
'none');
+   $('#tb_editbar_item_backcolor .w2ui-tb-caption').css('display', 
'none');
+   //calc?
+   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-image').css('box-shadow', 'inset 0 -2px #ff, inset 0px -6px ' + 
color);
+   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-down').css('display', 'none');
+   $('#tb_editbar_item_backgroundcolor 
.w2ui-tb-caption').css('display', 'none');
+
div = L.DomUtil.get('backcolorindicator');
if (div) {
L.DomUtil.setStyle(div, 'background', color);
commit f5d159b80bcda4493cd1086b879df83851e5f751
Author: Michael Meeks 
AuthorDate: Mon Jan 13 17:56:48 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 20:01:28 2020 +0100

mobile: restore calc background quick-toolbar button & fix typo.

Change-Id: Ieae15188113cd646bb3fe9be7747308a95857569
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86709
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Toolbar.js 
b/loleaflet/src/control/Control.Toolbar.js
index 11614f543..0d1daef7b 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -720,15 +720,14 @@ function insertShapes(mobile) {
 function getColorPickerData(type) {
var uno;
if (type === 'Font Color') {
-   if (map.getDocType() === 'spreadsheet')
-   uno = '.uno:Color';
-   else if (map.getDocType() === 'presentation')
+   if (map.getDocType() === 'spreadsheet' ||
+   map.getDocType() === 'presentation')
uno = '.uno:Color';
else
 

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

[Mike Kaganski (via logerrit)]

 basctl/source/basicide/baside2b.cxx |   26 --
 1 file changed, 16 insertions(+), 10 deletions(-)

New commits:
commit 96ab492b74d9e64051d82f220f65cadedf34a878
Author: Mike Kaganski 
AuthorDate: Mon Jan 13 18:48:30 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jan 13 19:24:19 2020 +0100

tdf#129360: fix old unsigned underflow

... discovered thanks to 62f3f3d92aa204eaaa063b30d7ade44df501b997:
properties count may be 0, and unconditionally subtracting 3 from
that will give a big number. Previously this was masked by a "Very
Hot Fix" in SbxArray::GetRef that was dropped in the said commit.

This unifies property count correction in the two places that use
it: in WatchTreeListBox::RequestingChildren, where it was correct,
and in WatchTreeListBox::UpdateWatches, where underflow happened.

Change-Id: Ie980bc9571b2555cc2f643e770d824d5e2eb3731
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86700
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 83fe6a481768..c6c954d36013 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2119,6 +2119,19 @@ void WatchTreeListBox::SetTabs()
 }
 }
 
+static sal_uInt32 getCorrectedPropCount(SbxArray* p)
+{
+sal_uInt32 nPropCount = p->Count32();
+if (nPropCount >= 3
+&& p->Get32(nPropCount - 
1)->GetName().equalsIgnoreAsciiCase("Dbg_Methods")
+&& p->Get32(nPropCount - 
2)->GetName().equalsIgnoreAsciiCase("Dbg_Properties")
+&& p->Get32(nPropCount - 
3)->GetName().equalsIgnoreAsciiCase("Dbg_SupportedInterfaces"))
+{
+nPropCount -= 3;
+}
+return nPropCount;
+}
+
 void WatchTreeListBox::RequestingChildren( SvTreeListEntry * pParent )
 {
 if( !StarBASIC::IsRunning() )
@@ -2144,14 +2157,7 @@ void WatchTreeListBox::RequestingChildren( 
SvTreeListEntry * pParent )
 {
 createAllObjectProperties( pObj );
 SbxArray* pProps = pObj->GetProperties();
-sal_uInt32 nPropCount = pProps->Count32();
-if ( nPropCount >= 3 &&
- pProps->Get32( nPropCount -1 )->GetName().equalsIgnoreAsciiCase( 
"Dbg_Methods" ) &&
- pProps->Get32( nPropCount -2 )->GetName().equalsIgnoreAsciiCase( 
"Dbg_Properties" ) &&
- pProps->Get32( nPropCount -3 )->GetName().equalsIgnoreAsciiCase( 
"Dbg_SupportedInterfaces" ) )
-{
-nPropCount -= 3;
-}
+const sal_uInt32 nPropCount = getCorrectedPropCount(pProps);
 pItem->maMemberList.reserve(nPropCount);
 
 for( sal_uInt32 i = 0 ; i < nPropCount ; ++i )
@@ -2488,8 +2494,8 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
 {
 bool bObjChanged = false; // Check if member list 
has changed
 SbxArray* pProps = pObj->GetProperties();
-sal_uInt32 nPropCount = pProps->Count32();
-for( sal_uInt32 i = 0 ; i < nPropCount - 3 ; i++ )
+const sal_uInt32 nPropCount = 
getCorrectedPropCount(pProps);
+for( sal_uInt32 i = 0 ; i < nPropCount ; i++ )
 {
 SbxVariable* pVar_ = pProps->Get32( i );
 if( pItem->maMemberList[i] != pVar_->GetName() 
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About tdf#129547 and adding COLON

[Eike Rathke]

Hi Julien,

On Monday, 2020-01-13 15:30:19 +, Julien wrote:

> https://bugs.documentfoundation.org/show_bug.cgi?id=129547 shows that some 
> shortcuts don't work at least with French localization. In French UI some 
> shortcuts need ":" but this character isn't declared in 
> offapi/com/sun/star/awt/Key.idl and at different other locations.
> 
> Is it possible to add this character? (I can propose a patch about this)

I don't see a reason why that should not be done.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

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

[Caolán McNamara (via logerrit)]

 cui/source/inc/treeopt.hxx |1 +
 cui/source/options/treeopt.cxx |   17 +
 2 files changed, 18 insertions(+)

New commits:
commit 6b3e268c9d21b911f14bab8ef95f69cf171a137c
Author: Caolán McNamara 
AuthorDate: Fri Jan 10 20:08:11 2020 +
Commit: Michael Stahl 
CommitDate: Mon Jan 13 19:10:15 2020 +0100

Resolves: tdf#129904 use the current page as the page for help

in the options dialog which has a non-standard organization for its
contents vs an ordinary dialog

Change-Id: I6a50652f5ae3fe2e8b4d32933bec6dc0217cbec1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86577
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 52ac526a61c1a26bb9dbf995f4af02c9469b8cf6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86663
Reviewed-by: Xisco Faulí 
Tested-by: Xisco Faulí 
Reviewed-by: Michael Stahl 

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index aa6f7f5b0a02..6344c23cd96b 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -163,6 +163,7 @@ private:
 DECL_LINK(BackHdl_Impl, weld::Button&, void);
 DECL_LINK(ApplyHdl_Impl, weld::Button&, void);
 DECL_LINK(OKHdl_Impl, weld::Button&, void);
+DECL_LINK(HelpHdl_Impl, weld::Widget&, bool);
 void SelectHdl_Impl();
 
 virtual short run() override;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f36a8ab76029..c3005688e297 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -683,6 +683,22 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ApplyHdl_Impl, 
weld::Button&, void)
 }
 }
 
+IMPL_LINK_NOARG(OfaTreeOptionsDialog, HelpHdl_Impl, weld::Widget&, bool)
+{
+Help* pHelp = Application::GetHelp();
+if (pHelp && xCurrentPageEntry && 
xTreeLB->get_iter_depth(*xCurrentPageEntry))
+{
+OptionsPageInfo* pPageInfo = 
reinterpret_cast(xTreeLB->get_id(*xCurrentPageEntry).toInt64());
+if (pPageInfo->m_xPage)
+{
+OString sHelpId(pPageInfo->m_xPage->GetHelpId());
+pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), 
m_xDialog.get());
+return false;
+}
+}
+return true;
+}
+
 IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl, weld::Button&, void)
 {
 if (xCurrentPageEntry && xTreeLB->get_iter_depth(*xCurrentPageEntry))
@@ -748,6 +764,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
 xBackPB->connect_clicked( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) 
);
 xApplyPB->connect_clicked( LINK( this, OfaTreeOptionsDialog, ApplyHdl_Impl 
) );
 xOkPB->connect_clicked( LINK( this, OfaTreeOptionsDialog, OKHdl_Impl ) );
+m_xDialog->connect_help( LINK( this, OfaTreeOptionsDialog, HelpHdl_Impl ) 
);
 }
 
 void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 352ab705a8b97414ac3fe95419473299811104a7
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 12:12:19 2020 +
Commit: Michael Stahl 
CommitDate: Mon Jan 13 19:01:39 2020 +0100

ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted element

Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86685
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index ebe405aefb9d..29fd41a9879c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5140,8 +5140,13 @@ SvxMSDffImportRec* SvxMSDffImportData::find(const 
SdrObject* pObj)
 
 void SvxMSDffImportData::insert(std::unique_ptr pImpRec)
 {
-m_ObjToRecMap[pImpRec->pObj] = pImpRec.get();
-m_Records.insert(std::move(pImpRec));
+auto aRet = m_Records.insert(std::move(pImpRec));
+bool bSuccess = aRet.second;
+if (bSuccess)
+{
+SvxMSDffImportRec* pRec = aRet.first->get();
+m_ObjToRecMap[pRec->pObj] = pRec;
+}
 }
 
 void SvxMSDffImportData::NotifyFreeObj(SdrObject* pObj)
___
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.2' - sc/source

[Michael Meeks (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |   21 -
 1 file changed, 16 insertions(+), 5 deletions(-)

New commits:
commit ff365eb193279bb9866b8fad7378f6068b207051
Author: Michael Meeks 
AuthorDate: Mon Jan 13 16:24:06 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 18:58:59 2020 +0100

mobile: escape JSON for function wizard, and emit only on mobile.

Otherwise typing "-> wa" into a cell gives JS exceptions.

Change-Id: I5303186fe9f84e055d65cf1929ccf5a7a20cae35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86705
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 59f6d3c5e809..5c4d4de77f96 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -24,6 +24,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1289,9 +1290,21 @@ bool ScInputHandler::GetFuncName( OUString& aStart, 
OUString& aResult )
 return true;
 }
 
+namespace {
+/// Rid ourselves of unwanted " quoted json characters.
+OString escapeJSON(const OUString &aStr)
+{
+OUString aEscaped = aStr;
+aEscaped = aEscaped.replaceAll("\n", " ");
+aEscaped = aEscaped.replaceAll("\"", "'");
+return OUStringToOString(aEscaped, RTL_TEXTENCODING_UTF8);
+}
+}
+
 void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & 
rFuncStrVec )
 {
-if (comphelper::LibreOfficeKit::isActive())
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
 {
 SfxViewShell* pViewShell = SfxViewShell::Current();
 if (pViewShell && rFuncStrVec.size())
@@ -1323,12 +1336,10 @@ void ScInputHandler::ShowFuncList( const ::std::vector< 
OUString > & rFuncStrVec
 {
 aPayload.append("{");
 aPayload.append("\"signature\": \"");
-OUString aSignature = ppFDesc->getSignature();
-aPayload.append(OUStringToOString(aSignature, 
RTL_TEXTENCODING_UTF8));
+aPayload.append(escapeJSON(ppFDesc->getSignature()));
 aPayload.append("\", ");
 aPayload.append("\"description\": \"");
-OUString aFuncDescr = ppFDesc->getDescription();
-aPayload.append(OUStringToOString(aFuncDescr, 
RTL_TEXTENCODING_UTF8));
+aPayload.append(escapeJSON(ppFDesc->getDescription()));
 aPayload.append("\"}, ");
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 9b318842d5062417640e0541d4799cb5b1598865
Author: Stephan Bergmann 
AuthorDate: Mon Jan 13 10:02:27 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 13 18:58:16 2020 +0100

solenv/flatpak-manifest.in: Merge "remove dconf access"




Change-Id: If2af9110b07518fb0fb2c65ca490f9e1125de8a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 714b7a76665655dc5d090c6ab4a715c085b52739)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86675
Reviewed-by: Michael Stahl 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 4031c46c5088..6051b3920daa 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -605,13 +605,10 @@
 "--socket=pulseaudio",
 "--device=dri",
 "--filesystem=host",
-"--filesystem=xdg-run/dconf",
-"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
 "--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
-"--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit a623b972d102ba44c14ab943b09892b8d3388c08
Author: Andras Timar 
AuthorDate: Mon Jan 13 18:49:12 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Jan 13 18:49:12 2020 +0100

Update git submodules

* Update dictionaries from branch 'libreoffice-6-4-0'
  to 288ed78013d9df0bfadf604c412c9e25c8ee6e59
  - corrected Slovenian readme and package description

Change-Id: Iaeece79f64ed03a63191afe9a5f55cbd298a5ed5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/86645
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index 06706ac86f74..288ed78013d9 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 06706ac86f74958613762114c0982aec079975b0
+Subproject commit 288ed78013d9df0bfadf604c412c9e25c8ee6e59
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-4-0' - sl_SI/package-description.txt sl_SI/README_th_sl_SI.txt

[Andras Timar (via logerrit)]

 sl_SI/README_th_sl_SI.txt |4 ++--
 sl_SI/package-description.txt |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 288ed78013d9df0bfadf604c412c9e25c8ee6e59
Author: Andras Timar 
AuthorDate: Sun Jan 12 20:35:46 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 13 18:49:12 2020 +0100

corrected Slovenian readme and package description

Change-Id: Iaeece79f64ed03a63191afe9a5f55cbd298a5ed5
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/86645
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sl_SI/README_th_sl_SI.txt b/sl_SI/README_th_sl_SI.txt
index 2b4cdfe..c96ebf7 100644
--- a/sl_SI/README_th_sl_SI.txt
+++ b/sl_SI/README_th_sl_SI.txt
@@ -2,7 +2,7 @@ The Slovenian thesaurus is developed as a part of project/
 Slovenski tezaver nastaja v okviru projekta:
OdprtiTezaver (www.tezaver.si)
 This dictionary pack includes version/Paket vsebuje različico:
-   1.9.19500
+   2.0.20003
 Thesaurus managed and edited by/Tezaver pripravlja in ureja:
Martin Srebotnjak (miles at filmsi net)
 Thesaurus data licensed under both/Podatki tezavra so izdani pod licencama:
@@ -18,7 +18,7 @@ Bug report/O napakah poročajte:
 http://external.openoffice.org/ form data:
 
 Product Name: Slovenian thesaurus
-Product Version: 1.9.19500
+Product Version: 2.0.20003
 Vendor or Owner Name: Martin Srebotnjak
 Vendor or Owner Contact: mi...@filmsi.net
 OpenOffice.org Contact: fil...@openoffice.org
diff --git a/sl_SI/package-description.txt b/sl_SI/package-description.txt
index 8f28668..3c66e73 100644
--- a/sl_SI/package-description.txt
+++ b/sl_SI/package-description.txt
@@ -1,3 +1,3 @@
-Slovar za črkovanje 1.0 · Vzorci za deljenje besed 1.2.1 · Tezaver 1.9.19500
+Slovar za črkovanje 1.0 · Vzorci za deljenje besed 1.2.1 · Tezaver 2.0.20003
 
 Razširitev vzdržuje ekipa slovenjenja LibreOffice.
\ 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 'distro/collabora/cp-6.2' - sc/source

[Mert Tumer (via logerrit)]

 sc/source/ui/view/formatsh.cxx |   26 --
 1 file changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 23e8e4521366aaf5831a3c1feaffdc41658ce7e7
Author: Mert Tumer 
AuthorDate: Mon Jan 13 13:17:09 2020 +0300
Commit: Michael Meeks 
CommitDate: Mon Jan 13 18:45:57 2020 +0100

Fix FontColor does not change selected cells on calc

Change-Id: Iae2f72bff4fd6986fc8cc07ba09996b1af4eb140
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86670
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 2d49fe1bb9c4..f6808252314a 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1784,10 +1784,32 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 break;
 case SID_ATTR_CHAR_COLOR:
 case SID_SCATTR_PROTECTION :
-pTabViewShell->ApplyAttr( pNewAttrs->Get( 
pNewAttrs->GetPool()->GetWhich( nSlot) ), false);
+{
+const SfxPoolItem* pColorStringItem = nullptr;
+if ( SfxItemState::SET == pNewAttrs->GetItemState( 
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
+{
+Color aColor;
+OUString sColor = static_cast(pColorStringItem)->GetValue();
+if ( sColor == "transparent" )
+aColor = Color( COL_TRANSPARENT );
+else
+aColor = Color( sColor.toInt32( 16 ) );
+
+SvxColorItem 
aColorItem(pTabViewShell->GetSelectionPattern()->
+GetItem( ATTR_FONT_COLOR ) );
+aColorItem.SetValue(aColor);
+pTabViewShell->ApplyAttr(aColorItem, false);
+}
+else
+{
+pTabViewShell->ApplyAttr( pNewAttrs->Get( 
pNewAttrs->GetPool()->GetWhich( nSlot) ), false);
+}
+
 rBindings.Invalidate( nSlot );
 rBindings.Update( nSlot );
-break;
+}
+
+break;
 
 case SID_ATTR_CHAR_FONT:
 case SID_ATTR_CHAR_FONTHEIGHT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/TextUnderlinePopup.hxx   |1 
 svx/source/sidebar/text/TextUnderlineControl.cxx |  113 +--
 svx/source/sidebar/text/TextUnderlineControl.hxx |   42 
 svx/source/sidebar/text/TextUnderlinePopup.cxx   |   14 ++
 svx/uiconfig/ui/textunderlinecontrol.ui  |   35 ++-
 5 files changed, 96 insertions(+), 109 deletions(-)

New commits:
commit e08f680c78d4f73ddeda658cea713fdecf7a4a1b
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 15:12:39 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:32:03 2020 +0100

weld TextUnderlineControl

Change-Id: I9ebf3b1e9c4509c0568d26370d5a97c5c60baedd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86699
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/TextUnderlinePopup.hxx 
b/include/svx/TextUnderlinePopup.hxx
index 6dc64face2b1..2132cbec94a2 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -30,6 +30,7 @@ public:
 TextUnderlinePopup(const css::uno::Reference& 
rContext);
 virtual ~TextUnderlinePopup() override;
 
+virtual std::unique_ptr weldPopupWindow() override;
 using svt::ToolboxController::createPopupWindow;
 virtual VclPtr createPopupWindow( vcl::Window* pParent ) 
override;
 
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx 
b/svx/source/sidebar/text/TextUnderlineControl.cxx
index f8bac8dc99d4..1d8770c91e0c 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -30,83 +30,69 @@
 
 namespace svx {
 
-TextUnderlineControl::TextUnderlineControl(TextUnderlinePopup* pControl, 
vcl::Window* pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent, 
"TextUnderlineControl", "svx/ui/textunderlinecontrol.ui")
+TextUnderlineControl::TextUnderlineControl(TextUnderlinePopup* pControl, 
weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/textunderlinecontrol.ui", "TextUnderlineControl")
+, mxNone(m_xBuilder->weld_button("none"))
+, mxSingle(m_xBuilder->weld_button("single"))
+, mxDouble(m_xBuilder->weld_button("double"))
+, mxBold(m_xBuilder->weld_button("bold"))
+, mxDot(m_xBuilder->weld_button("dot"))
+, mxDotBold(m_xBuilder->weld_button("dotbold"))
+, mxDash(m_xBuilder->weld_button("dash"))
+, mxDashLong(m_xBuilder->weld_button("dashlong"))
+, mxDashDot(m_xBuilder->weld_button("dashdot"))
+, mxDashDotDot(m_xBuilder->weld_button("dashdotdot"))
+, mxWave(m_xBuilder->weld_button("wave"))
+, mxMoreOptions(m_xBuilder->weld_button("moreoptions"))
+, mxControl(pControl)
 {
-get(maNone, "none");
-get(maSingle, "single");
-get(maDouble, "double");
-get(maBold, "bold");
-get(maDot, "dot");
-get(maDotBold, "dotbold");
-get(maDash, "dash");
-get(maDashLong, "dashlong");
-get(maDashDot, "dashdot");
-get(maDashDotDot, "dashdotdot");
-get(maWave, "wave");
-get(maMoreOptions, "moreoptions");
-
-maMoreOptions->SetHelpId(HID_UNDERLINE_BTN);
-
-Link aLink = LINK(this, TextUnderlineControl, PBClickHdl);
-maNone->SetClickHdl(aLink);
-maSingle->SetClickHdl(aLink);
-maDouble->SetClickHdl(aLink);
-maBold->SetClickHdl(aLink);
-maDot->SetClickHdl(aLink);
-maDotBold->SetClickHdl(aLink);
-maDash->SetClickHdl(aLink);
-maDashLong->SetClickHdl(aLink);
-maDashDot->SetClickHdl(aLink);
-maDashDotDot->SetClickHdl(aLink);
-maWave->SetClickHdl(aLink);
-maMoreOptions->SetClickHdl(aLink);
+mxMoreOptions->set_help_id(HID_UNDERLINE_BTN);
+
+Link aLink = LINK(this, TextUnderlineControl, 
PBClickHdl);
+mxNone->connect_clicked(aLink);
+mxSingle->connect_clicked(aLink);
+mxDouble->connect_clicked(aLink);
+mxBold->connect_clicked(aLink);
+mxDot->connect_clicked(aLink);
+mxDotBold->connect_clicked(aLink);
+mxDash->connect_clicked(aLink);
+mxDashLong->connect_clicked(aLink);
+mxDashDot->connect_clicked(aLink);
+mxDashDotDot->connect_clicked(aLink);
+mxWave->connect_clicked(aLink);
+mxMoreOptions->connect_clicked(aLink);
 }
 
-TextUnderlineControl::~TextUnderlineControl()
+void TextUnderlineControl::GrabFocus()
 {
-disposeOnce();
+mxNone->grab_focus();
 }
 
-void TextUnderlineControl::dispose()
+TextUnderlineControl::~TextUnderlineControl()
 {
-maNone.clear();
-maSingle.clear();
-maDouble.clear();
-maBold.clear();
-maDot.clear();
-maDotBold.clear();
-maDash.clear();
-maDashLong.clear();
-maDashDot.clear();
-maDashDotDot.clear();
-maWave.clear();
-maMoreOptions.clear();
-
-ToolbarPopup::dispose();
 }
 
-FontLineStyle TextUnderlineControl::getLineStyle(Button const * pButton)
+FontLineStyle TextUnderlineControl::getLineStyle(const weld::Button& rButton)
 {
-if(pButton == maSingle)
+if (&rButton == mxSingle.get())
 retu

[Libreoffice-commits] core.git: include/svx officecfg/registry sc/source sd/source svx/source svx/util sw/source

[Caolán McNamara (via logerrit)]

 include/svx/TextUnderlinePopup.hxx  |   19 ++--
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   11 ++
 sc/source/ui/app/scdll.cxx  |1 
 sd/source/ui/app/sddll.cxx  |2 
 svx/source/sidebar/text/TextUnderlineControl.cxx|7 +
 svx/source/sidebar/text/TextUnderlineControl.hxx|8 +-
 svx/source/sidebar/text/TextUnderlinePopup.cxx  |   40 
++
 svx/util/svx.component  |4 +
 sw/source/uibase/app/swmodule.cxx   |1 
 9 files changed, 62 insertions(+), 31 deletions(-)

New commits:
commit c81afdb5118536b2e2365a9a9af6b6e162c87aeb
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 14:53:51 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:29:32 2020 +0100

rework TextUnderlinePopup to be a PopupWindowController

Change-Id: I149777b827dd00e00e62b461836122861864f829
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86697
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/TextUnderlinePopup.hxx 
b/include/svx/TextUnderlinePopup.hxx
index 994664a621d4..6dc64face2b1 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -19,23 +19,26 @@
 #ifndef INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
 #define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
 
-#include 
+#include 
 #include 
 
 namespace svx {
 
-class SVX_DLLPUBLIC TextUnderlinePopup final : public SfxToolBoxControl
+class SVX_DLLPUBLIC TextUnderlinePopup final : public 
svt::PopupWindowController
 {
 public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+TextUnderlinePopup(const css::uno::Reference& 
rContext);
 virtual ~TextUnderlinePopup() override;
 
-// XInitialization
-virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& aArguments ) override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent ) 
override;
 
-virtual VclPtr CreatePopupWindow() override;
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& rArguments ) override;
 };
 
 } // end of namespace svx
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index e89903cd0149..a0bd1450d0e0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1404,6 +1404,17 @@
   com.sun.star.comp.svx.ColorToolBoxControl
 
   
+  
+
+  .uno:Underline
+
+
+  
+
+
+  com.sun.star.comp.svx.UnderlineToolBoxControl
+
+  
   
 
   .uno:XLineColor
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 07ae6ae2894b..df8a4319ea01 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -153,7 +153,6 @@ void ScDLL::Init()
 SvxClipBoardControl ::RegisterControl(SID_PASTE_UNFORMATTED,   
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_UNDO,
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_REDO,
 pMod );
-svx::TextUnderlinePopup ::RegisterControl(SID_ATTR_CHAR_UNDERLINE, 
 pMod );
 svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, 
 pMod );
 sc::ScNumberFormatControl   ::RegisterControl(SID_NUMBER_TYPE_FORMAT,  
 pMod );
 
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 281e96ef1831..b83882bd764b 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -215,8 +215,6 @@ void SdDLL::RegisterControllers(SdModule* pMod)
 SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
 SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
-svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
-
 #if HAVE_FEATURE_AVMEDIA
 ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod 
);
 #endif
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx 
b/svx/source/sidebar/text/TextUnderlineControl.cxx
index c509998e0b49..f8bac8dc99d4 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -29,8 +30,8 @@
 
 namespace svx {
 
-TextUnderlineControl::T

[Libreoffice-commits] core.git: include/svx officecfg/registry sc/source sd/source svx/source svx/util sw/source

[Caolán McNamara (via logerrit)]

 include/svx/TextCharacterSpacingPopup.hxx   |   18 +++-
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   11 ++
 sc/source/ui/app/scdll.cxx  |1 
 sd/source/ui/app/sddll.cxx  |1 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |3 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |   13 +--
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |   10 +-
 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx   |   37 
+++---
 svx/util/svx.component  |4 +
 sw/source/uibase/app/swmodule.cxx   |1 
 10 files changed, 68 insertions(+), 31 deletions(-)

New commits:
commit c9ba69cdfaaf19695fc8e40ba7af1d06490a123f
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 13:20:45 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:28:59 2020 +0100

rework TextCharacterSpacingPopup to be a PopupWindowController

Change-Id: I3db8f93b99157f7ee8d6095f7dfc5c2b2e6890e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86690
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/TextCharacterSpacingPopup.hxx 
b/include/svx/TextCharacterSpacingPopup.hxx
index d698cfa82bf4..1efc2d9a170f 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -19,20 +19,26 @@
 #ifndef INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
 #define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
 
-#include 
+#include 
 #include 
 
 namespace svx {
 
-class SVX_DLLPUBLIC TextCharacterSpacingPopup final : public SfxToolBoxControl
+class SVX_DLLPUBLIC TextCharacterSpacingPopup final : public 
svt::PopupWindowController
 {
 public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-TextCharacterSpacingPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& 
rTbx);
+TextCharacterSpacingPopup(const 
css::uno::Reference& rContext);
 virtual ~TextCharacterSpacingPopup() override;
 
-virtual VclPtr CreatePopupWindow() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent ) 
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& rArguments ) override;
 };
 
 } // end of namespace svx
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index c9870cec546c..e89903cd0149 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1283,6 +1283,17 @@
   com.sun.star.comp.svx.LineSpacingToolBoxControl
 
   
+  
+
+  .uno:Spacing
+
+
+  
+
+
+  com.sun.star.comp.svx.CharacterSpacingToolBoxControl
+
+  
   
 
   .uno:SetBorderStyle
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 4df0bf295e80..07ae6ae2894b 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -153,7 +153,6 @@ void ScDLL::Init()
 SvxClipBoardControl ::RegisterControl(SID_PASTE_UNFORMATTED,   
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_UNDO,
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_REDO,
 pMod );
-svx::TextCharacterSpacingPopup  ::RegisterControl(SID_ATTR_CHAR_KERNING,   
 pMod );
 svx::TextUnderlinePopup ::RegisterControl(SID_ATTR_CHAR_UNDERLINE, 
 pMod );
 svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, 
 pMod );
 sc::ScNumberFormatControl   ::RegisterControl(SID_NUMBER_TYPE_FORMAT,  
 pMod );
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 43f40d8df7bf..281e96ef1831 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -215,7 +215,6 @@ void SdDLL::RegisterControllers(SdModule* pMod)
 SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
 SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
-svx::TextCharacterSpacingPopup::RegisterControl(SID_ATTR_CHAR_KERNING, 
pMod);
 svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
 
 #if HAVE_FEATURE_AVMEDIA
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 93ced9fece15..13d662bc9763 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -27,9 +27,6 @@
 #include 
 

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

[Caolán McNamara (via logerrit)]

 include/svx/TextCharacterSpacingPopup.hxx   |1 
 solenv/sanitizers/ui/svx.suppr  |2 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |   98 ++
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |   34 ++--
 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx   |   14 +-
 svx/uiconfig/ui/textcharacterspacingcontrol.ui  |  110 ++--
 6 files changed, 122 insertions(+), 137 deletions(-)

New commits:
commit bd738ed736cc5e1f4ed8e81c3691538d401bbf65
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 12:55:23 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:29:14 2020 +0100

weld TextCharacterSpacingControl

Change-Id: Id0789c8c590a120efa8585d45fe7f5cdb0077cbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86694
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/svx/TextCharacterSpacingPopup.hxx 
b/include/svx/TextCharacterSpacingPopup.hxx
index 1efc2d9a170f..2074e468373d 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -30,6 +30,7 @@ public:
 TextCharacterSpacingPopup(const 
css::uno::Reference& rContext);
 virtual ~TextCharacterSpacingPopup() override;
 
+virtual std::unique_ptr weldPopupWindow() override;
 using svt::ToolboxController::createPopupWindow;
 virtual VclPtr createPopupWindow( vcl::Window* pParent ) 
override;
 
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 5061b07311e3..b2c056964c43 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -66,4 +66,4 @@ 
svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='transparency_label'] orphan-lab
 svx/uiconfig/ui/sidebarshadow.ui://GtkSpinButton[@id='FIELD_TRANSPARENCY'] 
no-labelled-by
 svx/uiconfig/ui/sidebarshadow.ui://GtkScale[@id='transparency_slider'] 
no-labelled-by
 svx/uiconfig/ui/sidebarline.ui://GtkMenuToolButton[@id='SelectWidth'] 
button-no-label
-svx/uiconfig/ui/textcharacterspacingcontrol.ui://GtkSpinButton[@id='kerning:0pt']
 no-labelled-by
+svx/uiconfig/ui/textcharacterspacingcontrol.ui://GtkSpinButton[@id='kerning'] 
no-labelled-by
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx 
b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 3de287aff0f9..e19044e2eb25 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -42,41 +42,40 @@
 
 namespace svx {
 
-TextCharacterSpacingControl::TextCharacterSpacingControl(TextCharacterSpacingPopup*
 pControl, vcl::Window* pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent, 
"TextCharacterSpacingControl", "svx/ui/textcharacterspacingcontrol.ui")
+TextCharacterSpacingControl::TextCharacterSpacingControl(TextCharacterSpacingPopup*
 pControl, weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent, 
"svx/ui/textcharacterspacingcontrol.ui", "TextCharacterSpacingControl")
 , mnId(SID_ATTR_CHAR_KERNING)
 , mnCustomKern(0)
 , mnLastCus(SPACING_NOCUSTOM)
+, mxEditKerning(m_xBuilder->weld_metric_spin_button("kerning", 
FieldUnit::POINT))
+, mxTight(m_xBuilder->weld_button("tight"))
+, mxVeryTight(m_xBuilder->weld_button("very_tight"))
+, mxNormal(m_xBuilder->weld_button("normal"))
+, mxLoose(m_xBuilder->weld_button("loose"))
+, mxVeryLoose(m_xBuilder->weld_button("very_loose"))
+, mxLastCustom(m_xBuilder->weld_button("last_custom"))
+, mxControl(pControl)
 {
-get(maEditKerning, "kerning");
-
-get(maNormal, "normal");
-get(maVeryTight, "very_tight");
-get(maTight, "tight");
-get(maVeryLoose, "very_loose");
-get(maLoose, "loose");
-get(maLastCustom, "last_custom");
-
-maEditKerning->SetModifyHdl(LINK(this, TextCharacterSpacingControl, 
KerningModifyHdl));
-maEditKerning->SetHelpId(HID_SPACING_MB_KERN);
-
-Link aLink = LINK(this, TextCharacterSpacingControl, 
PredefinedValuesHdl);
-maNormal->SetClickHdl(aLink);
-maVeryTight->SetClickHdl(aLink);
-maTight->SetClickHdl(aLink);
-maVeryLoose->SetClickHdl(aLink);
-maLoose->SetClickHdl(aLink);
-maLastCustom->SetClickHdl(aLink);
+mxEditKerning->connect_value_changed(LINK(this, 
TextCharacterSpacingControl, KerningModifyHdl));
+mxEditKerning->set_help_id(HID_SPACING_MB_KERN);
+
+Link aLink = LINK(this, TextCharacterSpacingControl, 
PredefinedValuesHdl);
+mxNormal->connect_clicked(aLink);
+mxVeryTight->connect_clicked(aLink);
+mxTight->connect_clicked(aLink);
+mxVeryLoose->connect_clicked(aLink);
+mxLoose->connect_clicked(aLink);
+mxLastCustom->connect_clicked(aLink);
 
 Initialize();
 }
 
-TextCharacterSpacingControl::~TextCharacterSpacingControl()
+void TextCharacterSpacingControl::GrabFocus()
 {
-disposeOnce();
+mxVeryTight->grab_focus();
 }
 
-void TextCharacterSpacingCon

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

[Caolán McNamara (via logerrit)]

 cui/source/inc/numpages.hxx   |8 
 cui/source/tabpages/numpages.cxx  |6 +++---
 include/svx/numvset.hxx   |8 
 sd/source/ui/inc/BulletAndPositionDlg.hxx |2 +-
 svx/source/dialog/svxbmpnumvalueset.cxx   |   18 +-
 svx/source/tbxctrls/bulletsnumbering.cxx  |4 ++--
 6 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 4e12a674f51e898cf11af64b01e8da8468cec401
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 09:52:41 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:15:11 2020 +0100

rename NumValueSet back to SvxNumValueSet

Change-Id: I05cd8e336f818e80de40abb40cf739a7cbb540d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86665
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 2e3584581a30..11e8e1846219 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -32,7 +32,7 @@
 #define MN_GALLERY_ENTRY 100
 
 class ColorListBox;
-class NumValueSet;
+class SvxNumValueSet;
 class SvxNumRule;
 class SvxBmpNumValueSet;
 class SvxBrushItem;
@@ -66,7 +66,7 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
 
 sal_uInt16  nNumItemId;
 
-std::unique_ptr m_xExamplesVS;
+std::unique_ptr m_xExamplesVS;
 std::unique_ptr m_xExamplesVSWin;
 
 DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
@@ -96,7 +96,7 @@ class SvxBulletPickTabPage final : public SfxTabPage
 
 OUStringsBulletCharFormatName;
 
-std::unique_ptr m_xExamplesVS;
+std::unique_ptr m_xExamplesVS;
 std::unique_ptr m_xExamplesVSWin;
 
 DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
@@ -133,7 +133,7 @@ class SvxNumPickTabPage final : public SfxTabPage
 boolbModified   : 1;
 boolbPreset : 1;
 
-std::unique_ptr m_xExamplesVS;
+std::unique_ptr m_xExamplesVS;
 std::unique_ptr m_xExamplesVSWin;
 
 DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 9c10291bd1d3..222349d0c583 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -164,7 +164,7 @@ 
SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::D
 , bModified(false)
 , bPreset(false)
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
-, m_xExamplesVS(new NumValueSet(nullptr))
+, m_xExamplesVS(new SvxNumValueSet(nullptr))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
@@ -343,7 +343,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* 
pPage, weld::DialogC
 , bModified(false)
 , bPreset(false)
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
-, m_xExamplesVS(new NumValueSet(nullptr))
+, m_xExamplesVS(new SvxNumValueSet(nullptr))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
@@ -492,7 +492,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* 
pPage, weld::DialogControl
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
 , bModified(false)
 , bPreset(false)
-, m_xExamplesVS(new NumValueSet(nullptr))
+, m_xExamplesVS(new SvxNumValueSet(nullptr))
 , m_xExamplesVSWin(new weld::CustomWeld(*m_xBuilder, "valueset", 
*m_xExamplesVS))
 {
 SetExchangeSupport();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 1eaa4390cb39..4b41a74c90c5 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -46,7 +46,7 @@ enum class NumberingPageType
 BITMAP
 };
 
-class SVX_DLLPUBLIC NumValueSet : public SvtValueSet
+class SVX_DLLPUBLIC SvxNumValueSet : public SvtValueSet
 {
 NumberingPageType ePageType;
 tools::Rectangle   aOrgRect;
@@ -64,9 +64,9 @@ class SVX_DLLPUBLIC NumValueSet : public SvtValueSet
 css::container::XIndexAccess> > aOutlineSettings;
 
 public:
-NumValueSet(std::unique_ptr pScrolledWindow);
+SvxNumValueSet(std::unique_ptr pScrolledWindow);
 void init(NumberingPageType eType);
-virtual ~NumValueSet() override;
+virtual ~SvxNumValueSet() override;
 
 virtual voidUserDraw( const UserDrawEvent& rUDEvt ) override;
 
@@ -84,7 +84,7 @@ public:
 };
 
 
-class SVX_DLLPUBLIC SvxBmpNumValueSet final : public NumValueSet
+class SVX_DLLPUBLIC SvxBmpNumValueSet final : public SvxNumValueSet
 {
 IdleaFormatIdle;
 boolbGrfNotFound;
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx 
b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index b2c5ce1fa54b..87cd14ad8370 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -32,7 +32,7 @@
 #define MN_GALLERY_ENTRY 100
 
 class ColorListBox;
-class NumValueSet;
+class SvxNumValueSet;
 class SvxNumRule;
 class SvxBmpNumValu

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

[Caolán McNamara (via logerrit)]

 include/svx/dialcontrol.hxx |6 +++-
 svx/source/dialog/dialcontrol.cxx   |   26 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |9 ++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |2 -
 4 files changed, 25 insertions(+), 18 deletions(-)

New commits:
commit 1caaf3cb0691a1659379ae3ce9964f600da5aa66
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 10:30:20 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 18:14:53 2020 +0100

update rotation immediately in sidebar

Change-Id: I7e44c3010bf44dca9c97548e040edf3af3573c43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86674
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index a67d522dff61..1b768e2c9ec5 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -115,6 +115,8 @@ public:
 const OUString& GetText() const { return mpImpl->maText; }
 voidSetText(const OUString& rText) { mpImpl->maText = 
rText; }
 
+voidSetModifyHdl( const Link& rLink );
+
 voidInit( const Size& rWinSize );
 private:
 struct DialControl_Impl
@@ -122,6 +124,7 @@ private:
 ScopedVclPtr mxBmpEnabled;
 ScopedVclPtr mxBmpDisabled;
 ScopedVclPtr mxBmpBuffered;
+Link  maModifyHdl;
 OUStringmaText;
 weld::SpinButton*   mpLinkField;
 sal_Int32   mnLinkedFieldValueMultiplyer;
@@ -143,12 +146,13 @@ private:
 voidHandleMouseEvent( const Point& rPos, bool bInitial );
 voidHandleEscapeEvent();
 
+voidSetRotation( sal_Int32 nAngle, bool bBroadcast );
+
 voidInit( const Size& rWinSize, const vcl::Font& rWinFont 
);
 
 voidInvalidateControl();
 
 DECL_LINK(LinkedFieldModifyHdl, weld::SpinButton&, void);
-void LinkedFieldModifyHdl();
 };
 
 }
diff --git a/svx/source/dialog/dialcontrol.cxx 
b/svx/source/dialog/dialcontrol.cxx
index 3ca96e2926af..6ebe5e397db2 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -354,6 +354,11 @@ sal_Int32 DialControl::GetRotation() const
 return mpImpl->mnAngle;
 }
 
+void DialControl::SetRotation(sal_Int32 nAngle)
+{
+SetRotation(nAngle, false);
+}
+
 void DialControl::SetLinkedField(weld::SpinButton* pField, sal_Int32 
nDecimalPlaces)
 {
 mpImpl->mnLinkedFieldValueMultiplyer = 100 / std::pow(10.0, 
double(nDecimalPlaces));
@@ -376,13 +381,7 @@ void DialControl::SetLinkedField(weld::SpinButton* pField, 
sal_Int32 nDecimalPla
 
 IMPL_LINK_NOARG(DialControl, LinkedFieldModifyHdl, weld::SpinButton&, void)
 {
-LinkedFieldModifyHdl();
-}
-
-void DialControl::LinkedFieldModifyHdl()
-{
-if( mpImpl->mpLinkField )
-SetRotation(mpImpl->mpLinkField->get_value() * 
mpImpl->mnLinkedFieldValueMultiplyer);
+SetRotation(mpImpl->mpLinkField->get_value() * 
mpImpl->mnLinkedFieldValueMultiplyer, true);
 }
 
 void DialControl::SaveValue()
@@ -422,7 +421,7 @@ void DialControl::InvalidateControl()
 Invalidate();
 }
 
-void DialControl::SetRotation(sal_Int32 nAngle)
+void DialControl::SetRotation(sal_Int32 nAngle, bool bBroadcast)
 {
 bool bOldSel = mpImpl->mbNoRot;
 mpImpl->mbNoRot = false;
@@ -436,9 +435,16 @@ void DialControl::SetRotation(sal_Int32 nAngle)
 InvalidateControl();
 if( mpImpl->mpLinkField )
 mpImpl->mpLinkField->set_value(GetRotation() / 
mpImpl->mnLinkedFieldValueMultiplyer);
+if( bBroadcast )
+mpImpl->maModifyHdl.Call(*this);
 }
 }
 
+void DialControl::SetModifyHdl( const Link& rLink )
+{
+mpImpl->maModifyHdl = rLink;
+}
+
 void DialControl::HandleMouseEvent( const Point& rPos, bool bInitial )
 {
 long nX = rPos.X() - mpImpl->mnCenterX;
@@ -454,7 +460,7 @@ void DialControl::HandleMouseEvent( const Point& rPos, bool 
bInitial )
 nAngle = ((nAngle + 750) / 1500) * 1500;
 // Round up to 1 degree
 nAngle = (((nAngle + 50) / 100) * 100) % 36000;
-SetRotation( nAngle );
+SetRotation(nAngle, true);
 }
 }
 
@@ -463,7 +469,7 @@ void DialControl::HandleEscapeEvent()
 if( IsMouseCaptured() )
 {
 ReleaseMouse();
-SetRotation( mpImpl->mnOldAngle );
+SetRotation(mpImpl->mnOldAngle, true);
 if( mpImpl->mpLinkField )
 mpImpl->mpLinkField->grab_focus();
 }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index a0d030172cef..fb4798920ce4 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -207,11 +207,9 @@ void PosSizePropertyPanel::Initialize()
 //Size : Keep ratio
 mxCbxScale->connect_toggled( LINK( this, PosSiz

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 94b6adc7eac7e5346c0432d606951ee0b1f9072e
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:03:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 17:44:30 2020 +0100

tdf#129908 Crash at Data > Group and outlone > AutoOutline

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.

Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86693

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 1f62b1a9418d..f5143b703687 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3682,6 +3682,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SC
 bool bFound;
 ScRange aRef;
 
+nEndCol = ClampToAllocatedColumns(nEndCol);
+
 StartOutlineTable();
 
 // Rows
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 sc/source/core/data/table2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2f7671ea28761b5212dbfcc3b6538b5b9e4d9a38
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:03:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 17:44:20 2020 +0100

tdf#129908 Crash at Data > Group and outlone > AutoOutline

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.

Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86692

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 4c36c7b63494..c35c92ad9be9 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3700,6 +3700,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SC
 bool bFound;
 ScRange aRef;
 
+nEndCol = ClampToAllocatedColumns(nEndCol);
+
 StartOutlineTable();
 
 // Rows
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 include/svx/svxdlg.hxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit a166a0d1d2aae132668a60ad845db154643c743a
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:55:11 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 17:42:18 2020 +0100

AbstractSvxMessDialog is unused

since
   commit 74713b34a36577f19eb3194246de73fa4f2bb741
   Date:   Wed May 25 09:05:21 2016 +0200
   loplugin:unusedmethods

Change-Id: I3605b189f6bd5264ead91e02c2a018a3dd5e1e98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86688
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 52282e6bb6e5..36d56e87acdd 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -216,12 +216,6 @@ public:
 virtual bool IsSlideScope() = 0;
 };
 
-class AbstractSvxMessDialog : public VclAbstractDialog
-{
-protected:
-virtual ~AbstractSvxMessDialog() override = default;
-};
-
 class AbstractSvxMultiPathDialog : public VclAbstractDialog
 {
 protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar-mobile.css |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84ef6bd6fbc0d679178890ee7bd2a007a255c5f3
Author: Pedro Pinto Silva 
AuthorDate: Mon Jan 13 17:29:27 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Mon Jan 13 17:31:34 2020 +0100

Mobile: toolbar-down: scroll/swipe indicator: increasing width
also related to: https://gerrit.libreoffice.org/#/c/online/+/86691/

Change-Id: I85f0500927164cfeab756c1588e3f5e97644b866
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86702
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/toolbar-mobile.css b/loleaflet/css/toolbar-mobile.css
index b9f09ab42..75259e00f 100644
--- a/loleaflet/css/toolbar-mobile.css
+++ b/loleaflet/css/toolbar-mobile.css
@@ -40,7 +40,7 @@
#toolbar-down .w2ui-scroll-left, #toolbar-down .w2ui-scroll-right{
background: linear-gradient(to left, #fff0 0%, #ccc 98%, #bbb 
100%);
height: 100%;
-   width: 8px;
+   width: 18px;
top: 0%;
box-shadow: none;
border-radius: 0px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Weblate (via logerrit)]

 loleaflet/po/ui-it.po |  116 ++
 1 file changed, 52 insertions(+), 64 deletions(-)

New commits:
commit 6a68ba735a67fbdcf672e058249be534f35c15da
Author: Weblate 
AuthorDate: Mon Jan 13 09:37:57 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 13 17:27:27 2020 +0100

update translations

LibreOffice Online/loleaflet-ui (Italian)
Currently translated at 100.0% (282 of 282 strings)

Change-Id: Ic91e8746d85971956f26e86d41e180b0a63b27fb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86657
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/po/ui-it.po b/loleaflet/po/ui-it.po
index 31b65c3db..291b51e60 100644
--- a/loleaflet/po/ui-it.po
+++ b/loleaflet/po/ui-it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-01-03 15:11+0100\n"
-"PO-Revision-Date: 2019-12-23 05:31+\n"
+"PO-Revision-Date: 2020-01-13 08:37+\n"
 "Last-Translator: Valter Mura \n"
 "Language-Team: Italian 
\n"
 "Language: it\n"
@@ -275,51 +275,51 @@ msgstr "Tu"
 
 #: src/control/Control.DownloadProgress.js:36
 msgid "Start download"
-msgstr "Avvia lo scaricamento"
+msgstr "Avvia scaricamento"
 
 #: src/control/Control.DownloadProgress.js:51
 msgid "Confirm copy to clipboard"
-msgstr ""
+msgstr "Conferma copia negli appunti"
 
 #: src/control/Control.DownloadProgress.js:209
 msgid "Start upload"
-msgstr ""
+msgstr "Avvia caricamento"
 
 #: src/control/Control.DownloadProgress.js:314
 msgid "Start cross copy/paste"
-msgstr ""
+msgstr "Avvia copia/incolla incrociato"
 
 #: src/control/ColorPicker.js:121
 msgid "No color"
-msgstr ""
+msgstr "Nessun colore"
 
 #: src/control/Control.JSDialogBuilder.js:151
 msgid "Linear"
-msgstr ""
+msgstr "Lineare"
 
 #: src/control/Control.JSDialogBuilder.js:154
 msgid "Axial"
-msgstr ""
+msgstr "Assiale"
 
 #: src/control/Control.JSDialogBuilder.js:157
 msgid "Radial"
-msgstr ""
+msgstr "Radiale"
 
 #: src/control/Control.JSDialogBuilder.js:160
 msgid "Ellipsoid"
-msgstr ""
+msgstr "Ellissoidale"
 
 #: src/control/Control.JSDialogBuilder.js:164
 msgid "Quadratic"
-msgstr ""
+msgstr "Quadratico"
 
 #: src/control/Control.JSDialogBuilder.js:167
 msgid "Square"
-msgstr ""
+msgstr "Quadrato"
 
 #: src/control/Control.JSDialogBuilder.js:170
 msgid "Fixed size"
-msgstr ""
+msgstr "Dimensione fissa"
 
 #: src/control/Control.JSDialogBuilder.js:736
 #: src/control/Control.Toolbar.js:1588
@@ -328,47 +328,43 @@ msgstr "Nessuno"
 
 #: src/control/Control.JSDialogBuilder.js:739
 msgid "Color"
-msgstr ""
+msgstr "Colore"
 
 #: src/control/Control.JSDialogBuilder.js:742
 msgid "Gradient"
-msgstr ""
+msgstr "Sfumatura"
 
 #: src/control/Control.JSDialogBuilder.js:745
 msgid "Hatching"
-msgstr ""
+msgstr "Tratteggio"
 
 #: src/control/Control.JSDialogBuilder.js:749
 msgid "Pattern"
-msgstr ""
+msgstr "Motivo"
 
 #: src/control/Control.JSDialogBuilder.js:882
 msgid "From"
-msgstr ""
+msgstr "Da"
 
 #: src/control/Control.JSDialogBuilder.js:885
 msgid "To"
-msgstr ""
+msgstr "A"
 
 #: src/control/Control.JSDialogBuilder.js:1017
-#, fuzzy
-#| msgid "Font"
 msgid "Font Name"
-msgstr "Carattere"
+msgstr "Nome del carattere"
 
 #: src/control/Control.JSDialogBuilder.js:1019
-#, fuzzy
-#| msgid "Not Signed"
 msgid "Font Size"
-msgstr "Non firmato"
+msgstr "Dimensione carattere"
 
 #: src/control/Control.JSDialogBuilder.js:1473
 msgid "Rows"
-msgstr ""
+msgstr "Righe"
 
 #: src/control/Control.JSDialogBuilder.js:1474
 msgid "Columns"
-msgstr ""
+msgstr "Colonne"
 
 #: src/control/Control.JSDialogBuilder.js:1494
 #: src/control/Control.Toolbar.js:945
@@ -450,7 +446,7 @@ msgstr "Azzera ingrandimento"
 
 #: src/control/Control.Menubar.js:64
 msgid "Show Ruler"
-msgstr ""
+msgstr "Mostra righello"
 
 #: src/control/Control.Menubar.js:74 src/control/Control.Menubar.js:290
 #: src/control/Control.Menubar.js:380 src/control/Control.Menubar.js:613
@@ -470,7 +466,7 @@ msgstr "Orientazione del testo"
 #: src/control/Control.Menubar.js:239 src/control/Control.Menubar.js:340
 #: src/control/Control.Menubar.js:455
 msgid "Online Help"
-msgstr ""
+msgstr "Aiuto in linea"
 
 #: src/control/Control.Menubar.js:240 src/control/Control.Menubar.js:341
 #: src/control/Control.Menubar.js:456
@@ -520,7 +516,7 @@ msgstr "Foglio di calcolo Excel (.xlsx)"
 #: src/control/Control.Menubar.js:471 src/control/Control.Menubar.js:513
 #: src/control/Control.Menubar.js:557
 msgid "Export as"
-msgstr ""
+msgstr "Esporta come"
 
 #: src/control/Control.Menubar.js:739 src/control/Control.Toolbar.js:1974
 msgid "Reset to Default Language"
@@ -564,7 +560,7 @@ msgstr "Eliminare veramente questa pagina?"
 
 #: src/control/Control.Toolbar.js:838
 msgid "Default Style"
-msgstr ""
+msgstr "Stile predefinito"
 
 #: src/control/Control.Toolbar.js:889
 msgid "Borders"
@@ -583,10 +579,8 @@ ms

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

[Mark Hung (via logerrit)]

 sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx|6 ++
 sw/source/core/doc/textboxhelper.cxx   |   10 ++
 3 files changed, 16 insertions(+)

New commits:
commit 340b0eedaac17ff26799b09f6bbb2b115712e2d5
Author: Mark Hung 
AuthorDate: Sat Dec 28 10:01:20 2019 +0800
Commit: Miklos Vajna 
CommitDate: Mon Jan 13 16:31:04 2020 +0100

tdf#129655 Sync TextWritingMode to frame direction.

Sync the text writing mode of a shape to the frame
direction of the attached text box ( a text frame ).

Change-Id: Ied9ff1a1d0f53d7ef78a83a086af0a2c1ca5eb36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86638
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt 
b/sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt
new file mode 100644
index ..8d668400c386
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf129655-vtextbox.odt 
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c9548208150b..31f095a2c0d3 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2451,4 +2451,10 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf90069)
 CPPUNIT_ASSERT_EQUAL(OUString("Lohit Devanagari"), sFontName);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf129655)
+{
+createDoc("tdf129655-vtextbox.odt");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//fly/txt[@WritingMode='Vertical']", 1);
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 3c4e63a12b2f..37939224daf6 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace com::sun::star;
@@ -124,6 +125,9 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
  
xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_AUTOGROWHEIGHT));
 syncProperty(pShape, RES_TEXT_VERT_ADJUST, 0,
  
xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_VERT_ADJUST));
+text::WritingMode eMode;
+if (xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_WRITINGMODE) >>= 
eMode)
+syncProperty(pShape, RES_FRAMEDIR, 0, uno::makeAny(sal_Int16(eMode)));
 }
 
 void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
@@ -386,6 +390,12 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, 
const OUString& rPrope
 syncProperty(pShape, RES_BOX, TOP_BORDER_DISTANCE, rValue);
 else if (rPropertyName == UNO_NAME_TEXT_LOWERDIST)
 syncProperty(pShape, RES_BOX, BOTTOM_BORDER_DISTANCE, rValue);
+else if (rPropertyName == UNO_NAME_TEXT_WRITINGMODE)
+{
+text::WritingMode eMode;
+if (rValue >>= eMode)
+syncProperty(pShape, RES_FRAMEDIR, 0, 
uno::makeAny(sal_Int16(eMode)));
+}
 }
 
 void SwTextBoxHelper::getProperty(SwFrameFormat const* pShape, sal_uInt16 
nWID, sal_uInt8 nMemberID,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About tdf#129547 and adding COLON

[Julien]

Hello,

https://bugs.documentfoundation.org/show_bug.cgi?id=129547 shows that some 
shortcuts don't work at least with French localization. In French UI some 
shortcuts need ":" but this character isn't declared in 
offapi/com/sun/star/awt/Key.idl and at different other locations.

Is it possible to add this character? (I can propose a patch about this)

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

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

[Andras Timar (via logerrit)]

 loleaflet/po/templates/loleaflet-ui.pot  |  139 ---
 loleaflet/src/control/Control.Menubar.js |7 +
 2 files changed, 78 insertions(+), 68 deletions(-)

New commits:
commit e199bcc72d25316e65857b934fe253cbc6550934
Author: Andras Timar 
AuthorDate: Sat Jan 11 23:47:26 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 13 15:59:46 2020 +0100

add 'Report an issue' item to the Help menu

if unwanted, this menu item can be hidden with branding.css

 #menu-report-an-issue {
display: none;
 }

Change-Id: Ic3fc3a74e8bea0b68ced542423c6068b150f647b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86632
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/po/templates/loleaflet-ui.pot 
b/loleaflet/po/templates/loleaflet-ui.pot
index 70a6ea794..e08dff0f6 100644
--- a/loleaflet/po/templates/loleaflet-ui.pot
+++ b/loleaflet/po/templates/loleaflet-ui.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-03 15:11+0100\n"
+"POT-Creation-Date: 2020-01-11 23:45+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -182,11 +182,11 @@ msgstr ""
 msgid "Connection error"
 msgstr ""
 
-#: admin/src/AdminSocketOverview.js:102
+#: admin/src/AdminSocketOverview.js:105
 msgid "Are you sure you want to terminate this session?"
 msgstr ""
 
-#: admin/src/AdminSocketOverview.js:183 admin/src/AdminSocketOverview.js:285
+#: admin/src/AdminSocketOverview.js:186 admin/src/AdminSocketOverview.js:288
 msgid "Documents"
 msgstr ""
 
@@ -318,59 +318,59 @@ msgstr ""
 msgid "Fixed size"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:736
+#: src/control/Control.JSDialogBuilder.js:741
 #: src/control/Control.Toolbar.js:1588
 msgid "None"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:739
+#: src/control/Control.JSDialogBuilder.js:744
 msgid "Color"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:742
+#: src/control/Control.JSDialogBuilder.js:747
 msgid "Gradient"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:745
+#: src/control/Control.JSDialogBuilder.js:750
 msgid "Hatching"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:749
+#: src/control/Control.JSDialogBuilder.js:754
 msgid "Pattern"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:882
+#: src/control/Control.JSDialogBuilder.js:887
 msgid "From"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:885
+#: src/control/Control.JSDialogBuilder.js:890
 msgid "To"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1017
+#: src/control/Control.JSDialogBuilder.js:1022
 msgid "Font Name"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1019
+#: src/control/Control.JSDialogBuilder.js:1024
 msgid "Font Size"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1473
+#: src/control/Control.JSDialogBuilder.js:1478
 msgid "Rows"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1474
+#: src/control/Control.JSDialogBuilder.js:1479
 msgid "Columns"
 msgstr ""
 
-#: src/control/Control.JSDialogBuilder.js:1494
+#: src/control/Control.JSDialogBuilder.js:1499
 #: src/control/Control.Toolbar.js:945
 msgid "Insert table"
 msgstr ""
 
 #: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:227
 #: src/control/Control.Menubar.js:229 src/control/Control.Menubar.js:231
-#: src/control/Control.Menubar.js:337 src/control/Control.Menubar.js:451
+#: src/control/Control.Menubar.js:338 src/control/Control.Menubar.js:453
 #: src/control/Control.Toolbar.js:1975
 msgid "None (Do not check spelling)"
 msgstr ""
@@ -380,63 +380,63 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:250
-#: src/control/Control.Menubar.js:351 src/control/Control.Menubar.js:466
-#: src/control/Control.Menubar.js:509 src/control/Control.Menubar.js:553
+#: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:251
+#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:469
+#: src/control/Control.Menubar.js:513 src/control/Control.Menubar.js:558
 msgid "Share..."
 msgstr ""
 
-#: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:252
-#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:468
-#: src/control/Control.Menubar.js:511 src/control/Control.Menubar.js:555
+#: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:253
+#: src/control/Control.Menubar.js:355 src/control/Control.Menubar.js:471
+#: src/control/Control.Menubar.js:515 src/control/Control.Menubar.js:560
 msgid "See revision history"
 msgstr ""
 
-#: src/control/Control.Menubar.js:24 src/control/Control.Menubar.js:253
-#: src/control/Control.Menubar.js:354 src/control/Control.Menubar.js:471
-#: src/control/Control.Menubar.js:513 src/control/Control.Menubar.js:557
+#: src/control/Control.Me

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

[Michael Meeks (via logerrit)]

 sc/source/ui/view/gridwin.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 568a8036e093e65ee1cc88f140a81fe62905e0c0
Author: Michael Meeks 
AuthorDate: Mon Jan 13 14:32:37 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 14:37:57 2020 +

WaE: unused code in calc.

Change-Id: I42a895573f8871841c9a33a23c0b826be814ddae

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b591b974dabf..d416607a379e 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5947,9 +5947,6 @@ void ScGridWindow::updateOtherKitSelections() const
 if (!pOther)
 return;
 
-const ScGridWindow *pGrid = pOther->GetViewData().GetActiveWin();
-assert(pGrid);
-
 // Fetch pixels & convert for each view separately.
 tools::Rectangle aBoundingBox;
 std::vector aPixelRects;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar-mobile.css |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 839cab9b65c6297a376ad0940a9925b604b6f1cd
Author: Pedro Pinto Silva 
AuthorDate: Mon Jan 13 15:06:05 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Mon Jan 13 15:11:00 2020 +0100

Increased the horizontal scroll indicator contrast,
- which increases legibility even when there is a checked element underneath
- also decreases its width so the element that is partially under is still 
interactive without the need to swipe it first

Change-Id: I54fe3e3d0bd699246f76c77e929b3c4a250e0b82
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86691
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/css/toolbar-mobile.css b/loleaflet/css/toolbar-mobile.css
index 8d11b4971..b9f09ab42 100644
--- a/loleaflet/css/toolbar-mobile.css
+++ b/loleaflet/css/toolbar-mobile.css
@@ -38,10 +38,12 @@
display: none;
}
#toolbar-down .w2ui-scroll-left, #toolbar-down .w2ui-scroll-right{
-   background: linear-gradient(to left, #fff0 50%, #0b87e730 95%, 
#0a77cc52 100%);
+   background: linear-gradient(to left, #fff0 0%, #ccc 98%, #bbb 
100%);
height: 100%;
+   width: 8px;
top: 0%;
box-shadow: none;
+   border-radius: 0px;
}
#toolbar-down .w2ui-scroll-right{
right: 0;
___
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/table2.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:03:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 15:08:46 2020 +0100

tdf#129908 Crash at Data > Group and outlone > AutoOutline

regression from
commit 7282014e362a1529a36c88eb308df8ed359c2cfa
tdf#50916 Makes numbers of columns dynamic.

Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0df049aba144..f24a3459a803 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3723,6 +3723,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW 
nStartRow, SCCOL nEndCol, SC
 bool bFound;
 ScRange aRef;
 
+nEndCol = ClampToAllocatedColumns(nEndCol);
+
 StartOutlineTable();
 
 // Rows
___
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.2' - scp2/source

[Mike Kaganski (via logerrit)]

 scp2/source/ooo/vc_redist.scp |   55 --
 1 file changed, 16 insertions(+), 39 deletions(-)

New commits:
commit 42b6b735c15f3cb7c16a85e2963fefca24c8dd38
Author: Mike Kaganski 
AuthorDate: Mon Jan 13 13:08:02 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jan 13 15:08:02 2020 +0100

Merge both x64 and x86 CRT merge modules into x64 MSI

... because it contains x86 binaries in addition to x64: e.g., twain32shim,
spsupp_x86.

The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see
https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI.

Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit a4681e8b74a59439110af42ff18cce021512056d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86680
Tested-by: Jenkins CollaboraOffice 

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 727c13b27615..234427536fa5 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,57 +18,34 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC140_REDIST)
-
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86
-#endif
-Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC140_CRT_x64.msm";
-#else
-Name = "Microsoft_VC140_CRT_x86.msm";
-#endif
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
+#if defined(WITH_VC141_REDIST)
+#define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x64
+#define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC141_CRT_x64.msm"
+#define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x86
+#define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC141_CRT_x86.msm"
+#elif defined(WITH_VC150_REDIST)
+#define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC150_CRT_x64
+#define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC150_CRT_x64.msm"
+#define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC150_CRT_x86
+#define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC150_CRT_x86.msm"
 #endif
 
-#if defined(WITH_VC150_REDIST)
+#if defined(WINDOWS_X86_MERGEMODULE)
 
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC150_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC150_CRT_x86
-#endif
+MergeModule WINDOWS_X86_MERGEMODULE
 Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC150_CRT_x64.msm";
-#else
-Name = "Microsoft_VC150_CRT_x86.msm";
-#endif
+Name = WINDOWS_X86_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
 End
 
 #endif
 
-#if defined(WITH_VC141_REDIST)
+#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE)
 
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86
-#endif
+MergeModule WINDOWS_X64_MERGEMODULE
 Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC141_CRT_x64.msm";
-#else
-Name = "Microsoft_VC141_CRT_x86.msm";
-#endif
+Name = WINDOWS_X64_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: package/inc reportdesign/inc sc/inc sfx2/inc

[Noel Grandin (via logerrit)]

 package/inc/EncryptionData.hxx   |2 +-
 package/inc/ZipOutputEntry.hxx   |6 +++---
 package/inc/ZipPackageStream.hxx |2 +-
 package/inc/zipfileaccess.hxx|2 +-
 reportdesign/inc/PropertyForward.hxx |4 ++--
 reportdesign/inc/ReportDefinition.hxx|7 ++-
 reportdesign/inc/RptModel.hxx|2 +-
 reportdesign/inc/RptObject.hxx   |2 +-
 reportdesign/inc/RptPage.hxx |3 +--
 reportdesign/inc/UndoActions.hxx |   16 
 sc/inc/sheetlimits.hxx   |2 +-
 sfx2/inc/autoredactdialog.hxx|4 ++--
 sfx2/inc/inettbc.hxx |2 +-
 sfx2/inc/preventduplicateinteraction.hxx |4 ++--
 sfx2/inc/saveastemplatedlg.hxx   |2 +-
 sfx2/inc/sorgitm.hxx |2 +-
 sfx2/inc/srchdlg.hxx |2 +-
 17 files changed, 30 insertions(+), 34 deletions(-)

New commits:
commit c1e96a5d323614f1566702c933dcda9d89d23632
Author: Noel Grandin 
AuthorDate: Mon Jan 13 15:08:08 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 14:58:03 2020 +0100

loplugin:finalclasses in package..sfx2

Change-Id: I2908abc13f16b0011fcb326e8405080cc30df74a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86684
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/package/inc/EncryptionData.hxx b/package/inc/EncryptionData.hxx
index 66f8aeb5881a..0eae28d3422a 100644
--- a/package/inc/EncryptionData.hxx
+++ b/package/inc/EncryptionData.hxx
@@ -42,7 +42,7 @@ public:
 {}
 };
 
-class EncryptionData : public BaseEncryptionData
+class EncryptionData final : public BaseEncryptionData
 {
 public:
 css::uno::Sequence < sal_Int8 > m_aKey;
diff --git a/package/inc/ZipOutputEntry.hxx b/package/inc/ZipOutputEntry.hxx
index 3bace59698b5..a8fbf1563c16 100644
--- a/package/inc/ZipOutputEntry.hxx
+++ b/package/inc/ZipOutputEntry.hxx
@@ -107,7 +107,7 @@ protected:
 };
 
 // Class that runs the compression in a background thread.
-class ZipOutputEntryInThread : public ZipOutputEntry
+class ZipOutputEntryInThread final : public ZipOutputEntry
 {
 class Task;
 OUString m_aTempURL;
@@ -135,7 +135,7 @@ private:
 };
 
 // Class that synchronously runs the compression in multiple threads (using 
ThreadDeflater).
-class ZipOutputEntryParallel : public ZipOutputEntryBase
+class ZipOutputEntryParallel final : public ZipOutputEntryBase
 {
 sal_Int64 totalIn;
 sal_Int64 totalOut;
@@ -145,7 +145,7 @@ public:
 const css::uno::Reference< css::uno::XComponentContext >& rxContext,
 ZipEntry& rEntry, ZipPackageStream* pStream, bool bEncrypt);
 void writeStream(const css::uno::Reference< css::io::XInputStream >& 
xInStream) override;
-protected:
+private:
 virtual void finishDeflater() override;
 virtual sal_Int64 getDeflaterTotalIn() const override;
 virtual sal_Int64 getDeflaterTotalOut() const override;
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 7f704ca59232..f4f6d438c8d9 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -38,7 +38,7 @@
 
 class ZipPackage;
 struct ZipEntry;
-class ZipPackageStream : public cppu::ImplInheritanceHelper
+class ZipPackageStream final : public cppu::ImplInheritanceHelper
 <
 ZipPackageEntry,
 css::io::XActiveDataSink,
diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx
index 901ae060e436..2cd403d54545 100644
--- a/package/inc/zipfileaccess.hxx
+++ b/package/inc/zipfileaccess.hxx
@@ -37,7 +37,7 @@
 
 #include 
 
-class OZipFileAccess : public ::cppu::WeakImplHelper<
+class OZipFileAccess final : public ::cppu::WeakImplHelper<
 css::packages::zip::XZipFileAccess2,
 css::lang::XInitialization,
 css::lang::XComponent,
diff --git a/reportdesign/inc/PropertyForward.hxx 
b/reportdesign/inc/PropertyForward.hxx
index c86858d87720..4f467c2a0fe0 100644
--- a/reportdesign/inc/PropertyForward.hxx
+++ b/reportdesign/inc/PropertyForward.hxx
@@ -39,7 +39,7 @@ namespace rptui
  * Identical properties will be set at the other propertyset.
  * \ingroup reportdesign_source_ui_misc
  */
-class REPORTDESIGN_DLLPUBLIC OPropertyMediator : public ::cppu::BaseMutex
+class REPORTDESIGN_DLLPUBLIC OPropertyMediator final : public 
::cppu::BaseMutex
 ,public OPropertyForward_Base
 {
 TPropertyNamePair m_aNameMap;
@@ -50,7 +50,7 @@ namespace rptui
 bool  m_bInChange;
 OPropertyMediator(OPropertyMediator const &) = delete;
 void operator =(OPropertyMediator const &) = delete;
-protected:
+
 virtual ~OPropertyMediator() override;
 
 /** this function is called upon disposing the component
diff --git a/rep

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

[Noel Grandin (via logerrit)]

 chart2/source/model/filter/XMLFilter.cxx |   50 ++-
 chart2/source/model/inc/XMLFilter.hxx|3 -
 2 files changed, 31 insertions(+), 22 deletions(-)

New commits:
commit 029044bd5b5989e4b1a965f89e6ba79bf9717bc2
Author: Noel Grandin 
AuthorDate: Sun Jan 12 20:12:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 14:35:06 2020 +0100

use FastParser in chart2

Change-Id: I98e8649bdfd2ceb556621a8b2c3c3a29bfaf7498
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86677
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/model/filter/XMLFilter.cxx 
b/chart2/source/model/filter/XMLFilter.cxx
index 0c608efcdd0e..467afe8038a2 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -34,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -41,13 +43,15 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -289,9 +293,6 @@ ErrCode XMLFilter::impl_Import(
 if( ! xFactory.is())
 return ERRCODE_SFX_GENERAL;
 
-// create a sax parser
-Reference< xml::sax::XParser > xSaxParser = 
xml::sax::Parser::create(m_xContext);
-
 bool bOasis = true;
 isOasisFormat( rMediaDescriptor, bOasis );
 Reference< embed::XStorage > xStorage( lcl_getReadStorage( 
rMediaDescriptor, m_xContext));
@@ -362,7 +363,7 @@ ErrCode XMLFilter::impl_Import(
 nWarning = impl_ImportStream(
 sXML_metaStreamName,
 "com.sun.star.comp.Chart.XMLOasisMetaImporter",
-xStorage, xSaxParser, xFactory, xGraphicStorageHandler, 
xImportInfo );
+xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
 
 // import styles
 ErrCode nTmpErr = impl_ImportStream(
@@ -370,7 +371,7 @@ ErrCode XMLFilter::impl_Import(
 bOasis
 ? OUString("com.sun.star.comp.Chart.XMLOasisStylesImporter")
 : OUString("com.sun.star.comp.Chart.XMLStylesImporter"),
-xStorage, xSaxParser, xFactory, xGraphicStorageHandler, 
xImportInfo );
+xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
 nWarning = nWarning != ERRCODE_NONE ? nWarning : nTmpErr;
 
 // import content
@@ -379,7 +380,7 @@ ErrCode XMLFilter::impl_Import(
 bOasis
 ? OUString("com.sun.star.comp.Chart.XMLOasisContentImporter")
 : OUString("com.sun.star.comp.Chart.XMLContentImporter"),
-xStorage, xSaxParser, xFactory, xGraphicStorageHandler, 
xImportInfo );
+xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
 nWarning = nWarning != ERRCODE_NONE ? nWarning : nContentWarning;
 
 // import of "content.xml" didn't work - try old "Content.xml" stream
@@ -388,7 +389,7 @@ ErrCode XMLFilter::impl_Import(
 nWarning = impl_ImportStream(
 "Content.xml", // old content stream name
 "com.sun.star.office.sax.importer.Chart",
-xStorage, xSaxParser, xFactory, xGraphicStorageHandler, 
xImportInfo );
+xStorage, xFactory, xGraphicStorageHandler, xImportInfo );
 }
 }
 catch (const uno::Exception&)
@@ -406,7 +407,6 @@ ErrCode XMLFilter::impl_ImportStream(
 const OUString & rStreamName,
 const OUString & rServiceName,
 const Reference< embed::XStorage > & xStorage,
-const Reference< xml::sax::XParser > & xParser,
 const Reference< lang::XMultiComponentFactory > & xFactory,
 const Reference< document::XGraphicStorageHandler > & 
xGraphicStorageHandler,
 uno::Reference< beans::XPropertySet > const & xImportInfo )
@@ -425,16 +425,14 @@ ErrCode XMLFilter::impl_ImportStream(
 {
 try
 {
-xml::sax::InputSource aParserInput;
-aParserInput.aInputStream.set(
+auto xInputStream =
 xStorage->openStreamElement(
 rStreamName,
-embed::ElementModes::READ | embed::ElementModes::NOCREATE 
),
-uno::UNO_QUERY );
+embed::ElementModes::READ | embed::ElementModes::NOCREATE 
);
 
 // todo: encryption
 
-if( aParserInput.aInputStream.is())
+if( xInputStream.is())
 {
 sal_Int32 nArgs = 0;
 if( xGraphicStorageHandler.is())
@@ -450,7 +448,8 @@ ErrCode XMLFilter::impl_ImportStream(
 if( xImportInfo.is())
 aFilterCompArgs[ nArgs++ ] <<= xImportInfo;
 
-Reference< xml::sax::XDocumentHandler > xDocHandler(
+// the underlying SvXMLImport implements XFastParser, 
XIm

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

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit bfb7fef85f63b82b54832c755e111b90f701e8dc
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 12:12:19 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 14:22:34 2020 +0100

ofz#20051 if duplicate exists then m_ObjToRecMap points to deleted element

Change-Id: I854410ba1d5c0a622b5ba9c6816a24a3477e5089
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86681
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 9f0db88ee889..cea6d7168b85 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5126,8 +5126,13 @@ SvxMSDffImportRec* SvxMSDffImportData::find(const 
SdrObject* pObj)
 
 void SvxMSDffImportData::insert(std::unique_ptr pImpRec)
 {
-m_ObjToRecMap[pImpRec->pObj] = pImpRec.get();
-m_Records.insert(std::move(pImpRec));
+auto aRet = m_Records.insert(std::move(pImpRec));
+bool bSuccess = aRet.second;
+if (bSuccess)
+{
+SvxMSDffImportRec* pRec = aRet.first->get();
+m_ObjToRecMap[pRec->pObj] = pRec;
+}
 }
 
 void SvxMSDffImportData::NotifyFreeObj(SdrObject* pObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yusuf Keten (via logerrit)]

 sfx2/source/doc/doctemplates.cxx |4 ++--
 svx/source/dialog/charmap.cxx|4 ++--
 svx/source/svdraw/svdedtv2.cxx   |4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c7de89df5efc4b2af1f81c00befcc957a7e22ca6
Author: Yusuf Keten 
AuthorDate: Sat Jan 4 15:30:01 2020 +0300
Commit: Michael Stahl 
CommitDate: Mon Jan 13 14:04:42 2020 +0100

tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer types

Change-Id: Ia45fb0bc882411fe0bfcd1e83932d187b4873ab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86214
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index aba17d40360b..1247d6cfab88 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -2580,8 +2580,8 @@ void SfxDocTplService_Impl::addGroupToHierarchy( 
GroupData_Impl *pGroup )
 setProperty( aGroup, TARGET_DIR_URL, makeAny( pGroup->getTargetURL() ) 
);
 pGroup->setHierarchyURL( aNewGroupURL );
 
-sal_uIntPtr nCount = pGroup->count();
-for ( sal_uIntPtr i=0; icount();
+for ( size_t i = 0; i < nCount; i++ )
 {
 DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i );
 addToHierarchy( pGroup, pData ); // add entry to hierarchy
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index ff323461cfa5..403d748a231e 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -358,9 +358,9 @@ int SvxShowCharSet::FirstInView() const
 
 int SvxShowCharSet::LastInView() const
 {
-sal_uIntPtr nIndex = FirstInView();
+sal_uInt32 nIndex = FirstInView();
 nIndex += ROW_COUNT * COLUMN_COUNT - 1;
-sal_uIntPtr nCompare = 
sal::static_int_cast(mxFontCharMap->GetCharCount() - 1);
+sal_uInt32 nCompare = mxFontCharMap->GetCharCount() - 1;
 if (nIndex > nCompare)
 nIndex = nCompare;
 return nIndex;
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 286b74bb5a23..72a743fda6c8 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -2093,7 +2093,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo 
*pProgrInfo)
 SdrPageView* pPV=pM->GetPageView();
 SdrObjList*  pOL=pObj->getParentSdrObjListFromSdrObject();
 const size_t nInsPos=pObj->GetOrdNum()+1;
-sal_uIntPtr  nInsCnt=0;
+size_t  nInsCnt=0;
 tools::Rectangle aLogicRect;
 
 SdrGrafObj*  pGraf = dynamic_cast( pObj );
@@ -2142,7 +2142,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo 
*pProgrInfo)
 if (aGeoStat.nRotationAngle)
 aGeoStat.RecalcSinCos();
 
-for (sal_uIntPtr i = 0; i < nInsCnt; i++)
+for (size_t i = 0; i < nInsCnt; i++)
 {
 if (bUndo)
 
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

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

New commits:
commit d865a4ea712619eee64e76483dc7223404e43a2c
Author: Noel Grandin 
AuthorDate: Mon Jan 13 13:16:04 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 13:34:46 2020 +0100

convert this warning to SAL_INFO for now

too noisy until I've done more conversion

Change-Id: I1afe653683f12edc4516a40f609e6c1dc749c9e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86676
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index f76c325d1f0d..09a7f8665ab5 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -878,7 +878,7 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32 
Element,
 else
 xContext.set( CreateFastContext( Element, Attribs ) );
 
-SAL_WARN_IF(!xContext.is(), "xmloff.core", "No fast context for element " 
<< getNameFromToken(Element));
+SAL_INFO_IF(!xContext.is(), "xmloff.core", "No fast context for element " 
<< getNameFromToken(Element));
 if ( !xContext.is() )
 xContext.set( new SvXMLImportContext( *this ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 dbaccess/source/filter/xml/xmlColumn.cxx  |   44 +-
 dbaccess/source/filter/xml/xmlColumn.hxx  |8 
 dbaccess/source/filter/xml/xmlComponent.cxx   |   33 --
 dbaccess/source/filter/xml/xmlComponent.hxx   |6 
 dbaccess/source/filter/xml/xmlConnectionData.cxx  |   28 -
 dbaccess/source/filter/xml/xmlConnectionData.hxx  |   10 
 dbaccess/source/filter/xml/xmlConnectionResource.cxx  |   84 ++---
 dbaccess/source/filter/xml/xmlConnectionResource.hxx  |7 
 dbaccess/source/filter/xml/xmlDataSource.cxx  |  265 -
 dbaccess/source/filter/xml/xmlDataSource.hxx  |   12 
 dbaccess/source/filter/xml/xmlDataSourceInfo.cxx  |   47 +--
 dbaccess/source/filter/xml/xmlDataSourceInfo.hxx  |9 
 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx   |   51 +--
 dbaccess/source/filter/xml/xmlDataSourceSetting.hxx   |   17 -
 dbaccess/source/filter/xml/xmlDataSourceSettings.cxx  |   19 -
 dbaccess/source/filter/xml/xmlDataSourceSettings.hxx  |9 
 dbaccess/source/filter/xml/xmlDatabase.cxx|   38 +-
 dbaccess/source/filter/xml/xmlDatabase.hxx|   14 
 dbaccess/source/filter/xml/xmlDatabaseDescription.cxx |   22 -
 dbaccess/source/filter/xml/xmlDatabaseDescription.hxx |   10 
 dbaccess/source/filter/xml/xmlDocuments.cxx   |   34 --
 dbaccess/source/filter/xml/xmlDocuments.hxx   |   11 
 dbaccess/source/filter/xml/xmlEnums.hxx   |  126 
 dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx   |   89 ++---
 dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx   |7 
 dbaccess/source/filter/xml/xmlHierarchyCollection.cxx |   52 +--
 dbaccess/source/filter/xml/xmlHierarchyCollection.hxx |   13 
 dbaccess/source/filter/xml/xmlLogin.cxx   |  113 +++
 dbaccess/source/filter/xml/xmlLogin.hxx   |7 
 dbaccess/source/filter/xml/xmlQuery.cxx   |   44 +-
 dbaccess/source/filter/xml/xmlQuery.hxx   |   11 
 dbaccess/source/filter/xml/xmlServerDatabase.cxx  |   63 ++--
 dbaccess/source/filter/xml/xmlServerDatabase.hxx  |7 
 dbaccess/source/filter/xml/xmlTable.cxx   |   85 ++---
 dbaccess/source/filter/xml/xmlTable.hxx   |   15 -
 dbaccess/source/filter/xml/xmlTableFilterList.cxx |   34 +-
 dbaccess/source/filter/xml/xmlTableFilterList.hxx |   13 
 dbaccess/source/filter/xml/xmlTableFilterPattern.cxx  |8 
 dbaccess/source/filter/xml/xmlTableFilterPattern.hxx  |6 
 dbaccess/source/filter/xml/xmlfilter.cxx  |  268 +-
 dbaccess/source/filter/xml/xmlfilter.hxx  |   18 -
 xmloff/source/core/xmlimp.cxx |3 
 42 files changed, 655 insertions(+), 1105 deletions(-)

New commits:
commit db6c54b2e93d1cc5c02e7db7b1841fabbc3ef950
Author: Noel Grandin 
AuthorDate: Sun Jan 12 20:11:49 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 13:34:15 2020 +0100

convert dbaccess to FastParser APIs

Noting that I use "& TOKEN_MASK" a lot because we can be dealing with
either NAMESPACE_DB or NAMESPACE_DB_OASIS.

Change-Id: I5ca0aac61e37dc903bb998a43b73b48df22e55fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86655
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx 
b/dbaccess/source/filter/xml/xmlColumn.cxx
index fc90f490179c..91dc85582883 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include "xmlStyleImport.hxx"
+#include 
 
 namespace dbaxml
 {
@@ -42,59 +43,52 @@ namespace dbaxml
 using namespace ::com::sun::star::xml::sax;
 
 OXMLColumn::OXMLColumn( ODBFilter& rImport
-,sal_uInt16 nPrfx
-,const OUString& _sLocalName
-,const Reference< XAttributeList > & _xAttrList
+,const Reference< XFastAttributeList > & _xAttrList
 ,const Reference< XNameAccess >& _xParentContainer
 ,const Reference< XPropertySet >& _xTable
 ) :
-SvXMLImportContext( rImport, nPrfx, _sLocalName )
+SvXMLImportContext( rImport )
 ,m_xParentContainer(_xParentContainer)
 ,m_xTable(_xTable)
 ,m_bHidden(false)
 {
-
-OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
-const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
-const SvXMLTokenMap& rTokenMap = rImport.GetColumnElemTokenMap();
-
-sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0;
 OUString sType;
-for(sal_Int16 i = 0; i < nLength; ++i)
+sax_fastparser::FastAttributeList *pAttribList =
+
sax_fastparser::FastAttributeList::castToFastAttributeList( _xAttrList );
+for (auto &aIter : *pAttribList)
 {
-OUString sLocalName;
-OUString sAttrName = _xAttrList->getNameByIndex( i );
-sal

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 069c95e9e5ebb9f716aa38abc9adc10910d73484
Author: Henry Castro 
AuthorDate: Fri Jan 10 14:03:57 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Jan 13 13:13:33 2020 +0100

loleaflet: mobile: trigger the mobile wizard on ..

long press event in thumbnail previews in Impress

Change-Id: Ib0661b906882b87d68833c96ce3f535bd3fccbec
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86568
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 212eb25b5..abaf996ec 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -3,7 +3,7 @@
  * L.Control.PartsPreview
  */
 
-/* global $ */
+/* global $ Hammer w2ui */
 L.Control.PartsPreview = L.Control.extend({
options: {
fetchThumbnail: true,
@@ -163,6 +163,16 @@ L.Control.PartsPreview = L.Control.extend({
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
img.fetched = false;
+   if (L.Browser.mobile) {
+   (new Hammer(img, {recognizers: [[Hammer.Press]]}))
+   .on('press', L.bind(function () {
+   if (this._map._permission === 'edit') {
+   setTimeout(function () {
+   
w2ui['actionbar'].click('mobile_wizard');
+   }, 0);
+   }
+   }, this));
+   }
L.DomEvent.on(img, 'click', function (e) {
L.DomEvent.stopPropagation(e);
L.DomEvent.stop(e);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/control/Control.PartsPreview.js |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit f192a5e7ba50f79328f478db8d70698de8984fe0
Author: Henry Castro 
AuthorDate: Fri Jan 10 11:47:29 2020 -0400
Commit: Henry Castro 
CommitDate: Mon Jan 13 13:13:15 2020 +0100

loleaflet: simplifiy click listener on thumbnail previews

It is complicated to debug 5 event listener attached to an element,
let's use one event listener.

Change-Id: I9de1f1707f95f07a49358c8e7580ad232edd4389
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86567
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.PartsPreview.js 
b/loleaflet/src/control/Control.PartsPreview.js
index 12c5bab19..212eb25b5 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -163,15 +163,14 @@ L.Control.PartsPreview = L.Control.extend({
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
img.fetched = false;
-   L.DomEvent
-   .on(img, 'click', L.DomEvent.stopPropagation)
-   .on(img, 'click', L.DomEvent.stop)
-   .on(img, 'click', this._setPart, this)
-   .on(img, 'click', this._map.focus, this._map)
-   .on(img, 'click', function() {
-   this.partsFocused = true;
-   document.activeElement.blur();
-   }, this);
+   L.DomEvent.on(img, 'click', function (e) {
+   L.DomEvent.stopPropagation(e);
+   L.DomEvent.stop(e);
+   this._setPart(e);
+   this._map.focus();
+   this.partsFocused = true;
+   document.activeElement.blur();
+   }, this);
 
var topBound = this._previewContTop;
var previewFrameTop = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 09597ab01d22820137ada0dc08b5a9bf481468a8
Author: Stephan Bergmann 
AuthorDate: Mon Jan 13 09:55:12 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 13 13:10:49 2020 +0100

Silence -Werror,-Wdeprecated-declarations for now

...as seen with qt5-qtbase-devel-5.13.2-1.fc31.x86_64:

> vcl/qt5/Qt5Frame.cxx:481:73: error: 'screenGeometry' is deprecated: Use 
QGuiApplication::screens() [-Werror,-Wdeprecated-declarations]
> toSize(pScreen ? pScreen->size() : 
QApplication::desktop()->screenGeometry(0).size()));
> ^
> /usr/include/qt5/QtWidgets/qdesktopwidget.h:79:5: note: 'screenGeometry' 
has been explicitly marked deprecated here
> QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect 
screenGeometry(int screen = -1) const;
> ^
[...]
> vcl/qt5/Qt5Frame.cxx:490:56: error: 'screenNumber' is deprecated: Use 
QGuiApplication::screenAt() [-Werror,-Wdeprecated-declarations]
> int nLeftScreen = 
QApplication::desktop()->screenNumber(QPoint(0, 0));
>^
> /usr/include/qt5/QtWidgets/qdesktopwidget.h:75:5: note: 'screenNumber' 
has been explicitly marked deprecated here
> QT_DEPRECATED_X("Use QGuiApplication::screenAt()") int 
screenNumber(const QPoint &) const;
> ^
[...]

Change-Id: I7db00ee0e7cd7f652af4f7426f9ea0172206d485
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86660
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index c5cc9dfaa0d1..905e542a65b0 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -477,17 +477,25 @@ Size Qt5Frame::CalcDefaultSize()
 if (!m_bFullScreen)
 {
 const QScreen* pScreen = screen();
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 aSize = bestmaxFrameSizeForScreenSize(
 toSize(pScreen ? pScreen->size() : 
QApplication::desktop()->screenGeometry(0).size()));
+SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 else
 {
 if (!m_bFullScreenSpanAll)
+{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 aSize = toSize(
 
QApplication::desktop()->screenGeometry(maGeometry.nDisplayScreenNumber).size());
+SAL_WNODEPRECATED_DECLARATIONS_POP
+}
 else
 {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 int nLeftScreen = QApplication::desktop()->screenNumber(QPoint(0, 
0));
+SAL_WNODEPRECATED_DECLARATIONS_POP
 aSize = 
toSize(QApplication::screens()[nLeftScreen]->availableVirtualGeometry().size());
 }
 }
@@ -1183,14 +1191,18 @@ void Qt5Frame::SetScreenNumber(unsigned int nScreen)
 
 if (!m_bFullScreenSpanAll)
 {
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 screenGeo = 
QApplication::desktop()->screenGeometry(nScreen);
+SAL_WNODEPRECATED_DECLARATIONS_POP
 pWindow->setScreen(QApplication::screens()[nScreen]);
 }
 else // special case: fullscreen over all available screens
 {
 assert(m_bFullScreen);
 // left-most screen
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 int nLeftScreen = 
QApplication::desktop()->screenNumber(QPoint(0, 0));
+SAL_WNODEPRECATED_DECLARATIONS_POP
 // entire virtual desktop
 screenGeo = 
QApplication::screens()[nLeftScreen]->availableVirtualGeometry();
 pWindow->setScreen(QApplication::screens()[nLeftScreen]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac scp2/source

[Mike Kaganski (via logerrit)]

 configure.ac  |9 ++
 scp2/source/ooo/vc_redist.scp |   55 --
 2 files changed, 19 insertions(+), 45 deletions(-)

New commits:
commit a4681e8b74a59439110af42ff18cce021512056d
Author: Mike Kaganski 
AuthorDate: Mon Jan 13 13:08:02 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jan 13 13:00:04 2020 +0100

Merge both x64 and x86 CRT merge modules into x64 MSI

... because it contains x86 binaries in addition to x64: e.g., twain32shim,
spsupp_x86.

The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see
https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI.

And fix inclusion of CRT MSMs in VS2019, which were detected in 
configure.ac,
but not used in scp2/source/ooo/vc_redist.scp.

Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 55a32ad70734..04e110bc6133 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5660,11 +5660,6 @@ find_msvc_x64_dlls()
 
msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC142.CRT"
 break
 fi
-echo "$as_me:$LINENO: testing 
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC150.CRT" >&5
-if test -d 
"$VC_PRODUCT_DIR/redist/MSVC/$l/onecore/x64/Microsoft.VC150.CRT"; then
-
msvcdllpath="$VC_PRODUCT_DIR/redist/MSVC/$l/onecore/x64/Microsoft.VC150.CRT"
-break
-fi
 done
 ;;
 esac
@@ -7362,7 +7357,9 @@ if test $_os = "WINNT"; then
 MSVC_DLLS="$msvcdlls"
 MSM_PATH=`win_short_path_for_make "$msmdir"`
 # MSVC 15.3 changed it to VC141
-if echo "$msvcdllpath" | grep -q "VC141.CRT$"; then
+if echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
+SCPDEFS="$SCPDEFS -DWITH_VC142_REDIST"
+elif echo "$msvcdllpath" | grep -q "VC141.CRT$"; then
 SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"
 else
 SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 727c13b27615..d32758312766 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,57 +18,34 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC140_REDIST)
-
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86
-#endif
-Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC140_CRT_x64.msm";
-#else
-Name = "Microsoft_VC140_CRT_x86.msm";
-#endif
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
+#if defined(WITH_VC142_REDIST)
+#define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x64
+#define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC142_CRT_x64.msm"
+#define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x86
+#define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC142_CRT_x86.msm"
+#elif defined(WITH_VC141_REDIST)
+#define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x64
+#define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC141_CRT_x64.msm"
+#define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x86
+#define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC141_CRT_x86.msm"
 #endif
 
-#if defined(WITH_VC150_REDIST)
+#if defined(WINDOWS_X86_MERGEMODULE)
 
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC150_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC150_CRT_x86
-#endif
+MergeModule WINDOWS_X86_MERGEMODULE
 Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC150_CRT_x64.msm";
-#else
-Name = "Microsoft_VC150_CRT_x86.msm";
-#endif
+Name = WINDOWS_X86_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
 End
 
 #endif
 
-#if defined(WITH_VC141_REDIST)
+#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE)
 
-#if defined WINDOWS_X64
-MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64
-#else
-MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86
-#endif
+MergeModule WINDOWS_X64_MERGEMODULE
 Feature = gm_Root;
-#if defined WINDOWS_X64
-Name = "Microsoft_VC141_CRT_x64.msm";
-#else
-Name = "Microsoft_VC141_CRT_x86.msm";
-#endif
+Name = WINDOWS_X64_MERGEMODULE_FILE;
 RootDir = "TARGETDIR";
 ComponentCondition = "VC_REDIST=1";
 End
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bakos Attila (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf128207.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|8 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 
 writerfilter/source/dmapper/GraphicImport.cxx |5 +
 writerfilter/source/dmapper/GraphicImport.hxx |2 ++
 5 files changed, 19 insertions(+)

New commits:
commit 4fcc04d134644a3013df7f331fe36072b96adb9f
Author: Bakos Attila 
AuthorDate: Fri Jan 10 10:49:14 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 13 12:27:47 2020 +0100

tdf#128207: DOCX import: fix chart positioning

Embedded graphic objects had got 0 values for vertical and horizontal
positioning before, resulting overlapping, hidden charts,
but now they are positioned according to the values in the document.

Change-Id: Ia5403ac65ff7192d61072e8a9d8a7f80c7178b9b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86521
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit d9c535ead688e9f156dbcf43948df08a69e218be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86536
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf128207.docx 
b/sw/qa/extras/ooxmlexport/data/tdf128207.docx
new file mode 100644
index ..c234ec8bc10f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf128207.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 062831503404..516d65d9bcb8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -34,6 +34,14 @@ protected:
 }
 };
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128207, "tdf128207.docx")
+{
+//There was the charts on each other, because their horizontal and 
vertical position was 0!
+xmlDocPtr p_XmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(p_XmlDoc);
+assertXPathContent(p_XmlDoc, 
"/w:document/w:body/w:p[1]/w:r[1]/w:drawing/wp:anchor/wp:positionH/wp:posOffset",
 "4445");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf87569v, "tdf87569_vml.docx")
 {
 //the original tdf87569 sample has vml shapes...
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f60d188c4c01..0f79bb73334e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6101,6 +6101,10 @@ void  DomainMapper_Impl::ImportGraphic(const 
writerfilter::Reference< Properties
 
 // Update the shape properties if it is embedded object.
 if(m_xEmbedded.is()){
+if (m_pGraphicImport->GetXShapeObject())
+m_pGraphicImport->GetXShapeObject()->setPosition(
+m_pGraphicImport->GetGraphicObjectPosition());
+
 uno::Reference xShape = 
m_pGraphicImport->GetXShapeObject();
 UpdateEmbeddedShapeProps(xShape);
 if (eGraphicImportType == IMPORT_AS_DETECTED_ANCHOR)
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx 
b/writerfilter/source/dmapper/GraphicImport.cxx
index da2b9ce04ef4..df4ae45f7671 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -424,6 +424,11 @@ GraphicImport::~GraphicImport()
 {
 }
 
+com::sun::star::awt::Point GraphicImport::GetGraphicObjectPosition()
+{
+return (com::sun::star::awt::Point(m_pImpl->nLeftPosition, 
m_pImpl->nTopPosition));
+}
+
 void GraphicImport::handleWrapTextValue(sal_uInt32 nVal)
 {
 switch (nVal)
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx 
b/writerfilter/source/dmapper/GraphicImport.hxx
index d83f41cb161d..7807e48ede00 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -99,6 +99,8 @@ public:
 bool IsGraphic() const;
 sal_Int32 GetLeftMarginOrig() const;
 
+com::sun::star::awt::Point GetGraphicObjectPosition();
+
  private:
 // Properties
 virtual void lcl_attribute(Id Name, Value & val) override;
___
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.2' - sfx2/source

[Michael Meeks (via logerrit)]

 sfx2/source/doc/docfile.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a33f4b8cf2221f1a70dd202c71e82c4778d05125
Author: Michael Meeks 
AuthorDate: Mon Jan 13 11:13:54 2020 +
Commit: Michael Meeks 
CommitDate: Mon Jan 13 11:16:32 2020 +

WaE: unused pLockData.

Change-Id: I3c074405f8645caf889f145a6f09f9f680d5a6b8

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 793e5cb9a01d..6bb27698673a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1125,6 +1125,7 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand(bool bLoading, bool bN
 (void) bLoading;
 (void) bNoUI;
 (void) bTryIgnoreLockFile;
+(void) pLockData;
 return LockFileResult::Succeeded;
 #else
 LockFileResult eResult = LockFileResult::Failed;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis (via logerrit)]

 package/inc/ThreadedDeflater.hxx   |   29 ---
 package/source/zipapi/ThreadedDeflater.cxx |  118 +++--
 package/source/zipapi/ZipOutputEntry.cxx   |   32 ++-
 3 files changed, 109 insertions(+), 70 deletions(-)

New commits:
commit 353d4528b8ad8abca9a13f3016632e42bab7afde
Author: Dennis Francis 
AuthorDate: Sat Jan 11 11:51:34 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jan 13 12:11:44 2020 +0100

tdf#125662: do parallel-zip in batches

In this approach the input stream is read one batch (of constant size)
at a time and each batch is compressed by ThreadedDeflater. After
we are done with a batch, the deflated buffer is processed straightaway
(directed to file backed storage).

Change-Id: I2d42f86cf5898e4d746836d94bf6009a8d3b0230
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86596
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/package/inc/ThreadedDeflater.hxx b/package/inc/ThreadedDeflater.hxx
index 3bd7e4bc966a..f22a40a0c941 100644
--- a/package/inc/ThreadedDeflater.hxx
+++ b/package/inc/ThreadedDeflater.hxx
@@ -21,37 +21,48 @@
 #define INCLUDED_PACKAGE_THREADEDDEFLATER_HXX
 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace ZipUtils
 {
 /// Parallel compression a stream using the libz deflate algorithm.
 ///
-/// Almost a replacement for the Deflater class. Call startDeflate() with the 
data,
-/// check with finished() or waitForTasks() and retrieve result with 
getOutput().
-/// The class will internally split into multiple threads.
+/// Call deflateWrite() with the input stream and input/output processing 
functions.
+/// This will use multiple threads for compression on each batch of data from 
the stream.
 class ThreadedDeflater final
 {
 class Task;
 // Note: All this should be lock-less. Each task writes only to its part
-// of the data, flags are atomic.
+// of the data.
 std::vector> outBuffers;
 std::shared_ptr threadTaskTag;
 css::uno::Sequence inBuffer;
+css::uno::Sequence prevDataBlock;
+std::function&, sal_Int32)> 
maProcessOutputFunc;
+sal_Int64 totalIn;
+sal_Int64 totalOut;
 int zlibLevel;
-std::atomic pendingTasksCount;
 
 public:
 // Unlike with Deflater class, bNoWrap is always true.
 ThreadedDeflater(sal_Int32 nSetLevel);
 ~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE;
-void startDeflate(const css::uno::Sequence& rBuffer);
-void waitForTasks();
-bool finished() const;
-css::uno::Sequence getOutput() const;
+void deflateWrite(
+const css::uno::Reference& xInStream,
+std::function&, sal_Int32)> 
aProcessInputFunc,
+std::function&, sal_Int32)> 
aProcessOutputFunc);
+sal_Int64 getTotalIn() const { return totalIn; }
+sal_Int64 getTotalOut() const { return totalOut; }
+
+private:
+void processDeflatedBuffers();
 void clear();
 };
 
diff --git a/package/source/zipapi/ThreadedDeflater.cxx 
b/package/source/zipapi/ThreadedDeflater.cxx
index 19bbda01bbb7..73725c580c02 100644
--- a/package/source/zipapi/ThreadedDeflater.cxx
+++ b/package/source/zipapi/ThreadedDeflater.cxx
@@ -44,14 +44,19 @@ class ThreadedDeflater::Task : public comphelper::ThreadTask
 ThreadedDeflater* deflater;
 int sequence;
 int blockSize;
+bool firstTask : 1;
+bool lastTask : 1;
 
 public:
-Task(ThreadedDeflater* deflater_, int sequence_, int blockSize_)
+Task(ThreadedDeflater* deflater_, int sequence_, int blockSize_, bool 
firstTask_,
+ bool lastTask_)
 : comphelper::ThreadTask(deflater_->threadTaskTag)
 , stream()
 , deflater(deflater_)
 , sequence(sequence_)
 , blockSize(blockSize_)
+, firstTask(firstTask_)
+, lastTask(lastTask_)
 {
 }
 
@@ -61,58 +66,83 @@ private:
 
 ThreadedDeflater::ThreadedDeflater(sal_Int32 nSetLevel)
 : threadTaskTag(comphelper::ThreadPool::createThreadTaskTag())
+, totalIn(0)
+, totalOut(0)
 , zlibLevel(nSetLevel)
-, pendingTasksCount(0)
 {
 }
 
-ThreadedDeflater::~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE
-{
-waitForTasks();
-clear();
-}
+ThreadedDeflater::~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE { clear(); }
 
-void ThreadedDeflater::startDeflate(const uno::Sequence& rBuffer)
+void ThreadedDeflater::deflateWrite(
+const css::uno::Reference& xInStream,
+std::function&, sal_Int32)> 
aProcessInputFunc,
+std::function&, sal_Int32)> 
aProcessOutputFunc)
 {
-inBuffer = rBuffer;
-sal_Int64 size = inBuffer.getLength();
-int tasksCount = (size + MaxBlockSize - 1) / MaxBlockSize;
-tasksCount = std::max(tasksCount, 1);
-pendingTasksCount = tasksCount;
-outBuffers.resize(pendingTasksCount);
-for (int sequence = 0; sequence < tasksCount; ++sequence)
+sal_Int64 nThreadCount = 
comphelper::ThreadPool::getSharedOptimalPool().getWorkerCount()

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

[Onur Yilmaz (via logerrit)]

 svx/source/dialog/searchcharmap.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9dce33e6943dec5ff111802ec3e7c338abf56592
Author: Onur Yilmaz 
AuthorDate: Sat Jan 11 19:45:34 2020 +0300
Commit: Michael Stahl 
CommitDate: Mon Jan 13 12:11:29 2020 +0100

Proper integer in SvxSearchCharSet::LastInView

At the recommendation of comment in Patch Set 6:

https://gerrit.libreoffice.org/c/core/+/85960/6/svx/source/dialog/searchcharmap.cxx#54

Change-Id: Ie2799b5e609b4843907a0a3e361ab4253b6cb9a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86611
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/svx/source/dialog/searchcharmap.cxx 
b/svx/source/dialog/searchcharmap.cxx
index 09868195aa66..09517c8fd117 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -53,9 +53,9 @@ 
SvxSearchCharSet::SvxSearchCharSet(std::unique_ptr pScroll
 
 int SvxSearchCharSet::LastInView() const
 {
-sal_uInt32 nIndex = FirstInView();
+int nIndex = FirstInView();
 nIndex += ROW_COUNT * COLUMN_COUNT - 1;
-sal_uInt32 nCompare = sal::static_int_cast(nCount - 1);
+int nCompare = nCount - 1;
 if (nIndex > nCompare)
 nIndex = nCompare;
 return nIndex;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source include/comphelper package/source

[Dennis Francis (via logerrit)]

 comphelper/Library_comphelper.mk   |1 
 comphelper/source/misc/meminfo.cxx |  140 -
 include/comphelper/meminfo.hxx |   37 --
 package/source/zippackage/ZipPackageStream.cxx |5 
 4 files changed, 1 insertion(+), 182 deletions(-)

New commits:
commit d98cc8f881673f64f0a1fa35eea8610fb5b083e3
Author: Dennis Francis 
AuthorDate: Sat Jan 11 11:48:42 2020 +0530
Commit: Dennis Francis 
CommitDate: Mon Jan 13 12:09:28 2020 +0100

Revert "tdf#125662: disable parallel-zip if the memory..."

This reverts commit 0b8ae8725083eb0526a262d434cc06fb3f3e7336.
A better fix will follow this patch.

Change-Id: I4ff8d71bf2401bae2e2071c369e3746b8b7c72bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86595
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index b5de3f58b36a..e0bf1a8574f5 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -117,7 +117,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
 comphelper/source/misc/listenernotification \
 comphelper/source/misc/logging \
 comphelper/source/misc/lok \
-comphelper/source/misc/meminfo \
 comphelper/source/misc/mimeconfighelper \
 comphelper/source/misc/namedvaluecollection \
 comphelper/source/misc/numberedcollection \
diff --git a/comphelper/source/misc/meminfo.cxx 
b/comphelper/source/misc/meminfo.cxx
deleted file mode 100644
index 72a55addd4d5..
--- a/comphelper/source/misc/meminfo.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-#include 
-
-#if defined(_WIN32)
-
-#define WIN32_LEAN_AND_MEAN
-#include 
-#include 
-
-#elif defined(UNX)
-
-#if defined(MACOSX)
-#include 
-#include 
-#include 
-#include 
-
-#else // Linux
-#include 
-#include 
-#endif
-
-#endif
-
-namespace comphelper
-{
-// Returns the virtual memory used currently by the process.
-static sal_Int64 getMemUsedBySelf()
-{
-#if defined(UNX)
-#if defined(MACOSX)
-
-vm_size_t pageSize;
-struct task_basic_info tInfo;
-mach_msg_type_number_t tInfoCount = TASK_BASIC_INFO_COUNT;
-
-if (host_page_size(mach_host_self(), &pageSize) != KERN_SUCCESS)
-return -1;
-
-if (task_info(mach_task_self(), TASK_BASIC_INFO, 
reinterpret_cast(&tInfo),
-  &tInfoCount)
-!= KERN_SUCCESS)
-return -1;
-
-return static_cast(tInfo.virtual_size) * pageSize;
-
-#elif defined(LINUX)
-
-sal_Int64 pageSize = sysconf(_SC_PAGESIZE);
-if (pageSize <= 0)
-return -1;
-
-std::ifstream ifs("/proc/self/statm", std::ifstream::in);
-if (!ifs.is_open())
-return -1;
-
-sal_Int64 vmSize;
-if (ifs >> vmSize)
-return vmSize * pageSize;
-
-return -1;
-
-#else
-
-return -1;
-
-#endif
-
-#elif defined(_WIN32)
-
-PROCESS_MEMORY_COUNTERS_EX pmc;
-GetProcessMemoryInfo(GetCurrentProcess(), 
reinterpret_cast(&pmc),
- sizeof(pmc));
-return static_cast(pmc.PrivateUsage);
-
-#else
-
-return -1;
-
-#endif
-}
-
-static sal_Int64 getMaxAddressableMemLimit()
-{
-#if defined(_WIN64)
-return 8796093022208ll; // 8 TB
-#elif defined(_WIN32)
-return 2147483648ll; // 2 GB
-#elif defined(__x86_64__)
-// TODO: check for artificial limits imposed by 'ulimit -Sv' too for UNX ?
-return 140737488355328ll; // 128 TB
-#elif defined(__i386__)
-return 3221225472ll; // 3 GB
-#else
-return 2147483648ll; // 2 GB
-#endif
-}
-
-// canAlloc() checks whether allocSize bytes can be allocated without exceeding
-// addressable memory limit. This is useful in case of 32-bit systems where
-// process addressable memory limit is less than physical memory limit.
-bool canAlloc(sal_Int64 allocSize)
-{
-if (allocSize <= 0)
-return true;
-
-sal_Int64 vmSize = getMemUsedBySelf();
-if (vmSize < 0)
-return true;
-
-sal_Int64 maxSize = getMaxAddressableMemLimit();
-
-if (vmSize + allocSize <= maxSize)
- 

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 714b7a76665655dc5d090c6ab4a715c085b52739
Author: Stephan Bergmann 
AuthorDate: Mon Jan 13 10:02:27 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Jan 13 12:03:17 2020 +0100

solenv/flatpak-manifest.in: Merge "remove dconf access"




Change-Id: If2af9110b07518fb0fb2c65ca490f9e1125de8a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index b4bf47bc3971..3597800e42d5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -611,13 +611,10 @@
 "--socket=pulseaudio",
 "--device=dri",
 "--filesystem=host",
-"--filesystem=xdg-run/dconf",
-"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
 "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
 "--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
-"--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
 ]
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen (via logerrit)]

 sfx2/IwyuFilter_sfx2.yaml |   27 ++
 sfx2/source/dialog/alienwarn.cxx  |3 --
 sfx2/source/dialog/backingcomp.cxx|   18 
 sfx2/source/dialog/backingwindow.cxx  |   10 --
 sfx2/source/dialog/basedlgs.cxx   |   10 --
 sfx2/source/dialog/bluthsnd.cxx   |3 --
 sfx2/source/dialog/charmappopup.cxx   |1 
 sfx2/source/dialog/dialoghelper.cxx   |5 ---
 sfx2/source/dialog/dinfdlg.cxx|   10 --
 sfx2/source/dialog/dockwin.cxx|7 
 sfx2/source/dialog/filedlghelper.cxx  |   17 ---
 sfx2/source/dialog/filtergrouping.cxx |3 --
 sfx2/source/dialog/infobar.cxx|2 -
 sfx2/source/dialog/inputdlg.cxx   |1 
 sfx2/source/dialog/mailmodel.cxx  |   16 ---
 sfx2/source/dialog/mgetempl.cxx   |3 --
 sfx2/source/dialog/navigat.cxx|1 
 sfx2/source/dialog/partwnd.cxx|   10 --
 sfx2/source/dialog/passwd.cxx |1 
 sfx2/source/dialog/printopt.cxx   |2 -
 sfx2/source/dialog/recfloat.cxx   |2 -
 sfx2/source/dialog/sfxdlg.cxx |2 -
 sfx2/source/dialog/splitwin.cxx   |5 ---
 sfx2/source/dialog/srchdlg.cxx|1 
 sfx2/source/dialog/styledlg.cxx   |1 
 sfx2/source/dialog/tabdlg.cxx |   11 ---
 sfx2/source/dialog/templdlg.cxx   |9 --
 sfx2/source/dialog/tplcitem.cxx   |1 
 sfx2/source/dialog/versdlg.cxx|2 -
 sfx2/source/doc/DocumentMetadataAccess.cxx|3 --
 sfx2/source/doc/DocumentSigner.cxx|4 --
 sfx2/source/doc/Metadatable.cxx   |2 -
 sfx2/source/doc/SfxDocumentMetaData.cxx   |4 --
 sfx2/source/doc/SfxRedactionHelper.cxx|4 --
 sfx2/source/doc/autoredactdialog.cxx  |   12 
 sfx2/source/doc/docfac.cxx|8 -
 sfx2/source/doc/docfile.cxx   |   22 ---
 sfx2/source/doc/docfilt.cxx   |4 --
 sfx2/source/doc/docinsert.cxx |1 
 sfx2/source/doc/docmacromode.cxx  |2 -
 sfx2/source/doc/doctempl.cxx  |   21 --
 sfx2/source/doc/doctemplates.cxx  |5 ---
 sfx2/source/doc/doctemplateslocal.cxx |3 --
 sfx2/source/doc/docundomanager.cxx|2 -
 sfx2/source/doc/frmdescr.cxx  |2 -
 sfx2/source/doc/graphhelp.cxx |9 --
 sfx2/source/doc/guisaveas.cxx |   23 ---
 sfx2/source/doc/iframe.cxx|3 --
 sfx2/source/doc/new.cxx   |2 -
 sfx2/source/doc/objcont.cxx   |   23 ---
 sfx2/source/doc/objembed.cxx  |9 ++
 sfx2/source/doc/objmisc.cxx   |   23 +--
 sfx2/source/doc/objserv.cxx   |   32 ++
 sfx2/source/doc/objstor.cxx   |   24 
 sfx2/source/doc/objxtor.cxx   |   26 -
 sfx2/source/doc/oleprops.cxx  |2 -
 sfx2/source/doc/ownsubfilterservice.cxx   |1 
 sfx2/source/doc/printhelper.cxx   |8 -
 sfx2/source/doc/sfxbasemodel.cxx  |   15 --
 sfx2/source/doc/templatedlg.cxx   |3 --
 sfx2/source/doc/zoomitem.cxx  |3 --
 sfx2/source/explorer/nochaos.cxx  |1 
 sfx2/source/inet/inettbc.cxx  |   10 --
 sfx2/source/notebookbar/ContextVBox.cxx   |1 
 sfx2/source/notebookbar/DropdownBox.cxx   |2 -
 sfx2/source/notebookbar/NotebookbarTabControl.cxx |3 --
 sfx2/source/notebookbar/PriorityHBox.cxx  |2 -
 sfx2/source/notebookbar/PriorityMergedHBox.cxx|3 --
 sfx2/source/notebookbar/SfxNotebookBar.cxx|3 --
 sfx2/source/notify/eventsupplier.cxx  |4 --
 sfx2/source/notify/globalevents.cxx   |3 --
 sfx2/source/notify/hintpost.cxx   |3 --
 sfx2/source/notify/openurlhint.cxx|1 
 73 files changed, 46 insertions(+), 479 deletions(-)

New commits:
commit f7804fc28bc65de4938d67d6f8a19f1eacab3341
Author: Gabor Kelemen 
AuthorDate: Fri Jan 3 00:41:00 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 13 11:50:28 2020 +0100

tdf#42949 Fix IWYU warnings in sfx2/source/[d-n]*/*cxx

Found with bin/find-unneeded-includes
   

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

[Mesut Çifci (via logerrit)]

 sw/source/core/layout/flowfrm.cxx |  163 ++
 1 file changed, 78 insertions(+), 85 deletions(-)

New commits:
commit c1482ce923ef033b5db989524d836a3bb4148b0d
Author: Mesut Çifci 
AuthorDate: Tue Dec 31 08:55:38 2019 +0300
Commit: Michael Stahl 
CommitDate: Mon Jan 13 11:38:01 2020 +0100

tdf#90834: Turn in-line version control history comments into good comments

Change-Id: Ia04b7d4ed5876db8f2f5bed2c8f28af2c203877b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86039
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/flowfrm.cxx 
b/sw/source/core/layout/flowfrm.cxx
index 587c96d7e809..8f4d804f1b00 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -287,7 +287,7 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const SwPageFrame 
*pPage, const SwRect
 // If the SurroundObj is anchored in a character bound Fly, and I'm not
 // a Lower of that character bound Fly myself, then the Fly doesn't matter.
 
-// #32639# If the object is anchored with me, i can ignore it, because
+// If the object is anchored with me, i can ignore it, because
 // it's likely that it will follow me with the flow. A test formatting is
 // not allowed in that case, however!
 sal_uInt8 nRet = 0;
@@ -304,13 +304,12 @@ sal_uInt8 SwFlowFrame::BwdMoveNecessary( const 
SwPageFrame *pPage, const SwRect
 const SwSortedObjs *pObjs = pPage ? pPage->GetSortedObjs() : nullptr;
 if (pObjs)
 {
-// #i28701# - new type 
+
 const SwSortedObjs &rObjs = *pObjs;
 sal_uLong nIndex = ULONG_MAX;
 for ( size_t i = 0; nRet < 3 && i < rObjs.size(); ++i )
 {
-// #i28701# - consider changed type of
-//  entries.
+
 SwAnchoredObject* pObj = rObjs[i];
 const SwFrameFormat& rFormat = pObj->GetFrameFormat();
 const SwRect aRect( pObj->GetObjRect() );
@@ -395,7 +394,7 @@ SwLayoutFrame *SwFlowFrame::CutTree( SwFrame *pStart )
 if ( pLay->IsInFootnote() )
 pLay = pLay->FindFootnoteFrame();
 
-// #i58846#
+// i#58846
 //  only for frames in footnotes
 if( pStart->IsInFootnote() )
 {
@@ -487,7 +486,7 @@ bool SwFlowFrame::PasteTree( SwFrame *pStart, SwLayoutFrame 
*pParent, SwFrame *p
 if ( nullptr == (pStart->mpPrev = pParent->Lower()) )
 pParent->m_pLower = pStart;
 else
-//Modified for #i100782#,04/03/2009
+//i#100782
 //If the pParent has more than 1 child nodes, former design will
 //ignore them directly without any collection work. It will make some
 //dangling pointers. This lead the crash...
@@ -508,9 +507,9 @@ bool SwFlowFrame::PasteTree( SwFrame *pStart, SwLayoutFrame 
*pParent, SwFrame *p
 }
 }
 }
-//End modification for #i100782#,04/03/2009
 
-// #i27145#
+
+// i#27145
 if ( pParent->IsSctFrame() )
 {
 // We have no sibling because pParent is a section frame and
@@ -590,7 +589,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, 
SwFrame* pSibling )
 if ( pPre )
 {
 pPre->SetRetouche();
-// #115759# - follow-up of #i26250#
+// follow-up of i#26250
 // invalidate printing area of previous frame, if it's in a table
 if ( pPre->GetUpper()->IsInTab() )
 {
@@ -623,8 +622,7 @@ void SwFlowFrame::MoveSubTree( SwLayoutFrame* pParent, 
SwFrame* pSibling )
 // If, by cutting & pasting, an empty SectionFrame came into existence, it 
should
 // disappear automatically.
 SwSectionFrame *pSct;
-// #126020# - adjust check for empty section
-// #130797# - correct fix #126020#
+
 if ( pOldParent && !pOldParent->Lower() &&
  ( pOldParent->IsInSct() &&
!(pSct = pOldParent->FindSctFrame())->ContainsContent() &&
@@ -788,7 +786,7 @@ SwLayoutFrame *SwFrame::GetLeaf( MakePageType eMakePage, 
bool bFwd )
 if ( IsInFootnote() )
 return bFwd ? GetNextFootnoteLeaf( eMakePage ) : GetPrevFootnoteLeaf( 
eMakePage );
 
-// #i53323#
+// i#53323
 // A frame could be inside a table AND inside a section.
 // Thus, it has to be determined, which is the first parent.
 bool bInTab( IsInTab() );
@@ -962,9 +960,9 @@ SwLayoutFrame *SwFrame::GetNextLeaf( MakePageType eMakePage 
)
 
 SwPageFrame *pNew = pLayLeaf->FindPageFrame();
 const SwViewShell *pSh = getRootFrame()->GetCurrShell();
-// #111704# The pagedesc check does not make sense for frames in 
fly frames
+// The pagedesc check does not make sense for frames in fly frames
 if ( pNew != FindPageFrame() && !bNewPg && !IsInFly() &&
- // #i46683#
+ // i#46683
  // Do not consider page descriptions in browse mode (since
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/check-elf-dynamic-objects configure.ac download.lst external/libffi external/Module_external.mk external/python3 Makefile.fetch readlicen

[Michael Stahl (via logerrit)]

 Makefile.fetch  |1 
 RepositoryExternal.mk   |6 +
 bin/check-elf-dynamic-objects   |3 --
 configure.ac|3 ++
 download.lst|2 +
 external/Module_external.mk |1 
 external/libffi/ExternalProject_libffi.mk   |   33 
 external/libffi/Makefile|7 +
 external/libffi/Module_libffi.mk|   17 ++
 external/libffi/README  |3 ++
 external/libffi/UnpackedTarball_libffi.mk   |   14 +++
 external/python3/ExternalProject_python3.mk |   13 +--
 readlicense_oo/license/license.xml  |   23 +++
 13 files changed, 121 insertions(+), 5 deletions(-)

New commits:
commit 6b5ce621ff2a82d4fa77d7781d1dabd4b14a4c90
Author: Michael Stahl 
AuthorDate: Thu Jan 9 15:06:07 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 13 11:14:30 2020 +0100

python3: bundle libffi for GNU/Linux builds

CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979:
Remove bundled copy of libffi" causes a bit of a problem because it
turns out that libffi isn't all that stable; there's libffi.so.5 on
CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on
lo_daily_update_gandalf tinderbox.

So we have to bundle it in LO; it's only used on GNU/Linux currently.

CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947:
Update Windows to the current version of libffi (GH-11797)" also removes
the libffi for MSVC, so in a future python upgrade we will have to build
libffi for MSVC too.

The libffi fork for MacOSX is still in CPython git master.

(regression from b10be5d48433076f0b7238d818020f708553e114)

Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500
Reviewed-by: Caolán McNamara 

diff --git a/Makefile.fetch b/Makefile.fetch
index d8d63cbb9523..0932b761adaf 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -154,6 +154,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBASSUAN,LIBASSUAN_TARBALL) \
$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
$(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \
+   $(call fetch_Optional,LIBFFI,LIBFFI_TARBALL) \
$(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8561ba84a0ea..9f172d6af448 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3169,6 +3169,12 @@ endif
 
 endef
 
+# this is only used by python currently
+define gb_ExternalProject__use_libffi
+$(call gb_ExternalProject_use_external_project,$(1),libffi)
+
+endef
+
 endif # SYSTEM_PYTHON
 
 # ORCUS
diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index d1b7ab5522f4..c619fc0cdfc5 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -111,9 +111,6 @@ local file="$1"
 # skip the majority of files, no ELF binaries here
 skip=1
 ;;
-*/_ctypes.cpython-*.so)
-whitelist="${whitelist} libffi.so.6" # TODO dubious?
-;;
 */_uuid.cpython-*.so)
 whitelist="${whitelist} libuuid.so.1"
 ;;
diff --git a/configure.ac b/configure.ac
index c239b1f66794..a14eff9b893a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8765,6 +8765,9 @@ internal)
 fi
 AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
 BUILD_TYPE="$BUILD_TYPE PYTHON"
+if test "$OS" = LINUX; then
+BUILD_TYPE="$BUILD_TYPE LIBFFI"
+fi
 # Embedded Python dies without Home set
 if test "$HOME" = ""; then
 export HOME=""
diff --git a/download.lst b/download.lst
index f1769774540a..8895fc25a1b0 100644
--- a/download.lst
+++ b/download.lst
@@ -146,6 +146,8 @@ export LIBEOT_SHA256SUM := 
cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_SHA256SUM := 
13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
 export LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.5.tar.xz
+export LIBFFI_SHA256SUM := 
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
+export LIBFFI_TARBALL := libffi-3.3.tar.gz
 export LIBGPGERROR_SHA256SUM := 
4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
 export LIBGPGERROR_TARBAL

Re: license statement

[Stephan Bergmann]

On 18/12/2019 21:44, Mesut Çifci wrote:

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


put on file as 
 
"added Mesut Çifci"


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

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

[Michael Stahl (via logerrit)]

 offapi/com/sun/star/style/ParagraphProperties.idl |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 88ff7edb95602648ac5bd00b29262cbe02f8bf83
Author: Michael Stahl 
AuthorDate: Fri Jan 10 16:20:34 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Jan 13 11:00:45 2020 +0100

offapi: misleadingly named ParaHyphenationMaxLeadingChars/Trailing

Change-Id: Iaf2fe6467b16b36c80ff8e4207b3749c7b34d39e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86565
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl 
b/offapi/com/sun/star/style/ParagraphProperties.idl
index 30aa9a28c608..6aca55d1b40f 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -334,13 +334,15 @@ published service ParagraphProperties
  */
 [optional, property] short ParaHyphenationMaxHyphens;
 
-/** specifies the maximum number of characters to remain before the
+/** specifies the minimum number of characters to remain before the
 hyphen character (when hyphenation is applied).
+@note Confusingly it is named Max but specifies a minimum.
  */
 [optional, property] short ParaHyphenationMaxLeadingChars;
 
-/** specifies the maximum number of characters to remain after the
+/** specifies the minimum number of characters to remain after the
 hyphen character (when hyphenation is applied).
+@note Confusingly it is named Max but specifies a minimum.
  */
 [optional, property] short ParaHyphenationMaxTrailingChars;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/chart/titleconverter.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9f4e9cacf02f6d6df939b2465b46d3398b68b8d5
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 08:45:41 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 10:58:54 2020 +0100

cid#1457613 Unchecked return value

Change-Id: I327f735a25fd3d33d571523a8c120b786d9c36ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86658
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/oox/source/drawingml/chart/titleconverter.cxx 
b/oox/source/drawingml/chart/titleconverter.cxx
index 9d35bf08ce69..fa79d0d9457a 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -290,8 +290,7 @@ void LegendConverter::legendEntriesFormatting(const 
Reference& rxDiagr
 for (const auto& rDataSeries : aDataSeriesSeq)
 {
 PropertySet aSeriesProp(rDataSeries);
-bool bVaryColorsByPoint = false;
-aSeriesProp.getProperty(bVaryColorsByPoint, 
PROP_VaryColorsByPoint);
+bool bVaryColorsByPoint = 
aSeriesProp.getBoolProperty(PROP_VaryColorsByPoint);
 
 if (bVaryColorsByPoint)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/source dbaccess/source oox/source package/source sfx2/source stoc/source testtools/source ucb/source

[Mesut Çifci (via logerrit)]

 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |3 +--
 dbaccess/source/core/api/column.cxx   |6 ++
 oox/source/core/filterdetect.cxx  |3 +--
 oox/source/shape/ShapeContextHandler.cxx  |3 +--
 package/source/zippackage/ZipPackageFolder.cxx|3 +--
 sfx2/source/appl/shutdownicon.cxx |3 +--
 stoc/source/implementationregistration/implreg.cxx|3 +--
 testtools/source/bridgetest/constructors.cxx  |3 +--
 ucb/source/ucp/cmis/cmis_repo_content.cxx |3 +--
 9 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit c4f0c87b2f4ac68accc202731e0328ab101a073e
Author: Mesut Çifci 
AuthorDate: Mon Jan 13 03:35:14 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Mon Jan 13 10:48:02 2020 +0100

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: I1c1e7b42211c51f572698efd3135e388f8fb2979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86648
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx 
b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 89e485cad0fe..a6fd0a7e3f8d 100644
--- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -106,8 +106,7 @@ sal_Bool VCLXAccessibleHeaderBarItem::supportsService( 
const OUString& rServiceN
 
 Sequence< OUString > VCLXAccessibleHeaderBarItem::getSupportedServiceNames()
 {
-Sequence< OUString > aNames { "com.sun.star.awt.AccessibleHeaderBarItem" };
-return aNames;
+return { "com.sun.star.awt.AccessibleHeaderBarItem" };
 }
 
 // XAccessible
diff --git a/dbaccess/source/core/api/column.cxx 
b/dbaccess/source/core/api/column.cxx
index 8b96a438292e..59780891c3a3 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -98,8 +98,7 @@ sal_Bool OColumn::supportsService( const OUString& 
_rServiceName )
 
 Sequence< OUString > OColumn::getSupportedServiceNames(  )
 {
-Sequence aSNS { SERVICE_SDBCX_COLUMN };
-return aSNS;
+return { SERVICE_SDBCX_COLUMN };
 }
 
 // OComponentHelper
@@ -190,8 +189,7 @@ sal_Bool OColumns::supportsService( const OUString& 
_rServiceName )
 
 Sequence< OUString > OColumns::getSupportedServiceNames(  )
 {
-Sequence aSNS { SERVICE_SDBCX_CONTAINER };
-return aSNS;
+return { SERVICE_SDBCX_CONTAINER };
 }
 
 void OColumns::append( const OUString& _rName, OColumn* _pColumn )
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c83dab9d6f74..8325752360ec 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -371,8 +371,7 @@ sal_Bool SAL_CALL FilterDetect::supportsService( const 
OUString& rServiceName )
 
 Sequence< OUString > SAL_CALL FilterDetect::getSupportedServiceNames()
 {
-Sequence aServiceNames { 
"com.sun.star.frame.ExtendedTypeDetection" };
-return aServiceNames;
+return { "com.sun.star.frame.ExtendedTypeDetection" };
 }
 
 // com.sun.star.document.XExtendedFilterDetection interface ---
diff --git a/oox/source/shape/ShapeContextHandler.cxx 
b/oox/source/shape/ShapeContextHandler.cxx
index acc8624af602..9db23f51b325 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -599,8 +599,7 @@ OUString ShapeContextHandler::getImplementationName()
 
 uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
 {
-uno::Sequence< OUString > s { 
"com.sun.star.xml.sax.FastShapeContextHandler" };
-return s;
+return { "com.sun.star.xml.sax.FastShapeContextHandler" };
 }
 
 sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & 
ServiceName)
diff --git a/package/source/zippackage/ZipPackageFolder.cxx 
b/package/source/zippackage/ZipPackageFolder.cxx
index fdc7231059a6..3a6b7ee19bbd 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -414,8 +414,7 @@ OUString ZipPackageFolder::getImplementationName()
 
 uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames()
 {
-uno::Sequence< OUString > aNames { "com.sun.star.packages.PackageFolder" };
-return aNames;
+return { "com.sun.star.packages.PackageFolder" };
 }
 
 sal_Bool SAL_CALL ZipPackageFolder::supportsService( OUString const & 
rServiceName )
diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index 8ec370eddc1c..740cbc702a63 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -100,8 +100,7 @@ sal_Bool SAL_CALL ShutdownIcon::supportsService(OUString 
const & ServiceName)
 
 css::uno::Sequence SAL_CALL ShutdownIcon::getSupportedServiceNames()
 {
-c

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

[Caolán McNamara (via logerrit)]

 oox/source/export/chartexport.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e111483bddecff4e874ad298f762cac42a010610
Author: Caolán McNamara 
AuthorDate: Mon Jan 13 08:46:28 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 10:44:48 2020 +0100

cid#1457617 Unchecked return value

Change-Id: I2ca1d1718b725b8a940d6500fcdc4aad21489524
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86659
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 62fc36cc5baa..02c2bdf951f4 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1104,8 +1104,7 @@ void ChartExport::exportLegend( const Reference< 
css::chart::XChartDocument >& x
 for (const auto& rCooSys : xCooSysSequence)
 {
 PropertySet aCooSysProp(rCooSys);
-bool bSwapXAndY = false;
-aCooSysProp.getProperty(bSwapXAndY, PROP_SwapXAndYAxis);
+bool bSwapXAndY = aCooSysProp.getBoolProperty(PROP_SwapXAndYAxis);
 
 Reference 
xChartTypeContainer(rCooSys, UNO_QUERY_THROW);
 const Sequence> 
xChartTypeSequence(xChartTypeContainer->getChartTypes());
@@ -1154,7 +1153,7 @@ void ChartExport::exportLegend( const Reference< 
css::chart::XChartDocument >& x
 }
 else
 {
-aSeriesProp.getProperty(bShowLegendEntry, 
PROP_ShowLegendEntry);
+bShowLegendEntry = 
aSeriesProp.getBoolProperty(PROP_ShowLegendEntry);
 if (!bShowLegendEntry)
 {
 pFS->startElement(FSNS(XML_c, XML_legendEntry));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/source xmlsecurity/source

[Mesut Çifci (via logerrit)]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx|3 +--
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx|3 +--
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |6 ++
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 4a372929c82e894601ab243a507061e1cfc6a59d
Author: Mesut Çifci 
AuthorDate: Fri Jan 10 17:06:33 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Mon Jan 13 10:41:01 2020 +0100

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: I7342275928e0231062f378942c567fe993b2a271
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86544
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 10b5441aa64f..07a65d6bda09 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -406,8 +406,7 @@ OUString SAL_CALL Content::getImplementationName()
 // virtual
 uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
 {
-uno::Sequence aSNS { WEBDAV_CONTENT_SERVICE_NAME };
-return aSNS;
+return { WEBDAV_CONTENT_SERVICE_NAME };
 }
 
 
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx 
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 421adfdf16e3..5b31fe984f50 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -569,8 +569,7 @@ sal_Bool SAL_CALL ONSSInitializer::supportsService( const 
OUString& rServiceName
 
 cssu::Sequence< OUString > SAL_CALL ONSSInitializer::getSupportedServiceNames( 
 )
 {
-cssu::Sequence aRet { NSS_SERVICE_NAME };
-return aRet;
+return { NSS_SERVICE_NAME };
 }
 
 #ifndef XMLSEC_CRYPTO_NSS
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 
b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index beefb82e0748..22ad88f24fc5 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -100,8 +100,7 @@ sal_Bool SAL_CALL SEInitializer_NssImpl::supportsService( 
const OUString& rServi
 }
 uno::Sequence< OUString > SAL_CALL 
SEInitializer_NssImpl::getSupportedServiceNames(  )
 {
-uno::Sequence seqServiceNames{ 
"com.sun.star.xml.crypto.SEInitializer" };
-return seqServiceNames;
+return { "com.sun.star.xml.crypto.SEInitializer" };
 }
 
 namespace {
@@ -128,8 +127,7 @@ OUString NSSInitializer_NssImpl::getImplementationName()
 
 uno::Sequence SAL_CALL 
NSSInitializer_NssImpl::getSupportedServiceNames()
 {
-uno::Sequence seqServiceNames{ 
"com.sun.star.xml.crypto.NSSInitializer" };
-return seqServiceNames;
+return { "com.sun.star.xml.crypto.NSSInitializer" };
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/inc/ndgrf.hxx|   32 
 sw/inc/unochart.hxx |   10 +-
 sw/source/core/graphic/ndgrf.cxx|  130 ++--
 sw/source/core/unocore/unochart.cxx |   78 ++---
 4 files changed, 125 insertions(+), 125 deletions(-)

New commits:
commit 467e355c6a947e12bc23b6d93e1a2cc0c778dc71
Author: Miklos Vajna 
AuthorDate: Mon Jan 13 09:33:03 2020 +0100
Commit: Miklos Vajna 
CommitDate: Mon Jan 13 10:25:28 2020 +0100

sw: prefix members of SwGrfNode and SwChartLabeledDataSequence

See tdf#94879 for motivation.

Change-Id: I6a752a952e41302620463682c3361fad7e639df4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86656
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 1a266ab7ee17..4bc668049d4b 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -37,13 +37,13 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
 
 GraphicObject maGrfObj;
 std::unique_ptr mpReplacementGraphic;
-tools::SvRef refLink;   ///< If graphics only as 
link then pointer is set.
-Size nGrfSize;
-bool bInSwapIn  :1;
+tools::SvRef mxLink;   ///< If graphics only as link 
then pointer is set.
+Size mnGrfSize;
+bool mbInSwapIn  :1;
 
-bool bChgTwipSize   :1;
-bool bFrameInPaint  :1; ///< To avoid Start-/EndActions in Paint 
via SwapIn.
-bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
+bool mbChangeTwipSize   :1;
+bool mbFrameInPaint  :1; ///< To avoid Start-/EndActions in Paint 
via SwapIn.
+bool mbScaleImageMap :1; ///< Scale image map in SetTwipSize.
 
 std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > 
mpThreadConsumer;
 bool mbLinkedInputStreamReady;
@@ -92,17 +92,17 @@ public:
 
 bool IsAnimated() const  { return maGrfObj.IsAnimated(); }
 
-bool IsChgTwipSize() const   { return bChgTwipSize; }
+bool IsChgTwipSize() const   { return mbChangeTwipSize; }
 void SetChgTwipSize( bool b)
 {
-bChgTwipSize = b;
+mbChangeTwipSize = b;
 }
 
-bool IsFrameInPaint() const  { return bFrameInPaint; }
-void SetFrameInPaint( bool b )   { bFrameInPaint = b; }
+bool IsFrameInPaint() const  { return mbFrameInPaint; }
+void SetFrameInPaint( bool b )   { mbFrameInPaint = b; }
 
-bool IsScaleImageMap() const { return bScaleImageMap; }
-void SetScaleImageMap( bool b )  { bScaleImageMap = b; }
+bool IsScaleImageMap() const { return mbScaleImageMap; }
+void SetScaleImageMap( bool b )  { mbScaleImageMap = b; }
 
 /// in ndcopy.cxx
 virtual SwContentNode* MakeCopy(SwDoc*, const SwNodeIndex&, bool 
bNewFrames) const override;
@@ -124,10 +124,10 @@ public:
 virtual bool RestorePersistentData() override;
 
 /// Query link-data.
-bool IsGrfLink() const  { return refLink.is(); }
+bool IsGrfLink() const  { return mxLink.is(); }
 bool IsLinkedFile() const;
 bool IsLinkedDDE() const;
-const tools::SvRef& GetLink() const{ return refLink; 
}
+const tools::SvRef& GetLink() const{ return mxLink; }
 bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const;
 void ReleaseLink();
 
@@ -161,12 +161,12 @@ inline const SwGrfNode   *SwNode::GetGrfNode() const
 
 inline bool SwGrfNode::IsLinkedFile() const
 {
-return refLink.is() && OBJECT_CLIENT_GRF == refLink->GetObjType();
+return mxLink.is() && OBJECT_CLIENT_GRF == mxLink->GetObjType();
 }
 
 inline bool SwGrfNode::IsLinkedDDE() const
 {
-return refLink.is() && OBJECT_CLIENT_DDE == refLink->GetObjType();
+return mxLink.is() && OBJECT_CLIENT_DDE == mxLink->GetObjType();
 }
 
 #endif
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index d52b5ebf7730..d7c87a53db88 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -328,13 +328,13 @@ SwChartLabeledDataSequenceBaseClass;
 class SwChartLabeledDataSequence final :
 public SwChartLabeledDataSequenceBaseClass
 {
-::comphelper::OInterfaceContainerHelper2   
aEvtListeners;
-::comphelper::OInterfaceContainerHelper2   
aModifyListeners;
+::comphelper::OInterfaceContainerHelper2   
m_aEventListeners;
+::comphelper::OInterfaceContainerHelper2   
m_aModifyListeners;
 
-css::uno::Reference< css::chart2::data::XDataSequence > xData;
-css::uno::Reference< css::chart2::data::XDataSequence > xLabels;
+css::uno::Reference< css::chart2::data::XDataSequence > m_xData;
+css::uno::Reference< css::chart2::data::XDataSequence > m_xLabels;
 
-boolbDisposed;
+boolm_bDisposed;
 
 SwChartLabeledDataSequence( const SwChartLabeledDataSequ

Re: LOOL master make check fail

[Miklos Vajna]

Hi Shivansh,

On Sat, Jan 11, 2020 at 08:11:58PM +0530, Shivansh Handa  
wrote:
> I built against the master branch with the last commit hash
> 7c29eb06ea2b8dad91a7836be3c387565658ad45, the last commit for core master
> branch is 2ab481b038b62b1ff576ac4d49d03c1798cd7f84.
> 
> The test that it is failing on is HTTPWSTest::testReloadWhileDisconnecting.
> I have uploaded a part of the log file, which should be able to cover the
> required logs(unable to paste it as file size exceed), If any other log is
> needed please let me know.
> Please help me out, log seems quite overwhelming.

Did you try running the test once more?

make check CPPUNIT_TEST_NAME="HTTPWSTest::testReloadWhileDisconnecting"

should be able to run just that test.

Sadly the online.git tests are less stable than the core.git ones, but
AFAIK the top of online.git master and core.git master has no
always-fail tests on the online side currently.

If it consistently fails for you, then it would be great to debug what
is the reason and improve the test.

Regards,

Miklos


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

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

[Caolán McNamara (via logerrit)]

 svtools/source/control/toolbarmenu.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 6c74c916652e38017c0097c131353d96b70e5414
Author: Caolán McNamara 
AuthorDate: Sun Jan 12 19:58:18 2020 +
Commit: Caolán McNamara 
CommitDate: Mon Jan 13 09:41:56 2020 +0100

if these popups have focus on dispose put focus into document

instead of an arbitrary window

Change-Id: Ib3af0ba6dabe94026b8548e88f7ecdc35907606f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86646
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index 7d74380a2d10..90bd3f3b53aa 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -1593,6 +1593,13 @@ void InterimToolbarPopup::GetFocus()
 
 void InterimToolbarPopup::dispose()
 {
+// if we have focus when disposed, pick the document window as destination
+// for focus rather than let it go to an arbitrary windows
+if (HasFocus())
+{
+if (auto xWindow = mxFrame->getContainerWindow())
+xWindow->setFocus();
+}
 // move the contents back where it belongs
 m_xContainer->move(m_xPopup->getContainer(), m_xPopup->getTopLevel());
 m_xPopup.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app android/lib loleaflet/po

[Weblate (via logerrit)]

 android/app/src/main/res/values-an/strings.xml |5 
 android/app/src/main/res/values-ast/strings.xml|5 
 android/app/src/main/res/values-bg/strings.xml |  102 ++-
 android/app/src/main/res/values-ca/strings.xml |4 
 android/app/src/main/res/values-eo/strings.xml |8 
 android/app/src/main/res/values-es/strings.xml |   12 
 android/app/src/main/res/values-fr/strings.xml |  102 ++-
 android/app/src/main/res/values-zh-rTW/strings.xml |   10 
 android/lib/src/main/res/values-bg/strings.xml |9 
 android/lib/src/main/res/values-eo/strings.xml |4 
 android/lib/src/main/res/values-fr/strings.xml |9 
 loleaflet/po/help-bg.po|  109 +++
 loleaflet/po/help-ca.po|   10 
 loleaflet/po/help-cs.po|   28 -
 loleaflet/po/help-cy.po|   81 ++---
 loleaflet/po/help-es.po|   24 -
 loleaflet/po/help-eu.po|  304 ++---
 loleaflet/po/help-fr.po|   85 ++---
 loleaflet/po/help-hsb.po   |   34 +-
 loleaflet/po/help-hu.po|   40 +-
 loleaflet/po/help-nl.po|   11 
 loleaflet/po/help-zh_TW.po |   13 
 loleaflet/po/ios-eo.po |   17 -
 loleaflet/po/ui-an.po  |   13 
 loleaflet/po/ui-ast.po |   10 
 loleaflet/po/ui-bg.po  |  130 
 loleaflet/po/ui-ca.po  |6 
 loleaflet/po/ui-cy.po  |   51 +--
 loleaflet/po/ui-eo.po  |8 
 loleaflet/po/ui-es.po  |8 
 loleaflet/po/ui-eu.po  |6 
 loleaflet/po/ui-nb.po  |   44 +--
 loleaflet/po/ui-zh_TW.po   |  129 
 33 files changed, 797 insertions(+), 634 deletions(-)

New commits:
commit 77e0f99c07e63d699abb78615a6829e214be9895
Author: Weblate 
AuthorDate: Sun Jan 12 23:17:00 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jan 13 09:35:44 2020 +0100

update translations

LibreOffice Online/android-app (Chinese (Traditional))
Currently translated at 7.1% (7 of 99 strings)

Change-Id: I1ceaa86db8879763ae029bc4942996dfa79d0973

update translations

LibreOffice Online/loleaflet-help (Chinese (Traditional))
Currently translated at 47.6% (198 of 416 strings)

Change-Id: I1c1848e73e53d0be044505ae7a687bf28d8578ca

update translations

LibreOffice Online/loleaflet-help (Hungarian)
Currently translated at 51.9% (216 of 416 strings)

Change-Id: Ibf3561376a333bc2b7766e50c90fb32ff7eb746d

update translations

LibreOffice Online/loleaflet-help (Basque)
Currently translated at 82.5% (343 of 416 strings)

Change-Id: Ic1bfb58a6c9ea4bbd5910314b5505336a6e91783

update translations

LibreOffice Online/loleaflet-ui (Chinese (Traditional))
Currently translated at 100.0% (282 of 282 strings)

Change-Id: Ib292d64b5a1acb65c3ea5edd37cafffcf34b1f2a

update translations

LibreOffice Online/loleaflet-ui (Catalan)
Currently translated at 97.5% (275 of 282 strings)

Change-Id: I1e1bad69cb9b1916d259a1ec65a512c56dd4fa3a

update translations

LibreOffice Online/loleaflet-ui (Bulgarian)
Currently translated at 100.0% (282 of 282 strings)

Change-Id: Iecdbfd73892365de7c650659537e99cffc431e1e

update translations

LibreOffice Online/android-app (Chinese (Traditional))
Currently translated at 7.1% (7 of 99 strings)

Change-Id: Ia75fd49836fa4ada900f9bf9961a97fb6a8def09

update translations

LibreOffice Online/loleaflet-help (Dutch)
Currently translated at 47.4% (197 of 416 strings)

Change-Id: I812cd246853d26ed7ce0ebef58fc8e839f5300c5

update translations

LibreOffice Online/loleaflet-ui (Chinese (Traditional))
Currently translated at 97.2% (274 of 282 strings)

Change-Id: Iedcd80e45a7062004c4395ae35bd90917c51ae6b

update translations

LibreOffice Online/loleaflet-ui (Bulgarian)
Currently translated at 81.6% (230 of 282 strings)

Change-Id: Ib4c3221aa9a7b0c1ff7c64c323d36239cf00fd63

update translations

LibreOffice Online/android-app (French)
Currently translated at 100.0% (99 of 99 strings)

Change-Id: I20b1d3949a277712a97ceaf907db75972ea216cf

update translations

LibreOffice Online/android-lib (French)
Currently translated at 100.0% (6 of 6 strings)

Change-Id: I3794a471ab784220ed74b2500371834eb7d2dad8

update translations

LibreOffice Online/loleaflet

[Libreoffice-commits] core.git: compilerplugins/clang extensions/source include/sfx2 include/svx include/vcl sc/source sfx2/source svx/source vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results |  222 +
 extensions/source/propctrlr/inspectorhelpwindow.cxx |   10 
 extensions/source/propctrlr/inspectorhelpwindow.hxx |4 
 include/sfx2/sidebar/SidebarToolBox.hxx |2 
 include/svx/colorwindow.hxx |3 
 include/svx/numvset.hxx |   38 --
 include/svx/tbcontrl.hxx|1 
 include/vcl/field.hxx   |1 
 include/vcl/lstbox.hxx  |1 
 include/vcl/toolbox.hxx |1 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |8 
 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx |1 
 sfx2/source/sidebar/SidebarToolBox.cxx  |8 
 svx/source/dialog/svxbmpnumvalueset.cxx |  335 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   14 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |1 
 svx/source/tbxctrls/tbcontrl.cxx|6 
 vcl/inc/svimpbox.hxx|1 
 vcl/source/control/field.cxx|   10 
 vcl/source/control/listbox.cxx  |   10 
 vcl/source/treelist/svimpbox.cxx|   15 
 vcl/source/window/toolbox2.cxx  |   22 -
 22 files changed, 88 insertions(+), 626 deletions(-)

New commits:
commit d5047c4a1cbae1cb2b57ed435ecd63e6817506d3
Author: Noel Grandin 
AuthorDate: Mon Jan 13 09:26:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 09:16:59 2020 +0100

loplugin:unusedmethods

Change-Id: I4eae284cf763b260dd9349bf8d31f46612916de1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86654
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 17b6cda32b75..ab53820ef05a 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -30,10 +30,6 @@ canvas/source/vcl/impltools.hxx:103
  vclcanvas::tools::LocalGuard::LocalGuard()
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:77
 void 
chart::ThreeD_SceneIllumination_TabPage::LinkStubfillControlsFromModel(void 
*,void *)
-chart2/source/view/inc/VSeriesPlotter.hxx:61
-_Bool chart::AxesNumberFormats::hasFormat(int,int) const
-chart2/source/view/inc/VSeriesPlotter.hxx:65
-int chart::AxesNumberFormats::getFormat(int,int) const
 connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51
 class com::sun::star::uno::Reference 
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
 connectivity/source/drivers/firebird/Driver.hxx:65
@@ -76,64 +72,6 @@ connectivity/source/inc/OTypeInfo.hxx:47
 _Bool connectivity::OTypeInfo::operator!=(const struct 
connectivity::OTypeInfo &) const
 cui/source/dialogs/SpellAttrib.hxx:72
 _Bool svx::SpellErrorDescription::operator==(const struct 
svx::SpellErrorDescription &) const
-cui/source/inc/backgrnd.hxx:47
- SvxBackgroundTabPage::SvxBackgroundTabPage(class weld::Container *,class 
weld::DialogController *,const class SfxItemSet &)
-cui/source/inc/backgrnd.hxx:48
-class std::unique_ptr > SvxBackgroundTabPage::Create(class weld::Container *,class 
weld::DialogController *,const class SfxItemSet *)
-cui/source/inc/backgrnd.hxx:52
-const unsigned short * SvxBackgroundTabPage::GetRanges()
-cui/source/inc/backgrnd.hxx:60
-void SvxBackgroundTabPage::ShowSelector()
-cui/source/inc/backgrnd.hxx:62
-void SvxBackgroundTabPage::ShowTblControl()
-cui/source/inc/backgrnd.hxx:133
-void SvxBackgroundTabPage::FillColorValueSets_Impl()
-cui/source/inc/backgrnd.hxx:134
-void SvxBackgroundTabPage::ShowColorUI_Impl()
-cui/source/inc/backgrnd.hxx:135
-void SvxBackgroundTabPage::HideColorUI_Impl()
-cui/source/inc/backgrnd.hxx:136
-void SvxBackgroundTabPage::ShowBitmapUI_Impl()
-cui/source/inc/backgrnd.hxx:137
-void SvxBackgroundTabPage::HideBitmapUI_Impl()
-cui/source/inc/backgrnd.hxx:138
-_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
-cui/source/inc/backgrnd.hxx:139
-void SvxBackgroundTabPage::RaiseLoadError_Impl()
-cui/source/inc/backgrnd.hxx:140
-void SvxBackgroundTabPage::SetGraphicPosition_Impl(enum SvxGraphicPosition)
-cui/source/inc/backgrnd.hxx:141
-enum SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl() 
const
-cui/source/inc/backgrnd.hxx:142
-void SvxBackgroundTabPage::FillControls_Impl(const class SvxBrushItem 
&,const class rtl::OUString &)
-cui/source/inc/backgrnd.hxx:145
-void SvxBackgroundTabPage::LinkStubLoadIdleHdl_Impl(void *,class Timer *)
-cui/source/inc/backgrnd.hxx:145
-void SvxBackgroundTabPage::LoadIdleHdl_Impl(class Timer *)
-cui/source/inc/backgrnd.hxx:146
-void SvxBackgroundTabPage::LinkStubSelectHdl_Impl(void *,class 
weld::ComboBox &)
-cui/source/inc/backg

[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source framework/inc framework/source include/svtools svtools/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  120 
+++
 compilerplugins/clang/unusedfields.readonly.results |   60 ++-
 compilerplugins/clang/unusedfields.untouched.results|  128 
++--
 compilerplugins/clang/unusedfields.writeonly.results|  152 
++
 dbaccess/source/filter/xml/xmlfilter.hxx|1 
 framework/inc/uielement/toolbarsmenucontroller.hxx  |1 
 framework/source/uielement/toolbarsmenucontroller.cxx   |1 
 include/svtools/inettbc.hxx |1 
 include/svtools/valueset.hxx|1 
 svtools/source/control/inettbc.cxx  |5 
 svtools/source/control/valueset.cxx |2 
 11 files changed, 216 insertions(+), 256 deletions(-)

New commits:
commit 748e354af826f2439982b69ffa99dce68378d1f1
Author: Noel Grandin 
AuthorDate: Mon Jan 13 08:55:43 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Jan 13 09:07:23 2020 +0100

loplugin:unusedfields

Change-Id: Iaf188bfd43396eeec31e62ac3de3fbc76da4331a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86653
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 113271d81797..3822fb535d35 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-libvlc_event_t u union (anonymous union at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+libvlc_event_t u union (anonymous union at 
/media/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
 libvlc_track_description_t psz_name char *
 basegfx/source/polygon/b2dtrapezoid.cxx:212
@@ -34,10 +34,10 @@ connectivity/source/commontools/RowFunctionParser.cxx:374
 connectivity::(anonymous namespace)::ExpressionGrammar::definition 
unaryFunction ::boost::spirit::rule
 connectivity/source/commontools/RowFunctionParser.cxx:375
 connectivity::(anonymous namespace)::ExpressionGrammar::definition 
assignment ::boost::spirit::rule
-connectivity/source/commontools/RowFunctionParser.cxx:376
-connectivity::(anonymous namespace)::ExpressionGrammar::definition integer 
::boost::spirit::rule
 connectivity/source/commontools/RowFunctionParser.cxx:376
 connectivity::(anonymous namespace)::ExpressionGrammar::definition 
argument ::boost::spirit::rule
+connectivity/source/commontools/RowFunctionParser.cxx:376
+connectivity::(anonymous namespace)::ExpressionGrammar::definition integer 
::boost::spirit::rule
 connectivity/source/commontools/RowFunctionParser.cxx:377
 connectivity::(anonymous namespace)::ExpressionGrammar::definition 
orExpression ::boost::spirit::rule
 connectivity/source/commontools/RowFunctionParser.cxx:377
@@ -80,8 +80,6 @@ cppcanvas/source/mtfrenderer/textaction.cxx:1643
 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo 
const tools::TextLineInfo
 cppu/source/threadpool/threadpool.cxx:361
 _uno_ThreadPool dummy sal_Int32
-cppu/source/typelib/typelib.cxx:59
-(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:38
 (anonymous namespace)::C1 n1 sal_Int16
 cppu/source/uno/check.cxx:67
@@ -114,6 +112,8 @@ cppu/source/uno/check.cxx:107
 (anonymous namespace)::P p2 double
 cppu/source/uno/check.cxx:115
 (anonymous namespace)::second a int
+cppu/source/uno/check.cxx:120
+(anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:126
 (anonymous namespace)::Char1 c1 char
 cppu/source/uno/check.cxx:130
@@ -126,36 +126,6 @@ cui/source/dialogs/colorpicker.cxx:737
 cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class 
cui::(anonymous namespace)::ColorPreviewControl
 cui/source/factory/dlgfact.cxx:1394
 (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
-cui/source/inc/backgrnd.hxx:71
-SvxBackgroundTabPage aBgdColor class Color
-cui/source/inc/backgrnd.hxx:72
-SvxBackgroundTabPage nHtmlMode sal_uInt16
-cui/source/inc/backgrnd.hxx:73
-SvxBackgroundTabPage bAllowShowSelector _Bool
-cui/source/inc/backgrnd.hxx:74
-Svx