CppCheck Report Update

2017-05-20 Thread 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 :
2017-21-05_02:31:37 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: 2 commits - configure.ac onlineupdate/CustomTarget_generated.mk onlineupdate/source

2017-05-20 Thread Markus Mohrhard
 configure.ac  |3 +++
 onlineupdate/CustomTarget_generated.mk|4 ++--
 onlineupdate/source/update/updater/gen_cert_header.py |7 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 20d04d6938a104124ac06271f17978a290cccf6c
Author: Markus Mohrhard 
Date:   Sun May 21 00:38:10 2017 +0200

take the certifcate info from the update config

Change-Id: I15856f21d19b45ec50bd3d63d2e526c9e8db450d

diff --git a/onlineupdate/CustomTarget_generated.mk 
b/onlineupdate/CustomTarget_generated.mk
index 0c0f230387a8..346629976328 100644
--- a/onlineupdate/CustomTarget_generated.mk
+++ b/onlineupdate/CustomTarget_generated.mk
@@ -15,13 +15,13 @@ $(onlineupdate_INC)/primaryCert.h : \
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
mkdir -p $(dir $@)
-   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"primaryCertData" /lo/users/moggi/NSSDBDir/master-daily.der > 
$(onlineupdate_INC)/primaryCert.h #"$(UPDATE_CONFIG)"
+   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"primaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/primaryCert.h 
#"$(UPDATE_CONFIG)"
 
 $(onlineupdate_INC)/secondaryCert.h : \
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1)
mkdir -p $(dir $@)
-   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"secondaryCertData" /lo/users/moggi/NSSDBDir/master-daily.der > 
$(onlineupdate_INC)/secondaryCert.h #"$(UPDATE_CONFIG)"
+   $(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py 
"secondaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/secondaryCert.h 
#"$(UPDATE_CONFIG)"
 
 $(call gb_CustomTarget_get_target,onlineupdate/generated) : \
$(onlineupdate_INC)/primaryCert.h \
diff --git a/onlineupdate/source/update/updater/gen_cert_header.py 
b/onlineupdate/source/update/updater/gen_cert_header.py
index 5b70758db3f2..8fedcd9bcf62 100755
--- a/onlineupdate/source/update/updater/gen_cert_header.py
+++ b/onlineupdate/source/update/updater/gen_cert_header.py
@@ -2,6 +2,7 @@
 
 import sys
 import binascii
+import configparser
 
 def file_byte_generator(filename):
 with open(filename, "rb") as f:
@@ -17,6 +18,8 @@ def create_header(array_name, in_filename):
 
 if __name__ == '__main__':
 if len(sys.argv) < 3:
-print('ERROR: usage: gen_cert_header.py array_name in_filename')
+print('ERROR: usage: gen_cert_header.py array_name update_config_file')
 sys.exit(1);
-sys.exit(create_header(sys.argv[1], sys.argv[2]))
+config = configparser.ConfigParser()
+config.read(sys.argv[2])
+sys.exit(create_header(sys.argv[1], config['Updater']['certificate-der']))
commit 3964bfa04f5aa09a9199225a8763cdec74d92ee3
Author: Markus Mohrhard 
Date:   Sun May 21 00:12:58 2017 +0200

check that a update config is specified for mar based updater

Change-Id: I1fb87b33d4db8e5b0608aef13013be6dc9e8657e

diff --git a/configure.ac b/configure.ac
index 585c47efdfb7..cd4f0fa2ebaf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11299,6 +11299,9 @@ else
 if test "$enable_online_update" = "mar"; then
 AC_MSG_RESULT([yes - MAR-based online update])
 ENABLE_ONLINE_UPDATE_MAR="TRUE"
+if test "$with_update_config" = ""; then
+AC_MSG_ERROR([mar based online updater needs an update config 
specified with "with-update-config])
+fi
 UPDATE_CONFIG="$with_update_config"
 AC_DEFINE(HAVE_FEATURE_UPDATE_MAR)
 elif test "$enable_online_update" = "yes"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Thorsten Behrens
 cppcanvas/source/mtfrenderer/emfplus.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ca5b8804f0bda6f04974b037fb71a6d594379eb4
Author: Thorsten Behrens 
Date:   Sat May 20 16:28:38 2017 +0200

cppcanvas: this assert can stay

Both sequences are supposed to be 4 - input there does not result
from parsing the EMF+ file.

Change-Id: Idcfa70d717b75ce226a8bae0ebe073002555ef17
Reviewed-on: https://gerrit.libreoffice.org/37861
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx 
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 8cfd1127540e..a96900d48872 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -450,8 +450,7 @@ namespace cppcanvas
 int length = aStartColor.getLength ();
 uno::Sequence< double > aColor (length);
 
-SAL_WARN_IF(length != aEndColor.getLength(), 
"cppcanvas.emf", "length != aEndColor.getLength()");
-
+assert(length == aEndColor.getLength());
 for (int i = 0; i < brush->blendPoints; i++) {
 aStops[i] = brush->blendPositions [i];
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Zdeněk Crhonek
 sc/qa/unit/data/functions/statistical/fods/maxifs.fods | 3328 -
 1 file changed, 2354 insertions(+), 974 deletions(-)

New commits:
commit 53fd8223b73c683e9e4d92b2ad3aabed368eff0e
Author: Zdeněk Crhonek 
Date:   Sat May 20 14:16:22 2017 +0200

tdf#107892 add MAXIFS test

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/maxifs.fods 
b/sc/qa/unit/data/functions/statistical/fods/maxifs.fods
index 0ea4a152f22f..c3bc66abb3b9 100644
--- a/sc/qa/unit/data/functions/statistical/fods/maxifs.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/maxifs.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.3.0.0.alpha1$Linux_X86_64
 
LibreOffice_project/5d39c2013374727b1c8f147b8b99d54402a7ff02
+ 
2016-07-24T08:15:55.36200P0D1LibreOfficeDev/5.5.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/07381c017cd2b4e3ce643d17ae7cbb11ddef2228
  
   
0
0
-   121969
-   20395
+   144547
+   32984

 
  view1
@@ -31,8 +31,8 @@
false
   
   
-   0
-   10
+   4
+   1
0
0
0
@@ -132,7 +132,7 @@
true
1
true
-   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
false
0
   
@@ -165,7 +165,7 @@
  
  
   
-   
+   

   
   
@@ -174,269 +174,269 @@
   

   
-  
+  

 
Kč
   
-  
+  

-

 
Kč
-   
+   
   
-  
+  
 

 
   
-  
+  
 
(

)
   
-  
+  
 
-

 
   
-  
+  

 
-   
-   
-   
+   
+   
+   
   
-  
+  

   
-  
+  

   
-  
+  

 
Kč
   
-  
+  
-

 
Kč
-   
+   
   
-  
+  

 
Kč
   
-  
+  
-

 
Kč
-   
+   
   
-  
+  

 
Kč
   
-  
+  

-

 
Kč
-   
+   
   
-  
+  

 
Kč
   
-  
+  

-

 
Kč
-   
+   
   
-  
+  
£

[Libreoffice-commits] core.git: desktop/source framework/source include/svtools scripting/source sc/source sd/source sfx2/source shell/source stoc/source sw/source vbahelper/source vcl/osx

2017-05-20 Thread Jochen Nitschke
 desktop/source/deployment/registry/help/dp_help.cxx  |2 --
 desktop/source/deployment/registry/script/dp_script.cxx  |1 -
 framework/source/uiconfiguration/moduleimagemanager.cxx  |2 --
 include/svtools/popupmenucontrollerbase.hxx  |2 --
 sc/source/ui/vba/vbaworkbooks.cxx|2 --
 scripting/source/protocolhandler/scripthandler.cxx   |1 -
 sd/source/ui/dlg/tpaction.cxx|2 --
 sfx2/source/doc/DocumentMetadataAccess.cxx   |1 -
 shell/source/unix/exec/shellexec.cxx |1 -
 stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx |1 -
 sw/source/ui/vba/vbadocuments.cxx|2 --
 vbahelper/source/vbahelper/vbadocumentsbase.cxx  |2 --
 vcl/osx/salinst.cxx  |1 -
 13 files changed, 20 deletions(-)

New commits:
commit 0d1a3593c2bc6ed16880e34c2b4243d9836b69cd
Author: Jochen Nitschke 
Date:   Sat May 20 13:17:15 2017 +0200

cleanup unused css/uri/ includes

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

diff --git a/desktop/source/deployment/registry/help/dp_help.cxx 
b/desktop/source/deployment/registry/help/dp_help.cxx
index 85eb867d9eeb..0a1b81dc4ed6 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -42,8 +42,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 using namespace ::dp_misc;
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx 
b/desktop/source/deployment/registry/script/dp_script.cxx
index 3c59f781a049..332a6057a01e 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include "dp_scriptbackenddb.hxx"
 
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx 
b/framework/source/uiconfiguration/moduleimagemanager.cxx
index e5b6069d29fd..279be2c92ba9 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -33,8 +33,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
diff --git a/include/svtools/popupmenucontrollerbase.hxx 
b/include/svtools/popupmenucontrollerbase.hxx
index ac33169b2824..0380b3fe1afa 100644
--- a/include/svtools/popupmenucontrollerbase.hxx
+++ b/include/svtools/popupmenucontrollerbase.hxx
@@ -31,8 +31,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx 
b/sc/source/ui/vba/vbaworkbooks.cxx
index 6683265fdaf8..f9384943abe0 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -33,8 +33,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include 
 #include 
diff --git a/scripting/source/protocolhandler/scripthandler.cxx 
b/scripting/source/protocolhandler/scripthandler.cxx
index 50188ae52e74..115d78a81112 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -50,7 +50,6 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uri/XUriReference.hpp"
 #include "com/sun/star/uri/UriReferenceFactory.hpp"
-#include "com/sun/star/uri/XVndSunStarScriptUrl.hpp"
 
 #include 
 
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index a0dec36b6c8c..e26bca9e196f 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -24,8 +24,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx 
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 2b4f3535dfb6..8fb8220bb1c6 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -58,7 +58,6 @@
 #include 
 #include 
 #include 
-#include 
 
 
 /*
diff --git a/shell/source/unix/exec/shellexec.cxx 
b/shell/source/unix/exec/shellexec.cxx
index def9d67cdae6..1fd5230fcf93 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -31,7 +31,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx 
b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index dc7fbf0015ff..d95ccf4a6906 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -26,7 +26,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/ui/vba/vbadocuments.cxx 
b/sw/source/ui/vba/vbadocuments.cxx
index c59c7a60130f..a0cca33527fa 1006

[Libreoffice-commits] core.git: basic/source include/toolkit scripting/source toolkit/source

2017-05-20 Thread Jochen Nitschke
 basic/source/classes/eventatt.cxx  |3 ---
 include/toolkit/controls/dialogcontrol.hxx |1 -
 include/toolkit/controls/tabpagemodel.hxx  |1 -
 scripting/source/dlgprov/dlgprov.cxx   |1 -
 toolkit/source/controls/dialogcontrol.cxx  |1 -
 toolkit/source/helper/property.cxx |1 -
 6 files changed, 8 deletions(-)

New commits:
commit cae3e20571167772e82b0cc714d9442af57ece8a
Author: Jochen Nitschke 
Date:   Sat May 20 11:05:39 2017 +0200

cleanup unused css/resource/ includes

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

diff --git a/basic/source/classes/eventatt.cxx 
b/basic/source/classes/eventatt.cxx
index ada6d09d0bf9..29a20f8a5be9 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -33,8 +33,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -57,7 +55,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::script;
-using namespace ::com::sun::star::resource;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index d166f30fef0a..2316613e4a4b 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -25,7 +25,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/toolkit/controls/tabpagemodel.hxx 
b/include/toolkit/controls/tabpagemodel.hxx
index 2b11f5c5ae5d..c4a7d1fb 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/scripting/source/dlgprov/dlgprov.cxx 
b/scripting/source/dlgprov/dlgprov.cxx
index 49c640503947..883a10d55593 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/toolkit/source/controls/dialogcontrol.cxx 
b/toolkit/source/controls/dialogcontrol.cxx
index 6861e8732ecf..ac9d0c427b25 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/toolkit/source/helper/property.cxx 
b/toolkit/source/helper/property.cxx
index 790a2fdfea31..7b98d1d80611 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -43,7 +43,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: editeng/source eventattacher/source extensions/source extensions/test

2017-05-20 Thread Johnny_M
 editeng/source/editeng/editdbg.cxx  |2 
+-
 editeng/source/editeng/eehtml.cxx   |4 
++--
 editeng/source/editeng/eertfpar.cxx |2 
+-
 editeng/source/editeng/impedit2.cxx |4 
++--
 editeng/source/items/svxitems.src   |2 
+-
 editeng/source/misc/svxacorr.cxx|2 
+-
 editeng/source/uno/unonrule.cxx |4 
++--
 eventattacher/source/eventattacher.cxx  |2 
+-
 extensions/source/bibliography/toolbar.cxx  |2 
+-
 extensions/source/propctrlr/formcomponenthandler.cxx|4 
++--
 extensions/test/ole/AxTestComponents/AxTestComponents.idl   |2 
+-
 extensions/test/ole/EventListenerSample/EventListener/EventListener.idl |2 
+-
 extensions/test/ole/EventListenerSample/EventListener/EvtListener.cpp   |2 
+-
 extensions/test/ole/EventListenerSample/EventListener/EvtListener.h |2 
+-
 14 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit f46e8802c2639cd56b65b35b5eea3a248437dbe4
Author: Johnny_M 
Date:   Fri May 19 19:55:00 2017 +0200

Translate German comments and debug strings (leftovers in e... dirs)

Translates all (leftovers) found using a custom regex, in directories not
shown by /bin/find-german-comments and beginning with "e".

Additionally, following is translated:
- A help string in 
/extensions/test/ole/EventListenerSample/EventListener/EventListener.idl

Change-Id: Iff521ae1c4a616ed5a4ca79641a5cee6f380bee0
Reviewed-on: https://gerrit.libreoffice.org/37836
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 6c2d0c58770c..6bdb9455ddb3 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -418,7 +418,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool 
bInfoBox )
 for ( sal_Int32 nLine = 0; nLine < pPPortion->GetLines().Count(); 
nLine++ )
 {
 EditLine& rLine = pPPortion->GetLines()[nLine];
-fprintf( fp, "\nZeile %" SAL_PRIdINT32 ":\tStart: %" SAL_PRIdINT32 
",\tEnd: %" SAL_PRIdINT32, nLine, rLine.GetStart(), rLine.GetEnd() );
+fprintf( fp, "\nLine %" SAL_PRIdINT32 ":\tStart: %" SAL_PRIdINT32 
",\tEnd: %" SAL_PRIdINT32, nLine, rLine.GetStart(), rLine.GetEnd() );
 fprintf( fp, "\t\tPortions: %" SAL_PRIdINT32 " - %" SAL_PRIdINT32 
".\tHight: %i, Ascent=%i", rLine.GetStartPortion(), rLine.GetEndPortion(), 
rLine.GetHeight(), rLine.GetMaxAscent() );
 }
 
diff --git a/editeng/source/editeng/eehtml.cxx 
b/editeng/source/editeng/eehtml.cxx
index e625669aea00..0b6dfd182af0 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -54,7 +54,7 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const 
OUString& rBaseURL, SvKeyVa
 DBG_ASSERT( !IsSwitchToUCS2(), "EditHTMLParserEditHTMLParser: Switch 
to UCS2?" );
 
 // Although the real default encoding is ISO8859-1, we use MS-1252
-// als default encoding.
+// as default encoding.
 SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  
RTL_TEXTENCODING_ISO_8859_1 ) );
 
 // If the file starts with a BOM, switch to UCS2.
@@ -443,7 +443,7 @@ void EditHTMLParser::NextToken( HtmlTokenId nToken )
 // misc
 case HtmlTokenId::DIRLIST_ON:
 case HtmlTokenId::DIRLIST_OFF:
-case HtmlTokenId::FOOTNOTE_ON:  //! land so im Text
+case HtmlTokenId::FOOTNOTE_ON:  //! they land so in the text
 case HtmlTokenId::FOOTNOTE_OFF:
 case HtmlTokenId::MENULIST_ON:
 case HtmlTokenId::MENULIST_OFF:
diff --git a/editeng/source/editeng/eertfpar.cxx 
b/editeng/source/editeng/eertfpar.cxx
index 88c0499eb9c2..96aac57b553d 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -344,7 +344,7 @@ void EditRTFParser::SetAttrInDoc( SvxRTFItemStackType &rSet 
)
 
 if( SfxItemState::SET == rSet.GetAttrSet().GetItemState( 
EE_CHAR_ESCAPEMENT, false, &pItem ))
 {
-// die richtige
+// the correct one
 long nEsc = static_cast(pItem)->GetEsc();
 
 if( ( DFLT_ESC_AUTO_SUPER != nEsc ) && ( DFLT_ESC_AUTO_SUB != nEsc ) )
diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 950a5bf79f1b..366e4f09ed6c 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -370,7 +370,7 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 }
 else if ( rCEvt.GetCommand() == CommandEventId::EndExtTextInput )
 {
-OSL_ENSURE( mpIMEInfos, "CommandEventId::EndExtTextIn

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

2017-05-20 Thread Julien Nabet
 sw/source/core/unocore/unodraw.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 6f873fe3e97d93a05d5d293c98a98b0f9d8edbf1
Author: Julien Nabet 
Date:   Sat May 20 13:42:01 2017 +0200

Remove "noel" SAL_WARN

Change-Id: I1557af6563f9dfab03cca5696b4622ae18b805d4
Reviewed-on: https://gerrit.libreoffice.org/37856
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit f80265fc9f9ff35b78609f91440d7515eb49d78a)
Reviewed-on: https://gerrit.libreoffice.org/37857

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index b155e81b2c0d..63d50325deed 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1044,9 +1044,6 @@ uno::Reference< beans::XPropertySetInfo >  
SwXShape::getPropertySetInfo()
 
 void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& 
aValue)
 {
-if (rPropertyName == "LayerID") {
-SAL_WARN("sw.uno", "noel");
-}
 SolarMutexGuard aGuard;
 SwFrameFormat*   pFormat = GetFrameFormat();
 const SfxItemPropertySimpleEntry*  pEntry = 
m_pPropSet->getPropertyMap().getByName( rPropertyName );
@@ -1447,9 +1444,6 @@ void SwXShape::setPropertyValue(const OUString& 
rPropertyName, const uno::Any& a
 
 uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
 {
-if (rPropertyName == "LayerID") {
-SAL_WARN("sw.uno", "noel");
-}
 SolarMutexGuard aGuard;
 uno::Any aRet;
 SwFrameFormat*   pFormat = GetFrameFormat();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Julien Nabet
 sw/source/core/unocore/unodraw.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit f80265fc9f9ff35b78609f91440d7515eb49d78a
Author: Julien Nabet 
Date:   Sat May 20 13:42:01 2017 +0200

Remove "noel" SAL_WARN

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

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index b155e81b2c0d..63d50325deed 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1044,9 +1044,6 @@ uno::Reference< beans::XPropertySetInfo >  
SwXShape::getPropertySetInfo()
 
 void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& 
aValue)
 {
-if (rPropertyName == "LayerID") {
-SAL_WARN("sw.uno", "noel");
-}
 SolarMutexGuard aGuard;
 SwFrameFormat*   pFormat = GetFrameFormat();
 const SfxItemPropertySimpleEntry*  pEntry = 
m_pPropSet->getPropertyMap().getByName( rPropertyName );
@@ -1447,9 +1444,6 @@ void SwXShape::setPropertyValue(const OUString& 
rPropertyName, const uno::Any& a
 
 uno::Any SwXShape::getPropertyValue(const OUString& rPropertyName)
 {
-if (rPropertyName == "LayerID") {
-SAL_WARN("sw.uno", "noel");
-}
 SolarMutexGuard aGuard;
 uno::Any aRet;
 SwFrameFormat*   pFormat = GetFrameFormat();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: filter/qa filter/source forms/qa forms/source formula/source fpicker/source framework/source

2017-05-20 Thread Johnny_M
 filter/qa/complex/filter/detection/typeDetection/TypeDetection.java |4 +-
 filter/source/graphicfilter/idxf/dxftblrd.hxx   |2 -
 filter/source/graphicfilter/ipcd/ipcd.cxx   |2 -
 filter/source/graphicfilter/ipsd/ipsd.cxx   |2 -
 filter/source/graphicfilter/iras/iras.cxx   |   14 
+-
 filter/source/graphicfilter/itga/itga.cxx   |2 -
 filter/source/msfilter/escherex.cxx |2 -
 filter/source/msfilter/eschesdo.hxx |1 
 filter/source/msfilter/msdffimp.cxx |8 
++---
 filter/source/msfilter/svdfppt.cxx  |8 
++---
 forms/qa/integration/forms/CellBinding.java |2 -
 forms/source/component/DatabaseForm.cxx |2 -
 forms/source/component/EventThread.hxx  |2 -
 forms/source/component/ListBox.hxx  |6 ++--
 forms/source/inc/FormComponent.hxx  |2 -
 forms/source/inc/property.hrc   |2 -
 forms/source/richtext/richtextunowrapper.cxx|2 -
 formula/source/core/resource/core_resource.src  |4 +-
 formula/source/ui/dlg/formdlgs.hrc  |2 -
 formula/source/ui/dlg/funcutl.cxx   |7 
++---
 formula/source/ui/dlg/parawin.hxx   |2 -
 fpicker/source/office/OfficeFilePicker.cxx  |2 -
 fpicker/source/office/OfficeFolderPicker.cxx|2 -
 framework/source/services/pathsettings.cxx  |4 +-
 24 files changed, 42 insertions(+), 44 deletions(-)

New commits:
commit fd48f39a7ec080c868b314e06bc91efd160e87c9
Author: Johnny_M 
Date:   Fri May 19 21:55:00 2017 +0200

Translate German comments and debug strings (leftovers in f... dirs)

Translates all (leftovers) found using a custom regex, in directories not
shown by /bin/find-german-comments and beginning with "f".

Additionally:
- Fixed translation in formula/source/ui/dlg/funcutl.cxx (translated in

https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=5e04331fc0a6434c61d3d18843cb4f80a44e5989
 ),
because clearing an event is quite the opposite of its triggering.

Change-Id: I0fd62193a29883796cd05e5a80ce8a2900636b6c
Reviewed-on: https://gerrit.libreoffice.org/37839
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git 
a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java 
b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
index d487c2176a84..c7def3cd16e8 100644
--- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
+++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java
@@ -491,8 +491,8 @@ public class TypeDetection extends ComplexTestCase {
  try{
 
 /*
- *als Dateien die typeDetection.props und eine der csv-Dateien
- *benutzten. diese können per dmake einfach auf andere Rechte 
setzten
+ * As files, use the typeDetection.props and one of the csv files.
+ * Those can, via dmake, simply set rights on others.
  *
  */
 log.println("### checkStreamLoader() ###");
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.hxx 
b/filter/source/graphicfilter/idxf/dxftblrd.hxx
index 824b03bf2993..3dd5edc7aa60 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.hxx
@@ -137,7 +137,7 @@ public:
 };
 
 
-//-- Tabellen 
+//-- Tables --
 
 
 class DXFTables {
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx 
b/filter/source/graphicfilter/ipcd/ipcd.cxx
index c78101ebddca..77ab89ddedb7 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -195,7 +195,7 @@ void PCDReader::ReadImage()
 sal_uInt8 * pL0; // luminance for each pixel of the 1st row of the current 
pair of rows
 sal_uInt8 * pL1; // luminance for each pixel of the 2nd row of the current 
pair of rows
 sal_uInt8 * pCb; // blue chrominance for each 2x2 pixel of the current 
pair of rows
-sal_uInt8 * pCr; // red chrominance fuer je 2x2 pixel of the current pair 
of rows
+sal_uInt8 * pCr; // red chrominance for each 2x2 pixel of the current pair 
of rows
 sal_uInt8 * pL0N, * pL1N, * pCbN, * pCrN; // like above, but for the next 
pair of rows
 
 if ( !bStatus )
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx 
b/filter/sour

File URI quandy

2017-05-20 Thread Chris Sherlock
As I assume mostly everyone knows by now, I’ve been reading through our 
codebase for my online book at 
https://www.gitbook.com/book/chrissherlock1/inside-libreoffice/details 


I’ve lately been looking at how the OSL handles URIs (as an aside, our codebase 
is ancient, so ancient we still call them file URLs, not URIs). 

However, I’ve hit a genuine quandry. When we convert from system paths to file 
URIs, the RFC that details the file URI spec (RFC 8089) handles everything 
except for system paths on POSIX systems that start with double slashes. POSIX 
defines the behaviour of initial double slashes as implementation specific, 
however I cannot see anywhere in the RFC where it describes how to handle 
initial double slashes in file URIs. 

I’ve actually emailed the author of the RFC, but in case he doesn’t get back to 
me I thought I’d ask on the mailing list. This is genuinely obscure and 
unlikely to ever bite us on the rear, but one thing other than writing my book 
is to try to ensure our test converage caters for these corner cases. 

Chris

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


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

2017-05-20 Thread Olivier Hallot
 AllLangHelp_sbasic.mk  |1 
 source/text/sbasic/shared/03120111.xhp |4 -
 source/text/sbasic/shared/03120411.xhp |2 
 source/text/sbasic/shared/03120412.xhp |   63 +
 source/text/sbasic/shared/special_vba_func.xhp |   50 +--
 5 files changed, 92 insertions(+), 28 deletions(-)

New commits:
commit 0351604e8d6b4e3d797bdf742ff81377eee46b96
Author: Olivier Hallot 
Date:   Sat May 20 08:22:15 2017 -0300

tdf#84675 Add help page for StrReverse VBA

Fixes some syntax definitions
Mute l10n for VBA function names

Change-Id: I06d7391a44b465339e3c82f333719488f7d843b2
Reviewed-on: https://gerrit.libreoffice.org/37854
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 48e8ca766..dc1039d08 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -303,6 +303,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03120402 \
 helpcontent2/source/text/sbasic/shared/03120403 \
 helpcontent2/source/text/sbasic/shared/03120411 \
+helpcontent2/source/text/sbasic/shared/03120412 \
 helpcontent2/source/text/sbasic/shared/0313 \
 helpcontent2/source/text/sbasic/shared/03130100 \
 helpcontent2/source/text/sbasic/shared/03130500 \
diff --git a/source/text/sbasic/shared/03120111.xhp 
b/source/text/sbasic/shared/03120111.xhp
index 778258258..d220006ba 100644
--- a/source/text/sbasic/shared/03120111.xhp
+++ b/source/text/sbasic/shared/03120111.xhp
@@ -41,7 +41,7 @@
 
 Syntax:
 
-AscW (Text As 
String) as Integer
+AscW (Text As 
String)
 
 
 Return 
value:
@@ -69,4 +69,4 @@
 
 
 
-
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03120411.xhp 
b/source/text/sbasic/shared/03120411.xhp
index ae0bd22e8..c0ab1daad 100644
--- a/source/text/sbasic/shared/03120411.xhp
+++ b/source/text/sbasic/shared/03120411.xhp
@@ -42,7 +42,7 @@
 
 Syntax:
 
-InStrRev (Text1 
As String, Text2 As String [,Start As Long] [, Compare As Integer]) As 
Long
+InStrRev (Text1 
As String, Text2 As String [,Start As Long] [, Compare As Integer])
 
 
 Return 
value:
diff --git a/source/text/sbasic/shared/03120412.xhp 
b/source/text/sbasic/shared/03120412.xhp
new file mode 100644
index 0..11c69947d
--- /dev/null
+++ b/source/text/sbasic/shared/03120412.xhp
@@ -0,0 +1,63 @@
+
+
+
+
+
+  
+StrReverse Function [Runtime - 
VBA]
+/text/sbasic/shared/03120412.xhp
+  
+
+
+
+
+
+
+
+  StrReverse function
+
+
+
+StrReverse Function [Runtime - VBA]
+Returns the 
string with the character order reversed.
+
+
+
+Syntax:
+
+StrReverse 
(Text1 As String)
+
+
+Return 
value:
+String
+
+Parameters:
+ 
Text1: The string expression that you want to reverse the 
character order.
+
+
+
+Example:
+
+Sub ExampleReverse
+ Print StrReverse("ABCdefGH") ' return "HGfedCBA"
+End Sub
+
+
+
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/special_vba_func.xhp 
b/source/text/sbasic/shared/special_vba_func.xhp
index 541870cea..27598358e 100644
--- a/source/text/sbasic/shared/special_vba_func.xhp
+++ b/source/text/sbasic/shared/special_vba_func.xhp
@@ -35,9 +35,9 @@
 
 
 Exclusive VBA 
functions
-%PRODUCTNAME Basic supports these functions 
when VBA support is enabled
+%PRODUCTNAME Basic adds this set of functions 
when VBA support is enabled
 
-The 
following VBA functions are enabled when Option VBASupport 
1 is the first line of a %PRODUCTNAME Basic module. 
+These exclusive VBA functions are enabled when Option VBASupport 1 is the first line of a %PRODUCTNAME 
Basic module. 
 
   VBA Functions;Text Functions
 
@@ -47,16 +47,16 @@
 
 
   
-AscW
+AscW
   
   
-ChrW
+ChrW
   
   
-InStrRev
+InStrRev
   
   
-StrReverse
+StrReverse
   
 
   VBA Functions;Financial Functions
@@ -67,43 +67,43 @@
 
 
   
-DDB
+DDB
   
   
-FV
+FV
   
   
-IPmt
+IPmt
   
   
-IRR
+IRR
   
   
-MIRR
+MIRR
   
   
-NPer
+NPer
   
   
-NPV
+NPV
   
   
-Pmt
+Pmt
   
   
-PPmt
+PPmt
   
   
-PV
+PV
   
   
-Rate
+Rate
   
   
-SLN
+SLN
   
   
-SYD
+SYD
   
 
   VBA Functions;Date and Time Functions
@@ -114,10 +114,10 @@
 
 
   
-FormatDateTime
+FormatDateTime
   
   
-WeekdayName
+WeekdayName
   
 
   VBA Functions;I/O Functions
@@ -128,7 +128,7 @@
 
 
   
-Input
+Input
   
 
   VBA Functions;Mathematical Functions
@@ -139,7 +139,7 @@
 
 
   
-Round
+Round
   
 
   VBA Functions;Object Functions
@@ -150,10 +150,10 @@
 
 
   
-Me
+Me
   
   
-RTL
+RTL
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: helpcontent2

2017-05-20 Thread Olivier Hallot
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 639a67273fd2a499ed05b805d0011da202067311
Author: Olivier Hallot 
Date:   Sat May 20 08:22:15 2017 -0300

Updated core
Project: help  0351604e8d6b4e3d797bdf742ff81377eee46b96

tdf#84675 Add help page for StrReverse VBA

Fixes some syntax definitions
Mute l10n for VBA function names

Change-Id: I06d7391a44b465339e3c82f333719488f7d843b2
Reviewed-on: https://gerrit.libreoffice.org/37854
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index cc6b76b3b8ed..0351604e8d6b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cc6b76b3b8ede1c9ad8e173df9fd5b813e9e6572
+Subproject commit 0351604e8d6b4e3d797bdf742ff81377eee46b96
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - helpcontent2

2017-05-20 Thread Olivier Hallot
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 260dbe96950f3d4f9055158bc0c4c01806ad7c58
Author: Olivier Hallot 
Date:   Sat May 20 08:22:15 2017 -0300

Updated core
Project: help  fbd52ae78b3405a6338554877046134df334ff8d

tdf#84675 Add help page for StrReverse VBA

Fixes some syntax definitions
Mute l10n for VBA function names

Change-Id: I06d7391a44b465339e3c82f333719488f7d843b2
Reviewed-on: https://gerrit.libreoffice.org/37855
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index b87ee2a7cfe3..fbd52ae78b34 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b87ee2a7cfe389411135347c6c5eb3dd3dff3fb1
+Subproject commit fbd52ae78b3405a6338554877046134df334ff8d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - AllLangHelp_sbasic.mk source/text

2017-05-20 Thread Olivier Hallot
 AllLangHelp_sbasic.mk  |1 
 source/text/sbasic/shared/03120111.xhp |4 -
 source/text/sbasic/shared/03120411.xhp |2 
 source/text/sbasic/shared/03120412.xhp |   63 +
 source/text/sbasic/shared/special_vba_func.xhp |   50 +--
 5 files changed, 92 insertions(+), 28 deletions(-)

New commits:
commit fbd52ae78b3405a6338554877046134df334ff8d
Author: Olivier Hallot 
Date:   Sat May 20 08:22:15 2017 -0300

tdf#84675 Add help page for StrReverse VBA

Fixes some syntax definitions
Mute l10n for VBA function names

Change-Id: I06d7391a44b465339e3c82f333719488f7d843b2
Reviewed-on: https://gerrit.libreoffice.org/37855
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 48e8ca766..dc1039d08 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -303,6 +303,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03120402 \
 helpcontent2/source/text/sbasic/shared/03120403 \
 helpcontent2/source/text/sbasic/shared/03120411 \
+helpcontent2/source/text/sbasic/shared/03120412 \
 helpcontent2/source/text/sbasic/shared/0313 \
 helpcontent2/source/text/sbasic/shared/03130100 \
 helpcontent2/source/text/sbasic/shared/03130500 \
diff --git a/source/text/sbasic/shared/03120111.xhp 
b/source/text/sbasic/shared/03120111.xhp
index 778258258..d220006ba 100644
--- a/source/text/sbasic/shared/03120111.xhp
+++ b/source/text/sbasic/shared/03120111.xhp
@@ -41,7 +41,7 @@
 
 Syntax:
 
-AscW (Text As 
String) as Integer
+AscW (Text As 
String)
 
 
 Return 
value:
@@ -69,4 +69,4 @@
 
 
 
-
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03120411.xhp 
b/source/text/sbasic/shared/03120411.xhp
index ae0bd22e8..c0ab1daad 100644
--- a/source/text/sbasic/shared/03120411.xhp
+++ b/source/text/sbasic/shared/03120411.xhp
@@ -42,7 +42,7 @@
 
 Syntax:
 
-InStrRev (Text1 
As String, Text2 As String [,Start As Long] [, Compare As Integer]) As 
Long
+InStrRev (Text1 
As String, Text2 As String [,Start As Long] [, Compare As Integer])
 
 
 Return 
value:
diff --git a/source/text/sbasic/shared/03120412.xhp 
b/source/text/sbasic/shared/03120412.xhp
new file mode 100644
index 0..11c69947d
--- /dev/null
+++ b/source/text/sbasic/shared/03120412.xhp
@@ -0,0 +1,63 @@
+
+
+
+
+
+  
+StrReverse Function [Runtime - 
VBA]
+/text/sbasic/shared/03120412.xhp
+  
+
+
+
+
+
+
+
+  StrReverse function
+
+
+
+StrReverse Function [Runtime - VBA]
+Returns the 
string with the character order reversed.
+
+
+
+Syntax:
+
+StrReverse 
(Text1 As String)
+
+
+Return 
value:
+String
+
+Parameters:
+ 
Text1: The string expression that you want to reverse the 
character order.
+
+
+
+Example:
+
+Sub ExampleReverse
+ Print StrReverse("ABCdefGH") ' return "HGfedCBA"
+End Sub
+
+
+
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/special_vba_func.xhp 
b/source/text/sbasic/shared/special_vba_func.xhp
index 541870cea..27598358e 100644
--- a/source/text/sbasic/shared/special_vba_func.xhp
+++ b/source/text/sbasic/shared/special_vba_func.xhp
@@ -35,9 +35,9 @@
 
 
 Exclusive VBA 
functions
-%PRODUCTNAME Basic supports these functions 
when VBA support is enabled
+%PRODUCTNAME Basic adds this set of functions 
when VBA support is enabled
 
-The 
following VBA functions are enabled when Option VBASupport 
1 is the first line of a %PRODUCTNAME Basic module. 
+These exclusive VBA functions are enabled when Option VBASupport 1 is the first line of a %PRODUCTNAME 
Basic module. 
 
   VBA Functions;Text Functions
 
@@ -47,16 +47,16 @@
 
 
   
-AscW
+AscW
   
   
-ChrW
+ChrW
   
   
-InStrRev
+InStrRev
   
   
-StrReverse
+StrReverse
   
 
   VBA Functions;Financial Functions
@@ -67,43 +67,43 @@
 
 
   
-DDB
+DDB
   
   
-FV
+FV
   
   
-IPmt
+IPmt
   
   
-IRR
+IRR
   
   
-MIRR
+MIRR
   
   
-NPer
+NPer
   
   
-NPV
+NPV
   
   
-Pmt
+Pmt
   
   
-PPmt
+PPmt
   
   
-PV
+PV
   
   
-Rate
+Rate
   
   
-SLN
+SLN
   
   
-SYD
+SYD
   
 
   VBA Functions;Date and Time Functions
@@ -114,10 +114,10 @@
 
 
   
-FormatDateTime
+FormatDateTime
   
   
-WeekdayName
+WeekdayName
   
 
   VBA Functions;I/O Functions
@@ -128,7 +128,7 @@
 
 
   
-Input
+Input
   
 
   VBA Functions;Mathematical Functions
@@ -139,7 +139,7 @@
 
 
   
-Round
+Round
   
 
   VBA Functions;Object Functions
@@ -150,10 +150,10 @@
 
 
   
-Me
+Me
   
   
-RTL
+RTL
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Chris Sherlock
 sal/osl/unx/file_url.cxx |4 ++--
 sal/qa/osl/file/osl_File.cxx |9 +
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 0a72b799718a17b0ea49dc36d974da28000fc952
Author: Chris Sherlock 
Date:   Sat May 20 18:17:13 2017 +1000

tdf#107968 - double slash handling misleading; add unit test

Change-Id: Ide52926eff56065e7368615338ea33dcb2f87c62
Reviewed-on: https://gerrit.libreoffice.org/37850
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index b47f94192833..e6c0ecc2a02f 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -281,7 +281,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( 
rtl_uString *ustrSystemPath,
 }
 }
 
-/* check if initial string contains double instances of '/' */
+/* check if initial string contains repeated '/' characters */
 nIndex = rtl_ustr_indexOfStr_WithLength( ustrSystemPath->buffer, 
ustrSystemPath->length, pDoubleSlash, 2 );
 if( nIndex != -1 )
 {
@@ -295,7 +295,7 @@ oslFileError SAL_CALL osl_getFileURLFromSystemPath( 
rtl_uString *ustrSystemPath,
 /* adapt index to pTmp */
 nIndex += pTmp->length - ustrSystemPath->length;
 
-/* remove all occurrences of '//' */
+/* replace repeated '/' characters with a single '/' */
 for( nSrcIndex = nIndex + 1; nSrcIndex < pTmp->length; nSrcIndex++ )
 {
 if( (pTmp->buffer[nSrcIndex] == '/') && (pTmp->buffer[nIndex] == 
'/') )
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 4e635a1d559f..7176885dbbae 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -611,6 +611,7 @@ namespace osl_FileBase
 void getFileURLFromSystemPath_002();
 void getFileURLFromSystemPath_003();
 void getFileURLFromSystemPath_004();
+void getFileURLFromSystemPath_004_1();
 void getFileURLFromSystemPath_005();
 
 CPPUNIT_TEST_SUITE(SystemPath_FileURL);
@@ -641,6 +642,7 @@ namespace osl_FileBase
 CPPUNIT_TEST(getFileURLFromSystemPath_002);
 CPPUNIT_TEST(getFileURLFromSystemPath_003);
 CPPUNIT_TEST(getFileURLFromSystemPath_004);
+CPPUNIT_TEST(getFileURLFromSystemPath_004_1);
 CPPUNIT_TEST(getFileURLFromSystemPath_005);
 CPPUNIT_TEST_SUITE_END();
 
@@ -1017,6 +1019,13 @@ namespace osl_FileBase
 checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, 
osl::FileBase::E_INVAL, "");
 }
 
+void SystemPath_FileURL::getFileURLFromSystemPath_004_1()
+{
+OString sSysPath("/tmp///first start");
+checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, 
osl::FileBase::E_None, "file:///tmp/first%20start");
+checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, 
osl::FileBase::E_INVAL, "");
+}
+
 void SystemPath_FileURL::getFileURLFromSystemPath_005()
 {
 OString sSysPath("");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Julien Nabet
 cui/source/options/optgdlg.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 36f1f96f4ae4fa95b2298c9edd9a9041e7c8cec1
Author: Julien Nabet 
Date:   Sat May 20 09:24:37 2017 +0200

tdf#107900: Revert "tdf#58134 Reset Button in Options Dialogues does not 
Work with all Options."

This reverts commit 45949bf73790b8214a1fcc8492f4ee6faad20780.

Change-Id: I5eea6c491b2c6d549bf6edb8d9c4726fccf7fa45
Reviewed-on: https://gerrit.libreoffice.org/37849
Reviewed-by: Julien Nabet 
Tested-by: Jenkins 
(cherry picked from commit c6c245bd4d759bb0a220e2d057ba1e0a556f9aab)
Reviewed-on: https://gerrit.libreoffice.org/37852
Tested-by: Julien Nabet 

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7696a7726df5..07496d9e6c26 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1568,7 +1568,6 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
 void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
 {
 LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
-m_pUserInterfaceLB->SelectEntryPos(0);
 if ( aLanguageTag.isSystemLocale() )
 m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG );
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Julien Nabet
 cui/source/options/optgdlg.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c6c245bd4d759bb0a220e2d057ba1e0a556f9aab
Author: Julien Nabet 
Date:   Sat May 20 09:24:37 2017 +0200

tdf#107900: Revert "tdf#58134 Reset Button in Options Dialogues does not 
Work with all Options."

This reverts commit 45949bf73790b8214a1fcc8492f4ee6faad20780.

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7696a7726df5..07496d9e6c26 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1568,7 +1568,6 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
 void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
 {
 LanguageTag aLanguageTag( pLangConfig->aSysLocaleOptions.GetLanguageTag());
-m_pUserInterfaceLB->SelectEntryPos(0);
 if ( aLanguageTag.isSystemLocale() )
 m_pLocaleSettingLB->SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG );
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Katarina Behrens
 cui/source/inc/cuitabarea.hxx |2 --
 cui/source/tabpages/tppattern.cxx |   16 
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 7662b11cad6105d56fb9acc9c431c89d3b68dc89
Author: Katarina Behrens 
Date:   Tue May 16 18:30:29 2017 +0200

tdf#107822: Apply custom pattern even if not saved as preset

do the same ff1f83dd08b7b0169301ffe0a53499a27af613b9 does for
gradients and hatches also here.
Additionally remove bool member variable, no eye deer what its
purpose was anyway, it was written multiple times but never read

Change-Id: Iebb811906e92827969da028ee66d90ac477b0bdf
Reviewed-on: https://gerrit.libreoffice.org/37690
Reviewed-by: Katarina Behrens 
Tested-by: Katarina Behrens 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 2e692005f7b5..e45186823170 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -625,8 +625,6 @@ private:
 ChangeType* m_pnColorListState;
 sal_Int32*  m_pPos;
 
-boolm_bPtrnChanged;
-
 XFillStyleItem  m_aXFStyleItem;
 XFillBitmapItem m_aXPatternItem;
 XFillAttrSetItemm_aXFillAttr;
diff --git a/cui/source/tabpages/tppattern.cxx 
b/cui/source/tabpages/tppattern.cxx
index df6a58249fec..71aea3caf0f7 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -93,7 +93,6 @@ SvxPatternTabPage::SvxPatternTabPage(  vcl::Window* pParent, 
const SfxItemSet& r
 m_pnPatternListState  ( nullptr ),
 m_pnColorListState( nullptr ),
 m_pPos( nullptr ),
-m_bPtrnChanged( false ),
 
 m_aXFStyleItem( drawing::FillStyle_BITMAP ),
 m_aXPatternItem   ( OUString(), Graphic() ),
@@ -214,7 +213,7 @@ DeactivateRC SvxPatternTabPage::DeactivatePage( SfxItemSet* 
_pSet)
 bool SvxPatternTabPage::FillItemSet( SfxItemSet* _rOutAttrs )
 {
 _rOutAttrs->Put(XFillStyleItem(drawing::FillStyle_BITMAP));
-size_t nPos = m_pPatternLB->GetSelectItemPos();
+size_t nPos = m_pPatternLB->IsNoSelection() ? VALUESET_ITEM_NOTFOUND : 
m_pPatternLB->GetSelectItemPos();
 if(VALUESET_ITEM_NOTFOUND != nPos)
 {
 const XBitmapEntry* pXBitmapEntry = m_pPatternList->GetBitmap( 
static_cast(nPos) );
@@ -341,8 +340,6 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, 
ValueSet*, void)
 }
 
 m_pCtlPixel->Invalidate();
-
-m_bPtrnChanged = false;
 }
 }
 
@@ -464,8 +461,6 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, 
Button*, void)
 m_pPatternLB->SelectItem( nId );
 
 *m_pnPatternListState |= ChangeType::MODIFIED;
-
-m_bPtrnChanged = false;
 }
 }
 
@@ -504,8 +499,6 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, 
SvxPresetListBox*, void)
 m_pPatternLB->SelectItem( nId );
 
 *m_pnPatternListState |= ChangeType::MODIFIED;
-
-m_bPtrnChanged = false;
 }
 else
 {
@@ -555,6 +548,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, 
SvxPresetListBox*, void)
 IMPL_LINK_NOARG(SvxPatternTabPage, ChangeColorHdl_Impl, SvxColorListBox&, void)
 {
 ChangeColor_Impl();
+m_pPatternLB->SetNoSelection();
 }
 
 void SvxPatternTabPage::ChangeColor_Impl()
@@ -570,8 +564,6 @@ void SvxPatternTabPage::ChangeColor_Impl()
 m_rXFSet.Put(XFillBitmapItem(OUString(), 
Graphic(m_pBitmapCtl->GetBitmapEx(;
 m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 m_pCtlPreview->Invalidate();
-
-m_bPtrnChanged = true;
 }
 
 
@@ -585,9 +577,9 @@ void SvxPatternTabPage::PointChanged( vcl::Window* pWindow, 
RectPoint )
 m_rXFSet.Put(XFillBitmapItem(OUString(), 
Graphic(m_pBitmapCtl->GetBitmapEx(;
 m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 m_pCtlPreview->Invalidate();
-
-m_bPtrnChanged = true;
 }
+
+m_pPatternLB->SetNoSelection();
 }
 
 sal_Int32 SvxPatternTabPage::SearchPatternList(const OUString& rPatternName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Laurent Balland-Poirier
 sd/source/ui/dlg/copydlg.cxx |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit 25d7103f99c51ccad0ccfc56a4457f0b7db6853e
Author: Laurent Balland-Poirier 
Date:   Thu Apr 20 22:38:25 2017 +0200

tdf#104423 Restore saving of Duplicate dlg parameters

Saving of parameters in Duplicate dlg was removed by
ce82146a6be87b239a0bde0b59fddf8865290b99

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

diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 6c679cd834bc..23f8b92d51cd 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -80,6 +80,31 @@ CopyDlg::~CopyDlg()
 
 void CopyDlg::dispose()
 {
+OUString& rStr = GetExtraData();
+
+rStr = OUString::number(m_pNumFldCopies->GetValue());
+rStr += OUString(TOKEN);
+
+rStr += OUString::number(m_pMtrFldMoveX->GetValue());
+rStr += OUString( TOKEN );
+
+rStr += OUString::number(m_pMtrFldMoveY->GetValue());
+rStr += OUString( TOKEN );
+
+rStr += OUString::number(m_pMtrFldAngle->GetValue());
+rStr += OUString( TOKEN );
+
+rStr += OUString::number(m_pMtrFldWidth->GetValue());
+rStr += OUString( TOKEN );
+
+rStr += OUString::number(m_pMtrFldHeight->GetValue());
+rStr += OUString( TOKEN );
+
+rStr += OUString::number( 
m_pLbStartColor->GetSelectEntryColor().GetColor() );
+rStr += OUString( TOKEN );
+
+rStr += OUString::number( m_pLbEndColor->GetSelectEntryColor().GetColor() 
);
+
 m_pNumFldCopies.clear();
 m_pBtnSetViewData.clear();
 m_pMtrFldMoveX.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Yeliz Taneroğlu
 sysui/desktop/share/apparmor.sh |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7bec7abd4c3d78e6a37f523f4fb599134ef51ca7
Author: Yeliz Taneroğlu 
Date:   Fri May 12 18:26:56 2017 +0300

tdf#105204: ShellCheck nitpicks for apparmor.sh

Double quote to prevent globbing and word splitting.
Iterating over ls output is fragile. Use globs.

Change-Id: I156b472708049115e753ff2a51a44807c8af6b94
Reviewed-on: https://gerrit.libreoffice.org/37544
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/sysui/desktop/share/apparmor.sh b/sysui/desktop/share/apparmor.sh
index 59803e1ae4db..cf554257cf72 100755
--- a/sysui/desktop/share/apparmor.sh
+++ b/sysui/desktop/share/apparmor.sh
@@ -37,10 +37,11 @@ INST_ROOT_FORMAT=${INST_ROOT_FORMAT.}
 #Need to escape / for sed
 INST_ROOT_SED=${INST_ROOT\\/}
 
-for filename in $(ls $PROFILESFROM)
+for filename in $PROFILESFROM
 do
 tourl=$INSTALLTO$INST_ROOT_FORMAT$filename
-sed "s/INSTDIR-/$INST_ROOT_SED/g" $PROFILESFROM$filename > $tourl
+sed "s/INSTDIR-/$INST_ROOT_SED/g" "$PROFILESFROM""$filename" > "$tourl"
+[[ -e $filename ]] || break
 echo "$tourl"
 
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Yeliz Taneroğlu
 solenv/bin/make-raspbian-root-tarball |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aa8fdfd2c2f6ba421e988a3ca85b1a1cbaeb69b8
Author: Yeliz Taneroğlu 
Date:   Mon May 15 23:26:19 2017 +0300

tdf#105204 fix shellcheck warning in solenv/bin/make-raspbian-root-tarball

Change-Id: I9257e43f18945f18c7ef738621dcb2f117246934
SC2038: Use -print0/-0 or find -exec + to allow for non-alphanumeric 
filenames.
Reviewed-on: https://gerrit.libreoffice.org/37658
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/solenv/bin/make-raspbian-root-tarball 
b/solenv/bin/make-raspbian-root-tarball
index a6540e9f9b1e..71054095715b 100755
--- a/solenv/bin/make-raspbian-root-tarball
+++ b/solenv/bin/make-raspbian-root-tarball
@@ -61,7 +61,7 @@ rm $FILELIST
 
 cd $STAGINGDIR
 # Change absolute symlinks to relative
-find . -type l | xargs ls -ld | grep -- '-> /' | 
+find . -type l -print0 | xargs -0 ls -ld | grep -- '-> /' | 
 while read mode links user group size month day yearortime link arrow 
target; do
target=`echo "$target" | sed -e 's,/,..;,'`
while test `expr index $target /` -gt 0; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Yeliz Taneroğlu
 solenv/bin/install-gdb-printers |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6c5ba692627791ba8a7f412ee965f89487be06d5
Author: Yeliz Taneroğlu 
Date:   Fri May 12 20:04:01 2017 +0300

tdf#105204: ShellCheck nitpicks for install-gdb-printers

Change-Id: I4d9a9f52d72b789d60e541193fa06dbfb8236ead
SC2155: Declare and assign separately to avoid masking return values.
Reviewed-on: https://gerrit.libreoffice.org/37551
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 4d5be9247087..aae4020a4532 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -55,7 +55,8 @@ make_autoload() {
 local lib="${DESTDIR}${autoloaddir}/$2/$3"
 local merged="$4"
 
-local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
+local resolved;
+resolved=$(readlink "${DESTDIR}${installdir}/$2/$3")
 [ -n "$resolved" ] && lib=$resolved
 local dir="${lib%/*}"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: setup_native/scripts

2017-05-20 Thread Yeliz Taneroğlu
 setup_native/scripts/unpack_update.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 46a30d5eb89a7198f30a895ac92ab5d70d111511
Author: Yeliz Taneroğlu 
Date:   Tue May 16 15:11:06 2017 +0300

tdf#105204 fix shellcheck warning in setup_native/scripts/unpack_update.sh

Change-Id: Ic2a3b58dac3bc148cf9a2bd8237574d4851aabe6
SC2006: Use $(STATEMENT) instead of legacy `STATEMENT`
SC2035: Use ./*glob* or -- *glob* so names with dashes won't become options.
Reviewed-on: https://gerrit.libreoffice.org/37681
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/setup_native/scripts/unpack_update.sh 
b/setup_native/scripts/unpack_update.sh
index 1b7b53430503..1af4865cd308 100644
--- a/setup_native/scripts/unpack_update.sh
+++ b/setup_native/scripts/unpack_update.sh
@@ -27,7 +27,7 @@ NUM=1
 DESTPATH="$BASEDIR/$FOLDER"
 
 while [ -d "$DESTPATH" ]; do
-  NUM=`expr $NUM + 1`
+  NUM=$(expr $NUM + 1)
   DESTPATH="$BASEDIR/$FOLDER-$NUM"
 done
 
@@ -47,4 +47,4 @@ else
   exit 2
 fi
 
-UPDATE=`eval ls */update` && SUBFOLDER=`dirname $UPDATE` && mv $SUBFOLDER/* . 
&& rmdir $SUBFOLDER && echo "$DESTPATH/update"
+UPDATE=$(eval ls ./*/update) && SUBFOLDER=$(dirname $UPDATE) && mv 
$SUBFOLDER/* . && rmdir $SUBFOLDER && echo "$DESTPATH/update"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


VclPtr some improvements ?

2017-05-20 Thread Michael Meeks
So,

Julien had some good ideas for simplifying VclPtr usage; here is the
background - currently we have:

VclPtr pFoo;
+ empty VclPtr pointer eg. shared_ptr xFoo;

VclPtrInstance pFoo( pParent );
+ creates a pFoo as above, and initializes it to an
  instance; we can't expose 'new Foo()' publicly due
  to the odd reference counting behavior. ::Create
  is a little like make_shared
+ sementically this is:
  VclPtr pFoo = VclPtr::Create( pParent );

* Suggestion - lets kill VclPtrInstance in a world with
  'auto' its main use of saving a bit of typing is gone
  ie.

auto pFoo = VclPtr::Create( pParent );


ScopedVclPtr pFoo;
+ empty VclPtr that is disposed when it goes out of
  scope.
+ I guess something like unique_ptr - but with a
  safe ref-count to the underlying object which can
  survive (in a disposed state) for longer than the
  scope.
+ something of a confusing name

* Suggestion: rename it to VclPtrAutoDispose - longer but
  perhaps clearer (?) - or something else ?

ScopedVclPtrInstance pFoo( pParent );

* Suggestion: as above - re-use auto and an:

auto pFoo = VclPtrAutoDispose::Create( pParent );

Thoughts pro & con appreciated before doing the cleanup =) are there
better / more familiar name and approaches ?

Hopefully using 'auto' would at least kill half of the template
complexity there =)

ATB,

Michael.

-- 
michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2017-05-20 Thread Yeliz Taneroğlu
 solenv/bin/create-ids |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 027d661ef7e2490f1182d3e5003ae4da4135e0ca
Author: Yeliz Taneroğlu 
Date:   Fri May 19 18:03:04 2017 +0300

tdf#105204 fix shellcheck warnings in solenv/bin/create-ids

Change-Id: Iab3855cdd8fb1ae3719dd7267b1592eea0ef1e22
SC2006: Use $(..) instead of legacy `..`.
SC2035: Use ./*/* so names with dashes won't become options.
SC2086: Double quote to prevent globbing and word splitting.
SC2046: Quote this to prevent word splitting.
Reviewed-on: https://gerrit.libreoffice.org/37832
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 0722091b2386..59c532719e38 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -11,8 +11,8 @@
 
 # TODO: should this include workdir headers?
 if [ "$1" = "--with-outpath" ]; then
-dirs="`ls -d */* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
+dirs="$(ls -d ./*/* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d')"
 else
-dirs="`ls -d */* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d'`"
+dirs="$(ls -d ./*/* | sed -e 
'/\(\/\(cscope\.\|tags\|ID\)\)\|^\(clone\|workdir\|instdir\)\//d')"
 fi
-mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl java make' 
--statistics $dirs
+mkid --lang-map="$(dirname "$0")"/id-lang.map --include='C C++ asm perl java 
make' --statistics "$dirs"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Yeliz Taneroğlu
 svx/source/gengal/gengal.sh |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 020e1bff16a7bb5f401a2547d211807acd7db0fb
Author: Yeliz Taneroğlu 
Date:   Fri May 12 19:15:53 2017 +0300

tdf#105204: ShellCheck nitpicks for gengal.sh

Use $(STATEMENT) instead of legacy `STATEMENT`.
Double quote to prevent globbing and word splitting.
Double quote array expansions to avoid re-splitting elements.

Change-Id: I7fac5d187597aa37920754ed53be7bcc83603cee
Reviewed-on: https://gerrit.libreoffice.org/37549
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
index 7535e25b5c6b..8bab14678ff3 100755
--- a/svx/source/gengal/gengal.sh
+++ b/svx/source/gengal/gengal.sh
@@ -22,19 +22,19 @@ SAL_ENABLE_FILE_LOCKING=1
 export SAL_ENABLE_FILE_LOCKING
 
 # resolve installation directory
-sd_cwd=`pwd`
+sd_cwd=$(pwd)
 sd_res=$0
 while [ -h "$sd_res" ] ; do
-cd "`dirname "$sd_res"`"
-sd_basename=`basename "$sd_res"`
-sd_res=`ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g"`
+cd "$(dirname "$sd_res")"
+sd_basename=$(basename "$sd_res")
+sd_res=$(ls -l "$sd_basename" | sed "s/.*$sd_basename -> //g")
 done
-cd "`dirname "$sd_res"`"
-sd_prog=`pwd`
+cd "$(dirname "$sd_res")"
+sd_prog=$(pwd)
 cd "$sd_cwd"
 
 # this is a temporary hack until we can live with the default search paths
-case "`uname -s`" in
+case "$(uname -s)" in
 NetBSD|OpenBSD|FreeBSD|DragonFly)
 LD_LIBRARY_PATH=$sd_prog${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
@@ -51,7 +51,7 @@ esac
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
-for arg in $@
+for arg in "$@"
 do
   case "$arg" in
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";;
@@ -62,10 +62,10 @@ done
 
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x "$sd_prog/javaldx" ] ; then
-my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
-"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
+my_path=$("$sd_prog/javaldx" "$BOOTSTRAPVARS" \
+"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc")
 if [ -n "$my_path" ] ; then
-sd_platform=`uname -s`
+sd_platform=$(uname -s)
 case $sd_platform in
   AIX)
 LIBPATH=$my_path${LIBPATH:+:$LIBPATH}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Failing tests on openSUSE

2017-05-20 Thread Tomáš Chvátal
Hello,

when building 5.4.0-beta1 on openSUSE one of the tests is consitently
failing for me:

[ 1117s] (anonymous namespace)::CanvasBitmapTest::runTest finished in: 778ms
[ 1117s]
/home/abuild/rpmbuild/BUILD/libreoffice-5.4.0.0.beta1/vcl/qa/cppunit/complextext.cxx:77:VclComplexTextTest::testArabic
[ 1117s] equality assertion failed
[ 1117s] - Expected: { 6, 9, 16, 16, 22, 22, 26, 29, 32, 32, 36, 40, 49,
53, 56, 63, 63, 66, 72, 72 }
[ 1117s] - Actual  : { 9, 18, 27, 36, 45, 54, 57, 66, 75, 84, 93, 102, 111,
114, 123, 132, 141, 150, 159, 168 }
[ 1117s]
[ 1117s] VclComplexTextTest::testArabic finished in: 31ms
[ 1117s] complextext.cxx:77:Assertion
[ 1117s] Test name: VclComplexTextTest::testArabic
[ 1117s] equality assertion failed
[ 1117s] - Expected: { 6, 9, 16, 16, 22, 22, 26, 29, 32, 32, 36, 40, 49,
53, 56, 63, 63, 66, 72, 72 }
[ 1117s] - Actual  : { 9, 18, 27, 36, 45, 54, 57, 66, 75, 84, 93, 102, 111,
114, 123, 132, 141, 150, 159, 168 }
[ 1117s]
[ 1117s] Failures !!!
[ 1117s] Run: 2   Failure total: 1   Failures: 1   Errors: 0

Full log [1].

I really have no clue what the test is doing or how to fix it. The commits
introducing the tests are:
https://cgit.freedesktop.org/libreoffice/core/commit/vcl/qa/cppunit/complextext.cxx?id=62592cf1ebcc8ef381fe53855684342d963e6138
https://cgit.freedesktop.org/libreoffice/core/commit/vcl/qa/cppunit/complextext.cxx?id=9af45ef67824f3ec6e95c16e7deb005a73532d65

Any help ideas how to fix this?

Tom

[1]
https://build.opensuse.org/package/live_build_log/LibreOffice:Unstable/libreoffice/openSUSE_Factory/x86_64
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2017-05-20 Thread Yeliz Taneroğlu
 sw/qa/extras/find-unused-data.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e20f6464cc4047876ce5e6d47510e8038c513234
Author: Yeliz Taneroğlu 
Date:   Fri May 12 18:34:12 2017 +0300

tdf#105204: ShellCheck nitpicks for find-unused-data.sh

Double quote to prevent globbing and word splitting.

Change-Id: I09faac27ca5c63a85b9b8cbd4f09821587bf4759
Reviewed-on: https://gerrit.libreoffice.org/37545
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/sw/qa/extras/find-unused-data.sh b/sw/qa/extras/find-unused-data.sh
index 9f4496871875..17b5678bece4 100755
--- a/sw/qa/extras/find-unused-data.sh
+++ b/sw/qa/extras/find-unused-data.sh
@@ -2,8 +2,8 @@
 
 for i in */data/*
 do
-file=$(basename $i)
-if ! git grep -q $file; then
+file=$(basename "$i")
+if ! git grep -q "$file"; then
 echo "WARNING: $i is not used, write a testcase for it!"
 fi
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Yeliz Taneroğlu
 ure/source/uno |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6c80b3730ebe5a95aa685e5f02c285edeb21d4a5
Author: Yeliz Taneroğlu 
Date:   Wed May 10 14:25:09 2017 +0300

tdf#105204 fix shellcheck warnings in ure/source/uno

Use $(..) instead of `..`,
double quote to prevent word splitting.

Change-Id: I80251d98e6fb27af5a18c202521050c8101131fa
Reviewed-on: https://gerrit.libreoffice.org/37465
Tested-by: Jenkins 
Reviewed-by: Chris Sherlock 

diff --git a/ure/source/uno b/ure/source/uno
index eae7173acf7e..342c6e58a42e 100755
--- a/ure/source/uno
+++ b/ure/source/uno
@@ -26,11 +26,11 @@ for my_arg in "$@" ; do
 done
 
 # Extend the LD_LIBRARY_PATH for Java:
-epath=`dirname "$0"`
+epath=$(dirname "$0")
 if [ -x "${epath}/javaldx" ] ; then
-jpath=`"${epath}/javaldx" $my_envargs`
+jpath=$("${epath}/javaldx" "$my_envargs")
 if [ -n "${jpath}" ]; then
-sd_platform=`uname -s`
+sd_platform=$(uname -s)
 case $sd_platform in
   AIX)
 LIBPATH=${jpath}${LIBPATH:+:${LIBPATH}}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread jmzambon
 offapi/com/sun/star/sheet/XConditionalFormat.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b850cad43d718d0d5c4b8a6dcef97781757c366
Author: jmzambon 
Date:   Fri May 19 18:27:43 2017 +0200

Correction of a typo in the doctext of XConditionalFormat.idl

XConditionalFormat.idl doctext refers to a ConditionFormatEntryType constant
that does not exist. The referred constant should be ConditionEntryType.

Change-Id: I99349f0f4fb2406155278330e7e3b5f26caadc90
Reviewed-on: https://gerrit.libreoffice.org/37834
Reviewed-by: Chris Sherlock 
Tested-by: Chris Sherlock 

diff --git a/offapi/com/sun/star/sheet/XConditionalFormat.idl 
b/offapi/com/sun/star/sheet/XConditionalFormat.idl
index aed1fec7ecdc..9520eae80bd8 100644
--- a/offapi/com/sun/star/sheet/XConditionalFormat.idl
+++ b/offapi/com/sun/star/sheet/XConditionalFormat.idl
@@ -20,7 +20,7 @@ interface XConditionalFormat : 
com::sun::star::container::XIndexAccess
 /**
  * Creates a new conditional format entry and insert its at the position.
  *
- * @param Type: a com.sun.star.sheet.ConditionFormatEntryType specifying 
the
+ * @param Type: a com.sun.star.sheet.ConditionEntryType specifying the
  *  type of the new entry
  *
  * @param Position: the position in the conditional format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: basctl/source basic/source comphelper/source cui/source dbaccess/source desktop/source extensions/source extensions/test forms/source include/basic include/sfx2 include

2017-05-20 Thread Jochen Nitschke
 basctl/source/basicide/bastypes.cxx |1 -
 basctl/source/inc/baside3.hxx   |2 --
 basic/source/classes/eventatt.cxx   |5 -
 basic/source/classes/sbunoobj.cxx   |1 -
 basic/source/classes/sbxmod.cxx |1 -
 basic/source/uno/scriptcont.cxx |1 -
 comphelper/source/eventattachermgr/eventattachermgr.cxx |1 -
 cui/source/customize/cfgutil.cxx|2 --
 cui/source/inc/acccfg.hxx   |1 -
 dbaccess/source/core/inc/querycomposer.hxx  |1 -
 desktop/source/deployment/registry/help/dp_help.cxx |1 -
 extensions/source/ole/ole2uno.hxx   |2 --
 extensions/source/ole/oleobjw.cxx   |   10 --
 extensions/source/propctrlr/propcontroller.hxx  |1 -
 extensions/test/ole/cppToUno/testcppuno.cxx |2 --
 forms/source/component/DatabaseForm.hxx |1 -
 include/basic/basmgr.hxx|2 +-
 include/sfx2/objsh.hxx  |1 -
 include/svx/fmtools.hxx |1 -
 include/vbahelper/vbaapplicationbase.hxx|1 -
 include/vbahelper/vbacollectionimpl.hxx |1 -
 include/vbahelper/vbahelperinterface.hxx|1 -
 include/vbahelper/vbashapes.hxx |1 -
 reportdesign/inc/UndoActions.hxx|3 ---
 reportdesign/source/core/sdr/RptObject.cxx  |1 -
 reportdesign/source/core/sdr/UndoActions.cxx|1 -
 reportdesign/source/core/sdr/UndoEnv.cxx|1 -
 reportdesign/source/ui/misc/RptUndo.cxx |1 -
 sc/source/filter/excel/excimp8.cxx  |1 -
 sc/source/ui/unoobj/servuno.cxx |1 -
 sc/source/ui/unoobj/viewuno.cxx |1 -
 sc/source/ui/vba/vbainterior.hxx|1 -
 sc/source/ui/vba/vbapagebreak.hxx   |1 -
 sc/source/ui/vba/vbapagebreaks.hxx  |1 -
 sc/source/ui/vba/vbarange.hxx   |2 --
 sc/source/ui/vba/vbaworkbooks.cxx   |6 --
 sc/source/ui/vba/vbaworksheet.cxx   |7 ---
 sc/source/ui/vba/vbaworksheet.hxx   |1 -
 sc/source/ui/view/viewfun2.cxx  |1 -
 scripting/source/dlgprov/dlgprov.hxx|2 +-
 scripting/source/provider/ActiveMSPList.cxx |2 --
 scripting/source/provider/ActiveMSPList.hxx |1 -
 scripting/source/provider/BrowseNodeFactoryImpl.cxx |1 +
 scripting/source/provider/BrowseNodeFactoryImpl.hxx |1 -
 scripting/source/vbaevents/eventhelper.cxx  |1 -
 sdext/source/minimizer/informationdialog.cxx|1 -
 sdext/source/minimizer/optimizerdialog.cxx  |1 -
 sdext/source/minimizer/optimizerdialogcontrols.cxx  |1 -
 sdext/source/minimizer/unodialog.cxx|1 -
 sdext/source/minimizer/unodialog.hxx|1 -
 sfx2/source/appl/appserv.cxx|1 -
 sfx2/source/doc/objmisc.cxx |   11 ---
 stoc/source/invocation/invocation.cxx   |1 -
 svx/source/form/fmexpl.cxx  |1 -
 sw/source/core/unocore/unocoll.cxx  |1 -
 sw/source/core/unocore/unomap1.cxx  |2 +-
 vbahelper/source/msforms/vbalistbox.cxx |1 -
 xmlhelp/source/cxxhelp/provider/databases.cxx   |1 -
 xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx   |1 -
 xmloff/source/forms/elementimport.hxx   |1 -
 xmlscript/source/xmldlg_imexp/imp_share.hxx |1 -
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx  |1 -
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |2 --
 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx|1 -
 64 files changed, 4 insertions(+), 106 deletions(-)

New commits:
commit a0b93fe08162b84b780a8f2553147485ec8629ff
Author: Jochen Nitschke 
Date:   Fri May 19 16:26:48 2017 +0200

cleanup unused css/script/ includes

but keep exception includes in headers for now

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

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index f182f15ba311..e82202a00768 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -26,7 +26,6 @@
 #include "iderdll2.hxx"
 
 #include 
-#include 
 #

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

2017-05-20 Thread Markus Mohrhard
 editeng/source/editeng/impedit.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 25e8148a1bdf37b57938c255235eb48d98abbfc6
Author: Markus Mohrhard 
Date:   Sat May 20 10:02:56 2017 +0200

no need for std::unique_ptr::reset in destructor

Change-Id: Id8628ae1e1d17dedf1c06d6a3d44d8be40be4cef

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 94599ab5ea5b..62cde1a44171 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -108,7 +108,6 @@ ImpEditView::~ImpEditView()
 delete pCursor;
 delete pBackgroundColor;
 delete pPointer;
-pDragAndDropInfo.reset();
 }
 
 void ImpEditView::SetBackgroundColor( const Color& rColor )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2017-05-20 Thread Julien Nabet
 editeng/source/editeng/impedit.cxx |   23 +--
 editeng/source/editeng/impedit.hxx |2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 417f65de89edfdafa24e49955109b5a58d37b151
Author: Julien Nabet 
Date:   Sat May 20 07:43:09 2017 +0200

convert to use std::unique_ptr

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

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 10c7e9650fba..94599ab5ea5b 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -85,7 +85,6 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, 
vcl::Window* pWindo
 nExtraCursorFlags   = GetCursorFlags::NONE;
 nCursorBidiLevel= CURSOR_BIDILEVEL_DONTKNOW;
 pCursor = nullptr;
-pDragAndDropInfo= nullptr;
 bReadOnly   = false;
 bClickedInSelection = false;
 eSelectionMode  = EESelectionMode::TxtOnly;
@@ -109,7 +108,7 @@ ImpEditView::~ImpEditView()
 delete pCursor;
 delete pBackgroundColor;
 delete pPointer;
-delete pDragAndDropInfo;
+pDragAndDropInfo.reset();
 }
 
 void ImpEditView::SetBackgroundColor( const Color& rColor )
@@ -1765,8 +1764,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 
 SolarMutexGuard aVclGuard;
 
-delete pDragAndDropInfo;
-pDragAndDropInfo = nullptr;
+pDragAndDropInfo.reset();
 
 Point aMousePosPixel( rDGE.DragOriginX, rDGE.DragOriginY );
 
@@ -1775,7 +1773,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 
 if ( GetEditSelection().HasRange() && bClickedInSelection )
 {
-pDragAndDropInfo = new DragAndDropInfo();
+pDragAndDropInfo.reset(new DragAndDropInfo());
 }
 else
 {
@@ -1786,7 +1784,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 const SvxFieldItem* pField = GetField( aMousePos, &nPara, &nPos );
 if ( pField )
 {
-pDragAndDropInfo = new DragAndDropInfo();
+pDragAndDropInfo.reset(new DragAndDropInfo());
 pDragAndDropInfo->pField = pField;
 ContentNode* pNode = pEditEngine->GetEditDoc().GetObject( nPara );
 aCopySel = EditSelection( EditPaM( pNode, nPos ), EditPaM( pNode, 
nPos+1 ) );
@@ -1797,7 +1795,7 @@ void ImpEditView::dragGestureRecognized(const 
css::datatransfer::dnd::DragGestur
 }
 else if ( IsBulletArea( aMousePos, &nPara ) )
 {
-pDragAndDropInfo = new DragAndDropInfo();
+pDragAndDropInfo.reset(new DragAndDropInfo());
 pDragAndDropInfo->bOutlinerMode = true;
 EditPaM aStartPaM( pEditEngine->GetEditDoc().GetObject( nPara ), 0 
);
 EditPaM aEndPaM( aStartPaM );
@@ -1929,8 +1927,7 @@ void ImpEditView::dragDropEnd( const 
css::datatransfer::dnd::DragSourceDropEvent
 
 HideDDCursor();
 ShowCursor( DoAutoScroll(), true );
-delete pDragAndDropInfo;
-pDragAndDropInfo = nullptr;
+pDragAndDropInfo.reset();
 pEditEngine->GetEndDropHdl().Call(GetEditViewPtr());
 }
 }
@@ -2000,8 +1997,7 @@ void ImpEditView::drop( const 
css::datatransfer::dnd::DropTargetDropEvent& rDTDE
 
 if ( !pDragAndDropInfo->bStarterOfDD )
 {
-delete pDragAndDropInfo;
-pDragAndDropInfo = nullptr;
+pDragAndDropInfo.reset();
 }
 
 rDTDE.Context->dropComplete( bChanges );
@@ -2013,7 +2009,7 @@ void ImpEditView::dragEnter( const 
css::datatransfer::dnd::DropTargetDragEnterEv
 SolarMutexGuard aVclGuard;
 
 if ( !pDragAndDropInfo )
-pDragAndDropInfo = new DragAndDropInfo( );
+pDragAndDropInfo.reset(new DragAndDropInfo());
 
 pDragAndDropInfo->bHasValidData = false;
 
@@ -2043,8 +2039,7 @@ void ImpEditView::dragExit( const 
css::datatransfer::dnd::DropTargetEvent& )
 
 if ( pDragAndDropInfo && !pDragAndDropInfo->bStarterOfDD )
 {
-delete pDragAndDropInfo;
-pDragAndDropInfo = nullptr;
+pDragAndDropInfo.reset();
 }
 }
 
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index a125a97e34f0..dc5f9ac7af3c 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -238,7 +238,7 @@ private:
 VclPtr   pOutWin;
 EditView::OutWindowSetaOutWindowSet;
 Pointer*  pPointer;
-DragAndDropInfo*  pDragAndDropInfo;
+std::unique_ptr  pDragAndDropInfo;
 
 css::uno::Reference< css::datatransfer::dnd::XDragSourceListener > 
mxDnDListener;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/list

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

2017-05-20 Thread Pranav Kant
 wsd/FileServer.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f47936a2da64accd262d24be0357fe0ea7a8e791
Author: Pranav Kant 
Date:   Sat May 20 12:16:36 2017 +0530

ENABLE_DEBUG has values either 0 or 1, otherwise its always defined.

Change-Id: I0253dc2d83c11888e79ddb991b065eb62bbbd805

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 769193ba..a50be219 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -207,7 +207,7 @@ void FileServerRequestHandler::handleRequest(const 
HTTPRequest& request, Poco::M
 
 bool gzip = request.hasToken("Accept-Encoding", "gzip");
 const std::string *content;
-#ifdef ENABLE_DEBUG
+#if ENABLE_DEBUG
 if (std::getenv("LOOL_SERVE_FROM_FS"))
 {
 // Useful to not serve from memory sometimes especially during 
loleaflet development
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits