CppCheck Report Update

[cppcheck.libreoff...@gmail.com]

A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2018-23-09 02:38:06 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh


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

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

[Libreoffice Gerrit user]

 compilerplugins/clang/expressionalwayszero.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 8b1501d80dc9d3f42c351c6e026fa737e116cae5
Author: Stephan Bergmann 
AuthorDate: Sat Sep 22 20:44:30 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Sep 22 23:59:53 2018 +0200

Always disable loplugin:expressionalwayszero, to avoid false positives

bdade7e3fc33c1832c6f6a472443fca8238738d2 "tdf#105444 DOCX import: don't put
extra paragraphs in comments" caused

> 
/home/sbergman/lo2/core/writerfilter/source/dmapper/DomainMapper_Impl.cxx:441:22:
 error: expression always evaluates to zero, lhs=0 rhs=unknown 
[loplugin:expressionalwayszero]
> (sizeof(SAL_NEWLINE_STRING)-1 == 2 && 
xCursor->getString() == "\n"))
>  
^

now with sufficiently new Clang, and the code looks reasonable, and there's 
no
apparent way to avoid such false positives in the plugin.  (It could check 
for a
sub-expression of the problematic expression being an object-like macro, but
SAL_NEWLINE_STRING could just as well be a variable instead of a macro.  
That
variable would need to be defined in some #if to have different values on
different platforms, so the plugin could theoretically check for such
conditional inclusion, but it's not clear whether that's worth it and would 
even
be a useful heuristic to not produce neither too many false positives nor 
too
many false negatives.)  So just disable the plugin for good.

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

diff --git a/compilerplugins/clang/expressionalwayszero.cxx 
b/compilerplugins/clang/expressionalwayszero.cxx
index dae006b00097..c4762aecbc35 100644
--- a/compilerplugins/clang/expressionalwayszero.cxx
+++ b/compilerplugins/clang/expressionalwayszero.cxx
@@ -150,12 +150,7 @@ bool ExpressionAlwaysZero::TraverseStaticAssertDecl( 
StaticAssertDecl * )
 return true;
 }
 
-// on clang-3.8, this plugin can generate OOM
-#if CLANG_VERSION >= 30900
-loplugin::Plugin::Registration< ExpressionAlwaysZero > 
X("expressionalwayszero");
-#else
 loplugin::Plugin::Registration< ExpressionAlwaysZero > 
X("expressionalwayszero", false);
-#endif
 
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |   20 
 cui/source/options/personalization.hxx |   13 +
 2 files changed, 25 insertions(+), 8 deletions(-)

New commits:
commit 98530f4dfe13fd379ab0c2d55b90914b6738dad9
Author: Muhammet Kara 
AuthorDate: Sat Sep 22 17:31:30 2018 +0300
Commit: Muhammet Kara 
CommitDate: Sat Sep 22 23:39:53 2018 +0200

Ensure settings consistency for default personas

Change-Id: I7610e890a8b49c50bf23ed07daa5517c33edcb8d
Reviewed-on: https://gerrit.libreoffice.org/60897
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index e839de754d23..6ac90e7fea3b 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -450,21 +450,25 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 while( aStream.IsOpen() && !aStream.eof() && nIndex < MAX_DEFAULT_PERSONAS 
)
 {
 OString aLine;
+OUString aPersonaSetting, aPreviewFile;
+sal_Int32 nPreviewIndex = 0;
+
 aStream.ReadLine( aLine );
-OUString aPersonaSetting( OStringToOUString( aLine, 
RTL_TEXTENCODING_UTF8 ) );
-OUString aPreviewFile;
-sal_Int32 nNewIndex = aPersonaSetting.indexOf( ';' );
-if( nNewIndex < 0 )
+aPersonaSetting = OStringToOUString( aLine, RTL_TEXTENCODING_UTF8 );
+aPreviewFile = aPersonaSetting.getToken( 2, ';', nPreviewIndex );
+
+if (aPreviewFile.isEmpty())
 break;
-aPreviewFile = aPersonaSetting.copy( 0, nNewIndex );
-aPersonaSetting = aPersonaSetting.copy( nNewIndex + 1 );
+
+// There is no room for the preview file in the PersonaSettings 
currently
+aPersonaSetting = aPersonaSetting.replaceFirst( aPreviewFile + ";", "" 
);
 m_vDefaultPersonaSettings.push_back( aPersonaSetting );
 
 INetURLObject aURLObj( gallery + aPreviewFile );
 aFilter.ImportGraphic( aGraphic, aURLObj );
 BitmapEx aBmp = aGraphic.GetBitmapEx();
-m_vDefaultPersonaImages[nIndex]->Show();
-m_vDefaultPersonaImages[nIndex++]->SetModeImage( Image( aBmp ) );
+m_vDefaultPersonaImages[nIndex]->SetModeImage( Image( aBmp ) );
+m_vDefaultPersonaImages[nIndex++]->Show();
 foundOne = true;
 }
 
diff --git a/cui/source/options/personalization.hxx 
b/cui/source/options/personalization.hxx
index 006f7dfced1a..9ee91e875015 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -62,6 +62,19 @@ public:
 void CheckAppliedTheme();
 void ShowAppliedThemeLabel( const OUString& );
 
+/*
+ * Loads the default personas from the shared personas directory
+ * which resides in the shared gallery.
+ * There needs to be a separate subdirectory for each default persona,
+ * which includes the preview, header, and footer images.
+ * And there needs to be a personas_list.txt file in the personas directory
+ * which keeps the index/info of the default personas, one persona per 
line.
+ * A line should look like this:
+ * persona_slug;Persona 
Name;subdir/preview.jpg;subdir/header.jpg;subdir/footer.jpg;#textcolor;#accentcolor
+ * (It is recommended to keep the subdir name the same as the slug)
+ * Example line:
+ *  
abstract;Abstract;abstract/preview.jpg;abstract/Header2.jpg;abstract/Footer2.jpg;#ff;#00
+ */
 void LoadDefaultImages();
 void LoadExtensionThemes();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/svdraw/svdograf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a052cc921ee819c44794f5762023816e4c4343c
Author: Caolán McNamara 
AuthorDate: Sat Sep 22 16:54:06 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 22:16:34 2018 +0200

ofz#10610 Direct-leak

Change-Id: If7cd5e7157419c5d3b3a7ff834613e7f6489047c
Reviewed-on: https://gerrit.libreoffice.org/60900
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 27b1e4d5eeb4..b22cdfac5412 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -755,7 +755,7 @@ void SdrGrafObj::AddToHdlList(SdrHdlList& rHdlList) const
 {
 SdrHdlList tempList(nullptr);
 SdrRectObj::AddToHdlList( tempList );
-tempList.RemoveHdl(0);
+delete tempList.RemoveHdl(0);
 tempList.MoveTo(rHdlList);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   39 ++---
 1 file changed, 23 insertions(+), 16 deletions(-)

New commits:
commit 6bebb05bd4b338e1ed3dac2c02b8b4186dc79675
Author: Lionel Elie Mamane 
AuthorDate: Sat Sep 15 07:19:28 2018 +0200
Commit: Lionel Elie Mamane 
CommitDate: Sat Sep 22 22:10:34 2018 +0200

tdf#119569 try most likely to succeed method to get column metadata _before_

We first try to prepare the statement and get metadata
information. That's fine. Some DB engines/drivers will not give column
information on an unexectured prepared statement. In that case, first
try to execute the statement with all parameters set to NULL, which is
likely to succeed. If not, keep "execute the raw SQL indiscriminately"
as a last resort. I'm not sure it will ever be useful, though.

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

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 4892df42be23..cfac370ca6b0 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -788,29 +788,36 @@ Reference< XNameAccess > SAL_CALL 
OSingleSelectQueryComposer::getColumns(  )
 }
 catch( const Exception& ) { }
 
-try
+if ( !xResultSetMeta.is() && xPreparedStatement.is() )
 {
-if ( !xResultSetMeta.is() )
+try
 {
-xStatement.reset( Reference< XStatement >( 
m_xConnection->createStatement(), UNO_QUERY_THROW ) );
-Reference< XPropertySet > xStatementProps( xStatement, 
UNO_QUERY_THROW );
-try { xStatementProps->setPropertyValue( 
PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); }
-catch ( const Exception& ) { 
DBG_UNHANDLED_EXCEPTION("dbaccess"); }
-xResMetaDataSup.set( xStatement->executeQuery( sSQL ), 
UNO_QUERY_THROW );
+//@see issue 
http://qa.openoffice.org/issues/show_bug.cgi?id=110111
+// access returns a different order of column names when 
executing select * from
+// and asking the columns from the metadata.
+Reference< XParameters > xParameters( xPreparedStatement, 
UNO_QUERY_THROW );
+Reference< XIndexAccess > xPara = getParameters();
+for(sal_Int32 i = 1;i <= xPara->getCount();++i)
+xParameters->setNull(i,DataType::VARCHAR);
+xResMetaDataSup.set(xPreparedStatement->executeQuery(), 
UNO_QUERY_THROW );
 xResultSetMeta.set( xResMetaDataSup->getMetaData(), 
UNO_QUERY_THROW );
 }
+catch( const Exception& ) { }
 }
-catch( const Exception& )
+
+if ( !xResultSetMeta.is() )
 {
-//@see issue http://qa.openoffice.org/issues/show_bug.cgi?id=110111
-// access returns a different order of column names when executing 
select * from
-// and asking the columns from the metadata.
-Reference< XParameters > xParameters( xPreparedStatement, 
UNO_QUERY_THROW );
-Reference< XIndexAccess > xPara = getParameters();
-for(sal_Int32 i = 1;i <= xPara->getCount();++i)
-xParameters->setNull(i,DataType::VARCHAR);
-xResMetaDataSup.set(xPreparedStatement->executeQuery(), 
UNO_QUERY_THROW );
+xStatement.reset( Reference< XStatement >( 
m_xConnection->createStatement(), UNO_QUERY_THROW ) );
+Reference< XPropertySet > xStatementProps( xStatement, 
UNO_QUERY_THROW );
+try { xStatementProps->setPropertyValue( 
PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); }
+catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
+xResMetaDataSup.set( xStatement->executeQuery( sSQL ), 
UNO_QUERY_THROW );
 xResultSetMeta.set( xResMetaDataSup->getMetaData(), 
UNO_QUERY_THROW );
+
+if (xResultSetMeta.is())
+{
+SAL_WARN("dbaccess", "OSingleSelectQueryComposer::getColumns 
failed to get xResultSetMeta from executed PreparedStatement, but got it from 
'no escape processing' statement. SQL command:\n\t" << sSQL );
+}
 }
 
 if ( aSelectColumns->get().empty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/fontfeaturesdialog.ui |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3e17cdbca0738eeecbda7ed8f60f1e988c68d7bc
Author: Caolán McNamara 
AuthorDate: Sat Sep 22 16:46:10 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 21:12:08 2018 +0200

tdf#120045 propagate_natural_[width|height] illegal in gtk 3.18

no warning in glade about it, though there is for other
such things that don't exist in the targetted version

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

diff --git a/cui/uiconfig/ui/fontfeaturesdialog.ui 
b/cui/uiconfig/ui/fontfeaturesdialog.ui
index dcbce1de44c2..b3db9831fbe8 100644
--- a/cui/uiconfig/ui/fontfeaturesdialog.ui
+++ b/cui/uiconfig/ui/fontfeaturesdialog.ui
@@ -87,8 +87,6 @@
 True
 True
 in
-True
-True
 
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Libreoffice Gerrit user]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0a5542438320ee81bbf285b11d0996796c8a9830
Author: Stephan Bergmann 
AuthorDate: Sat Sep 22 17:30:36 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Sep 22 20:55:16 2018 +0200

external/harfbuzz's libharfbuzz.a links against icuuc library

buovjaga reported on IRC that his build (implicitly 
--without-system-harfbuzz
--without-system-icu) failed to link e.g. Library_vclplug_gtk3 due to 
harfbuzz
missing symbols from ICU, like

> /usr/bin/ld: 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/.libs/libharfbuzz.a(libharfbuzz_la-hb-icu.o):
 in function `hb_icu_unicode_decompose_compatibility(hb_unicode_funcs_t*, 
unsigned int, unsigned int*, void*)':
> 
/home/user/libreoffice/workdir/UnpackedTarball/harfbuzz/src/hb-icu.cc:334: 
undefined reference to `unorm2_getNFKDInstance_62'
[...]

It is not clear to me why Library_vclplug_gtk3 would actually use
libharfbuzz.a's hb_icu_unicode_decompose_compatibility (and for e.g. my 
builds,
it apparently doesn't), but in general libharfbuzz.a does depend on some 
symbols
from icuuc, so it is correct to add icuuc to the link when linking against
harfbuzz.  (And "gb_LinkTarget_use_external,...,icuuc" conveniently only 
adds
libs for linking, and does not add C/C++ include file paths, which would 
not be
wanted here.)

( "Revert 'Add more more 
dependencies
to VCL makefiles'" was a false start trying to address the above issue.)

Change-Id: Ic8bcfa2aab185f8a9487d7787b4f22068e7cb481
Reviewed-on: https://gerrit.libreoffice.org/60898
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f172765a84f8..9312d0b7ab2a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1505,6 +1505,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
+$(call gb_LinkTarget_use_external,$(1),icuuc)
 $(call gb_LinkTarget_use_external_project,$(1),harfbuzz)
 
 endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - 2 commits - download.lst external/curl nss/nss-no-c99.patch nss/nss.patch nss/nss.windowbuild.patch.0 nss/UnpackedTarb

[Libreoffice Gerrit user]

 download.lst  |4 
 external/curl/CVE-2018-14618.patch|   34 
 external/curl/UnpackedTarball_curl.mk |1 
 nss/UnpackedTarball_nss.mk|3 
 nss/nss-no-c99.patch  | 2526 +-
 nss/nss.patch |  131 -
 nss/nss.windowbuild.patch.0   |   55 
 7 files changed, 2595 insertions(+), 159 deletions(-)

New commits:
commit d064c6d91d527f5ce2336c37bb98adafd3fbb187
Author: Thorsten Behrens 
AuthorDate: Sat Sep 22 19:14:00 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Sep 22 19:25:26 2018 +0200

curl: fix CVE-2018-14618

* don't upgrade to new release, just use the patch from git

Change-Id: I1f2af0cb388c6a94a817b765d0a1eff9990f1661

diff --git a/external/curl/CVE-2018-14618.patch 
b/external/curl/CVE-2018-14618.patch
new file mode 100644
index ..5d99c9fb3118
--- /dev/null
+++ b/external/curl/CVE-2018-14618.patch
@@ -0,0 +1,34 @@
+From 57d299a499155d4b327e341c6024e293b0418243 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg 
+Date: Mon, 13 Aug 2018 10:35:52 +0200
+Subject: [PATCH] Curl_ntlm_core_mk_nt_hash: return error on too long password
+
+... since it would cause an integer overflow if longer than (max size_t
+/ 2).
+
+This is CVE-2018-14618
+
+Bug: https://curl.haxx.se/docs/CVE-2018-14618.html
+Closes #2756
+Reported-by: Zhaoyang Wu
+---
+ lib/curl_ntlm_core.c | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
+index e27cab353c..922e85a926 100644
+--- a/lib/curl_ntlm_core.c
 b/lib/curl_ntlm_core.c
+@@ -557,8 +557,11 @@ CURLcode Curl_ntlm_core_mk_nt_hash(struct Curl_easy *data,
+unsigned char *ntbuffer /* 21 bytes */)
+ {
+   size_t len = strlen(password);
+-  unsigned char *pw = len ? malloc(len * 2) : strdup("");
++  unsigned char *pw;
+   CURLcode result;
++  if(len > SIZE_T_MAX/2) /* avoid integer overflow */
++return CURLE_OUT_OF_MEMORY;
++  pw = len ? malloc(len * 2) : strdup("");
+   if(!pw)
+ return CURLE_OUT_OF_MEMORY;
+ 
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index a08086610fa9..bb06e3f1ddf2 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc.patch.1 \
external/curl/curl-msvc-disable-protocols.patch.1 \
external/curl/curl-7.26.0_win-proxy.patch \
+   external/curl/CVE-2018-14618.patch \
 ))
 ifeq ($(OS),ANDROID)
 $(eval $(call gb_UnpackedTarball_add_patches,curl,\
commit 1c8620aa4fd5c09910720db91389a87e8a172e4a
Author: Thorsten Behrens 
AuthorDate: Sat Sep 22 05:49:18 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Sep 22 19:17:52 2018 +0200

nss: upgrade to 3.38

Fixes CVE-2018-0495 and "the ASN.1 code".

(cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef)

Change-Id: I0544d31b6338403a75bd35e0de9d72ca6a8086b6

diff --git a/download.lst b/download.lst
index 36546a51a1f6..0ccf205a7578 100644
--- a/download.lst
+++ b/download.lst
@@ -10,8 +10,8 @@ MWAW_MD5SUM := 828dd03510791fbe037081a2b4a1a8ff
 export MWAW_TARBALL := libmwaw-0.1.11.tar.bz2
 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40
 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2
-NSS_MD5SUM := e55ee06b22687df68fafc6a30c0554b2
-export NSS_TARBALL := nss-3.29.5-with-nspr-4.13.1.tar.gz
+export NSS_MD5SUM := cd649be8ee61fe15d64d7bef361b37ba
+export NSS_TARBALL := nss-3.38-with-nspr-4.19.tar.gz
 ZLIB_MD5SUM := f4669c4b1eb2007b208b70c96dcd4108
 export ZLIB_TARBALL := zlib-1.2.11.tar.bz2
 OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114
diff --git a/nss/UnpackedTarball_nss.mk b/nss/UnpackedTarball_nss.mk
index d58f7171b9f6..a839620f5f53 100644
--- a/nss/UnpackedTarball_nss.mk
+++ b/nss/UnpackedTarball_nss.mk
@@ -15,12 +15,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
nss/nss.patch \
nss/nss-3.13.5-zlib-werror.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),nss/nss.windows.patch) \
-nss/nss.windowbuild.patch.0 \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
nss/nss.cygwin64.in32bit.patch) \
 $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \
 nss/nss-winXP-sdk.patch.1) \
-   nss/nss-no-c99.patch \
+   $(if $(filter WNTMSC,$(OS)$(COM)),nss/nss-no-c99.patch) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/nss/nss-no-c99.patch b/nss/nss-no-c99.patch
index eb686145e4e9..b695683f6d0e 100644
--- a/nss/nss-no-c99.patch
+++ b/nss/nss-no-c99.patch
@@ -1475,34 +1475,9 @@
  64,
  }
  };
 a/nss/nss/lib/freebl/ecl/curve25519_64.c   2017-04-06 16:14:46.0 
+0200
-+++ b/nss/nss/lib/freebl/ecl/curve25519_64.c   2018-05-22 19:18:07.482457400 
+0200
-@@ -38,17 +38,17 @@
- const int64_t *in = (const int64_t

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

[Libreoffice Gerrit user]

 cui/source/tabpages/align.cxx  |1 -
 cui/source/tabpages/border.cxx |5 ++---
 include/sfx2/tabdlg.hxx|2 --
 sfx2/source/dialog/tabdlg.cxx  |   15 +++
 4 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit 5372962696ba4271ffb6b2b230fab5261108af6b
Author: Caolán McNamara 
AuthorDate: Fri Sep 21 21:12:16 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 20:29:00 2018 +0200

unwind ItemWrapperHelper

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

diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 3dd853fe0248..8832ec7df80c 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 59607465d0ca..c64aa54e6669 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -374,8 +373,8 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, 
const SfxItemSet& rCor
 
 mbHorEnabled = pBoxInfo->IsHorEnabled();
 mbVerEnabled = pBoxInfo->IsVerEnabled();
-mbTLBREnabled = sfx::ItemWrapperHelper::IsKnownItem( rCoreAttrs, 
SID_ATTR_BORDER_DIAG_TLBR );
-mbBLTREnabled = sfx::ItemWrapperHelper::IsKnownItem( rCoreAttrs, 
SID_ATTR_BORDER_DIAG_BLTR );
+mbTLBREnabled = 
rCoreAttrs.GetItemState(GetWhich(SID_ATTR_BORDER_DIAG_TLBR)) != 
SfxItemState::UNKNOWN;
+mbBLTREnabled = 
rCoreAttrs.GetItemState(GetWhich(SID_ATTR_BORDER_DIAG_BLTR)) != 
SfxItemState::UNKNOWN;
 
 if(pBoxInfo->IsDist())
 {
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 12dd8201fce9..5342dd089173 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -374,8 +374,6 @@ protected:
 public:
 voidSetTabDialog(SfxTabDialog* pDialog);
 voidSetDialogController(SfxTabDialogController* pDialog);
-protected:
-voidAddItemConnection( sfx::ItemConnectionBase* 
pConnection );
 public:
 virtual ~SfxTabPage() override;
 virtual voiddispose() override;
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d4bfaf1db24d..889fab6b5a13 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -51,7 +50,6 @@ using namespace ::com::sun::star::uno;
 struct TabPageImpl
 {
 boolmbStandard;
-sfx::ItemConnectionArraymaItemConn;
 VclPtrmxDialog;
 SfxTabDialogController* mpDialogController;
 css::uno::Reference< css::frame::XFrame > mxFrame;
@@ -213,15 +211,13 @@ void SfxTabPage::dispose()
 TabPage::dispose();
 }
 
-bool SfxTabPage::FillItemSet( SfxItemSet* rSet )
+bool SfxTabPage::FillItemSet( SfxItemSet* )
 {
-return pImpl->maItemConn.DoFillItemSet( *rSet, GetItemSet() );
+return false;
 }
 
-void SfxTabPage::Reset( const SfxItemSet* rSet )
+void SfxTabPage::Reset( const SfxItemSet* )
 {
-pImpl->maItemConn.DoApplyFlags( rSet );
-pImpl->maItemConn.DoReset( rSet );
 }
 
 void SfxTabPage::ActivatePage( const SfxItemSet& )
@@ -327,11 +323,6 @@ void SfxTabPage::ChangesApplied()
 {
 }
 
-void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
-{
-pImpl->maItemConn.AddConnection( pConnection );
-}
-
 void SfxTabPage::SetTabDialog(SfxTabDialog* pDialog)
 {
 pImpl->mxDialog = pDialog;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 include/svtools include/svx include/vcl sfx2/source svtools/source svx/source

[Libreoffice Gerrit user]

 cui/source/inc/align.hxx|   65 +--
 cui/source/tabpages/align.cxx   |  636 +---
 cui/uiconfig/ui/cellalignment.ui|  162 +++--
 include/sfx2/controlwrapper.hxx |   70 ---
 include/sfx2/itemconnect.hxx|   83 
 include/svtools/valueset.hxx|   12 
 include/svx/dialcontrol.hxx |   26 -
 include/svx/frmdirlbox.hxx  |   22 -
 include/svx/orienthelper.hxx|   19 -
 include/vcl/customweld.hxx  |1 
 sfx2/source/dialog/itemconnect.cxx  |   28 -
 svtools/source/control/valueset.cxx |1 
 svx/source/dialog/dialcontrol.cxx   |   67 +--
 svx/source/dialog/frmdirlbox.cxx|   28 -
 svx/source/dialog/orienthelper.cxx  |   28 -
 15 files changed, 610 insertions(+), 638 deletions(-)

New commits:
commit 32eac27a2c22aae63941479482ef21e8d75a5122
Author: Caolán McNamara 
AuthorDate: Fri Sep 21 17:09:42 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 20:28:23 2018 +0200

weld AlignmentTabPage

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

diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index df2094afe684..669cac0467e0 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -69,47 +69,50 @@ public:
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 
 private:
-explicitAlignmentTabPage( vcl::Window* pParent, const 
SfxItemSet& rCoreSet );
+explicitAlignmentTabPage(TabPageParent pParent, const 
SfxItemSet& rCoreSet);
 
 voidInitVsRefEgde();
 voidUpdateEnableControls();
 
 boolHasAlignmentChanged( const SfxItemSet& rNew, 
sal_uInt16 nWhich ) const;
 
-DECL_LINK( UpdateEnableHdl, ListBox&, void );
-DECL_LINK( UpdateEnableClickHdl, Button*, void );
+DECL_LINK(UpdateEnableHdl, weld::ComboBox&, void);
+DECL_LINK(UpdateEnableClickHdl, weld::ToggleButton&, void);
 
 private:
-VclPtr m_pLbHorAlign;
-VclPtr   m_pFtIndent;
-VclPtr m_pEdIndent;
-VclPtr   m_pFtVerAlign;
-VclPtr m_pLbVerAlign;
-
-VclPtr m_pCtrlDial;
-VclPtr   m_pFtRotate;
-VclPtrm_pNfRotate;
-VclPtr   m_pFtRefEdge;
-VclPtrm_pVsRefEdge;
-VclPtr m_pCbStacked;
-VclPtr m_pCbAsianMode;
-std::unique_ptr m_pOrientHlp;
-
-VclPtr m_pBoxDirection;
-VclPtr m_pBtnWrap;
-VclPtr m_pBtnHyphen;
-VclPtr m_pBtnShrink;
-VclPtr m_pLbFrameDir;
+SvxDialControl m_aCtrlDial;
+SvtValueSet m_aVsRefEdge;
+
+std::unique_ptr m_xLbHorAlign;
+std::unique_ptr m_xFtIndent;
+std::unique_ptr m_xEdIndent;
+std::unique_ptr m_xFtVerAlign;
+std::unique_ptr m_xLbVerAlign;
+
+std::unique_ptr m_xFtRotate;
+std::unique_ptr m_xNfRotate;
+std::unique_ptr m_xFtRefEdge;
+std::unique_ptr m_xCbStacked;
+std::unique_ptr m_xCbAsianMode;
+
+std::unique_ptr m_xBoxDirection;
+std::unique_ptr m_xBtnWrap;
+std::unique_ptr m_xBtnHyphen;
+std::unique_ptr m_xBtnShrink;
+std::unique_ptr m_xLbFrameDir;
 
 // hidden labels/string
-VclPtr   m_pFtBotLock;
-VclPtr   m_pFtTopLock;
-VclPtr   m_pFtCelLock;
-VclPtr   m_pFtABCD;
-
-VclPtrm_pAlignmentFrame;
-VclPtrm_pOrientFrame;
-VclPtrm_pPropertiesFrame;
+std::unique_ptr m_xFtBotLock;
+std::unique_ptr m_xFtTopLock;
+std::unique_ptr m_xFtCelLock;
+std::unique_ptr m_xFtABCD;
+
+std::unique_ptr m_xAlignmentFrame;
+std::unique_ptr m_xOrientFrame;
+std::unique_ptr m_xPropertiesFrame;
+
+std::unique_ptr m_xVsRefEdge;
+std::unique_ptr m_xCtrlDial;
 };
 
 
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index ed35fa53ea6b..3dd853fe0248 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -46,55 +46,6 @@
 
 namespace svx {
 
-// item connections ===
-
-// horizontal alignment ---
-
-typedef sfx::ValueItemWrapper< SvxHorJustifyItem, SvxCellHorJustify > 
HorJustItemWrapper;
-typedef sfx::ListBoxConnection< HorJustItemWrapper > HorJustConnection;
-
-static const HorJustConnection::MapEntryType s_pHorJustMap[] =
-{
-{ ALIGNDLG_HORALIGN_STD,SvxCellHorJustify::Standard},
-{ ALIGNDLG_HORALIGN_LEFT,   SvxCellHorJustify::Left},
-{ ALIGNDLG_HORALIGN_CENTER, SvxCellHorJustify::Center  },
-{ ALIGNDLG_HORALIGN_RIGHT,  SvxCellHorJustify::Right   },
-{ ALIGNDLG_HORALIGN_BLOCK,  SvxCellHorJustify::Block   },
-{ ALIGNDLG_HORALIGN_FILL,   SvxCe

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

[Libreoffice Gerrit user]

 sd/qa/unit/data/tdf67248.odg |binary
 sd/qa/unit/misc-tests.cxx|   15 +++
 2 files changed, 15 insertions(+)

New commits:
commit 47f84e024344d9a50e44dda4f947945e8fc643b5
Author: Regina Henschel 
AuthorDate: Sat Sep 22 12:52:37 2018 +0200
Commit: Regina Henschel 
CommitDate: Sat Sep 22 19:38:01 2018 +0200

tdf#67248 unittest for: Use localized layer name only ...

for display in UI. The test counts the layers. The error was, that a
user layer was merged into a standard layer.

Change-Id: Ib73e14965689b005a7d42811b6de9126dd3ef57d
Reviewed-on: https://gerrit.libreoffice.org/60892
Tested-by: Jenkins
Reviewed-by: Regina Henschel 

diff --git a/sd/qa/unit/data/tdf67248.odg b/sd/qa/unit/data/tdf67248.odg
new file mode 100644
index ..03417effa62d
Binary files /dev/null and b/sd/qa/unit/data/tdf67248.odg differ
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index a3e717cca5e6..df038e5fde65 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -67,6 +67,7 @@ public:
 void testTdf101242_ODF();
 void testTdf101242_settings();
 void testTdf119392();
+void testTdf67248();
 
 CPPUNIT_TEST_SUITE(SdMiscTest);
 CPPUNIT_TEST(testTdf96206);
@@ -79,6 +80,7 @@ public:
 CPPUNIT_TEST(testTdf101242_ODF);
 CPPUNIT_TEST(testTdf101242_settings);
 CPPUNIT_TEST(testTdf119392);
+CPPUNIT_TEST(testTdf67248);
 CPPUNIT_TEST_SUITE_END();
 
 virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -535,6 +537,19 @@ void SdMiscTest::testTdf119392()
 xDocShRef->DoClose();
 }
 
+void SdMiscTest::testTdf67248()
+{
+// The document tdf67248.odg has been created with a German UI. It has a 
user layer named "Background".
+// On opening the user layer must still exists. The error was, that it was 
merged into the standard
+// layer "background".
+sd::DrawDocShellRef xDocShRef = 
Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf67248.odg"), ODG);
+CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is());
+SdrLayerAdmin& rLayerAdmin = xDocShRef->GetDoc()->GetLayerAdmin();
+CPPUNIT_ASSERT_EQUAL( sal_uInt16(6), rLayerAdmin.GetLayerCount());
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdMiscTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Calc research & funcalc ...

[Michael Meeks]

Hi Alexander,

On 21/09/18 12:57, Alexander Bock wrote:
> Yes, that’s very close :) Thanks! I can see there is also a tentative
> LibreOffice Conference

Sure, we do this each year - always fun; this year in Albania -
starting early next week: do join us. Next year's location to be
announced but will happen.

> The threaded variant you refer to is the one from the slides right? As I
> understand, the interpreter is not fully parallel but runs cell
> arrays/formula groups in parallel.

Correct; so far. Always more to do there. We'd love help as well - if
you have students interested in the more vexed engineering of
re-assembling our aircraft in-flight =) the interesting (and partially
solved) issue of more deeply unwinding the implicit intersections for
more precise dependencies and a decent view of the dependency graph is
something we'd love help with eg.

While Calc seems daunting, it's really only ~400k lines of code and
attacking a reasonably well understood problem (vs. say writer layout =).

ATB,

Michael.

-- 
michael.me...@collabora.com <><, GM Collabora Productivity
Hangout: mejme...@gmail.com, Skype: mmeeks
(M) +44 7795 666 147 - timezone usually UK / Europe
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu |
2 +-
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |
2 +-
 dbaccess/source/ui/dlg/generalpage.cxx|
6 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 37dba4f25f00ffc1a1a631772eadd50e998966c1
Author: Tamas Bunth 
AuthorDate: Sat Sep 22 14:31:23 2018 +0200
Commit: Tamás Bunth 
CommitDate: Sat Sep 22 18:44:13 2018 +0200

tdf#119850 show missing mysql connector options

For MYSQL connections there is an extra window which determines how to
connect to a mysql/mariadb database. This functionality is handled in
OGeneralPageWizard::approveDatasourceType.

Change-Id: Ia3c548103b694731cba47ff5390c34b072a938a0
Reviewed-on: https://gerrit.libreoffice.org/60893
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 

diff --git 
a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
index eec6fe8f99ec..2be9b6658c92 100644
--- a/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -18,7 +18,7 @@
  -->
 http://openoffice.org/2004/installation"; 
xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
   
-
+
   
 com.sun.star.comp.sdbc.mysqlc.MysqlCDriver
   
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index e1ffd84be35c..69b46357d2c1 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -278,7 +278,7 @@ using namespace ::com::sun::star;
 {
 // show the "Connect directly" option only if the driver is installed
 const DbuTypeCollectionItem* pCollectionItem = dynamic_cast( _rSet.GetItem(DSID_TYPECOLLECTION) );
-bool bHasMySQLNative = ( pCollectionItem != nullptr ) && 
pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" );
+bool bHasMySQLNative = ( pCollectionItem != nullptr ) && 
pCollectionItem->getCollection()->hasDriver( "sdbc:mysql:mysqlc:" );
 if ( bHasMySQLNative )
 m_pNATIVEDatabase->Show();
 
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index e3efcaaedaf3..9826ffb3f985 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -608,13 +608,9 @@ namespace dbaui
 switch ( eType )
 {
 case ::dbaccess::DST_MYSQL_JDBC:
-_inout_rDisplayName = "MySQL";
-break;
 case ::dbaccess::DST_MYSQL_ODBC:
 case ::dbaccess::DST_MYSQL_NATIVE:
-// don't display those, the decision whether the user connects via 
JDBC/ODBC/C-OOo is made on another
-// page
-_inout_rDisplayName.clear();
+_inout_rDisplayName = "MySQL";
 break;
 default:
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/chardlg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f576512912599c527d4465e34df5844371c5b530
Author: Caolán McNamara 
AuthorDate: Fri Sep 21 13:04:51 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 17:52:40 2018 +0200

eState is not that of SID_ATTR_CHAR_WORDLINEMODE as it should be

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

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 84d0aa2b2006..8ca732247b6c 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1810,6 +1810,8 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
 
 // WordLineMode
 nWhich = GetWhich( SID_ATTR_CHAR_WORDLINEMODE );
+eState = rSet->GetItemState( nWhich );
+
 switch ( eState )
 {
 case SfxItemState::UNKNOWN:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/qa/cppunit/test_misc.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9b1af015fba717db26e6419365b25b4c274fedea
Author: Caolán McNamara 
AuthorDate: Sat Sep 22 14:37:32 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 16:43:53 2018 +0200

try other markup

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

diff --git a/sfx2/qa/cppunit/test_misc.cxx b/sfx2/qa/cppunit/test_misc.cxx
index c86eca8262a2..cf9fcdb3e0be 100644
--- a/sfx2/qa/cppunit/test_misc.cxx
+++ b/sfx2/qa/cppunit/test_misc.cxx
@@ -181,7 +181,7 @@ void MiscTest::testHardLinks()
 xStorable->store();
 
 struct stat buf;
-// coverity[toctou] - this is legitimate in the context of this text
+// coverity[fs_check_call] - this is legitimate in the context of this text
 int nRet = stat(aOld.getStr(), &buf);
 CPPUNIT_ASSERT_EQUAL(0, nRet);
 // This failed: hard link count was 1, the hard link broke on store.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cppu/source/uno/sequence.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2e145afcfe9bcda3dbf916bb7a91bcf45442f12e
Author: Caolán McNamara 
AuthorDate: Sat Sep 22 14:41:05 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sat Sep 22 16:44:09 2018 +0200

tweak markup

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

diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 1a15b1c8a8d6..848aaa39f428 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -269,7 +269,7 @@ static inline bool idefaultConstructElements(
 {
 if (nAlloc >= 0)
 {
-// coverity[suspicious_sizeof] - sizeof(uno_Sequence*) is correct 
here
+// coverity[suspicious_sizeof : FALSE] - sizeof(uno_Sequence*) is 
correct here
 pSeq = reallocSeq(pSeq, sizeof(uno_Sequence*), nAlloc);
 }
 if (pSeq != nullptr)
@@ -518,7 +518,7 @@ static inline bool icopyConstructFromElements(
 }
 case typelib_TypeClass_SEQUENCE: // sequence of sequence
 {
-// coverity[suspicious_sizeof] - sizeof(uno_Sequence*) is correct here
+// coverity[suspicious_sizeof : FALSE] - sizeof(uno_Sequence*) is 
correct here
 pSeq = reallocSeq(pSeq, sizeof(uno_Sequence*), nAlloc);
 if (pSeq != nullptr)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf105444.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx|9 +
 sw/qa/extras/uiwriter/uiwriter.cxx|   10 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++-
 4 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit bdade7e3fc33c1832c6f6a472443fca8238738d2
Author: László Németh 
AuthorDate: Fri Sep 21 12:38:48 2018 +0200
Commit: László Németh 
CommitDate: Sat Sep 22 15:47:11 2018 +0200

tdf#105444 DOCX import: don't put extra paragraphs in comments

on Win32, waiting only for \r\n instead of \n in RemoveLastParagraph().

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf105444.docx 
b/sw/qa/extras/ooxmlexport/data/tdf105444.docx
new file mode 100644
index ..a6e0ea8732e3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf105444.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 61388952f583..2b55c3f1ecfd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -797,6 +797,15 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119143, "tdf119143.docx")
 sParaText);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf105444, "tdf105444.docx")
+{
+xmlDocPtr pXmlComm = parseExport("word/comments.xml");
+if (!pXmlComm)
+return;
+// there is no extra paragraph on Win32, only a single one.
+assertXPath(pXmlComm, "/w:comments/w:comment/w:p", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 0bb8c12afab1..12c3e08cb150 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5405,15 +5405,7 @@ void SwUiWriterTest::testCreateDocxAnnotation()
 uno::Reference xField(xFields->nextElement(), 
uno::UNO_QUERY);
 
 // this was empty instead of "some text"
-OUString aResultText = aSomeText
-#ifdef WNT
-// FIXME From some unclear reason, on windows we get an additional
-// paragraph in the comment - please adapt this test when that gets
-// fixed.
-+ "\n"
-#endif
-;
-CPPUNIT_ASSERT_EQUAL(aResultText, 
xField->getPropertyValue("Content").get());
+CPPUNIT_ASSERT_EQUAL(aSomeText, 
xField->getPropertyValue("Content").get());
 }
 
 void SwUiWriterTest::testTdf107976()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8767256faa76..6359fdf0982a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -436,7 +436,9 @@ void DomainMapper_Impl::RemoveLastParagraph( )
 xCursor->goLeft( 1, true );
 // If this is a text on a shape, possibly the text has the trailing
 // newline removed already.
-if (xCursor->getString() == SAL_NEWLINE_STRING)
+if (xCursor->getString() == SAL_NEWLINE_STRING ||
+// tdf#105444 comments need an exception, if 
SAL_NEWLINE_STRING defined as "\r\n"
+(sizeof(SAL_NEWLINE_STRING)-1 == 2 && xCursor->getString() 
== "\n"))
 {
 uno::Reference 
xDocProps(GetTextDocument(), uno::UNO_QUERY);
 const OUString aRecordChanges("RecordChanges");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/test/util/xindent.hxx   |   35 +++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv |2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv   |2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangeObj.csv  |2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv |2 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |2 
 qadevOOo/tests/java/ifc/util/_XIndent.java  |   90 
--
 sc/qa/extras/sccellcursorobj.cxx|6 
 sc/qa/extras/sccellobj.cxx  |6 
 sc/qa/extras/sccellrangeobj.cxx |6 
 sc/qa/extras/sccellrangesobj.cxx|6 
 sc/qa/extras/sctablesheetobj.cxx|6 
 test/Library_subsequenttest.mk  |1 
 test/source/util/xindent.cxx|   55 ++
 15 files changed, 121 insertions(+), 101 deletions(-)

New commits:
commit b56ad4cbe0aa67b92211cf31d70eca0b35c62666
Author: Rahul Gurung 
AuthorDate: Sun Sep 9 19:15:15 2018 +0530
Commit: Markus Mohrhard 
CommitDate: Sat Sep 22 15:37:52 2018 +0200

tdf#45904 Move _XIndent Java Tests to C++

Change-Id: I65b594db595f0e08a50a9ea18baf44c496cf18e3
Reviewed-on: https://gerrit.libreoffice.org/60218
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/include/test/util/xindent.hxx b/include/test/util/xindent.hxx
new file mode 100644
index ..bb3c0e5d3ede
--- /dev/null
+++ b/include/test/util/xindent.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef INCLUDED_TEST_UTIL_XINDENT_HXX
+#define INCLUDED_TEST_UTIL_XINDENT_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XIndent
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testIncrementIndent();
+void testDecrementIndent();
+
+protected:
+~XIndent() {}
+};
+}
+
+#endif // INCLUDED_TEST_UTIL_XINDENT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index cbde0376703a..f7f56ae29046 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -721,7 +721,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/util/_XCloneable \
 qadevOOo/tests/java/ifc/util/_XFlushable \
 qadevOOo/tests/java/ifc/util/_XImportable \
-qadevOOo/tests/java/ifc/util/_XIndent \
 qadevOOo/tests/java/ifc/util/_XModeSelector \
 qadevOOo/tests/java/ifc/util/_XModifiable \
 qadevOOo/tests/java/ifc/util/_XModifyBroadcaster \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
index 6e73814c7386..5b19c7d3bc96 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellCursorObj.csv
@@ -105,8 +105,6 @@
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontPitchComplex"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharPostureComplex"
 
"ScCellCursorObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex"
-"ScCellCursorObj";"com::sun::star::util::XIndent";"decrementIndent()"
-"ScCellCursorObj";"com::sun::star::util::XIndent";"incrementIndent()"
 "ScCellCursorObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
 
"ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScCellCursorObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
index 036c38dea7ef..e54b4fc80ff0 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellObj.csv
@@ -109,8 +109,6 @@
 "ScCellObj";"com::sun::star::text::XTextRangeMover#optional";"moveTextRange()"
 
"ScCellObj";"com::sun::star::text::XTextRangeCompare#optional";"compareRegionStarts()"
 
"ScCellObj";"com::sun::star::text::XTextRangeCompare#optional";"compareRegionEnds()"
-"ScCellObj";"com::sun::star::util::XIndent";"decrementIndent()"
-"ScCellObj";"com::sun::star::util::XIndent";"incrementIndent()"
 "ScCellObj";"com::sun::star::text::XSimpleText";"createTextCursor()"

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

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |   28 
 cui/source/options/personalization.hxx |3 ++-
 cui/uiconfig/ui/personalization_tab.ui |   12 +++-
 3 files changed, 29 insertions(+), 14 deletions(-)

New commits:
commit ac2dff01460f8ef0c23fbf51f3666218b00c0c66
Author: Muhammet Kara 
AuthorDate: Fri Sep 21 23:44:27 2018 +0300
Commit: Muhammet Kara 
CommitDate: Sat Sep 22 12:42:27 2018 +0200

tdf#60543: Remember the URL of the currently applied persona

Change-Id: I21bc9353dc37825967bdca3329568990907928b4
Reviewed-on: https://gerrit.libreoffice.org/60888
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 27c0b2e836f4..e839de754d23 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -21,6 +21,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -278,7 +280,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
vcl::Window *pParent, cons
 // persona
 get( m_pNoPersona, "no_persona" );
 get( m_pDefaultPersona, "default_persona" );
-get( m_pAppliedThemeLabel, "applied_theme" );
+get( m_pAppliedThemeLabel, "applied_theme_link" );
 
 get( m_pOwnPersona, "own_persona" );
 m_pOwnPersona->SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
ForceSelect ) );
@@ -411,14 +413,24 @@ void SvxPersonalizationTabPage::CheckAppliedTheme()
 
 void SvxPersonalizationTabPage::ShowAppliedThemeLabel(const OUString& 
aPersonaSetting)
 {
-sal_Int32 nSlugIndex, nNameIndex;
-OUString aName;
+OUString aSlug, aName;
+sal_Int32 nIndex = 0;
+
+aSlug = aPersonaSetting.getToken( 0, ';', nIndex );
 
-nSlugIndex = aPersonaSetting.indexOf( ';' ) + 1;
-nNameIndex = aPersonaSetting.indexOf( ';', nSlugIndex );
-aName = "(" + aPersonaSetting.copy( nSlugIndex, nNameIndex ) +")";
-m_pAppliedThemeLabel->Show();
-m_pAppliedThemeLabel->SetText( aName );
+if ( nIndex > 0 )
+aName = "(" + aPersonaSetting.getToken( 0, ';', nIndex ) + ")";
+
+if ( !aName.isEmpty() )
+{
+m_pAppliedThemeLabel->SetText( aName );
+m_pAppliedThemeLabel->SetURL( 
"https://addons.mozilla.org/en-US/firefox/addon/"; + aSlug + "/" );
+m_pAppliedThemeLabel->Show();
+}
+else
+{
+SAL_WARN("cui.options", "Applied persona doesn't have a name!");
+}
 }
 
 void SvxPersonalizationTabPage::LoadDefaultImages()
diff --git a/cui/source/options/personalization.hxx 
b/cui/source/options/personalization.hxx
index b1b91d917f25..006f7dfced1a 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -23,6 +23,7 @@
 #define MAX_DEFAULT_PERSONAS 3  // Maximum number of default personas
 
 class FixedText;
+class FixedHyperlink;
 class SearchAndParseThread;
 
 class SvxPersonalizationTabPage : public SfxTabPage
@@ -39,7 +40,7 @@ private:
 VclPtr m_pPersonaList;///< The ListBox to 
show the list of installed personas
 OUString m_aPersonaSettings;   ///< Header and footer 
images + color to be set in the settings.
 VclPtr m_pExtensionLabel;   ///< The "select 
persona installed via extensions" label
-VclPtr m_pAppliedThemeLabel;///< The label for 
showing applied custom theme
+VclPtr m_pAppliedThemeLabel;///< The label for 
showing applied custom theme
 
 std::vector m_vDefaultPersonaSettings;
 std::vector m_vExtensionPersonaSettings;
diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index eb2338232521..a5990c1b1c8f 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -134,9 +134,11 @@
   
 
 
-  
-True
-False
+  
+Applied 
persona's name and URL
+True
+True
+none
   
   
 True
@@ -167,8 +169,8 @@
 
   
 False
-0
 Or, select from the Themes 
installed via extensions:
+0
   
   
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit d3e6b3e4c15c57f876b4e7e22a1e7ba25e0cd18d
Author: Mike Kaganski 
AuthorDate: Sat Sep 22 10:58:47 2018 +0200
Commit: Gerrit Code Review 
CommitDate: Sat Sep 22 12:42:00 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - SEARCH spreadsheet function returns error when text not found

... as per OASIS ODF OpenFormula specification:

http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018874_715980110

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

diff --git a/helpcontent2 b/helpcontent2
index 38e128a7d8e7..3e53721f941e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 38e128a7d8e71e5bf1fdb43e4299dab1562fca52
+Subproject commit 3e53721f941e72291b18d0a70c9870d663bcd576
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 3e53721f941e72291b18d0a70c9870d663bcd576
Author: Mike Kaganski 
AuthorDate: Sat Sep 22 10:58:47 2018 +0200
Commit: Olivier Hallot 
CommitDate: Sat Sep 22 12:42:00 2018 +0200

SEARCH spreadsheet function returns error when text not found

... as per OASIS ODF OpenFormula specification:

http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part2.html#__RefHeading__1018874_715980110

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

diff --git a/source/text/scalc/01/04060110.xhp 
b/source/text/scalc/01/04060110.xhp
index ef59e4a78..e6f8f9829 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -608,7 +608,7 @@
 
 
 SEARCH
-Returns the position of a text segment within a character 
string. You can set the start of the search as an option. The search 
text can be a number or any sequence of characters. The search is not 
case-sensitive.
+Returns the position of a text segment within a character 
string. You can set the start of the search as an option. The search 
text can be a number or any sequence of characters. The search is not 
case-sensitive. If the text is not found, returns error 519 
(#VALUE).
 
 
 Syntax
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits