[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loolwsd.spec.in

2019-09-11 Thread Andras Timar (via logerrit)
 loolwsd.spec.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 740a8e182024467199eb663e9147a4d88c6bdf84
Author: Andras Timar 
AuthorDate: Thu Sep 12 08:34:34 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 12 08:34:34 2019 +0200

update poco deps for openSUSE, because they updated poco in their repos

Change-Id: I8964d888fb998cc175a9efce4b0a43947d2f4ea0

diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index aa5c2c97c..aec8dfc56 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -68,7 +68,7 @@ Requires:   libcap2 libpng12-0 %{fillup_prereq}
 %if 0%{?suse_version} >= 1300
 Requires:   systemd
 Requires:   libopenssl1_0_0 libpcre1 libz1
-Requires:   libPocoCrypto60 >= 1.9.0 libPocoFoundation60 >= 1.9.0 
libPocoJSON60 >= 1.9.0 libPocoNet60 >= 1.9.0 libPocoNetSSL60 >= 1.9.0 
libPocoUtil60 >= 1.9.0 libPocoXML60 >= 1.9.0
+Requires:   libPocoCrypto63 >= 1.9.3 libPocoFoundation63 >= 1.9.3 
libPocoJSON63 >= 1.9.3 libPocoNet63 >= 1.9.3 libPocoNetSSL63 >= 1.9.3 
libPocoUtil63 >= 1.9.3 libPocoXML63 >= 1.9.3
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
do not have real dependencies)
 # cd /opt/collaboraoffice6.0/program ; for i in soffice.bin *.so ;do ldd $i | 
grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs 
rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
 Requires:   fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Michael Weghorn (via logerrit)
 svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit e49eb6c9968f3ccc4e24c3f0444221c20aefb7aa
Author: Michael Weghorn 
AuthorDate: Thu Sep 5 19:09:09 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Sep 12 07:37:01 2019 +0200

tdf#126184 Use max paper dimensions to calculate clip region

Assuming at least A4 for the page size isn't enough if
e.g. A2 or larger is used, so too much was clipped in that case.

Therefore, use the the maximum paper width/height instead, which
is 6 m by default. This is still far from the 19 km that caused
tdf#63955 and I cannot reproduce tdf#63955 with that new limit.

A big thanks to Regina Henschel for the great analysis in
tdf#126184!

(Side note: Comments 18 and 19 in tdf#63955 suggest to do the whole
 clipping elsewhere, so if anybody wants to take a look at this...)

Change-Id: Iccacad621675df6c7b4477182d7332c4a3d67139
Reviewed-on: https://gerrit.libreoffice.org/78690
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 1dccd6814f1fe7a06f3168d01d18d347269cd3c1)
Reviewed-on: https://gerrit.libreoffice.org/78759
(cherry picked from commit 859f49294ad95d3a6596e135e550253155d6517b)
Reviewed-on: https://gerrit.libreoffice.org/78790
Reviewed-by: Michael Weghorn 

diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
index 9005b67a3fb4..b9f3950772f2 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
@@ -19,6 +19,7 @@
 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -104,11 +105,14 @@ namespace sdr
 //would not over flow into a tiny clip region
 if (nPageWidth < SAL_MAX_INT32/2 && nPageHeight < 
SAL_MAX_INT32/2)
 {
-//But, see tdf#97276 and tdf#98366. Don't clip too much if 
the
+//But, see tdf#97276, tdf#126184 and tdf#98366. Don't clip 
too much if the
 //underlying page dimension is unknown or a paste document
 //where the page sizes use the odd default of 10x10
-nPageWidth = std::max(21000, nPageWidth);
-nPageHeight = std::max(29700, nPageHeight);
+const SvtOptionsDrawinglayer aDrawinglayerOpt;
+const sal_Int32 nMaxPaperWidth = 
aDrawinglayerOpt.GetMaximumPaperWidth() * 1000;
+const sal_Int32 nMaxPaperHeight = 
aDrawinglayerOpt.GetMaximumPaperHeight() * 1000;
+nPageWidth = std::max(nPageWidth, 
nMaxPaperWidth);
+nPageHeight = std::max(nPageHeight, 
nMaxPaperHeight);
 basegfx::B2DRange aClipRange(-nPageWidth, -nPageHeight,
  nPageWidth*2, nPageHeight*2);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Jim Raykowski (via logerrit)
 sw/source/uibase/shells/basesh.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 1d5b89eccdccb3090b5503a60f829c54c077f328
Author: Jim Raykowski 
AuthorDate: Sun Sep 8 21:37:43 2019 -0800
Commit: Jim Raykowski 
CommitDate: Thu Sep 12 00:20:05 2019 +0200

tdf#126833 fix table auto format undo/redo

Fixes regression caused by fix for tdf#123516

Change-Id: If7b6bf9cba30085585fc495898f3dfb308197495
Reviewed-on: https://gerrit.libreoffice.org/78770
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 0479fca697e0..cf1b2296ca80 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -118,6 +118,7 @@
 #include 
 #include 
 #include 
+#include 
 
 FlyMode SwBaseShell::eFrameMode = FLY_DRAG_END;
 
@@ -2746,7 +2747,12 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest )
 {
 SwTableNode* pTableNode = const_cast( 
rSh.IsCursorInTable() );
 if ( pTableNode )
+{
 pTableNode->GetTable().SetTableStyleName( aAutoName );
+SwUndoTableAutoFormat* pUndo = new 
SwUndoTableAutoFormat( *pTableNode, *pTAFormat );
+if ( pUndo )
+rSh.GetIDocumentUndoRedo().AppendUndo( 
std::unique_ptr(pUndo) );
+}
 }
 
 rSh.EndAllAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Stephan Bergmann (via logerrit)
 solenv/flatpak-manifest.in |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6bddab1d2553defebf6b2ebdd80553413d364dd8
Author: Stephan Bergmann 
AuthorDate: Mon Sep 9 08:53:05 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 23:39:04 2019 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst changes

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index ca233e6a8e88..7fbd150a3b72 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -341,10 +341,10 @@
 "dest-filename": 
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2";,
-"sha256": 
"25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81",
+"url": 
"https://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2";,
+"sha256": 
"144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d",
 "type": "file",
-"dest-filename": "external/tarballs/mdds-1.4.3.tar.bz2"
+"dest-filename": "external/tarballs/mdds-1.5.0.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";,
@@ -365,10 +365,10 @@
 "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz";,
-"sha256": 
"3f48cfbc21ad74787218284939c04d42cb836c73bc393f27f538b668e4d78a5f",
+"url": 
"https://dev-www.libreoffice.org/src/liborcus-0.15.2.tar.gz";,
+"sha256": 
"aa9bd86da242bf67de1cb0785afd457b5398798c8a86d6c5492c9e6c3d3e8aa4",
 "type": "file",
-"dest-filename": "external/tarballs/liborcus-0.14.1.tar.gz"
+"dest-filename": "external/tarballs/liborcus-0.15.2.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source framework/inc framework/source offapi/com offapi/type_reference

2019-09-11 Thread Andrea Gelmini (via logerrit)
 dbaccess/inc/strings.hrc|2 +-
 dbaccess/source/core/api/RowSet.cxx |2 +-
 dbaccess/source/core/api/query.cxx  |2 +-
 dbaccess/source/core/api/querycontainer.cxx |8 
 dbaccess/source/core/dataaccess/definitioncontainer.cxx |2 +-
 dbaccess/source/ui/app/AppController.cxx|4 ++--
 dbaccess/source/ui/app/AppControllerDnD.cxx |4 ++--
 dbaccess/source/ui/app/AppDetailView.cxx|4 ++--
 dbaccess/source/ui/browser/brwctrlr.cxx |   12 ++--
 dbaccess/source/ui/browser/dsbrowserDnD.cxx |6 +++---
 dbaccess/source/ui/browser/unodatbr.cxx |4 ++--
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx  |2 +-
 dbaccess/source/ui/dlg/indexdialog.cxx  |4 ++--
 dbaccess/source/ui/dlg/paramdialog.cxx  |   10 +-
 dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx|2 +-
 dbaccess/source/ui/misc/indexcollection.cxx |2 +-
 dbaccess/source/ui/querydesign/JoinExchange.cxx |4 ++--
 dbaccess/source/ui/querydesign/QueryDesignView.cxx  |2 +-
 dbaccess/source/ui/querydesign/TableConnection.cxx  |2 +-
 dbaccess/source/ui/uno/dbinteraction.cxx|2 +-
 framework/inc/dispatch/closedispatcher.hxx  |2 +-
 framework/inc/helper/statusindicator.hxx|2 +-
 framework/source/helper/ocomponentenumeration.cxx   |4 ++--
 framework/source/helper/oframes.cxx |4 ++--
 framework/source/inc/loadenv/loadenvexception.hxx   |4 ++--
 framework/source/services/frame.cxx |4 ++--
 framework/source/services/pathsettings.cxx  |2 +-
 offapi/com/sun/star/form/XGridPeer.idl  |2 +-
 offapi/com/sun/star/form/control/CommandButton.idl  |2 +-
 offapi/com/sun/star/form/control/ImageButton.idl|2 +-
 offapi/com/sun/star/sdbc/XDatabaseMetaData.idl  |2 +-
 offapi/type_reference/typelibrary_history.txt   |2 +-
 33 files changed, 57 insertions(+), 57 deletions(-)

New commits:
commit 157420e496ddebd7101d88ba8d07164d3971ad22
Author: Andrea Gelmini 
AuthorDate: Thu Sep 5 18:51:10 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 23:43:34 2019 +0200

Typos

Mainly fixing '..' and ''

Change-Id: Ied226ed148c571d278ae65b3f468bd329f557fa9
Reviewed-on: https://gerrit.libreoffice.org/78669
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 982e146c7f38..a5d8f397283d 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -255,7 +255,7 @@
 #define STR_TABLEDESIGN_UNDO_PRIMKEY
NC_("STR_TABLEDESIGN_UNDO_PRIMKEY", "Insert/remove primary key" )
 #define STR_VALUE_YES   NC_("STR_VALUE_YES", "Yes" 
)
 #define STR_VALUE_NONC_("STR_VALUE_NO", "No" )
-// Note: should somehow fit to the word "value" in other languages as well: 
value - none 
+// Note: should somehow fit to the word "value" in other languages as well: 
value - none...
 #define STR_VALUE_NONE  NC_("STR_VALUE_NONE", 
"")
 #define STR_TAB_FIELD_NAME  NC_("STR_TAB_FIELD_NAME", 
"Field name" )
 #define STR_TAB_FIELD_COLUMN_NAME   
NC_("STR_TAB_FIELD_COLUMN_NAME", "Field Name" )
diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index 334afad81836..99c6e56edc0c 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1254,7 +1254,7 @@ void SAL_CALL ORowSet::moveToCurrentRow(  )
 return;
 
 if ( rowDeleted() )
-// this would perhaps even justify a RuntimeException 
+// this would perhaps even justify a RuntimeException...
 // if the current row is deleted, then no write access to this row 
should be possible. So,
 // m_bModified should be true. Also, as soon as somebody calls 
moveToInsertRow,
 // our current row should not be deleted anymore. So, we should not 
have survived the above
diff --git a/dbaccess/source/core/api/query.cxx 
b/dbaccess/source/core/api/query.cxx
index ddb1f59c2ef6..f8b60a76cb9e 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -291,7 +291,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 
_nHandle, const Any& _r
 m_xCommandDefinition->setPropertyValue(sAggPropName, _rValue);
 
 if ( PROPERTY_ID_COMMAND == _nHandle )
-// the columns are out of date if we are based on a new statement 

+// the col

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

2019-09-11 Thread Julien Nabet (via logerrit)
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |   22 +++---
 connectivity/source/drivers/firebird/DatabaseMetaData.hxx |2 +
 2 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 7289828e106081ddae0e053d306fef5ffd0dee3b
Author: Julien Nabet 
AuthorDate: Wed Sep 11 21:24:39 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 11 23:10:47 2019 +0200

tdf#120945: Relationship of tables isn't recognized by formwizard

The patch implements getExportedKeys which was lacking.
Console logs:

warn:connectivity.firebird:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1468:
 Not yet implemented

warn:legacy.osl:13144:18512:connectivity/source/drivers/firebird/DatabaseMetaData.cxx:1469:
 Not implemented yet!

The only difference with getImportedKeys is the fact that :
- in getImportedKeys, table name of Where condition is the foreign key
- in getExportedKeys, table name of Where condition should be the primary 
key
Instead of duplicating the whole code of getImportedKeys,
I created a local function which contains the main part.

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

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 7de45f9021d8..76d32e70ba8d 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1460,20 +1460,19 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getVersionColumns(
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-const Any&, const OUString&, const OUString& )
+const Any&, const OUString&, const OUString& table )
 {
-// List the columns in a table which are foreign keys. This is actually
-// never used anywhere in the LO codebase currently. Retrieval from 
firebird
-// requires using a 5-table join.
-SAL_WARN("connectivity.firebird", "Not yet implemented");
-OSL_FAIL("Not implemented yet!");
-// TODO implement
-return new 
ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eExportedKeys);
+return ODatabaseMetaData::lcl_getKeys(false, table);
 }
 
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 const Any&, const OUString&, const OUString& table )
 {
+return ODatabaseMetaData::lcl_getKeys(true, table);
+}
+
+uno::Reference< XResultSet > ODatabaseMetaData::lcl_getKeys(const bool& 
bIsImport, const OUString& table )
+{
 ODatabaseMetaDataResultSet* pResultSet = new
 ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eImportedKeys);
 uno::Reference< XResultSet > xResultSet = pResultSet;
@@ -1501,8 +1500,11 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getImportedKeys(
"ON PRIM.RDB$INDEX_NAME = PRIMARY_INDEX.RDB$INDEX_NAME "
"INNER JOIN RDB$INDEX_SEGMENTS AS FOREIGN_INDEX "
"ON FOREI.RDB$INDEX_NAME = FOREIGN_INDEX.RDB$INDEX_NAME "
-   "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' "
-   "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+   "WHERE FOREI.RDB$CONSTRAINT_TYPE = 'FOREIGN KEY' ";
+if (bIsImport)
+sSQL = sSQL + "AND FOREI.RDB$RELATION_NAME = '"+ table +"'";
+else
+sSQL = sSQL + "AND PRIM.RDB$RELATION_NAME = '"+ table +"'";
 
 uno::Reference< XResultSet > rs = statement->executeQuery(sSQL);
 uno::Reference< XRow > xRow( rs, UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index dc55940fcfe5..95e744bcf7ef 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -38,6 +38,8 @@ namespace connectivity
 class ODatabaseMetaData : public ODatabaseMetaData_BASE
 {
 ::rtl::Reference m_pConnection;
+private:
+css::uno::Reference< css::sdbc::XResultSet > lcl_getKeys( const 
bool& bIsImport, const OUString& table );
 public:
 
 explicit ODatabaseMetaData(Connection* _pCon);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: idlc/Executable_idlc.mk

2019-09-11 Thread Mike Kaganski (via logerrit)
 idlc/Executable_idlc.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit e08cba00beaf29b9953cb4c3f89faca2bc7b42c1
Author: Mike Kaganski 
AuthorDate: Wed Sep 4 10:20:38 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 23:46:20 2019 +0200

Fix missing dependency

Without this, e.g. 'make clean; make CustomTarget_idlc/parser_test' may
fail on localized Windows, because the library is not built yet.

$ locale
LANG=en_US.UTF-8
LC_CTYPE="en_US.UTF-8"
LC_NUMERIC="en_US.UTF-8"
LC_TIME="en_US.UTF-8"
LC_COLLATE="en_US.UTF-8"
LC_MONETARY="en_US.UTF-8"
LC_MESSAGES="en_US.UTF-8"
LC_ALL=en_US.UTF-8

(but what is relevant, is that on Windows, osl_getThreadTextEncoding
returns active codepage, independent on cygwin locale settings; in my
case, it's Win1251)

Backtrace:

ucrtbased.dll!issue_debug_notification(const wchar_t * const message) 
Line 28
at 
minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp(28)
ucrtbased.dll!__acrt_report_runtime_error(const wchar_t * message) Line 
154
at 
minkernel\crts\ucrt\src\appcrt\internal\report_runtime_error.cpp(154)
ucrtbased.dll!abort() Line 61
at minkernel\crts\ucrt\src\appcrt\startup\abort.cpp(61)
sal3.dll!`anonymous 
namespace'::FullTextEncodingData::FullTextEncodingData() Line 389
at c:\lo\src\core\sal\textenc\textenc.cxx(389)
sal3.dll!rtl::Static<`anonymous 
namespace'::FullTextEncodingData,A0xa37698ef::FullTextEncodingDataSingleton>::get()
 Line 395
at c:\lo\src\core\include\rtl\instance.hxx(395)
sal3.dll!Impl_getTextEncodingData(unsigned short nEncoding) Line 434
at c:\lo\src\core\sal\textenc\textenc.cxx(434)
sal3.dll!rtl_createTextToUnicodeConverter(unsigned short eTextEncoding) 
Line 110
at c:\lo\src\core2\sal\textenc\textcvt.cxx(110)
sal3.dll!rtl_string2UString_status(_rtl_uString * * ppThis, const char 
* pStr, long nLen, unsigned short eTextEncoding, unsigned long nCvtFlags, 
unsigned long * pInfo) Line 807
at c:\lo\src\core\sal\rtl\ustring.cxx(807)
sal3.dll!rtl_string2UString(_rtl_uString * * ppThis, const char * pStr, 
long nLen, unsigned short eTextEncoding, unsigned long nCvtFlags) Line 887
at c:\lo\src\core\sal\rtl\ustring.cxx(887)
idlc.exe!rtl::OUString::OUString(const char * value, long length, 
unsigned short encoding, unsigned long convertFlags) Line 363
at c:\lo\src\core\include\rtl\ustring.hxx(363)
idlc.exe!convertToAbsoluteSystemPath(const rtl::OString & fileName) 
Line 62
at c:\lo\src\core\idlc\source\idlccompile.cxx(62)
idlc.exe!sal_main_with_args(int argc, char * * argv) Line 86
at c:\lo\src\core\idlc\source\idlcmain.cxx(86)
idlc.exe!main(int argc, char * * argv) Line 26
at c:\lo\src\core\idlc\source\idlcmain.cxx(26)
idlc.exe!invoke_main() Line 79
at 
d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(79)
idlc.exe!__scrt_common_main_seh() Line 288
at 
d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(288)
idlc.exe!__scrt_common_main() Line 331
at 
d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(331)
idlc.exe!mainCRTStartup() Line 17
at 
d:\agent\_work\2\s\src\vctools\crt\vcstartup\src\startup\exe_main.cpp(17)
kernel32.dll!BaseThreadInitThunk()
ntdll.dll!RtlUserThreadStart()


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

diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index d5d1af3f9d13..e194e9049c77 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -63,4 +63,11 @@ $(eval $(call gb_Executable_add_exception_objects,idlc,\
 idlc/source/astservice \
 ))
 
+# Without this, e.g. 'make clean; make CustomTarget_idlc/parser_test' may fail 
on Windows localized
+# to something other than listed in Impl_getTextEncodingData, because 
osl_getThreadTextEncoding()
+# returns Windows ACP, calling FullTextEncodingData ctor which loads the 
not-yet-built library
+$(call gb_Executable_add_runtime_dependencies,idlc, \
+$(call gb_Library_get_target,sal_textenc) \
+)
+
 # vim:set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

2019-09-11 Thread Stephan Bergmann (via logerrit)
 distro-configs/LibreOfficeFlatpak.conf |1 +
 solenv/flatpak-manifest.in |6 ++
 2 files changed, 7 insertions(+)

New commits:
commit e046381467f7ad03a845156042dcedb75e56f0d3
Author: Stephan Bergmann 
AuthorDate: Mon Sep 9 08:54:42 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 19:26:58 2019 +0200

Adapt solenv/flatpak-manifest.in to "bundle external: qrcodegen"

(b4141cade04dac0c9d47293313a4521282975f12)

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

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 9d638fa0a449..5bdba7501869 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -55,6 +55,7 @@
 --without-system-orcus
 --without-system-poppler
 --without-system-postgresql
+--without-system-qrcodegen
 --without-system-redland
 --without-system-sane
 --without-system-xmlsec
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 9ebddffefca1..ca233e6a8e88 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -383,6 +383,12 @@
 "dest-filename": 
"external/tarballs/postgresql-9.2.24.tar.bz2"
 },
 {
+"url": 
"https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz";,
+"sha256": 
"fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a",
+"type": "file",
+"dest-filename": 
"external/tarballs/QR-Code-generator-1.4.0.tar.gz"
+},
+{
 "url": 
"https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";,
 "sha256": 
"ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed",
 "type": "file",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Arkadiy Illarionov (via logerrit)
 framework/inc/uielement/rootitemcontainer.hxx |3 --
 framework/source/fwi/uielement/rootitemcontainer.cxx  |   11 
+-
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |7 +++---
 framework/source/uiconfiguration/uiconfigurationmanager.cxx   |7 +++---
 4 files changed, 11 insertions(+), 17 deletions(-)

New commits:
commit 8f35bb1fcc9c1efd7edc52efbfc33509de2c00f2
Author: Arkadiy Illarionov 
AuthorDate: Sat Sep 7 16:25:24 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 23:45:08 2019 +0200

tdf#39593 Drop RootItemContainer::GetImplementation

Replace with comphelper::getUnoTunnelImplementation.
Also use isUnoTunnelId().

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

diff --git a/framework/inc/uielement/rootitemcontainer.hxx 
b/framework/inc/uielement/rootitemcontainer.hxx
index ce0aa4a426ec..a0238b94579e 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -69,8 +69,7 @@ class RootItemContainer final : private cppu::BaseMutex,
 virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) 
override;
 
 // XUnoTunnel
-static FWI_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&   
GetUnoTunnelId() throw();
-static FWI_DLLPUBLIC RootItemContainer*
   GetImplementation( const css::uno::Reference< css::uno::XInterface >& 
rxIFace ) throw();
+static FWI_DLLPUBLIC const css::uno::Sequence< sal_Int8 >&   
getUnoTunnelId() throw();
 sal_Int64   SAL_CALL 
getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) override;
 
 // XIndexContainer
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx 
b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 4571b3b61603..f7e7eb28dbb7 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -142,7 +142,7 @@ Reference< XIndexAccess > 
RootItemContainer::deepCopyContainer( const Reference<
 // XUnoTunnel
 sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 
>& rIdentifier )
 {
-if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( 
RootItemContainer::GetUnoTunnelId().getConstArray(), 
rIdentifier.getConstArray(), 16 ) ) )
+if( isUnoTunnelId(rIdentifier) )
 return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr 
>( this ));
 return 0;
 }
@@ -152,18 +152,11 @@ namespace
 class theRootItemContainerUnoTunnelId : public rtl::Static< 
UnoTunnelIdInit, theRootItemContainerUnoTunnelId > {};
 }
 
-const Sequence< sal_Int8 >& RootItemContainer::GetUnoTunnelId() throw()
+const Sequence< sal_Int8 >& RootItemContainer::getUnoTunnelId() throw()
 {
 return theRootItemContainerUnoTunnelId::get().getSeq();
 }
 
-RootItemContainer* RootItemContainer::GetImplementation( const 
css::uno::Reference< css::uno::XInterface >& rxIFace ) throw()
-{
-css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, 
css::uno::UNO_QUERY );
-return xUT.is() ? reinterpret_cast< RootItemContainer* 
>(sal::static_int_cast< sal_IntPtr >(
-  xUT->getSomething( 
RootItemContainer::GetUnoTunnelId() ))) : nullptr;
-}
-
 // XElementAccess
 sal_Bool SAL_CALL RootItemContainer::hasElements()
 {
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx 
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index b629dbaefca3..36631222539e 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -60,6 +60,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace css;
@@ -427,7 +428,7 @@ void 
ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
 {
 MenuConfiguration aMenuCfg( m_xContext );
 Reference< XIndexAccess > xContainer( 
aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream ));
-RootItemContainer* pRootItemContainer = 
RootItemContainer::GetImplementation( xContainer );
+auto pRootItemContainer = 
comphelper::getUnoTunnelImplementation( xContainer );
 if ( pRootItemContainer )
 aUIElementData.xSettings.set( static_cast< 
OWeakObject * >( new ConstItemContainer( pRootItemContainer, true ) ), 
UNO_QUERY );
 else
@@ -446,7 +447,7 @@ void 
ModuleUIConfigurationManager::impl_requestUIElementData( sal_Int16 nElement
 {
 Reference< XIndexContainer > x

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

2019-09-11 Thread Stephan Bergmann (via logerrit)
 sal/qa/rtl/textenc/rtl_textcvt.cxx |6 +++---
 sal/textenc/tcvtjp2.tab|4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 27808e6e3ed049dda09f552b7769a4e87a82283a
Author: Stephan Bergmann 
AuthorDate: Fri Sep 6 16:25:40 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 19:25:49 2019 +0200

Fix Unicode to Shift JIS/MS932 conversion data

These are MS932 extensions, and per

("Table version: 2.01", "Date: 04/15/98"), U+4F92 is a mapping for 0xFA6F 
(and
also for 0xED53, which is also an MS932 extension, and "loses" here), and
U+4F9A is a mapping for 0xFA71 (and also for 0xED55, which is also an MS932
extension, and "loses" here).  (And neither U+4F92 nor U+4F9A appear as 
mappings
in 
,
"Table version: 2.0", "Date: 2011 October 14 (header updated: 2015
December 02)".)

This appears to be a typo dating back to
9399c662f36c385b0c705eb34e636a9aec450282 "initial import".

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

diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx 
b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 068e727d53cb..795950a0347a 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -1765,9 +1765,9 @@ void Test::testComplex() {
   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR },
 #if WITH_LOCALE_ALL || WITH_LOCALE_ja
 { RTL_TEXTENCODING_SHIFT_JIS,
-  RTL_CONSTASCII_STRINGPARAM("\x00"),
-  {0x},
-  1,
+  RTL_CONSTASCII_STRINGPARAM("\x00\xFA\x6F\xFA\x71"),
+  {0x, 0x4F92, 0x4F9A},
+  3,
   true,
   true,
   true,
diff --git a/sal/textenc/tcvtjp2.tab b/sal/textenc/tcvtjp2.tab
index fc9b0a3d98d7..1e4716b168bf 100644
--- a/sal/textenc/tcvtjp2.tab
+++ b/sal/textenc/tcvtjp2.tab
@@ -717,8 +717,8 @@ static sal_uInt16 const aImplUniToDBCSTab_SJIS_4F[] =
  0,  0,  0, 0x98CD, 0x8CF1,  0,  0, 0x8E67, /* 0x70 */
  0,  0,  0, 0x8AA4,  0,  0, 0x98D2,  0, /* 0x80 */
 0x98CA,  0, 0xFA70, 0x97E1,  0, 0x8E98,  0, 0x98CB, /* 0x80 */
- 0, 0x98D0, 0xFA71,  0, 0xFA72,  0, 0x98D3,  0, /* 0x90 */
-0x98CC,  0, 0xFA6F, 0x8B9F,  0, 0x88CB,  0,  0, /* 0x90 */
+ 0, 0x98D0, 0xFA6F,  0, 0xFA72,  0, 0x98D3,  0, /* 0x90 */
+0x98CC,  0, 0xFA71, 0x8B9F,  0, 0x88CB,  0,  0, /* 0x90 */
 0x8BA0, 0x89BF,  0,  0,  0,  0,  0,  0, /* 0xA0 */
  0,  0,  0, 0x9B44,  0, 0x9699, 0x958E, 0x8CF2, /* 0xA0 */
  0,  0,  0,  0,  0, 0x904E, 0x97B5,  0, /* 0xB0 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - compilerplugins/.gitignore compilerplugins/Makefile-clang.mk

2019-09-11 Thread Stephan Bergmann (via logerrit)
 compilerplugins/.gitignore|   17 +
 compilerplugins/Makefile-clang.mk |   11 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 343df4dfb7242599afc3187b9c674037b7d5c6af
Author: Stephan Bergmann 
AuthorDate: Wed Sep 11 18:09:15 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 19:27:47 2019 +0200

Adapt compilerplugins/.gitignore

...to ceb26770b3d1c5c2ffaf73f8f589c5e169e6db06 "split clangplugins 
sharedvisitor
generator into two steps"

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

diff --git a/compilerplugins/.gitignore b/compilerplugins/.gitignore
index b672fdeaf35b..73146bcd4e8a 100644
--- a/compilerplugins/.gitignore
+++ b/compilerplugins/.gitignore
@@ -1 +1,18 @@
+/clang/clang-timestamp
+/clang/plugin.dll
+/clang/plugin.so
+/clang/sharedvisitor/*.plugininfo
+/clang/sharedvisitor/analyzer
+/clang/sharedvisitor/analyzer.d
+/clang/sharedvisitor/analyzer.exe
+/clang/sharedvisitor/analyzer.o
+/clang/sharedvisitor/clang.pch
+/clang/sharedvisitor/generator
+/clang/sharedvisitor/generator.d
+/clang/sharedvisitor/generator.exe
+/clang/sharedvisitor/generator.o
+/clang/sharedvisitor/sharedvisitor.cxx
+/clang/sharedvisitor/sharedvisitor.d
+/clang/sharedvisitor/sharedvisitor.o
+/clang/sources.txt
 obj
commit b057f4f8dbc1a3e392fee7b0b06de1847d3424c3
Author: Stephan Bergmann 
AuthorDate: Wed Sep 11 17:45:21 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 19:27:35 2019 +0200

Adapt compilerplugins.clean

...to ceb26770b3d1c5c2ffaf73f8f589c5e169e6db06 "split clangplugins 
sharedvisitor
generator into two steps"

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

diff --git a/compilerplugins/Makefile-clang.mk 
b/compilerplugins/Makefile-clang.mk
index c36bc6bd18cb..f2ed9212948d 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -141,7 +141,16 @@ $(CLANGOUTDIR)/sources.txt:
 compilerplugins-build: $(CLANGOUTDIR) $(CLANGOBJDIR) 
$(CLANGOUTDIR)/plugin$(CLANG_DL_EXT)
 
 compilerplugins-clean:
-   rm -rf $(CLANGOUTDIR)
+   rm -rf \
+$(CLANGOBJDIR) \
+$(CLANGOUTDIR)/clang-timestamp \
+$(CLANGOUTDIR)/plugin$(CLANG_DL_EXT) \
+$(CLANGOUTDIR)/sharedvisitor/*.plugininfo \
+$(CLANGOUTDIR)/sharedvisitor/clang.pch \
+$(CLANGOUTDIR)/sharedvisitor/sharedvisitor.{cxx,d,o} \
+
$(CLANGOUTDIR)/sharedvisitor/{analyzer,generator}{$(CLANG_EXE_EXT),.d,.o} \
+$(CLANGOUTDIR)/sources-new.txt \
+$(CLANGOUTDIR)/sources.txt
 
 $(CLANGOUTDIR):
mkdir -p $(CLANGOUTDIR)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Stephan Bergmann (via logerrit)
 sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 833c23264b532e34e050e3b8747c02ede6bf7350
Author: Stephan Bergmann 
AuthorDate: Mon Sep 9 11:54:04 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 11 19:26:09 2019 +0200

Fix stack-use-after-return when moving a slide in the list

...very far, so that the list needs to scroll:

> ==1676==ERROR: AddressSanitizer: stack-use-after-return on address 
0x7f039a1e6420 at pc 0x7f03c34e0658 bp 0x7ffede26b140 sp 0x7ffede26b138
> READ of size 8 at 0x7f039a1e6420 thread T0
>  #0 in Point::X() const at include/tools/gen.hxx:78:44 
(instdir/program/libvcllo.so +0x5cf6657)
>  #1 in OutputDevice::PixelToLogic(Point const&) const at 
vcl/source/outdev/map.cxx:1191:47
>  #2 in 
sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, 
sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool) at 
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx:84:47
>  #3 in 
sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, 
sd::slidesorter::controller::InsertionIndicatorHandler::Mode, 
bool)::$_0::operator()() const at 
sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx:92:34
>  #4 in void std::__invoke_impl(std::__invoke_other, 
sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point const&, 
sd::slidesorter::controller::InsertionIndicatorHandler::Mode, bool)::$_0&) at 
gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/invoke.h:60:14
>  #5 in std::enable_if, 
void>::type std::__invoke_r(sd::slidesorter::controller::DragAndDropContext::UpdatePosition(Point
 const&, sd::slidesorter::controller::InsertionIndicatorHandler::Mode, 
bool)::$_0&) at 
gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/invoke.h:110:2
>  #6 in std::_Function_handler::_M_invoke(std::_Any_data const&) at 
gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/std_function.h:291:9
>  #7 in std::function::operator()() const at 
gcc/x86_64-pc-linux-gnu/10.0.0/../../../../include/c++/10.0.0/bits/std_function.h:622:14
>  #8 in sd::slidesorter::controller::ScrollBarManager::RepeatAutoScroll() 
at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:518:17
>  #9 in 
sd::slidesorter::controller::ScrollBarManager::AutoScrollTimeoutHandler(Timer*) 
at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:539:5
>  #10 in 
sd::slidesorter::controller::ScrollBarManager::LinkStubAutoScrollTimeoutHandler(void*,
 Timer*) at sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx:537:1
>  #11 in Link::Call(Timer*) const at 
include/tools/link.hxx:112:45
>  #12 in Timer::Invoke() at vcl/source/app/timer.cxx:75:21
>  #13 in Scheduler::ProcessTaskScheduling() at 
vcl/source/app/scheduler.cxx:479:20
>  #14 in Scheduler::CallbackTaskScheduling() at 
vcl/source/app/scheduler.cxx:287:5
>  #15 in SalTimer::CallCallback() at vcl/inc/saltimer.hxx:54:13
>  #16 in sal_gtk_timeout_dispatch(_GSource*, int (*)(void*), void*) at 
vcl/unx/gtk3/gtk3gtkdata.cxx:761:45
>  #17 in g_main_dispatch at ../glib/gmain.c:3189:28
> [...]
> Address 0x7f039a1e6420 is located in stack of thread T0 at offset 32 in 
frame
>  #0 in 
sd::slidesorter::controller::SelectionFunction::MouseDragged(AcceptDropEvent 
const&, signed char) at 
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx:630 
(instdir/program/../program/libsdlo.so +0x5c22e1f)
>   This frame has 1 object(s):
> [32, 104) 'aEventDescriptor' (line 631) <== Memory access at offset 
32 is inside this variable
> HINT: this may be a false positive if your program uses some custom stack 
unwind mechanism, swapcontext or vfork
>   (longjmp and C++ exceptions *are* supported)

Presumably a regression introduced with 
26912eea7521dd2b84bfac56b322cf0f8b142450
"sd: replace boost::bind with C++11 lambdas and for loops", assuming that
boost::bind bound rMousePosition by value.

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

diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx 
b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 342ac4599f3d..9db562c480db 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -88,7 +88,7 @@ void DragAndDropContext::UpdatePosition (
 bool bDoAutoScroll = bAllowAutoScroll
 && 
mpTargetSlideSorter->GetController().GetScrollBarManager().AutoScroll(
 rMousePosition,
-[this, eMode, &rMousePosition] () {
+[this, eMode, rMousePosition] () {
 retu

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

2019-09-11 Thread Caolán McNamara (via logerrit)
 dbaccess/uiconfig/ui/tablesjoindialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7adc6bb244dc127c7cc313a2f60d04f62d16c4c4
Author: Caolán McNamara 
AuthorDate: Tue Sep 10 22:52:20 2019 +0100
Commit: Xisco Faulí 
CommitDate: Wed Sep 11 16:58:58 2019 +0200

Resolves: tdf#127343 show expanders in Add Tables or Query dialog

Change-Id: If30987a07031a8bc37d5089cf03d1e7370275ea2
Reviewed-on: https://gerrit.libreoffice.org/78810
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui 
b/dbaccess/uiconfig/ui/tablesjoindialog.ui
index c67b0606e5f0..ceb5185162c1 100644
--- a/dbaccess/uiconfig/ui/tablesjoindialog.ui
+++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui
@@ -151,7 +151,7 @@
 liststore2
 False
 1
-False
+True
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Caolán McNamara (via logerrit)
 dbaccess/uiconfig/ui/tablesjoindialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77039992be17e6881f0c67021718d7d551195b3c
Author: Caolán McNamara 
AuthorDate: Tue Sep 10 22:52:20 2019 +0100
Commit: Xisco Faulí 
CommitDate: Wed Sep 11 16:58:42 2019 +0200

Resolves: tdf#127343 show expanders in Add Tables or Query dialog

Change-Id: If30987a07031a8bc37d5089cf03d1e7370275ea2
Reviewed-on: https://gerrit.libreoffice.org/78807
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/dbaccess/uiconfig/ui/tablesjoindialog.ui 
b/dbaccess/uiconfig/ui/tablesjoindialog.ui
index c67b0606e5f0..ceb5185162c1 100644
--- a/dbaccess/uiconfig/ui/tablesjoindialog.ui
+++ b/dbaccess/uiconfig/ui/tablesjoindialog.ui
@@ -151,7 +151,7 @@
 liststore2
 False
 1
-False
+True
 True
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting minutes: 2019-09-11

2019-09-11 Thread Miklos Vajna
* Present:
 + Kendy, Stephan, Caolan, Michael M, Cloph, Miklos, Thorsten, Michael W, 
Lionel, Xisco, Eike, Bjoern, Gabriel

* Completed Action Items:
+ backport the hsqldb/firebird patch to 6.3 (Xisco)

* Pending Action Items:
+ None

* Release Engineering update (Christian)
+ 6.4 alpha: mid-October
+ 6.3.2 RC2 will be tagged next week
+ 6.2.8 RC1: in 2 weeks
+ Remotes
+ Android viewer
   + uploading a 64bit version – the new requirement
 + have a patch working, but NSS needs more love, in progress
   + arm / master crashes on every file operation → pending
+ Online
+ daily builds status
  + Linux solved completely
  + Windows / macOS needs integration into Jenkins
+ freedesktop anongit was offline → affected some tinderboxes
+ Thorsten: new Windows tinderbox, supposed to provide daily builds
  + blocked on packaging, but should be fixed now (Cloph)
+ other mirrors? (Michael)
  + we also have launchpad and github (Cloph)

* Documentation (Olivier)
  + maintenance & translation work continues for 6.3
  + more developments for the new help, but not yet ready
  + Google Seans of Docs: work of technical writer started, progressing


* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
235(235) (topicUI) bugs open, 227(227) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added   9(3) 25(-3)45(-6)  97(2)
 commented 102(34)   301(28)   738(34)1832(71)
   removed   0(0)  0(0)  1(0)   18(0)
  resolved   9(2) 27(0) 66(6)  167(6)
+ top 10 contributors:
  Heiko Tietze made 189 changes in 1 month, and 493 changes in 1 year
  Thomas Lendo made 93 changes in 1 month, and 326 changes in 1 year
  Buovjaga made 43 changes in 1 month, and 85 changes in 1 year
  Foote, V Stuart made 43 changes in 1 month, and 296 changes in 1 year
  Dieter Praas made 35 changes in 1 month, and 181 changes in 1 year
  Xisco Faulí made 20 changes in 1 month, and 297 changes in 1 year
  Pedro Pinto da Silva made 17 changes in 1 month, and 17 changes in 1 
year
  Kainz, Andreas made 17 changes in 1 month, and 189 changes in 1 year
  Cor Nouws made 15 changes in 1 month, and 145 changes in 1 year
  Nabet, Julien made 12 changes in 1 month, and 35 changes in 1 year

   * Impress crashes by changing the symbol of a bulleted list
 + https://bugs.documentfoundation.org/show_bug.cgi?id=127450
   * Choosing versions other than current version when opening file from inside 
LO doesn't work
 + https://bugs.documentfoundation.org/show_bug.cgi?id=127492
   …
+ UX on hold, expect updates next week

* Crash Reporting (Caolan)
+ 2(+0) import failure, 2(+0) export failures
+ 35 coverity issues
+ Google / ossfuzz: fuzzers active now
+ CVE-2019-9854, CVE-2019-9855
  + macro now warns even on script invocation, not when providing scripts 
in documents, should help in the long run

* Crash Reporting (Xisco)
+ https://crashreport.libreoffice.org/stats/version/6.2.5.2
+ (-86) 2280 2366 2188 1865 1808 3000 2274 748 0
+ https://crashreport.libreoffice.org/stats/version/6.2.6.2
+ (-2) 507 509 311 246 12 0
+ https://crashreport.libreoffice.org/stats/version/6.2.7.1
+ (+186) 186 0
+ https://crashreport.libreoffice.org/stats/version/6.3.0.4
+ (+33) 7000 6967 6267 4942 2052 0
+ https://crashreport.libreoffice.org/stats/version/6.3.1.2
+ (+820) 820 0
+ lots of Calc dynamic column-related crashes fixed, thanks Noel


* Hackfests & Events (Sophie)
+ Google Mentor summit happening in Europe end of October
   + could be a fall-back for European meetup
   + Cafe Netzwerk / CIB office or something.
   + one slot for Mentor Summit available
   + call for Munich volunteers to organize something around this?
 (Thorsten)
  + https://wiki.documentfoundation.org/Hackfest/Muenchen2019
 + Mentor summit is Oct. 19th-20th, something around that weekend
   would be perfect
 + suggestion to have a small hackfest in Munich, before or after the
   GSoC summit,
   + proposal either before: 17/18th of Oct
   + works better for Michael W.
   + or after: 24/25th  of Oct
   + works better for Heiko
   + Heiko setting up a wiki page for this
   + 
   + interested if there are at least 10 attendees (Thorsten)
   + hope to have one each quarter.

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + Project page:
https://summerofcode.withgoogle.com/organizations/5557591040589824/
   + Mentor Summit: Michael M & Thorsten going, event is Oct 19th and 20th in   
  Munich
   + 100% success rate this time
 

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

2019-09-11 Thread Noel Grandin (via logerrit)
 compilerplugins/clang/redundantfcast.cxx  |   56 ++
 compilerplugins/clang/test/redundantfcast.cxx |   24 ---
 vcl/qt5/Qt5Instance.cxx   |2 
 vcl/unx/kf5/KF5SalInstance.cxx|6 +-
 4 files changed, 61 insertions(+), 27 deletions(-)

New commits:
commit 81fd3bb4d76a0e57a4e8464cb1c5813115ea28f3
Author: Noel Grandin 
AuthorDate: Sat Sep 7 14:28:59 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 11 15:33:28 2019 +0200

loplugin:redundantfcast check for std::function cast

noticed by mike kaganski

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

diff --git a/compilerplugins/clang/redundantfcast.cxx 
b/compilerplugins/clang/redundantfcast.cxx
index a53c42d73add..8879a386d621 100644
--- a/compilerplugins/clang/redundantfcast.cxx
+++ b/compilerplugins/clang/redundantfcast.cxx
@@ -13,6 +13,7 @@
 #include "plugin.hxx"
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -53,9 +54,10 @@ public:
 {
 return true;
 }
-report(DiagnosticsEngine::Warning, "redundant functional cast from %0 
to %1",
-   cxxFunctionalCastExpr->getExprLoc())
-<< t2 << t1 << cxxFunctionalCastExpr->getSourceRange();
+if (m_Seen.insert(cxxFunctionalCastExpr->getExprLoc()).second)
+report(DiagnosticsEngine::Warning, "redundant functional cast from 
%0 to %1",
+   cxxFunctionalCastExpr->getExprLoc())
+<< t2 << t1 << cxxFunctionalCastExpr->getSourceRange();
 return true;
 }
 
@@ -103,11 +105,14 @@ public:
 if (t1.getCanonicalType().getTypePtr() != paramClassOrStructType)
 continue;
 
-report(DiagnosticsEngine::Warning, "redundant functional cast from 
%0 to %1",
-   arg->getExprLoc())
-<< t2 << t1 << arg->getSourceRange();
-report(DiagnosticsEngine::Note, "in call to method here", 
param->getLocation())
-<< param->getSourceRange();
+if (m_Seen.insert(arg->getExprLoc()).second)
+{
+report(DiagnosticsEngine::Warning, "redundant functional cast 
from %0 to %1",
+   arg->getExprLoc())
+<< t2 << t1 << arg->getSourceRange();
+report(DiagnosticsEngine::Note, "in call to method here", 
param->getLocation())
+<< param->getSourceRange();
+}
 }
 return true;
 }
@@ -146,15 +151,28 @@ public:
 if (t1.getCanonicalType().getTypePtr() != paramClassOrStructType)
 continue;
 
-report(DiagnosticsEngine::Warning, "redundant functional cast from 
%0 to %1",
-   arg->getExprLoc())
-<< t2 << t1 << arg->getSourceRange();
-report(DiagnosticsEngine::Note, "in call to method here", 
param->getLocation())
-<< param->getSourceRange();
+if (m_Seen.insert(arg->getExprLoc()).second)
+{
+report(DiagnosticsEngine::Warning, "redundant functional cast 
from %0 to %1",
+   arg->getExprLoc())
+<< t2 << t1 << arg->getSourceRange();
+report(DiagnosticsEngine::Note, "in call to method here", 
param->getLocation())
+<< param->getSourceRange();
+}
 }
 return true;
 }
 
+// Find redundant cast to std::function, where clang reports
+// two different types for the inner and outer
+static bool isRedundantStdFunctionCast(CXXFunctionalCastExpr const* expr)
+{
+auto cxxConstruct = 
dyn_cast(compat::IgnoreImplicit(expr->getSubExpr()));
+if (!cxxConstruct)
+return false;
+return isa(cxxConstruct->getArg(0));
+}
+
 bool VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const* expr)
 {
 if (ignoreLocation(expr))
@@ -166,7 +184,8 @@ public:
 return true;
 auto const t1 = expr->getTypeAsWritten();
 auto const t2 = compat::getSubExprAsWritten(expr)->getType();
-if (t1.getCanonicalType().getTypePtr() != 
t2.getCanonicalType().getTypePtr())
+if (!(t1.getCanonicalType().getTypePtr() == 
t2.getCanonicalType().getTypePtr()
+  || isRedundantStdFunctionCast(expr)))
 {
 return true;
 }
@@ -191,9 +210,10 @@ public:
 if (tc.Typedef("sal_Int32").GlobalNamespace())
 return true;
 
-report(DiagnosticsEngine::Warning, "redundant functional cast from %0 
to %1",
-   expr->getExprLoc())
-<< t2 << t1 << expr->getSourceRange();
+if (m_Seen.insert(expr->getExprLoc()).second)
+report(DiagnosticsEngine::Warning, "redundant functional cast from 
%0 to %1",
+ 

[Libreoffice-commits] core.git: Branch 'private/khaledhosny/vcl-cleanup-font' - 148 commits - accessibility/source android/README android/source basctl/source basic/source bean/com bin/check-elf-dynam

2019-09-11 Thread Khaled Hosny (via logerrit)
Rebased ref, commits from common ancestor:
commit ac9d7d4157813fcf43dd41043981c4bb27d2cc33
Author: Khaled Hosny 
AuthorDate: Tue Sep 3 14:40:42 2019 +0200
Commit: Khaled Hosny 
CommitDate: Wed Sep 11 12:40:33 2019 +0200

Consolidate GetFontCapabilities()

All implementations were basically doing the same thing. Move to
PhysicalFontFace and use HarfBuzz API to get the raw OpeenType table
data.

Change-Id: Ia5ac0d1ba6299f86e90e1b0dac34ba7672855ec0

diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 3992bb91bf41..679420a05fd1 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -22,6 +22,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,7 @@ public:
 sal_Int32   CompareIgnoreSize( const PhysicalFontFace& ) const;
 
 const FontCharMapRef&   GetCharMap() const;
+boolGetCapabilities(vcl::FontCapabilities 
&rCapabilities) const;
 
 hb_face_t*  GetHbFace() const;
 virtual hb_blob_t*  GetHbTable(hb_tag_t nTag) const = 0;
@@ -84,6 +86,8 @@ protected:
 mutable hb_face_t*  mpHbFace;
 
 mutable FontCharMapRef  mxCharMap;
+mutable boolmbCapabilitiesRead;
+mutable vcl::FontCapabilities maCapabilities;
 };
 
 #endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index a179438cf2a5..03884fc31df9 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -42,8 +42,6 @@ public:
 
 int GetFontTable(const char pTagName[5], unsigned char*) const;
 
-bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const;
-
 rtl::Reference
 CreateFontInstance(const FontSelectPattern& rFSD) const override;
 
@@ -55,8 +53,6 @@ protected:
 
 private:
 const QString m_aFontId;
-mutable vcl::FontCapabilities m_aFontCapabilities;
-mutable bool m_bFontCapabilitiesRead;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 3be470f0caf6..540d695a3a11 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -67,16 +67,12 @@ public:
 int GetFontTable( uint32_t nTagCode, unsigned 
char* ) const;
 int GetFontTable( const char pTagName[5], 
unsigned char* ) const;
 
-boolGetFontCapabilities(vcl::FontCapabilities 
&rFontCapabilities) const;
-
 rtl::Reference CreateFontInstance(const 
FontSelectPattern&) const override;
 
 hb_blob_t*  GetHbTable(hb_tag_t nTag) const override;
 
 private:
 const sal_IntPtrmnFontId;
-mutable vcl::FontCapabilities   maFontCapabilities;
-mutable boolmbFontCapabilitiesRead;
 };
 
 class CoreTextStyle final : public LogicalFontInstance
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index c072752db6a7..12800ae0458c 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -107,7 +107,6 @@ public:
 
 voidGetFontMetric(ImplFontMetricDataRef const &) const;
 const unsigned char*GetTable( const char* pName, sal_uLong* pLength ) 
const;
-boolGetFontCapabilities(vcl::FontCapabilities &) const;
 
 boolGetGlyphBoundRect(sal_GlyphId, tools::Rectangle&, 
bool) const;
 boolGetGlyphOutline(sal_GlyphId, 
basegfx::B2DPolyPolygon&, bool) const;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 0cc2fd05ba2d..5eeb0747c253 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -71,24 +71,16 @@ public:
 BYTEGetCharSet() const  { return meWinCharSet; 
}
 BYTEGetPitchAndFamily() const   { return 
mnPitchAndFamily; }
 
-bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-
 hb_blob_t*  GetHbTable(hb_tag_t nTag) const override;
 
 private:
 sal_IntPtr  mnId;
 
-// some members that are initialized lazily when the font gets selected 
into a HDC
-mutable boolmbFontCapabilitiesRead;
-mutable vcl::FontCapabilities   maFontCapabilities;
-
 BYTEmeWinCharSet;
 BYTEmnPitchAndFamily;
 boolmbAliasSymbolsHigh;
 boolmbAliasSymbolsLow;
 
-voidGetFontCapabilities( HDC hDC ) const;
-
 mutable HDC mhDC;
 };
 
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index 4c4bbb7ef6de..dcf7cbf6611c 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -128,7 +128,6 @@ Qt5FontFace* Qt5FontFace::fromQFontDatabase(const QString& 
aFamily, const QStrin
 Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const QString& rF

[Libreoffice-commits] online.git: common/Log.cpp

2019-09-11 Thread Miklos Vajna (via logerrit)
 common/Log.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f8140acac79142255af6e09c9846b2900a8399d8
Author: Miklos Vajna 
AuthorDate: Wed Sep 11 12:23:59 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 11 12:23:59 2019 +0200

Avoid static member access through instance

Change-Id: Ifbfdfbb0d5b6020908d041904b61a2ed3b8255c1

diff --git a/common/Log.cpp b/common/Log.cpp
index 1abb81d28..c94b382a2 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -216,7 +216,7 @@ namespace Log
 #if !MOBILEAPP
 void shutdown()
 {
-logger().shutdown();
+Poco::Logger::shutdown();
 IsShutdown = true;
 
 // Flush
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Gabor Kelemen (via logerrit)
 sc/qa/extras/anchor.cxx  |2 -
 sc/qa/extras/check_data_pilot_field.cxx  |3 --
 sc/qa/extras/check_data_pilot_table.cxx  |3 --
 sc/qa/extras/check_xcell_ranges_query.cxx|3 --
 sc/qa/extras/htmlexporttest.cxx  |4 ---
 sc/qa/extras/macros-test.cxx |   11 
--
 sc/qa/extras/new_cond_format.cxx |2 -
 sc/qa/extras/scarealinkobj.cxx   |1 
 sc/qa/extras/sccellobj.cxx   |2 -
 sc/qa/extras/sccellrangeobj.cxx  |7 
--
 sc/qa/extras/sccellrangesobj.cxx |1 
 sc/qa/extras/scdatapilotfieldgroupitemobj.cxx|2 -
 sc/qa/extras/scdatapilotfieldgroupobj.cxx|1 
 sc/qa/extras/scdatapilotfieldgroupsobj.cxx   |2 -
 sc/qa/extras/scdatapilotitemobj.cxx  |1 
 sc/qa/extras/scdatapilotitemsobj.cxx |4 ---
 sc/qa/extras/scddelinkobj.cxx|2 -
 sc/qa/extras/scddelinksobj.cxx   |3 --
 sc/qa/extras/sceditfieldobj-cell.cxx |2 -
 sc/qa/extras/sceditfieldobj-header.cxx   |3 --
 sc/qa/extras/scfunctiondescriptionobj.cxx|1 
 sc/qa/extras/scheaderfieldsobj.cxx   |3 --
 sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx   |2 -
 sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx   |2 -
 sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx  |1 
 sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx   |1 
 sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx   |1 
 sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx|1 
 sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx |2 -
 sc/qa/extras/scmodelobj.cxx  |1 
 sc/qa/extras/scnamedrangeobj.cxx |2 -
 sc/qa/extras/scpdfexport.cxx |2 -
 sc/qa/extras/screcentfunctionsobj.cxx|1 
 sc/qa/extras/scscenariosobj.cxx  |2 -
 sc/qa/extras/scsheetlinkobj.cxx  |1 
 sc/qa/extras/scsheetlinksobj.cxx |1 
 sc/qa/extras/scsortdescriptorbaseobj.cxx |1 
 sc/qa/extras/scsubtotaldescriptorbase.cxx|1 
 sc/qa/extras/scsubtotalfieldobj.cxx  |1 
 sc/qa/extras/sctableconditionalentryobj.cxx  |1 
 sc/qa/extras/sctableconditionalformat.cxx|1 
 sc/qa/extras/sctablesheetsobj.cxx|1 
 sc/qa/extras/sctablevalidationobj.cxx|2 -
 sc/qa/extras/scuniquecellformatsenumeration.cxx  |1 
 44 files changed, 92 deletions(-)

New commits:
commit 06f99cd5520fa431ffb74ca5dd4691e892715657
Author: Gabor Kelemen 
AuthorDate: Sun Aug 25 14:00:27 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 11 12:25:52 2019 +0200

tdf#42949 Fix IWYU warnings in sc/qa/extras/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

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

diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 8ec960489d65..c003c09d8084 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -12,11 +12,9 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/sc/qa/extras/check_data_pilot_field.cxx 
b/sc/qa/extras/check_data_pilot_field.cxx
index a132788e2b8b..3445245ade2b 100644
--- a/sc/qa/extras/check_data_pilot_field.cxx
+++ b/sc/qa/extras/check_data_pilot_field.cxx
@@ -10,9 +10,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sc/qa/extras/check_data_pilot_table.cxx 
b/sc/qa/extras/check_data_pilot_table.cxx
index 586fe72b0af3..79fcd14c66ca 100644
--- a/sc/qa/extras/check_data_pilot_table.cxx
+++ b/sc/qa/extras/check_data_pilot_table.cxx
@@ -10,9 +10,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 

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

2019-09-11 Thread Tomáš Chvátal (via logerrit)
 vcl/unx/generic/fontmanager/fontconfig.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 39b8846276e82a50625a08dfddec34de67ca71c8
Author: Tomáš Chvátal 
AuthorDate: Wed Sep 11 09:58:43 2019 +0200
Commit: Tomáš Chvátal 
CommitDate: Wed Sep 11 10:55:44 2019 +0200

Check for EMOJI content only on ICU 57 and newer

The older ICU does not have the logic to work with there as it is
feature of the new icu only:
  http://bugs.icu-project.org/trac/ticket/11802

Change-Id: Icd21be1e20b7cb988e94d107406a4f81d00116a7
Reviewed-on: https://gerrit.libreoffice.org/78811
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 2767cafcf07f..bfa487153321 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -800,7 +800,11 @@ namespace
 
 bool isEmoji(sal_uInt32 nCurrentChar)
 {
+#if U_ICU_VERSION_MAJOR_NUM >= 57
 return u_hasBinaryProperty(nCurrentChar, UCHAR_EMOJI);
+#else
+   return false;
+#endif
 }
 
 //returns true if the given code-point couldn't possibly be in rLangTag.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-11 Thread Julien Nabet (via logerrit)
 sc/source/ui/dataprovider/htmldataprovider.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit ec57f6eca37192ada29cda1d37ec192472c0d9ef
Author: Julien Nabet 
AuthorDate: Tue Sep 10 21:16:43 2019 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 11 09:59:54 2019 +0200

tdf#127461: fix data provider crashes

See bts provided in the bugtracker

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

diff --git a/sc/source/ui/dataprovider/htmldataprovider.cxx 
b/sc/source/ui/dataprovider/htmldataprovider.cxx
index bbe6dd3c514b..b8b7b3746d2c 100644
--- a/sc/source/ui/dataprovider/htmldataprovider.cxx
+++ b/sc/source/ui/dataprovider/htmldataprovider.cxx
@@ -192,8 +192,21 @@ void HTMLFetchThread::execute()
 OString aID = OUStringToOString(maID, RTL_TEXTENCODING_UTF8);
 xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pHtmlPtr);
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(aID.getStr()), pXmlXpathCtx);
+
+if (!pXmlXpathObj)
+{
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
 xmlNodeSetPtr pXmlNodes = pXmlXpathObj->nodesetval;
 
+if (!pXmlNodes)
+{
+xmlXPathFreeNodeSetList(pXmlXpathObj);
+xmlXPathFreeContext(pXmlXpathCtx);
+return;
+}
+
 if (pXmlNodes->nodeNr == 0)
 {
 xmlXPathFreeNodeSet(pXmlNodes);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits