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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/addin/fods/bin2dec.fods | 5712 ++
 sc/qa/unit/data/functions/addin/fods/bin2hex.fods | 5687 +
 sc/qa/unit/data/functions/addin/fods/bin2oct.fods | 5687 +
 3 files changed, 17086 insertions(+)

New commits:
commit bbaf57e0ba2e10c4340128dbaa8b90aaea2518cf
Author: Zdeněk Crhonek 
Date:   Fri Jan 13 22:36:12 2017 +0100

add BIN2DEC,BIN2HEX, BIN2OCT test case

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

diff --git a/sc/qa/unit/data/functions/addin/fods/bin2dec.fods 
b/sc/qa/unit/data/functions/addin/fods/bin2dec.fods
new file mode 100644
index 000..c7c99ba
--- /dev/null
+++ b/sc/qa/unit/data/functions/addin/fods/bin2dec.fods
@@ -0,0 +1,5712 @@
+
+
+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">
+ 
2017-01-13T22:34:46.056299441P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   69530
+   359833
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   120
+   60
+   true
+   false
+  
+  
+   2
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   120
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 120
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+  

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/statistical/fods/t.dist.fods | 5189 +
 1 file changed, 5189 insertions(+)

New commits:
commit e65da0ea4533e4a1d3e80f9d19a07d55b53e89c8
Author: Zdeněk Crhonek 
Date:   Thu Jan 12 17:39:29 2017 +0100

add T.DIST test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/t.dist.fods 
b/sc/qa/unit/data/functions/statistical/fods/t.dist.fods
new file mode 100644
index 000..81ad925
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/t.dist.fods
@@ -0,0 +1,5189 @@
+
+
+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">
+ 
2017-01-12T17:38:54.979203079P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   81398
+   17141
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   27
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+
+   Kč
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+

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

[Justin Luth]

 sw/source/core/edit/autofmt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 098d90920a7aea1cc2ee53a79b909f0eef67ca02
Author: Justin Luth 
Date:   Fri Jan 13 20:58:02 2017 +0300

tdf#105294 - only add spacing for the border being set

related to bug 41542 which now allows the space-to-contents value
even if the border is not visible.

For years, LO has been resetting the spacing to zero when a line
is diabled. Setting all border distances here was a mistake that
was never caught before, and the documents created because of
this oversight will likely cause some grief to bug 41542.

Change-Id: Id2708cf20600e29e97dc6c8d8b779894ad9c38d1
Reviewed-on: https://gerrit.libreoffice.org/33055
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
(cherry picked from commit 9e7526044c8fa6b006b0cb791d15f2476c96ebf2)
Reviewed-on: https://gerrit.libreoffice.org/33062

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 1109e5d..fbc8351 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -584,7 +584,7 @@ bool SwAutoFormat::DoUnderline()
 aSet.Put( SwParaConnectBorderItem( false ) );
 SvxBoxItem aBox( RES_BOX );
 aBox.SetLine( &aLine, SvxBoxItemLine::BOTTOM );
-aBox.SetAllDistances(42); // ~0,75 mm
+aBox.SetDistance(42, SvxBoxItemLine::BOTTOM ); // ~0,75 mm
 aSet.Put(aBox);
 m_pDoc->getIDocumentContentOperations().InsertItemSet( m_aDelPam, aSet 
);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/source/core/edit/autofmt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e7526044c8fa6b006b0cb791d15f2476c96ebf2
Author: Justin Luth 
Date:   Fri Jan 13 20:58:02 2017 +0300

tdf#105294 - only add spacing for the border being set

related to bug 41542 which now allows the space-to-contents value
even if the border is not visible.

For years, LO has been resetting the spacing to zero when a line
is diabled. Setting all border distances here was a mistake that
was never caught before, and the documents created because of
this oversight will likely cause some grief to bug 41542.

Change-Id: Id2708cf20600e29e97dc6c8d8b779894ad9c38d1
Reviewed-on: https://gerrit.libreoffice.org/33055
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 7ed1013..42444dd 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -584,7 +584,7 @@ bool SwAutoFormat::DoUnderline()
 aSet.Put( SwParaConnectBorderItem( false ) );
 SvxBoxItem aBox( RES_BOX );
 aBox.SetLine( &aLine, SvxBoxItemLine::BOTTOM );
-aBox.SetAllDistances(42); // ~0,75 mm
+aBox.SetDistance(42, SvxBoxItemLine::BOTTOM ); // ~0,75 mm
 aSet.Put(aBox);
 m_pDoc->getIDocumentContentOperations().InsertItemSet( m_aDelPam, aSet 
);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-0' - external/libpng

[Caolán McNamara]

 external/libpng/configs/pnglibconf.h |   37 ++-
 1 file changed, 32 insertions(+), 5 deletions(-)

New commits:
commit 5b9580c94fddce2873d4efc7154313320f0cbd1a
Author: Caolán McNamara 
Date:   Mon Nov 16 09:57:06 2015 +

Fix libpng upgrade

by back-porting part of:

upgrade png to 1.6.19

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

diff --git a/external/libpng/configs/pnglibconf.h 
b/external/libpng/configs/pnglibconf.h
index 8149f59..ff5d156 100644
--- a/external/libpng/configs/pnglibconf.h
+++ b/external/libpng/configs/pnglibconf.h
@@ -1,7 +1,8 @@
-/* 1.5.24 STANDARD API DEFINITION */
+/* libpng 1.6.19 STANDARD API DEFINITION */
+
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.5.24 - November 12, 2015 */
+/* Libpng version 1.6.19 - November 12, 2015 */
 
 /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
 
@@ -20,9 +21,11 @@
 /*#undef PNG_ARM_NEON_API_SUPPORTED*/
 /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
 #define PNG_BENIGN_ERRORS_SUPPORTED
+#define PNG_BENIGN_READ_ERRORS_SUPPORTED
+/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
 #define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
 #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_CHECK_cHRM_SUPPORTED
+#define PNG_COLORSPACE_SUPPORTED
 #define PNG_CONSOLE_IO_SUPPORTED
 #define PNG_CONVERT_tIME_SUPPORTED
 #define PNG_EASY_ACCESS_SUPPORTED
@@ -31,6 +34,9 @@
 #define PNG_FIXED_POINT_SUPPORTED
 #define PNG_FLOATING_ARITHMETIC_SUPPORTED
 #define PNG_FLOATING_POINT_SUPPORTED
+#define PNG_FORMAT_AFIRST_SUPPORTED
+#define PNG_FORMAT_BGR_SUPPORTED
+#define PNG_GAMMA_SUPPORTED
 #define PNG_GET_PALETTE_MAX_SUPPORTED
 #define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #define PNG_INCH_CONVERSIONS_SUPPORTED
@@ -91,13 +97,21 @@
 #define PNG_READ_tIME_SUPPORTED
 #define PNG_READ_tRNS_SUPPORTED
 #define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
 #define PNG_SAVE_INT_32_SUPPORTED
+#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_SEQUENTIAL_READ_SUPPORTED
 #define PNG_SETJMP_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
+#define PNG_SET_OPTION_SUPPORTED
+#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_SET_USER_LIMITS_SUPPORTED
+#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
+#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_READ_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
+#define PNG_SIMPLIFIED_WRITE_SUPPORTED
 #define PNG_STDIO_SUPPORTED
+#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
 #define PNG_TEXT_SUPPORTED
 #define PNG_TIME_RFC1123_SUPPORTED
 #define PNG_UNKNOWN_CHUNKS_SUPPORTED
@@ -173,15 +187,28 @@
 #define PNG_API_RULE 0
 #define PNG_DEFAULT_READ_MACROS 1
 #define PNG_GAMMA_THRESHOLD_FIXED 5000
+#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
+#define PNG_INFLATE_BUF_SIZE 1024
+#define PNG_LINKAGE_API extern
+#define PNG_LINKAGE_CALLBACK extern
+#define PNG_LINKAGE_DATA extern
+#define PNG_LINKAGE_FUNCTION extern
 #define PNG_MAX_GAMMA_8 11
 #define PNG_QUANTIZE_BLUE_BITS 5
 #define PNG_QUANTIZE_GREEN_BITS 5
 #define PNG_QUANTIZE_RED_BITS 5
+#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
+#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
 #define PNG_USER_CHUNK_CACHE_MAX 1000
 #define PNG_USER_CHUNK_MALLOC_MAX 800
 #define PNG_USER_HEIGHT_MAX 100
 #define PNG_USER_WIDTH_MAX 100
 #define PNG_ZBUF_SIZE 8192
+#define PNG_ZLIB_VERNUM 0 /* unknown */
+#define PNG_Z_DEFAULT_COMPRESSION (-1)
+#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
+#define PNG_Z_DEFAULT_STRATEGY 1
 #define PNG_sCAL_PRECISION 5
+#define PNG_sRGB_PROFILE_CHECKS 2
 /* end of settings */
 #endif /* PNGLCONF_H */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - sal/osl set_soenv.in solenv/inc

[Pedro Giffuni]

 sal/osl/unx/diagnose.c |8 +++
 set_soenv.in   |   56 +++--
 solenv/inc/unx.mk  |   17 --
 solenv/inc/unxfbsd.mk  |5 
 4 files changed, 32 insertions(+), 54 deletions(-)

New commits:
commit cbe87f8fbb23e726a320bc282afea51cfd47a5ce
Author: Pedro Giffuni 
Date:   Fri Jan 13 19:47:12 2017 +

FreeBSD PPC: Cleanup the Java detection.

I don't think FreeBSD ever shipped gcj before it was deprecated by the
FSF.

Submitted by:   Curtis Hamilton

diff --git a/set_soenv.in b/set_soenv.in
index 4d23f3b..7db8d39 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -408,45 +408,25 @@ elsif ( $platform =~ m/freebsd/ )
   $JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
   $EPM_FLAGS  = "-a arm";
}
-   elsif ($platform =~ m/^powerpc/)
-   {
-  if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
- print "Setting FreeBSD PPC64 specific values... ";
- $outfile = "FreeBSDPPC64Env.Set"; 
- $OUTPATH = "unxfbsdppc64";
- $CPUNAME = "POWERPC64";
-
- if ( $JDK eq "gcj" ) {
-$JRELIBDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
-$JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
-$JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
- }
-  }
-  else {
- print "Setting FreeBSD PPC specific values... ";
- $outfile = "FreeBSDPPCEnv.Set"; 
- $OUTPATH = "unxfbsdppc";
- $CPUNAME = "POWERPC";
-
- if ( $JDK eq "gcj" ) {
-$JRELIBDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-$JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-$JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
- elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
- {  $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-$JRETOOLKITDIR = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-$JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
- }
-# OpenJDK
-elsif ($JDK =~ m/sun/) {
-   $JRELIBDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-   $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
-   $JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-}
-  }
-
+   elsif (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8'))
+   {  print "Setting FreeBSD PPC64 specific values... ";
+  $outfile= "FreeBSDPPC64Env.Set"; 
   $CPU= "P";
-
+  $CPUNAME= "POWERPC64";
+  $OUTPATH= "unxfbsdppc64";
+  $JRELIBDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."server";
+  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+   }
+   elsif ($platform =~ m/powerpc/)
+   {  print "Setting FreeBSD PPC specific values... ";
+  $outfile= "FreeBSDPPCEnv.Set"; 
+  $CPU= "P";
+  $CPUNAME= "POWERPC";
+  $OUTPATH= "unxfbsdppc";
+  $JRELIBDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+  $JRETOOLKITDIR  = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+  $JRETHREADDIR   = 
'$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
}
else
{  print "Unsupported FreeBSD architecture: $platform \n";
commit 2392e0d29388e347de3ecc3f73a51552ca098d7d
Author: Pedro Giffuni 
Date:   Fri Jan 13 16:20:00 2017 +

FreeBSD PPC: Cleanup makefile include mess.

Reported by:Curtis Hamilton

diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 1f4383b..92862bf 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -91,14 +91,6 @@
 .INCLUDE : unxlngppc.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
-.INCLUDE : unxlngppc64.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCFREEBSDPPOWERPC64"
-.INCLUDE : unxfbsdp.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
 .INCLUDE : unxlngs390.mk
 .ENDIF
@@ -115,6 +107,11 @@
 .INCLUDE : unxlnga.mk
 .ENDIF
 
+# FreeBSD includes the specific platforms in its makefile
+.IF "$(OS)" == "FREEBSD"
+.INCLUDE : unxfbsd.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)" == "ACCHPUXR"
 .INCLUDE : unxhpxr.mk
 .ENDIF
@@ -143,10 +140,6 @@
 .INCLUDE : unxbsds.mk
 .ENDIF
 
-.IF "$(OS)" == "FREEBSD"
-.INCLUDE : unxfbsd.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 .INCLUDE : unxmacxp.mk
 .ENDIF
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index 5ecbf18..baa01f5 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -38,14 +38,11 @@ JAVAFLAGSDEBUG=-g
 .INCLUDE : unxfbsdx.mk
 .ENDIF
 .IF "

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

14 new defect(s) introduced to LibreOffice found with Coverity Scan.
6 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 14 of 14 defect(s)


** CID 1398592:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/tableshape.cxx: 50 in 
SvxTableShape::setPropertyValueImpl(const rtl::OUString &, const 
SfxItemPropertySimpleEntry *, const com::sun::star::uno::Any &)()



*** CID 1398592:  Error handling issues  (UNCAUGHT_EXCEPT)
/svx/source/unodraw/tableshape.cxx: 50 in 
SvxTableShape::setPropertyValueImpl(const rtl::OUString &, const 
SfxItemPropertySimpleEntry *, const com::sun::star::uno::Any &)()
44 
45 SvxTableShape::~SvxTableShape() throw()
46 {
47 }
48 
49 
>>> CID 1398592:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::RuntimeException, 
>>> com::sun::star::lang::WrappedTargetException, 
>>> com::sun::star::lang::IllegalArgumentException, 
>>> com::sun::star::beans::PropertyVetoException, 
>>> com::sun::star::beans::UnknownPropertyException)" doesn't allow it to be 
>>> thrown. This will cause a call to unexpected() which usually calls 
>>> terminate().
50 bool SvxTableShape::setPropertyValueImpl(
51 const OUString& rName,
52 const SfxItemPropertySimpleEntry* pProperty,
53 const css::uno::Any& rValue )
54 throw(css::beans::UnknownPropertyException, 
css::beans::PropertyVetoException, css::lang::IllegalArgumentException, 
css::lang::WrappedTargetException, css::uno::RuntimeException)
55 {

** CID 1398591:(UNCAUGHT_EXCEPT)
/filter/source/config/cache/filtercache.cxx: 1602 in 
filter::config::FilterCache::impl_loadItem(const 
com::sun::star::uno::Reference &, 
filter::config::FilterCache::EItemType, const rtl::OUString &, 
filter::config::FilterCache::EReadOption)()
/filter/source/config/cache/filtercache.cxx: 1602 in 
filter::config::FilterCache::impl_loadItem(const 
com::sun::star::uno::Reference &, 
filter::config::FilterCache::EItemType, const rtl::OUString &, 
filter::config::FilterCache::EReadOption)()



*** CID 1398591:(UNCAUGHT_EXCEPT)
/filter/source/config/cache/filtercache.cxx: 1602 in 
filter::config::FilterCache::impl_loadItem(const 
com::sun::star::uno::Reference &, 
filter::config::FilterCache::EItemType, const rtl::OUString &, 
filter::config::FilterCache::EReadOption)()
1596 TODO
1597 clarify, how the real problem behind the
1598 wrong constructed CacheItem instance (which
1599 will force a crash during destruction)
1600 can be solved ...
1601 ---*/
>>> CID 1398591:(UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::Exception)" doesn't allow it to be thrown. This 
>>> will cause a call to unexpected() which usually calls terminate().
1602 CacheItem FilterCache::impl_loadItem(const css::uno::Reference< 
css::container::XNameAccess >& xSet   ,
1603EItemType   
eType  ,
1604  const OUString&   
 sItem  ,
1605EReadOption 
eOption)
1606 throw(css::uno::Exception)
1607 {
/filter/source/config/cache/filtercache.cxx: 1602 in 
filter::config::FilterCache::impl_loadItem(const 
com::sun::star::uno::Reference &, 
filter::config::FilterCache::EItemType, const rtl::OUString &, 
filter::config::FilterCache::EReadOption)()
1596 TODO
1597 clarify, how the real problem behind the
1598 wrong constructed CacheItem instance (which
1599 will force a crash during destruction)
1600 can be solved ...
1601 ---*/
>>> CID 1398591:(UNCAUGHT_EXCEPT)
>>> An exception of type "std::length_error" is thrown but the throw list 
>>> "throw(com::sun::star::uno::Exception)" doesn't allow it to be thrown. This 
>>> will cause a call to unexpected() which usually calls terminate().
1602 CacheItem FilterCache::impl_loadItem(const css::uno::Reference< 
css::container::XNameAccess >& xSet   ,
1603EItemType   
eType  ,
1604  const OUSt

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

[Katarina Behrens]

 sfx2/source/appl/appserv.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ec1afa55e8ed79dc290caff74aaca304a77c3b4f
Author: Katarina Behrens 
Date:   Fri Jan 13 15:33:48 2017 +0100

SafeMode: Deactivate 'Restart in safe mode' when already in safe mode

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

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 6267920..3527e02 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1174,6 +1174,9 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 }
 case SID_SAFE_MODE:
 {
+// no restart in safe mode when already in safe mode
+if ( Application::IsSafeModeEnabled() )
+   rSet.DisableItem( SID_SAFE_MODE );
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/statistical/fods/t.dist.2t.fods | 5291 
 sc/qa/unit/data/functions/statistical/fods/t.test.fods| 6023 ++
 sc/qa/unit/data/functions/statistical/fods/tdist.fods | 5257 
 3 files changed, 16571 insertions(+)

New commits:
commit 2d6c7ebe83c2fec4b43ec8e410fd24450958d63f
Author: Zdeněk Crhonek 
Date:   Fri Jan 13 17:22:23 2017 +0100

add TDIST,T.TEST,T.DIST.2T test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/t.dist.2t.fods 
b/sc/qa/unit/data/functions/statistical/fods/t.dist.2t.fods
new file mode 100644
index 000..95b3c65
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/t.dist.2t.fods
@@ -0,0 +1,5291 @@
+
+
+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">
+ 
2017-01-13T17:19:27.766903163P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   45753
+   18813
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   1
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -

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

[Tomaž Vajngerl]

 cui/source/tabpages/tparea.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit 9157ae95d4861c545b01e1d9df67932c86a3c640
Author: Tomaž Vajngerl 
Date:   Fri Jan 13 13:55:01 2017 +0100

tdf#105259 calculate sizes of all area tab pages on construction

When we open dialog that contains the area tab, we need to
calculate the size of area tab pages (that are triggered by
clicking on a button) and set the page area to the appropriate
combined size. Otherwise we don't account for the needed space
correctly and some page will be squished or have overlapping
controls.

This change creates all pages at dialog construction, gets
all the optimal sizes and sets the size of the page container box
to the combined (minimal) size.

Change-Id: Ie04a121810b96973f6e4502a52af675b2baacf25
Reviewed-on: https://gerrit.libreoffice.org/33040
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 
(cherry picked from commit e6d7d737522124350a17a3cfdee055f03200a274)
Reviewed-on: https://gerrit.libreoffice.org/33048
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 9972ca5..f2a054d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -66,6 +66,19 @@ const sal_uInt16 SvxAreaTabPage::pAreaRanges[] =
 0
 };
 
+namespace
+{
+
+void lclExtendSize(Size& rSize, const Size& rInputSize)
+{
+if (rSize.Width() < rInputSize.Width())
+rSize.Width() = rInputSize.Width();
+if (rSize.Height() < rInputSize.Height())
+rSize.Height() = rInputSize.Height();
+}
+
+} // end anonymous namespace
+
 /*
 |*
 |*  Dialog to modify fill-attributes
@@ -125,6 +138,22 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, 
const SfxItemSet& rInAttrs
 m_pBtnPattern->SetClickHdl(aLink);
 
 SetExchangeSupport();
+
+// Calculate optimal size of all pages..
+m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(m_pFillTab, 
&m_rXFSet));
+Size aSize = m_pFillTabPage->GetOptimalSize();
+m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndClear();
+
+m_pFillTab->set_width_request(aSize.Width());
+m_pFillTab->set_height_request(aSize.Height());
 }
 
 SvxAreaTabPage::~SvxAreaTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 solenv/bin/add-modelines |   28 ++--
 1 file changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 1ad45ecbf172bca9d3eeff8750a0eb13731c322e
Author: Jochen Nitschke 
Date:   Wed Jan 11 11:49:18 2017 +0100

tdf#105204 shellcheck

addressed issues in order of appearance:
warnings
 - prefer [..] && [..] (SC2166)
 - unused 'awkCMD' (SC2034)
 - typo currentFirstLIne -> currentFirstLine (SC2154)

recommendations
 - use $(..) instead of `..` (SC2006)
 - remove $ on arithmetic variable OPTIND (SC2004)
 - double quote to prevent globbing in $findArgs (SC2086)

Change-Id: I2d2b7aecac97b2e4e0df8ce556c85995d4ecf7cf
Reviewed-on: https://gerrit.libreoffice.org/33003
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/solenv/bin/add-modelines b/solenv/bin/add-modelines
index fcb26bc..7dff27b 100755
--- a/solenv/bin/add-modelines
+++ b/solenv/bin/add-modelines
@@ -43,10 +43,10 @@ ModelineReplace="false"
 
 function SetEnvironment()
 {
- if [ -n "$(which tail)" -a -n "$(which head)" ]; then
+ if [ -n "$(which tail)" ] && [ -n "$(which head)" ]; then
 {
-headCMD=`which head`
-tailCMD=`which tail`
+headCMD=$(which head)
+tailCMD=$(which tail)
 }
 else
 {
@@ -55,21 +55,13 @@ function SetEnvironment()
 }
 fi
 if [ -n "$(which find)" ]; then
-findCMD=`which find`
+findCMD=$(which find)
 else
 {
 echo "Missing find, exiting..."
 exit 1
 }
 fi
-if [ -n "$(which awk)" ]; then
-awkCMD=`which awk`
-else
-{
-echo "Missing awk, exiting..."
-exit 1
-}
-fi
 }
 
 function EditFile()
@@ -80,12 +72,12 @@ function EditFile()
 
 FileToEdit="$1"
 
-currentFirstLine=`$headCMD -1 "$FileToEdit"`
-currentLastLine=`$tailCMD -1 "$FileToEdit"`
+currentFirstLine=$($headCMD -1 "$FileToEdit")
+currentLastLine=$($tailCMD -1 "$FileToEdit")
 
 case "$ModelineReplace" in
 "true" )
-if [ "${currentFirstLIne:0:6}" = "${FirstLine:0:6}" ]; then
+if [ "${currentFirstLine:0:6}" = "${FirstLine:0:6}" ]; then
 {
 echo "$FirstLine" > "$FileToEdit".new
 $tailCMD -n +2 "$FileToEdit" >> "$FileToEdit".new
@@ -144,7 +136,7 @@ while getopts "zs:p:" opt; do
 done
 
 if [ $OPTIND -gt 1 ]; then
-shift $(($OPTIND - 1))
+shift $((OPTIND - 1))
 fi
 
 if [ $# -gt 1 ]; then
@@ -167,9 +159,9 @@ for FileType in ${SourceFiles}; do
 done
 
 # This gets rid of the final " -a " in the find argument list
-findArgs="${findArgs:0:(${#findArgs}-3)}"
+findArgs=(${findArgs:0:(${#findArgs}-3)})
 
-for file in $($findCMD $findArgs); do
+for file in $($findCMD "${findArgs[@]}"); do
 EditFile "$file"
 echo "Completed: " "$file"
 done
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 filter/source/graphicfilter/ios2met/ios2met.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e81454861f4fa2d5d6bbdc2c0eb6af14347c8205
Author: Caolán McNamara 
Date:   Fri Jan 13 20:42:55 2017 +

acquire/release in ctor/dtor

Change-Id: I4cf6ba1ece0491bc7a83c4adf1e5c086c0fa3553

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 751217c..6d6067c 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -451,10 +451,14 @@ OS2METReader::OS2METReader()
 , aAttr()
 , pAttrStack(nullptr)
 {
+pVirDev = VclPtr::Create();
+pVirDev->EnableOutput(false);
 }
 
 OS2METReader::~OS2METReader()
 {
+pVirDev.disposeAndClear();
+
 while (pAreaStack!=nullptr) {
 OSArea * p=pAreaStack;
 pAreaStack=p->pSucc;
@@ -2702,8 +2706,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, 
GDIMetaFile & rGDIMetaF
 
 xOrdFile.reset();
 
-pVirDev = VclPtr::Create();
-pVirDev->EnableOutput(false);
 rGDIMetaFile.Record(pVirDev);
 
 pOS2MET->SetEndian(SvStreamEndian::LITTLE);
@@ -2761,7 +2763,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, 
GDIMetaFile & rGDIMetaF
 }
 
 rGDIMetaFile.Stop();
-pVirDev.disposeAndClear();
 
 rGDIMetaFile.SetPrefMapMode( aGlobMapMode );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - accessibility/source

[Caolán McNamara]

 accessibility/source/standard/vclxaccessibletabcontrol.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 252f2d4978e5861cb62cca7c1553be63a7bae119
Author: Caolán McNamara 
Date:   Thu Jan 12 14:03:43 2017 +

a11y crash on accessing disposed TabControl during close of impress

Change-Id: I3064eb136ed3a6a32acd64bfb2f6fbe31595e1cf
(cherry picked from commit ff30d20c1ae3a30717123c267d52eb2b3105a1b7)
Reviewed-on: https://gerrit.libreoffice.org/32997
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx 
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 12837d6..b715964 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -43,9 +43,14 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( 
VCLXWindow* pVCLXWindow )
 :VCLXAccessibleComponent( pVCLXWindow )
 {
 m_pTabControl = static_cast< TabControl* >( GetWindow().get() );
-
-if ( m_pTabControl )
-m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), 
Reference< XAccessible >() );
+if (!m_pTabControl)
+return;
+if (m_pTabControl->isDisposed())
+{
+m_pTabControl.clear();
+return;
+}
+m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< 
XAccessible >() );
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Caolán McNamara]

 vcl/source/filter/ixpm/xpmread.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fc342c44c46287bbeb8bfb76d93fe601c87b8c5f
Author: Caolán McNamara 
Date:   Fri Jan 13 11:41:55 2017 +

ofz: ensure all not explicitly set indexes are zero

Change-Id: Idbe6ceeb61d3dfe26f281349181e7a60f7e59000
(cherry picked from commit 14d9b3519adac8543b52ddb84e49eecbdd1d9eb2)
Reviewed-on: https://gerrit.libreoffice.org/33036
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index b757709..bca7f11e0 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -223,7 +223,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 // using 2 charakters per pixel and less than 257 
Colors we speed up
 if ( mnCpp == 2 )   // by using a 64kb indexing 
table
 {
-mpFastColorTable = new sal_uInt8[ 256 * 256 ];
+const size_t nSize = 256 * 256;
+mpFastColorTable = new sal_uInt8[nSize];
+memset(mpFastColorTable, 0, nSize);
 for ( pPtr = mpColMap, i = 0; i < mnColors; 
i++, pPtr += mnCpp + 4 )
 {
 sal_uLong   j =  pPtr[ 0 ] << 8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/ixpm/xpmread.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 10a7f48aa83aaf78ccd09d3cab1a961aa1e8219e
Author: Caolán McNamara 
Date:   Fri Jan 13 11:41:55 2017 +

ofz: ensure all not explicitly set indexes are zero

Change-Id: Idbe6ceeb61d3dfe26f281349181e7a60f7e59000
(cherry picked from commit 14d9b3519adac8543b52ddb84e49eecbdd1d9eb2)
Reviewed-on: https://gerrit.libreoffice.org/33035
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index bdeacf9..3d22258 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -223,7 +223,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 // using 2 charakters per pixel and less than 257 
Colors we speed up
 if ( mnCpp == 2 )   // by using a 64kb indexing 
table
 {
-mpFastColorTable = new sal_uInt8[ 256 * 256 ];
+const size_t nSize = 256 * 256;
+mpFastColorTable = new sal_uInt8[nSize];
+memset(mpFastColorTable, 0, nSize);
 for ( pPtr = mpColMap, i = 0; i < mnColors; 
i++, pPtr += mnCpp + 4 )
 {
 sal_uLong   j =  pPtr[ 0 ] << 8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/58c5a9de2a0b985ef81557271db39c56ceb624f9/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - filter/qa filter/source

[Caolán McNamara]

 filter/qa/cppunit/data/dxf/pass/loop-1.dxf|17320 ++
 filter/source/graphicfilter/idxf/dxf2mtf.cxx  |6 
 filter/source/graphicfilter/idxf/dxfentrd.hxx |   25 
 3 files changed, 17337 insertions(+), 14 deletions(-)

New commits:
commit 597252f43536637b89b8ab99353807d4d63bede4
Author: Caolán McNamara 
Date:   Fri Jan 13 13:18:53 2017 +

avoid infinite loops in dxf rendering

Change-Id: Id2eb5540241f0792cde35c444fc2c0c5b7778353
(cherry picked from commit 57779b5f3a49fedd952aed70ddcce22f48b98ea5)
Reviewed-on: https://gerrit.libreoffice.org/33043
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/filter/qa/cppunit/data/dxf/pass/loop-1.dxf 
b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
new file mode 100644
index 000..e3277e6
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
@@ -0,0 +1,17320 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1015
+  9
+$ACADMAINTVER
+ 70
+ 6
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMAX
+ 10
+297.0
+ 20
+420.0
+ 30
+0.0
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+297.0
+ 20
+420.0
+  9
+$ORTHOMODE
+ 70
+ 0
+  9
+$REGENMODE
+ 70
+ 1
+  9
+$FILL«ODE
+ 70
+ 1
+  9
+$QTEXTMODE
+ 70
+ 0
+  9
+$MIRRTEXT
+ 70
+ 1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+ 1
+  9
+$TEXTSIZE
+ 40
+3.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+   256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+ 0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+3.0
+  9
+$DIMEXO
+ 40
+1.0
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.0
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+3.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+ 0
+  9
+$DIMLIM
+ 70
+ 0
+  9
+$DIMTIH
+ 70
+ 1
+  9
+$DIMTOH
+ 70
+ 1
+  9
+$DIMSE1
+ 70
+ 0
+  9
+$DIMSE2
+ 70
+ 0
+  9
+$DIMTAD
+ 70
+ 1
+  9
+$DIMZIN
+ 70
+ 0
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+ 1
+  9
+$DIMSHO
+ 70
+ 1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+ 0
+  9
+$DIMALTD
+ 70
+ 3
+  9
+$DIMALTF
+ 40
+0.0393700787
+  9
+$DIMLFAC
+ 40
+100.0
+  9
+$DIMTOFL
+ 70
+ 1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+ 0
+  9
+$DIMSOXD
+ 70
+ 0
+  9
+$DIMSAH
+ 70
+ 0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+ 0
+  9
+$DIMCLRE
+ 70
+ 0
+  9
+$DIMCLRT
+ 70
+ 0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+1.524
+  9
+$DIMJUST
+ 70
+ 0
+  9
+$DIMSD1
+ 70
+ 0
+  9
+$DIMSD2
+ 70
+ 0
+  9
+$DIMTOLJ
+ 70
+ 0
+  9
+$DIMTZIN
+ 70
+ 0
+  9
+$DIMALTZ
+ 70
+ 0
+  9
+$DIMALTTZ
+ 70
+ 0
+  9
+$DIMUPT
+ 70
+ 0
+  9
+$DIMDEC
+ 70
+ 3
+  9
+$DIMTDEC
+ 70
+ 3
+  9
+$DIMALTU
+ 70
+ 2
+  9
+$DIMALTTD
+ 70
+ 3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+ 0
+  9
+$DIMADEC
+ 70
+ 2
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+ 0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+ 3
+  9
+$DIMFRAC
+ 70
+ 0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+ 2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+ 0
+  9
+$LUNITS
+ 70
+ 2
+  9
+$LUPREC
+ 70
+ 2
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+ 0
+  9
+$AUPREC
+ 70
+ 2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+ 0
+  9
+$CHAMFERA
+ 40
+10.0
+  9
+$CHAMFERB
+ 40
+10.0
+  9
+$CHAMFERC
+ 40
+20.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+ 0
+  9
+$TDCREATE
+ 40
+2456962.662635255
+  9
+$TDUCREATE
+ 40
+2456962.620968588
+  9
+$TDUPDATE
+ 40
+2456962.662636401
+  9
+$TDUUPDATE
+ 40
+2456962.620969734
+  9
+$TDINDWG
+ 40
+0.000116
+  9
+$TDUSRTIMER
+ 40
+0.000116
+  9
+$USRTIMER
+ 70
+ 1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+ 0
+  9
+$PDMODE
+ 70
+ 0
+  9
+$PDSIZE
+ 40
+-1.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+ 0
+  9
+$SPLINETYPE
+ 70
+ 6
+  9
+$SPLINESEGS
+ 70
+ 8
+  9
+$HANDSEED
+  5
+5C0
+  9
+$SURFTAB1
+ 70
+ 6
+  9
+$SURFTAB2
+ 70
+ 6
+  9
+$SURFTYPE
+ 70
+ 6
+  9
+$SURFU
+ 70
+ 6
+  9
+$SURFV
+ 70
+ 6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+ 0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+

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

[Caolán McNamara]

 filter/qa/cppunit/data/dxf/pass/loop-1.dxf|17320 ++
 filter/source/graphicfilter/idxf/dxf2mtf.cxx  |6 
 filter/source/graphicfilter/idxf/dxfentrd.hxx |   25 
 3 files changed, 17337 insertions(+), 14 deletions(-)

New commits:
commit 1ce26b9f3503c3197a98383747213b679b7bbfc3
Author: Caolán McNamara 
Date:   Fri Jan 13 13:18:53 2017 +

avoid infinite loops in dxf rendering

Change-Id: Id2eb5540241f0792cde35c444fc2c0c5b7778353
(cherry picked from commit 57779b5f3a49fedd952aed70ddcce22f48b98ea5)
Reviewed-on: https://gerrit.libreoffice.org/33042
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/filter/qa/cppunit/data/dxf/pass/loop-1.dxf 
b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
new file mode 100644
index 000..e3277e6
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
@@ -0,0 +1,17320 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1015
+  9
+$ACADMAINTVER
+ 70
+ 6
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMAX
+ 10
+297.0
+ 20
+420.0
+ 30
+0.0
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+297.0
+ 20
+420.0
+  9
+$ORTHOMODE
+ 70
+ 0
+  9
+$REGENMODE
+ 70
+ 1
+  9
+$FILL«ODE
+ 70
+ 1
+  9
+$QTEXTMODE
+ 70
+ 0
+  9
+$MIRRTEXT
+ 70
+ 1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+ 1
+  9
+$TEXTSIZE
+ 40
+3.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+   256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+ 0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+3.0
+  9
+$DIMEXO
+ 40
+1.0
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.0
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+3.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+ 0
+  9
+$DIMLIM
+ 70
+ 0
+  9
+$DIMTIH
+ 70
+ 1
+  9
+$DIMTOH
+ 70
+ 1
+  9
+$DIMSE1
+ 70
+ 0
+  9
+$DIMSE2
+ 70
+ 0
+  9
+$DIMTAD
+ 70
+ 1
+  9
+$DIMZIN
+ 70
+ 0
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+ 1
+  9
+$DIMSHO
+ 70
+ 1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+ 0
+  9
+$DIMALTD
+ 70
+ 3
+  9
+$DIMALTF
+ 40
+0.0393700787
+  9
+$DIMLFAC
+ 40
+100.0
+  9
+$DIMTOFL
+ 70
+ 1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+ 0
+  9
+$DIMSOXD
+ 70
+ 0
+  9
+$DIMSAH
+ 70
+ 0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+ 0
+  9
+$DIMCLRE
+ 70
+ 0
+  9
+$DIMCLRT
+ 70
+ 0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+1.524
+  9
+$DIMJUST
+ 70
+ 0
+  9
+$DIMSD1
+ 70
+ 0
+  9
+$DIMSD2
+ 70
+ 0
+  9
+$DIMTOLJ
+ 70
+ 0
+  9
+$DIMTZIN
+ 70
+ 0
+  9
+$DIMALTZ
+ 70
+ 0
+  9
+$DIMALTTZ
+ 70
+ 0
+  9
+$DIMUPT
+ 70
+ 0
+  9
+$DIMDEC
+ 70
+ 3
+  9
+$DIMTDEC
+ 70
+ 3
+  9
+$DIMALTU
+ 70
+ 2
+  9
+$DIMALTTD
+ 70
+ 3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+ 0
+  9
+$DIMADEC
+ 70
+ 2
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+ 0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+ 3
+  9
+$DIMFRAC
+ 70
+ 0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+ 2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+ 0
+  9
+$LUNITS
+ 70
+ 2
+  9
+$LUPREC
+ 70
+ 2
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+ 0
+  9
+$AUPREC
+ 70
+ 2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+ 0
+  9
+$CHAMFERA
+ 40
+10.0
+  9
+$CHAMFERB
+ 40
+10.0
+  9
+$CHAMFERC
+ 40
+20.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+ 0
+  9
+$TDCREATE
+ 40
+2456962.662635255
+  9
+$TDUCREATE
+ 40
+2456962.620968588
+  9
+$TDUPDATE
+ 40
+2456962.662636401
+  9
+$TDUUPDATE
+ 40
+2456962.620969734
+  9
+$TDINDWG
+ 40
+0.000116
+  9
+$TDUSRTIMER
+ 40
+0.000116
+  9
+$USRTIMER
+ 70
+ 1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+ 0
+  9
+$PDMODE
+ 70
+ 0
+  9
+$PDSIZE
+ 40
+-1.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+ 0
+  9
+$SPLINETYPE
+ 70
+ 6
+  9
+$SPLINESEGS
+ 70
+ 8
+  9
+$HANDSEED
+  5
+5C0
+  9
+$SURFTAB1
+ 70
+ 6
+  9
+$SURFTAB2
+ 70
+ 6
+  9
+$SURFTYPE
+ 70
+ 6
+  9
+$SURFU
+ 70
+ 6
+  9
+$SURFV
+ 70
+ 6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+ 0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - framework/source

[Thorsten Behrens]

 framework/source/loadenv/loadenv.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2417f4dbb1d9696c57ba1f84eb8d79d4160b199a
Author: Thorsten Behrens 
Date:   Fri Jan 13 21:09:42 2017 +0100

fixup:  bring window to top and restore window when minimized

We're before the enum class cleanups...

Change-Id: Idcabdfb9d03258a3c4562c1e085929d4a853e411

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index ab4010f..ea4162c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1665,7 +1665,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const 
css::uno::Reference< css::awt::X
 }
 
 if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
-pWindow->ToTop( ToTopFlags::RestoreWhenMin | 
ToTopFlags::ForegroundTask );
+pWindow->ToTop( TOTOP_RESTOREWHENMIN | TOTOP_FOREGROUNDTASK );
 else
 pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? 
SHOW_FOREGROUNDTASK : 0 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 vcl/unx/gtk/gtksalframe.cxx   |2 ++
 vcl/unx/gtk3/gtk3gtkframe.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 1f30385e0a415fc5b053ef4831eb54841b837923
Author: Takeshi Abe 
Date:   Fri Jan 13 23:35:01 2017 +0900

vcl: Fix memory leaks

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

diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 1f1a814..2777c36 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -544,6 +544,8 @@ static void activate_uno(GSimpleAction *action, GVariant*, 
gpointer)
 
 if (strcmp(strval, "New") == 0)
 {
+g_free(strval);
+
 uno::Reference 
xModuleManager(frame::ModuleManager::create(xContext));
 OUString aModuleId(xModuleManager->identify(xFrame));
 if (aModuleId.isEmpty())
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 3f49b65..d3a0310 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -550,6 +550,8 @@ static void activate_uno(GSimpleAction *action, GVariant*, 
gpointer)
 
 if (strcmp(strval, "New") == 0)
 {
+g_free(strval);
+
 uno::Reference 
xModuleManager(frame::ModuleManager::create(xContext));
 OUString aModuleId(xModuleManager->identify(xFrame));
 if (aModuleId.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

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

New commits:
commit a076a062ceb02bd34a460819db61dcbfbca5c8d7
Author: Noel Grandin 
Date:   Fri Jan 13 15:18:15 2017 +0200

tdf# 105017 Crash when click a "New Theme..." in Gallery on detached SideBar

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

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 4e0fd97..e17b66b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1037,7 +1037,7 @@ void Dialog::SetModalInputMode( bool bModal )
 // Disable the prev Modal Dialog, because our dialog must close at 
first,
 // before the other dialog can be closed (because the other dialog
 // is on stack since our dialog returns)
-if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->IsWindowOrChild( this, 
true ) )
+if ( mpPrevExecuteDlg && !mpPrevExecuteDlg->isDisposed() && 
!mpPrevExecuteDlg->IsWindowOrChild( this, true ) )
 mpPrevExecuteDlg->EnableInput( false, this );
 
 // determine next overlap dialog parent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svtools/grfmgr.hxx|2 +-
 svtools/source/graphic/grfmgr.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 24fa5d0570b997cc92f1fdf412f517f8d4021207
Author: Noel Grandin 
Date:   Fri Jan 13 14:15:23 2017 +0200

better fix for tdf#101563: Export to PDF creates huge PDF files

Change-Id: Idda6a5ac824090e620fc6577fc82d5c5f1234b7e
Reviewed-on: https://gerrit.libreoffice.org/33037
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 18af820..b39e691 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -386,7 +386,7 @@ public:
 boolHasLink() const { return !maLink.isEmpty(); }
 voidSetLink();
 voidSetLink( const OUString& rLink );
-OUStringGetLink() const { return maLink; }
+const OUString& GetLink() const { return maLink; }
 
 boolHasUserData() const { return 
!maUserData.isEmpty(); }
 voidSetUserData();
diff --git a/svtools/source/graphic/grfmgr.cxx 
b/svtools/source/graphic/grfmgr.cxx
index ffaa93a..f818bad 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -647,8 +647,11 @@ void GraphicObject::SetGraphic( const Graphic& rGraphic, 
const GraphicObject* pC
 
 void GraphicObject::SetGraphic( const Graphic& rGraphic, const OUString& rLink 
)
 {
+// in case we are called from a situation where rLink and maLink are the 
same thing,
+// we need a copy because SetGraphic clears maLink
+OUString sLinkCopy = rLink;
 SetGraphic( rGraphic );
-maLink = rLink;
+maLink = sLinkCopy;
 }
 
 Graphic GraphicObject::GetTransformedGraphic( const Size& rDestSize, const 
MapMode& rDestMap, const GraphicAttr& rAttr ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] minutes of ESC call ...

[Bjoern Michaelsen]

Hi,

On Fri, Jan 13, 2017 at 04:41:44PM +0100, Alexander Thurgood wrote:
> So, dropping make 3.8.1 on Mac would clearly push people not to build
> with the XCode system provided tools ?

Well, it is still GNU make. But yes in general, its suggested to work on
LibreOffice in a well defined environment anyway, which for OSX and Windows is
LODE.

Best,

Bjoern

(FWIW, GNU make 3.82 was released 2010-07-28: Its older than LibreOffice
itself, and it is trivial to build with older versions of generic POSIX make
including GNU make 3.81.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.

[Bjoern Michaelsen]

Hi,

On Fri, Jan 13, 2017 at 05:35:19PM +0100, Alexander Thurgood wrote:
> That is unfortunate as it means that most of the database functionality
> is excluded, including the bundled extensions and wizards (abpilot,
> bibliography, dbpilots, spotlight/mdimporter), the external stuff :
> reportbuilder, firebird, anything that relies on Java.

Stuff wasnt excluded "because it was Java", but because these modules broke
gbuildtojson at some point on some platform. Some of the early breakers might
have been fixed as people improve gbuild/gbuildtojson elsewhere.

So, the first thing to do is: Remove the module you are interested in from the
blacklist and see if "cd $MODULE && make gbuildtojson" works for you locally.
If it does, upload to gerrit and verify with others that you are not breaking
other platforms in a horrible way (or remove the blacklisted module for your
platform only).

If the module still fails to complete gbuildtojson, it usually means it thinks
its a special snowflake and is allowed to do dirty tricks with manually created
dependencies etc.. In that case, the first thing to check is if those dirty
tricks are really needed and if there isnt a clean way to do the same. If that
is not possible gbuildtojson needs to be hacked to be adopted to those tricks.
 
> It is also a bit inconsistent, in that the module "forms" is included,
> but without any database connectivity, it is probably not much use. Same
> for reportdesign.

Not really: If low level modules do dirty tricks they need to be skipped. If
the higher-level modules do stuff in a clean way, they still can be handled
from IDEs.

Best,

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

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

[Caolán McNamara]

 filter/source/graphicfilter/ios2met/ios2met.cxx |  113 +++-
 1 file changed, 55 insertions(+), 58 deletions(-)

New commits:
commit 9e3d5996b919dfaacc152fd055e6d2250f56de47
Author: Caolán McNamara 
Date:   Fri Jan 13 16:39:47 2017 +

fix met leaks

Change-Id: Ic26d70cd967324432d0b5fbd7346cfee9f1d305e

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index e5e5e6d..751217c 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -371,7 +371,7 @@ private:
 OSAttr   aAttr;
 OSAttr   * pAttrStack;
 
-SvStream * pOrdFile;
+std::unique_ptr xOrdFile;
 
 void AddPointsToPath(const tools::Polygon & rPoly);
 void AddPointsToArea(const tools::Polygon & rPoly);
@@ -450,12 +450,54 @@ OS2METReader::OS2METReader()
 , aDefAttr()
 , aAttr()
 , pAttrStack(nullptr)
-, pOrdFile(nullptr)
 {
 }
 
 OS2METReader::~OS2METReader()
 {
+while (pAreaStack!=nullptr) {
+OSArea * p=pAreaStack;
+pAreaStack=p->pSucc;
+delete p;
+}
+
+while (pPathStack!=nullptr) {
+OSPath * p=pPathStack;
+pPathStack=p->pSucc;
+delete p;
+}
+
+while (pPathList!=nullptr) {
+OSPath * p=pPathList;
+pPathList=p->pSucc;
+delete p;
+}
+
+while (pFontList!=nullptr) {
+OSFont * p=pFontList;
+pFontList=p->pSucc;
+delete p;
+}
+
+while (pBitmapList!=nullptr) {
+OSBitmap * p=pBitmapList;
+pBitmapList=p->pSucc;
+if (p->pBMP!=nullptr) delete p->pBMP;
+delete p;
+}
+
+while (pAttrStack!=nullptr) {
+OSAttr * p=pAttrStack;
+pAttrStack=p->pSucc;
+delete p;
+}
+
+while (pPaletteStack!=nullptr) {
+OSPalette * p=pPaletteStack;
+pPaletteStack=p->pSucc;
+if (p->p0RGB!=nullptr) delete[] p->p0RGB;
+delete p;
+}
 }
 
 bool OS2METReader::IsLineInfo()
@@ -2509,15 +2551,16 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, 
sal_uInt16 nFieldSize)
 sal_uInt16 nOrderID, nOrderLen;
 sal_uInt8 nbyte;
 
-if (pOrdFile==nullptr) break;
+if (!xOrdFile)
+break;
 
-// In pOrdFile all "DatGrfObj" fields were collected so that the
+// In xOrdFile all "DatGrfObj" fields were collected so that the
 // therein contained "Orders" are continuous and not segmented by 
fields.
 // To read them from the memory stream without having any trouble,
 // we use a  little trick:
 
 pSave=pOS2MET;
-pOS2MET=pOrdFile; //(!)
+pOS2MET=xOrdFile.get(); //(!)
 nMaxPos=pOS2MET->Tell();
 pOS2MET->Seek(0);
 
@@ -2560,11 +2603,11 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, 
sal_uInt16 nFieldSize)
 }
 
 pOS2MET=pSave;
-if (pOrdFile->GetError()) {
+if (xOrdFile->GetError()) {
 pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
 ErrorCode=10;
 }
-delete pOrdFile; pOrdFile=nullptr;
+xOrdFile.reset();
 break;
 }
 case DscGrfObjMagic: {
@@ -2583,13 +2626,13 @@ void OS2METReader::ReadField(sal_uInt16 nFieldType, 
sal_uInt16 nFieldSize)
 break;
 }
 case DatGrfObjMagic: {
-if (pOrdFile==nullptr) {
-pOrdFile = new SvMemoryStream;
-pOrdFile->SetEndian(SvStreamEndian::LITTLE);
+if (!xOrdFile) {
+xOrdFile.reset(new SvMemoryStream);
+xOrdFile->SetEndian(SvStreamEndian::LITTLE);
 }
 std::unique_ptr pBuf(new sal_uInt8[nFieldSize]);
 pOS2MET->ReadBytes(pBuf.get(), nFieldSize);
-pOrdFile->WriteBytes(pBuf.get(), nFieldSize);
+xOrdFile->WriteBytes(pBuf.get(), nFieldSize);
 break;
 }
 case MapCodFntMagic:
@@ -2657,7 +2700,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, 
GDIMetaFile & rGDIMetaF
 
 aAttr=aDefAttr;
 
-pOrdFile=nullptr;
+xOrdFile.reset();
 
 pVirDev = VclPtr::Create();
 pVirDev->EnableOutput(false);
@@ -2732,52 +2775,6 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, 
GDIMetaFile & rGDIMetaF
 rGDIMetaFile.SetPrefSize( aCalcBndRect.GetSize() );
 }
 
-if (pOrdFile!=nullptr) delete pOrdFile;
-
-while (pAreaStack!=nullptr) {
-OSArea * p=pAreaStack;
-pAreaStack=p->pSucc;
-delete p;
-}
-
-while (pPathStack!=nullptr) {
-OSPath * p=pPathStack;
-pPathStack=p->pSucc;
-delete p;
-}
-
-while (pPathList!=nullptr) {
-OSPath * p=pPathList;
-pPathList=p->pSucc;
-delete p;
-}
-
-while (pFontList!=nullptr) {
-OSFont * 

Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.

[Alexander Thurgood]

Le 13/01/2017 à 17:07, Jan Iversen a écrit :
> 


> Bjoern is the right person to ask, he declared a number of modules for
> blacklisted. Once reason could be if the module contains Java, another
> can be the makefiles are not using the standard gb_ macros.
> 
> 
> gb_GbuildToJson_BLACKLISTEDMODULES := connectivity compilerplugins
> cli_ure dictionaries bridges helpcompiler helpcontent2 icon-themes jurt
> sal shell cppu cppuhelper cpputools extensions external i18npool
> javaunohelper lingucomponent odk scaddins solenv stoc tools translations
> udkapi unoidl
> 

That is unfortunate as it means that most of the database functionality
is excluded, including the bundled extensions and wizards (abpilot,
bibliography, dbpilots, spotlight/mdimporter), the external stuff :
reportbuilder, firebird, anything that relies on Java.

It is also a bit inconsistent, in that the module "forms" is included,
but without any database connectivity, it is probably not much use. Same
for reportdesign.


I imagine that that represents still quite a bit of work to achieve, so
good luck !


Alex





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

Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.

[Jan Iversen]

> On 13 Jan 2017, at 17:01, Alexander Thurgood  wrote:
> 
> Le 05/01/2017 à 19:23, jan iversen a écrit :
> 
> Hi Jan,
> 
> 
> Exploring the included modules in libreoffice.xcodeproj shows that
> "connectivity" isn't included - why might this be ?
Bjoern is the right person to ask, he declared a number of modules for 
blacklisted. Once reason could be if the module contains Java, another can be 
the makefiles are not using the standard gb_ macros.


gb_GbuildToJson_BLACKLISTEDMODULES := connectivity compilerplugins cli_ure 
dictionaries bridges helpcompiler helpcontent2 icon-themes jurt sal shell cppu 
cppuhelper cpputools extensions external i18npool javaunohelper lingucomponent 
odk scaddins solenv stoc tools translations udkapi unoidl

see core/solenv/gbuild/extensions/post_GbuildToJson.mk

We just started an Italian project to update vs2013-ide-integration and I will 
update xcode-ide-integration in parallel, this might cause that some 
blacklisted modules are activated.

Rgds
jan I.

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

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

Re: News on Xcode IDE, libre office now loads as 1 project, with modules etc.

[Alexander Thurgood]

Le 05/01/2017 à 19:23, jan iversen a écrit :

Hi Jan,


Exploring the included modules in libreoffice.xcodeproj shows that
"connectivity" isn't included - why might this be ?


Alex



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

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

[Tor Lillqvist]

 kit/Kit.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3d18b6558dd0966ed7cc41dd5c0f9b3d7726e903
Author: Tor Lillqvist 
Date:   Fri Jan 13 17:47:49 2017 +0200

Revert "I assume these plus signs were accidental slips of the finger"

Thet are intentional.

This reverts commit c31425e4e2bf0bd251629222db454ebff478bdf4.

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index d5dbcf2..4aa58ed 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -608,7 +608,7 @@ public:
 return;
 }
 
-LOG_TRC("paintTile at (" << tile.getPart() << ',' << 
tile.getTilePosX() << ',' << tile.getTilePosY() <<
+LOG_TRC("+paintTile at (" << tile.getPart() << ',' << 
tile.getTilePosX() << ',' << tile.getTilePosY() <<
 ") " << "ver: " << tile.getVersion());
 Timestamp timestamp;
 _loKitDocument->paintPartTile(pixmap.data(), tile.getPart(),
@@ -689,7 +689,7 @@ public:
 return;
 }
 
-LOG_DBG("paintTile (combined) at (" << renderArea.getLeft() << ", " << 
renderArea.getTop() << "), (" <<
+LOG_DBG("+paintTile (combined) at (" << renderArea.getLeft() << ", " 
<< renderArea.getTop() << "), (" <<
 renderArea.getWidth() << ", " << renderArea.getHeight() << 
").");
 Timestamp timestamp;
 _loKitDocument->paintPartTile(pixmap.data(), tileCombined.getPart(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - bridges/source

[Samuel Mehrbrodt]

 bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx  |4 ++--
 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 3208a9f9bb7b14bb627c3f493cff66e9a5a0d0fb
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 16:46:34 2017 +0100

bridges: Log function names, not string pointers

Change-Id: I5177dd4fbc8f1b638ceff14c5d88d19fff8076a3

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index e2f5976..930657f 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
 std::hex << pCallStack[0] << "," << pCallStack[1] << "," << 
pCallStack[2] << ",...]" <<
 ", pThis=" << pThis << ", pCppI=" << pCppI <<
 std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
-SAL_INFO( "bridges.win32", "name=" << pTypeDescr->aBase.pTypeName );
+SAL_INFO( "bridges.win32", "name=" << 
OUString::unacquired(&pTypeDescr->aBase.pTypeName) );
 
 if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
 {
@@ -268,7 +268,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
 
 TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-SAL_INFO( "bridges.win32", "Calling " << aMemberDescr.get()->pTypeName );
+SAL_INFO( "bridges.win32", "Calling " << 
OUString::unacquired(&aMemberDescr.get()->pTypeName) );
 
 typelib_TypeClass eRet = typelib_TypeClass_VOID;
 switch (aMemberDescr.get()->eTypeClass)
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 14776e7..15c0551 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -244,7 +244,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 std::hex << pStack[0] << "," << pStack[1] << "," << pStack[2] << 
",...]" <<
 ", pThis=" << pThis << ", pCppI=" << pCppI <<
 std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
-SAL_INFO( "bridges.win64", "name=" << pTD->aBase.pTypeName );
+SAL_INFO( "bridges.win64", "name=" << 
OUString::unacquired(&pTD->aBase.pTypeName) );
 
 if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
 {
@@ -266,7 +266,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
 TypeDescription aMemberDescr( pTD->ppAllMembers[nMemberPos] );
 
-SAL_INFO( "bridges.win64", "Calling " << aMemberDescr.get()->pTypeName );
+SAL_INFO( "bridges.win64", "Calling " << 
OUString::unacquired(&aMemberDescr.get()->pTypeName) );
 
 typelib_TypeClass eRet;
 switch ( aMemberDescr.get()->eTypeClass )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f86845b60642cb9381f18ea646ea8806597eb4eb
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 15:40:57 2017 +

iOS bridge: Log function names, not string pointers

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

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx 
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
index ae661903..7189bd7 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-i386.cxx
@@ -260,7 +260,7 @@ extern "C" void cpp_vtable_call(
   ", pThis=" << pThis << ", pCppI=" << pCppI <<
   std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
 
-SAL_INFO( "bridges.ios", "name=" << pTypeDescr->aBase.pTypeName );
+SAL_INFO( "bridges.ios", "name=" << 
OUString::unacquired(&pTypeDescr->aBase.pTypeName) );
 
 assert( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex );
 
@@ -276,7 +276,7 @@ extern "C" void cpp_vtable_call(
 
 TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
 
-SAL_INFO( "bridges.ios", "Calling " << aMemberDescr.get()->pTypeName );
+SAL_INFO( "bridges.ios", "Calling " << 
OUString::unacquired(&aMemberDescr.get()->pTypeName) );
 
 switch (aMemberDescr.get()->eTypeClass)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - common/Log.cpp

[Jan Holesovsky]

 common/Log.cpp |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 2db8969dcd1e3ad3ac0aaef8cabb4372ef5e1747
Author: Jan Holesovsky 
Date:   Fri Jan 13 16:09:47 2017 +0100

Log the time in wall-clock time, instead of since the process start.

Otherwise we are getting completely confused times - various processes start
at various times, so for one process the epoch start can be eg. 20 minutes
later than for the other.

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

diff --git a/common/Log.cpp b/common/Log.cpp
index c263975..df2286d 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -19,6 +19,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -35,8 +36,6 @@ namespace Log
 {
 using namespace Poco;
 
-static const Poco::Int64 epochStart = 
Poco::Timestamp().epochMicroseconds();
-
 /// Helper to avoid destruction ordering issues.
 struct StaticNames
 {
@@ -81,15 +80,7 @@ namespace Log
 // FIXME: If running under systemd it is redundant to output 
timestamps, as those will be
 // attached to messages that the systemd journalling mechanism picks 
up anyway, won't they?
 
-Poco::Int64 usec = Poco::Timestamp().epochMicroseconds() - epochStart;
-
-const Poco::Int64 one_s = 100;
-const Poco::Int64 hours = usec / (one_s*60*60);
-usec %= (one_s * 60 * 60);
-const Poco::Int64 minutes = usec / (one_s*60);
-usec %= (one_s * 60);
-const Poco::Int64 seconds = usec / (one_s);
-usec %= (one_s);
+std::string time = DateTimeFormatter::format(Poco::Timestamp(), 
"%H:%M:%s");
 
 char procName[32]; // we really need only 16
 if (prctl(PR_GET_NAME, reinterpret_cast(procName), 0, 
0, 0) != 0)
@@ -100,9 +91,9 @@ namespace Log
 const char* appName = (Source.inited ? Source.id.c_str() : 
"");
 assert(strlen(appName) + 32 + 28 < 1024 - 1);
 
-snprintf(buffer, 4095, "%s-%.04lu %d:%.2d:%.2d.%.6d [ %s ] %s  ", 
appName,
+snprintf(buffer, 4095, "%s-%.04lu %s [ %s ] %s  ", appName,
  syscall(SYS_gettid),
- (int)hours, (int)minutes, (int)seconds, (int)usec,
+ time.c_str(),
  procName, level);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 common/Log.cpp |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 4416c836d0e1456dc80e27c8fb17a95bd195f87c
Author: Jan Holesovsky 
Date:   Fri Jan 13 16:09:47 2017 +0100

Log the time in wall-clock time, instead of since the process start.

Otherwise we are getting completely confused times - various processes start
at various times, so for one process the epoch start can be eg. 20 minutes
later than for the other.

Change-Id: I6d87e98682a5fcd0348a584cf66f7ffa5813ca66

diff --git a/common/Log.cpp b/common/Log.cpp
index 380b0ed..8d020fb 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,8 +37,6 @@ namespace Log
 {
 using namespace Poco;
 
-static const Poco::Int64 epochStart = 
Poco::Timestamp().epochMicroseconds();
-
 /// Helper to avoid destruction ordering issues.
 struct StaticNames
 {
@@ -82,15 +81,7 @@ namespace Log
 // FIXME: If running under systemd it is redundant to output 
timestamps, as those will be
 // attached to messages that the systemd journalling mechanism picks 
up anyway, won't they?
 
-Poco::Int64 usec = Poco::Timestamp().epochMicroseconds() - epochStart;
-
-const Poco::Int64 one_s = 100;
-const Poco::Int64 hours = usec / (one_s*60*60);
-usec %= (one_s * 60 * 60);
-const Poco::Int64 minutes = usec / (one_s*60);
-usec %= (one_s * 60);
-const Poco::Int64 seconds = usec / (one_s);
-usec %= (one_s);
+std::string time = DateTimeFormatter::format(Poco::Timestamp(), 
"%H:%M:%s");
 
 char procName[32]; // we really need only 16
 if (prctl(PR_GET_NAME, reinterpret_cast(procName), 0, 
0, 0) != 0)
@@ -101,9 +92,9 @@ namespace Log
 const char* appName = (Source.inited ? Source.id.c_str() : 
"");
 assert(strlen(appName) + 32 + 28 < 1024 - 1);
 
-snprintf(buffer, 4095, "%s-%.04lu %d:%.2d:%.2d.%.6d [ %s ] %s  ", 
appName,
+snprintf(buffer, 4095, "%s-%.04lu %s [ %s ] %s  ", appName,
  syscall(SYS_gettid),
- (int)hours, (int)minutes, (int)seconds, (int)usec,
+ time.c_str(),
  procName, level);
 }
 
___
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

[Caolán McNamara]

 filter/qa/cppunit/data/dxf/pass/loop-2.dxf|13974 ++
 filter/source/graphicfilter/idxf/dxfreprd.cxx |7 
 filter/source/graphicfilter/idxf/dxfreprd.hxx |2 
 3 files changed, 13982 insertions(+), 1 deletion(-)

New commits:
commit 7420e350906558556881afc213f942d45d3e0b60
Author: Caolán McNamara 
Date:   Fri Jan 13 15:12:18 2017 +

guard against self-recursive GetBoundingBox

Change-Id: If33f0e5e326604bf731d6ad50644e3a0b24ccf51

diff --git a/filter/qa/cppunit/data/dxf/pass/loop-2.dxf 
b/filter/qa/cppunit/data/dxf/pass/loop-2.dxf
new file mode 100644
index 000..961dd35
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/pass/loop-2.dxf
@@ -0,0 +1,13974 @@
+  0
+SECTION*
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1015
+  9
+$ACADMAINTVER
+ 70
+ 6
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMAX
+ 10
+297.0
+ 20
+420.0
+ 30
+0.0
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+297.0
+ 20
+420.0
+  9
+$ORTHOMODE
+ 70
+ 0
+  9
+$REGENMODE
+ 70
+ 1
+  9
+$FILL«ODE
+ 70
+ 1
+  9
+$QTEXTMODE
+ 70
+ 0
+  9
+$MIRRTEXT
+ 70
+ 1
+  0
+DIMSTYLE
+105
+501
+102
+{ACAD_REACTORS
+330
+500
+102
+}
+330
+A
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+SLDDIMSTYLE0
+ 70
+ 0
+ 41
+3.0
+ 44
+0.0
+ 45
+0.1
+ 73
+ 0
+ 74
+ 0
+ 77
+ 1
+ 78
+12
+ 79
+ 3
+140
+3.5
+144
+2.5
+147
+0.875
+172
+ 1
+173
+ 1
+178
+ 0
+271
+ 3
+272
+ 3
+276
+ 2
+284
+12
+289
+ 0
+340
+54
+  0
+DIMSTYLE
+105
+50E
+102
+{ACAD_REACTORS
+330
+50D
+330
+51A
+330
+526
+330
+56C
+330
+578
+330
+584
+102
+}
+330
+A
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+SLDDIMSTYLE1
+ 70
+ 0
+ 41
+3.0
+ 44
+0.0
+ 45
+0.1
+ 73
+ 0
+ 74
+ 0
+ 77
+ 1
+ 78
+12
+ 79
+ 3
+140
+3.5
+144
+2.5
+147
+0.875
+172
+ 1
+173
+ 1
+178
+ 0
+271
+ 0
+272
+ 0
+276
+ 2
+284
+12
+289
+ 0
+340
+54
+  0
+DIMSTYLE
+105
+533
+102
+{ACAD_REACTORS
+330
+532
+330
+53C
+330
+545
+330
+54E
+330
+557
+330
+561
+102
+}
+330
+A
+100
+AcDbSymbolTableRecord
+100
+AcDbDimStyleTableRecord
+  2
+SLDDIMSTYLE2
+ 70
+ 0
+ 41
+3.0
+ 44
+0.0
+ 45
+0.1
+ 73
+ 0
+ 74
+ 0
+ 77
+ 1
+ 78
+12
+ 79
+ 3
+140
+3.5
+144
+2.5
+147
+0.875
+173
+ 1
+178
+ 0
+271
+ 3
+272
+ 3
+276
+ 2
+284
+12
+340
+54
+  0
+ENDTAB
+  0
+TABLE
+  2
+BLOCK_RECORD
+  5
+1
+330
+0
+100
+AcDbSymbolTable
+ 70
+15
+  0
+BLOCK_RECORD
+  5
+1F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Model_Space
+340
+22
+  0
+BLOCK_RECORD
+  5
+1B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space
+340
+1E
+  0
+BLOCK_RECORD
+  5
+23
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+*Paper_Space0
+340
+26
+  0
+BLOCK_RECORD
+  5
+56
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+SW_BROKEN_VIEW_0
+340
+0
+102
+{BLKREFS
+331
+59
+102
+}
+  0
+BLOCK_RECORD
+  5
+502
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D
+340
+0
+  0
+BLOCK_RECORD
+  5
+50F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_1
+340
+0
+  0
+BLOCK_RECORD
+  5
+51B
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_2
+340
+0
+  0
+BLOCK_RECORD
+  5
+527
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_3
+340
+0
+  0
+BLOCK_RECORD
+  5
+534
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_4
+340
+0
+  0
+BLOCK_RECORD
+  5
+53D
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_5
+340
+0
+  0
+BLOCK_RECORD
+  5
+546
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_6
+340
+0
+  0
+BLOCK_RECORD
+  5
+54F
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_7
+340
+0
+  0
+BLOCK_RECORD
+  5
+558
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_8
+340
+0
+  0
+BLOCK_RECORD
+  5
+562
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_9
+340
+0
+  0
+BLOCK_RECORD
+  5
+56D
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_10
+340
+0
+  0
+BLOCK_RECORD
+  5
+579
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_11
+340
+0
+  0
+BLOCK_RECORD
+  5
+585
+330
+1
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+  2
+_D_12
+340
+0
+  0
+ENDTAB
+  0
+ENDSEC
+  0
+SECTION
+  2
+BLOCKS
+  0
+BLOCK
+  5
+20
+330
+1F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Model_Space
+ 70
+ 0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Model_Space
+  1
+
+  0
+ENDBLK
+  5
+21
+330
+1F
+100
+AcDbEntity
+  8
+0
+100
+AcDbBlockEnd
+  0
+BLOCK
+  5
+1C
+330
+1B
+100
+AcDbEntity
+ 67
+ 1
+  8
+0
+100
+AcDbBlockBegin
+  2
+*Paper_Space
+ 70
+ 0
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  3
+*Paper

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

[Pranav Kant]

 loleaflet/README  |2 +-
 loleaflet/dist/toolbar/toolbar.js |3 +--
 loleaflet/src/control/Parts.js|4 +++-
 loleaflet/src/control/Search.js   |   18 +++---
 loleaflet/src/layer/tile/TileLayer.js |5 +
 5 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit 35e904ecf942eb379ec181a4edf6e18d45adb59c
Author: Pranav Kant 
Date:   Fri Jan 13 20:32:10 2017 +0530

loleaflet: Don't focus on map if search is going on

... and part is changed.

Change-Id: Icebcfc9924a6891787d08476ba37a0174ae9b67d

diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index cbca779..41f36e9 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -46,7 +46,9 @@ L.Map.include({
this._socket.sendMessage('commandvalues 
command=.uno:ViewRowColumnHeaders');
}
docLayer._drawSearchResults();
-   this.focus();
+   if (!this._searchRequested) {
+   this.focus();
+   }
},
 
getPreview: function (id, index, maxWidth, maxHeight, options) {
diff --git a/loleaflet/src/control/Search.js b/loleaflet/src/control/Search.js
index 8bf8d15..f030a7b 100644
--- a/loleaflet/src/control/Search.js
+++ b/loleaflet/src/control/Search.js
@@ -50,6 +50,7 @@ L.Map.include({
searchCmd['SearchItem.Command'] = {};
searchCmd['SearchItem.Command'].type = 'long';
searchCmd['SearchItem.Command'].value = all;
+   this._searchRequested = true;
this._socket.sendMessage('uno .uno:ExecuteSearch ' + 
JSON.stringify(searchCmd));
},
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 4f34b8f..0e75eaa 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -885,11 +885,13 @@ L.TileLayer = L.GridLayer.extend({
 
_onSearchNotFoundMsg: function (textMsg) {
this._clearSearchResults();
+   this._searchRequested = false;
var originalPhrase = textMsg.substring(16);
this._map.fire('search', {originalPhrase: originalPhrase, 
count: 0});
},
 
_onSearchResultSelection: function (textMsg) {
+   this._searchRequested = false;
textMsg = textMsg.substring(23);
var obj = JSON.parse(textMsg);
var originalPhrase = obj.searchString;
commit 64835bec909e797daa25947da876e779a3641134
Author: Pranav Kant 
Date:   Fri Jan 13 19:59:28 2017 +0530

loleaflet: Allow search expansion as you type

Change-Id: I648721a0ed9e4d66db45956657398a4834ac45ce

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 0385b26..02a89f0 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -736,10 +736,9 @@ function selectItem(item, func)
item.current = index;
}
 }
-
 function onSearch(e) {
var toolbar = w2ui['toolbar-down'];
-   map.search(L.DomUtil.get('search-input').value);
+   map.search(L.DomUtil.get('search-input').value, false, 0, true /* 
expand search */);
toolbar.enable('searchprev');
toolbar.enable('searchnext');
toolbar.show('cancelsearch');
diff --git a/loleaflet/src/control/Search.js b/loleaflet/src/control/Search.js
index 22bd3dd..8bf8d15 100644
--- a/loleaflet/src/control/Search.js
+++ b/loleaflet/src/control/Search.js
@@ -1,5 +1,5 @@
 L.Map.include({
-   search: function (text, backward, all) {
+   search: function (text, backward, all, expand) {
if (backward === undefined) {
backward = false;
}
@@ -28,14 +28,25 @@ L.Map.include({
Math.max(viewTopLeftpx.y, docBoundsTopLeft.y)));
var topLeftTwips = this._docLayer._latLngToTwips(topLeft);
 
+   var searchStartPointX = topLeftTwips.x;
+   var searchStartPointY = topLeftTwips.y;
+   if (this._docLayer && this._docLayer._lastSearchResult && 
expand) {
+   var strTwips = 
this._docLayer._lastSearchResult.twipsRectangles.match(/\d+/g);
+   if (strTwips != null) {
+   searchStartPointX = strTwips[0];
+   searchStartPointY = strTwips[1];
+   }
+   this.resetSelection();
+   }
+
searchCmd['SearchItem.SearchString'].value = text;
searchCmd['SearchItem.Backward'].value = backward;
searchCmd['SearchItem.SearchStartPointX'] = {};
searchCmd['SearchItem.SearchStartPointX'].type = 'long';
-   searchCmd['SearchItem.SearchStartPointX'].value = 
topLeftTwips.x;
+   search

Re: minutes of ESC call ...

[Xisco Fauli]

Hello all,


+ new issue created as MAB tdf#105259
+ Beluga: can’t be fixed before 5.3
+ asking for help with glade (Heiko)
+ even the simple reverting is risky (Xisco)
+ we need to fix the dialog (Heiko)
+ fixing and testing in one week not possible (Xisco)
=> revert the patch in 5.3 & fix in 5.4.
AI:do the revert and do it in 5.4 (Xisco)
in yesterday's meeting, we agreed to revert this patch 
62a94dcf0c750e335d6ce272d8a5df9813910d5a in 5.3.
However, I've just seen Tomaž submitted two new patches to master 
related to this problem: 00db9f51215d11da3b27685a39ec940ecd65e387 and 
e6d7d737522124350a17a3cfdee055f03200a274, and according to a comment 
written by Buovjaga in tdf#105259, it seems to fix all problem 
introduced by 62a94dcf0c750e335d6ce272d8a5df9813910d5a.


So I would to like to ask if any developer can review those new patches 
and if they look good, push them to 5.3 instead of reverting 
62a94dcf0c750e335d6ce272d8a5df9813910d5a as we agreed yesterday.


Regards

--
Xisco Faulí
Libreoffice QA Team
IRC: x1sc0

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

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/statistical/fods/poisson.dist.fods |11832 +++
 sc/qa/unit/data/functions/statistical/fods/poisson.fods  |11795 ++
 2 files changed, 23627 insertions(+)

New commits:
commit a658c181617ce75fafcc1c2808e9558ee546503e
Author: Zdeněk Crhonek 
Date:   Sun Jan 8 17:10:16 2017 +0100

add POISSON, POISSON.DIST test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/poisson.dist.fods 
b/sc/qa/unit/data/functions/statistical/fods/poisson.dist.fods
new file mode 100644
index 000..0aea71a
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/poisson.dist.fods
@@ -0,0 +1,11832 @@
+
+
+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-12-29T18:23:56.52200P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/92a1ad1f36b6d3cc13135a8c0805508933011577
+ 
+  
+   0
+   0
+   83842
+   359833
+   
+
+ view1
+ 
+  
+   1
+   7
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   2
+   326
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   291
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet1
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/addin/fods/besseli.fods | 7162 ++
 sc/qa/unit/data/functions/addin/fods/besselj.fods | 7162 ++
 sc/qa/unit/data/functions/addin/fods/besselk.fods | 7162 ++
 sc/qa/unit/data/functions/addin/fods/bessely.fods | 7162 ++
 4 files changed, 28648 insertions(+)

New commits:
commit c3fc9ac6ef1be34e4683c0c5fb7f5f116da9c59e
Author: Zdeněk Crhonek 
Date:   Sun Jan 8 21:19:36 2017 +0100

add BESSELI,BESSELJ,BESSELK,BESSELY test case

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

diff --git a/sc/qa/unit/data/functions/addin/fods/besseli.fods 
b/sc/qa/unit/data/functions/addin/fods/besseli.fods
new file mode 100644
index 000..a0b0b8c
--- /dev/null
+++ b/sc/qa/unit/data/functions/addin/fods/besseli.fods
@@ -0,0 +1,7162 @@
+
+
+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">
+ 
2017-01-02T19:55:59.875194457P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   64713
+   148642
+   
+
+ view1
+ 
+  
+   1
+   7
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   120
+   60
+   true
+   false
+  
+  
+   2
+   326
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   309
+   0
+   120
+   60
+   true
+   false
+  
+ 
+ Sheet1
+ 1241
+ 0
+ 120
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ en
+ US
+ 
+ 
+ 
+
+
+ zh
+ CN
+ 
+ :!),.:;?]}¢'"、。〉》」』】〕〗〞︰︱︳﹐､﹒﹔﹕﹖﹗﹚﹜﹞！），．：；？｜｝︴︶︸︺︼︾﹀﹂﹄﹏､～ï¿
 ã€…‖•·ˇˉ―--′’”
+ ([{£¥'"‵〈《「『【〔〖（［｛￡￥〝︵︷︹︻︽︿﹁﹃﹙﹛﹝（｛“‘
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+   

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

[Tor Lillqvist]

 kit/Kit.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c31425e4e2bf0bd251629222db454ebff478bdf4
Author: Tor Lillqvist 
Date:   Fri Jan 13 16:23:18 2017 +0200

I assume these plus signs were accidental slips of the finger

Change-Id: Ic227f40d1ba71cef388719ef10dfcf4d9f172caf

diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 4aa58ed..d5dbcf2 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -608,7 +608,7 @@ public:
 return;
 }
 
-LOG_TRC("+paintTile at (" << tile.getPart() << ',' << 
tile.getTilePosX() << ',' << tile.getTilePosY() <<
+LOG_TRC("paintTile at (" << tile.getPart() << ',' << 
tile.getTilePosX() << ',' << tile.getTilePosY() <<
 ") " << "ver: " << tile.getVersion());
 Timestamp timestamp;
 _loKitDocument->paintPartTile(pixmap.data(), tile.getPart(),
@@ -689,7 +689,7 @@ public:
 return;
 }
 
-LOG_DBG("+paintTile (combined) at (" << renderArea.getLeft() << ", " 
<< renderArea.getTop() << "), (" <<
+LOG_DBG("paintTile (combined) at (" << renderArea.getLeft() << ", " << 
renderArea.getTop() << "), (" <<
 renderArea.getWidth() << ", " << renderArea.getHeight() << 
").");
 Timestamp timestamp;
 _loKitDocument->paintPartTile(pixmap.data(), tileCombined.getPart(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Samuel Mehrbrodt]

 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08316e7b2fd913dc20f9477d161b48d8e676a9bb
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 15:27:41 2017 +0100

tdf#96011 Document is not focused when opening a second window

This reverts commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54.

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 00ba109..e45beb4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -27,7 +27,7 @@
 
 
   
-false
+true
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - 2 commits - framework/source officecfg/registry

[Samuel Mehrbrodt]

 framework/source/loadenv/loadenv.cxx |2 +-
 officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 70d7aff88124dce45e8dc7ae7a3f6c5c74161a57
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 15:27:41 2017 +0100

tdf#96011 Document is not focused when opening a second window

This reverts commit fa52e16b3fb1b8b051f8f64a52c126ba3cbf4d54.

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index ffca153..1889d3f 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -27,7 +27,7 @@
 
 
   
-false
+true
   
 
 
commit a5aa8b32e808f458be262d6532b7451861dcac13
Author: Mark Hung 
Date:   Sat Apr 9 23:45:28 2016 +0800

tdf#48300 bring window to top and restore window when minimized.

While XWindow->ToTop() in Linux do the both for default ( None ),
ToTopFlags::RestoreWhenMin has to be specified in Windows in order
to restore the window, and ToTopFlags::ForegroundTask is necessary
when ToTopFlags::RestoreWhenMin is specified in order to bring
non-minimized window to the front.

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

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 4261971..ab4010f 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1665,7 +1665,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const 
css::uno::Reference< css::awt::X
 }
 
 if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
-pWindow->ToTop();
+pWindow->ToTop( ToTopFlags::RestoreWhenMin | 
ToTopFlags::ForegroundTask );
 else
 pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? 
SHOW_FOREGROUNDTASK : 0 );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure]

 wizards/source/access2base/DoCmd.xba |8 +++-
 wizards/source/access2base/Field.xba |8 ++--
 wizards/source/access2base/Recordset.xba |1 +
 wizards/source/access2base/Utils.xba |2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit 3107a5d0e9ff7a3ccaac536606a733767886d438
Author: Jean-Pierre Ledure 
Date:   Fri Jan 13 15:24:08 2017 +0100

Access2Base - Review size limits of VARCHAR fields

- Basic has no practical limit anymore for string variables
- LONGVARCHAR fields can vary a lot in size across RDBMS's (f.i. Sqlite < 
64K)
This forces an overflow check when setting a field value and no check when 
getting it

Change-Id: I4c9629f63164fbbdb84497e7002fa3186d7c63b7

diff --git a/wizards/source/access2base/DoCmd.xba 
b/wizards/source/access2base/DoCmd.xba
index 9b6500c..b52cbbd 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -340,7 +340,7 @@ Const cstProgressMeterLimit = 100

Utils._updateResultSetColumnValue(iRDBMS, oOutput.RowSet, i + 1, vField)

ElseIf oDatabase._BinaryStream Then

'  Typically for SQLite where binary fields are limited
-   
If lInputSize > vOutputField.Column.Precision Then
+   
If lInputSize > vOutputField._Precision Then

TraceError(TRACEWARNING, ERRPRECISION, Utils._CalledSub(), 0, 
1, Array(vOutputField._Name, lInputRecs + 1))

Utils._updateResultSetColumnValue(iRDBMS, oOutput.RowSet, i + 
1, Null)

Else
@@ -352,6 +352,12 @@ Const cstProgressMeterLimit = 100

End If
Else

vField =  Utils._getResultSetColumnValue(.RowSet, i + 1)
+   
If VarType(vField) = vbString Then
+   
If Len(vField) > vOutputField._Precision Then
+   
TraceError(TRACEWARNING, ERRPRECISION, Utils._CalledSub(), 0, 
1, Array(vOutputField._Name, lInputRecs + 1))
+   
End If
+   
End If
+   
'  Update is done anyway, if too long, with truncation

Utils._updateResultSetColumnValue(iRDBMS, oOutput.RowSet, i + 1, vField)
End If
Next i
diff --git a/wizards/source/access2base/Field.xba 
b/wizards/source/access2base/Field.xba
index 35d5bc6..5a7fcc4c 100644
--- a/wizards/source/access2base/Field.xba
+++ b/wizards/source/access2base/Field.xba
@@ -16,6 +16,7 @@ REM 

 
 Private_Type   As String   
'  Must be FIELD
 Private _Name  As String
+Private _Precision As Long
 Private _ParentNameAs String
 Private _ParentTypeAs String
 Private _ParentDatabaseAs Object
@@ -400,7 +401,6 @@ Dim cstThisSub As String
 
 Dim bCond1 As Boolean, bCond2 As Boolean, vValue As Variant, oValue As Object, 
sValue As String
 Dim oSize As Object, lSize As Long, bNullable As Boolean, bNull As Boolean
-Const cstMaxTextLength = 65535
 Const cstMaxBinlength = 2 * 65535
 
_PropertyGet = EMPTY
@@ -551,7 +551,6 @@ Const cstMaxBinlength = 2 * 65535
If Not bNull Then
lSize = 
CLng(oValue.getLength())
oValue.closeInput()
-  

Re: Java based connectivity drivers

[Lionel Elie Mamane]

On Fri, Jan 13, 2017 at 01:44:42PM +0100, Bunth Tamás wrote:

> I'd like to have a better understanding of how the hsqldb and jdbc
> drivers work.

> Is there any wiki page for them like "FirebirdSQL" for firebird that
> I couldn't find?

Nah, I don't think so, not on the TDF/LibreOffice wiki. There are some
on the OpenOffice wiki, but not what (I think) you are looking for:

https://wiki.openoffice.org/wiki/Base/connectivity/HSQLdb#HSQLDB
https://wiki.openoffice.org/wiki/HSQLDB_Integration
https://wiki.openoffice.org/wiki/HSQLDB:Tips_and_Tricks
https://wiki.openoffice.org/wiki/HSQLDB_Localization

> The code in connectivity/source/drivers/jdbc contains a bunch of java
> function calls afais. So where are the java codes, and how does the
> driver call them?

The Java code is in the JDBC driver, that is loaded from the
system. In the case of embedded HSQLDB, the JDBC driver is bundled
with LibreOffice and is handled in the build system by
external/hsqldb. It is installed as instdir/program/classes/hsqldb.jar
You'll find the source in workdir/UnpackedTarball/hsqldb/

There is also instdir/program/classes/sdbc_hsqldb.jar; I think this
contains the hack to redirect HSQLDB writes directly into the
in-memory ZIP structure of the ODB instead of to a file. The actual
source code to that is in connectivity/source/drivers/hsqldb/Storage*
and connectivity/com/sun/star/sdbcx/comp/hsqldb

The embedded HSQLDB is mostly just the JDBC driver, with some extras
specific to HSQLDB in connectivity/source/drivers/hsqldb

(In the case of HSQLDB, "JDBC driver" is a bit of a misnomer, since
JDBC is the native API of HSQLDB.)

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

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

[Caolán McNamara]

 include/svtools/grfmgr.hxx |1 -
 svtools/source/graphic/grfattr.cxx |7 ---
 vcl/source/filter/ixpm/xpmread.cxx |5 +++--
 3 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 15cee52b62c760e1cb212d34d9279c5eee5ecb6d
Author: Caolán McNamara 
Date:   Fri Jan 13 14:22:30 2017 +

use the same number in alloc and memset

Change-Id: Ie532985e655d1dd383a1781422213cee0787bfae

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index d9d237d..57dd2b3 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -216,8 +216,9 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 // using 2 charakters per pixel and less than 257 
Colors we speed up
 if ( mnCpp == 2 )   // by using a 64kb indexing 
table
 {
-mpFastColorTable = new sal_uInt8[ 256 * 256 ];
-memset(mpFastColorTable, 0, 255 * 255);
+const size_t nSize = 256 * 256;
+mpFastColorTable = new sal_uInt8[nSize];
+memset(mpFastColorTable, 0, nSize);
 for ( pPtr = mpColMap, i = 0; i < mnColors; 
i++, pPtr += mnCpp + 4 )
 {
 sal_uLong   j =  pPtr[ 0 ] << 8;
commit 467e32348faf71ed1aa4039910e7a6ba6dd2eb8c
Author: Caolán McNamara 
Date:   Fri Jan 13 13:48:49 2017 +

coverity#1371198 Missing move assignment operator

Change-Id: I89a718a245ea36f33c47f8044280bf7e46c0f66a

diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index abd8b29..18af820 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -102,7 +102,6 @@ private:
 public:
 
 GraphicAttr();
-~GraphicAttr();
 
 booloperator==( const GraphicAttr& rAttr ) const;
 booloperator!=( const GraphicAttr& rAttr ) const { return !( 
*this == rAttr ); }
diff --git a/svtools/source/graphic/grfattr.cxx 
b/svtools/source/graphic/grfattr.cxx
index 03d4908..6b5cd6c 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -41,12 +41,6 @@ GraphicAttr::GraphicAttr() :
 {
 }
 
-
-GraphicAttr::~GraphicAttr()
-{
-}
-
-
 bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
 {
 return( ( mfGamma == rAttr.mfGamma ) &&
@@ -66,5 +60,4 @@ bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
 ( meDrawMode == rAttr.meDrawMode ) );
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Java based connectivity drivers

[Michael Stahl]

On 13/01/17 13:44, Bunth Tamás wrote:
> Hi,
> 
> I'd like to have a better understanding of how the hsqldb and jdbc drivers 
> work.
> 
> Is there any wiki page for them like "FirebirdSQL" for firebird that I
> couldn't find?

maybe there's some old page somewhere here

http://www.openoffice.org/dba/
https://wiki.openoffice.org/wiki/Category:Database

> The code in connectivity/source/drivers/jdbc contains a bunch of java
> function calls afais. So where are the java codes, and how does the
> driver call them?

it looks like the jdbc driver uses JNI to call Java methods directly
from C++.

like this, the strings are method name and signature:

jobject out =
callObjectMethod(t.pEnv,"getMetaData","()Ljava/sql/DatabaseMetaData;", mID)


i think there's some generic JDBC implementation in the JRE plus a
driver-specific part in the JDBC driver.

so for the hsqldb case, i would expect this to call into here:

workdir/UnpackedTarball/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java:
  public synchronized DatabaseMetaData getMetaData() throws SQLException {

another point is that we have (at least on Linux) segregated the JDBC
driver into a separate thread for performance reasons, as it turned out
that JNI calls on the main thread happen to be really slow.

see jdbc.component:

environment="@CPPU_ENV@:affine" prefix="jdbc"

this means that every UNO call first goes via the affine UNO-UNO bridge
onto a separate thread into the C++ JDBC UNO component, then that calls
via JNI into the Java library, then the return value of that is
converted with some C++ UNO wrapper, then it goes back over the bridge
to the calling thread.



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

minutes of ESC call ...

[Michael Meeks]

Sorry for the delay.

* Present
+ Stephan, Andras, Caolan, Heiko, JanI, Kendy, Olivier, Xisco, Michael M,
  Sophie, Christian, Lionel, Norbert, Thorsten, Bubli, Michael S, Eike,
  Jan-Marek, Bjoern

* Completed Action Items:
+ write to Aron & Heiko to welcome to committing (Kendy)
+ poke Florian to encourage posting of Macs (Cloph/Michael)
+ have a look at certification names again (Kendy)

* Pending Action Items:
+ produce a trend / graph of last year’s work (JanI)
+ September – September numbers here 
https://conference.libreoffice.org/assets/Conference/Brno/iversen-development-mentoring.pdf
+ investigate https://beta.opendocumentformat.org/testsets/all/en (Xisco)
[ https://gitlab.com/odfplugfest/odfserver
  More progress still waiting for Jos’ help ]

* Release Engineering update (Christian)
+ 5.2.5 RC1 schedule acceleration ?
+ fixes for both regressions in 5.2
+ builds done, tagging finished, up-loading underway.
+ should we do an RC1 release as final ?
  + Markus’ patches in the release & sensible (Xisco)
  + concern wrt. rushing things (Thorsten)
  + does waiting one week make sense ? (Xisco)
   => test over the weekend – recide RC2 or release on Tuesday (Xisco)
+ 5.3.0 RC2 update
+ bug in RC1 not being signed; patch from Tor to fix it.
+ would be a blocker for RC2 if we can’t confirm it is fixed.
+ REMINDER: please update with your features ASAP:
  https://wiki.documentfoundation.org/ReleaseNotes/5.3
+ Updated Marketing in TDF call (Sophie)
+ Android & iOS Remote (Cloph)
+ new build in the beta channel needing promotion to production.
+ online (Michael)
AI: + remove textwrap patch for 5.3 ? (Thorsten)

* MSDN license situation (Michael)
+ no responses from Microsoft
+ MSDN costs O($1000)/year → for one person.
+ Visual Studio is now free.
+ get Development budget line-item for buying MS / Windows licenses ?
 + not enthusiastic (Norbert)
 + Happy for OS licenses - $100 for VMs (Michael)
+ all CI builds are at 2012 and working (Norbert)
+ expected that legacy MSDN licenses are perpetual anyway (Michael)
 => no urgent action required.
+ want to pin-down the use-cases, instead of “because we used this stuff 
before” (Bjoern)
=> ask for $1k for Windows licenses.

* Documentation (Olivier)
+ 3 days healing food intoxication, low productivity.
+ Many help page errors fixed after translator noticed.
   + XHP + gerrit very hard/impossible to catch typos, dups, etc..
+ More help pages fixed by Gabor Kelemen (reconnecting UI with HC)
+ Some pages completely rewritten (bad english) (Olivier)
+ Investigating more developments for HC – next-gen.

* Mac development H/W (Thorsten)
+ Sophie working on getting Macs.
+ best if TDF buys them – to have invoice with TDF name on it.
+ high-res 4k screen for Caolan
+ just buy it & get a TDF on the invoice line.
=> put this in the budget: QA team high-res display too (Xisco)
* my screen is 4K (MAC) and I can test on demand. (janI)

* UX Update (Heiko)
 + Bugzilla (topicUI) statistics
   252(252) (topicUI) bugs open, 487(487) (needsUXEval) needs to be 
evaluated by the UXteam
   + Updates:
   BZ changes   1 week1 month3 months   12 months  
added  4(2)  13(3)  40(-1) 506(0)  
commented 46(-29)   242(-43)   846(-69)   3707(8)  
  removed  0(-1)  1(0)   9(-4)  34(0)  
 resolved  5(-8) 30(-2) 99(-5) 160(4)  
   + top 10 contributors:
 Tietze, Heiko made 128 changes in 1 month, and 1930 changes in 1 year
 Foote, V Stuart made 52 changes in 1 month, and 664 changes in 1 year
 Buovjaga made 31 changes in 1 month, and 356 changes in 1 year
 Cor Nouws made 31 changes in 1 month, and 445 changes in 1 year
 Iversen, Jan made 24 changes in 1 month, and 472 changes in 1 year
 Zolnai, Tamás made 16 changes in 1 month, and 19 changes in 1 year
 tommy27 made 13 changes in 1 month, and 82 changes in 1 year
 Schäfe,r Christoph made 10 changes in 1 month, and 24 changes in 1 
year
 Philips, Yousuf made 10 changes in 1 month, and 1648 changes in 1 year
 Kelemen, Gabor made 9 changes in 1 month, and 13 changes in 1 year

+ talking about Breeze as default icon set on Windows
   + G+ poll reveals ~65% acceptance, but rejected as it’s not a perfect fit
   + area style dialop patch with fix size reverted because of whitespace 
and
 hi-res trouble
 + now the controls are badly aligned again

   + new issue created as MAB tdf#105259
   + Beluga: can’t be fixed before 5.3
   + asking for help with glade (Heiko)
   + even t

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

[Caolán McNamara]

 connectivity/source/drivers/postgresql/pq_statement.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bd96eda065f819e1b147e9a94b337b6cc21e626
Author: Caolán McNamara 
Date:   Fri Jan 13 13:46:12 2017 +

coverity#1371289 avoid the need for an assignment

Change-Id: Ia0efc427d9996eb8414821d07f7e760fb1b35246

diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx 
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 5aaef39..55715b0 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -797,7 +797,7 @@ Reference< XResultSet > getGeneratedValuesFromLastInsert(
 {
 // it even was no autovalue, no sense to continue as 
we can't query the
 // inserted row
-buf = OUStringBuffer();
+buf.setLength(0);
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/jmux/tdf#105288' - 37 commits - android/source bin/gbuild-to-ide compilerplugins/clang connectivity/source cui/source dbaccess/source desktop/unx distro

[Jan-Marek Glogowski]

Rebased ref, commits from common ancestor:
commit 346f3ba58ace345ef31d5c316801d4596db33dfa
Author: Jan-Marek Glogowski 
Date:   Thu Jan 12 15:48:52 2017 +0100

tdf#105288 MM wait until all emails are send

Seems mail merge is now much faster then the sending of the merged
documents via email. This is why the attached workaround patch to
the tdf#103919 bug report, which simply sleeps after queuing a new
message, helped solving the problem. It slowes down the mail merge
and gives time to the mail dispatcher thread.

But we actually want to wait until all mails are send, so we have
to add a listener and wait for the mail thread to become idle.

This listener also allows us to cancel further mail merge when an
SMTP error has occured.

Change-Id: I9d13bcd8f0d0ff084b20d72ab96f70afa3a764ba

diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index f0fc855..a5c9c75 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -67,6 +67,7 @@ enum class SfxEventHintId {
 SwEventFieldMerge,
 SwEventFieldMergeFinished,
 SwEventLayoutFinished,
+SwMailMergeSendMail,
 };
 
 class SFX2_DLLPUBLIC SfxEventHint : public SfxHint
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 7c25639..79f73c5 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -239,6 +239,7 @@ class SW_DLLPUBLIC SwDBManager
 {
 friend struct SwDBManager_Impl;
 class ConnectionDisposedListener_Impl;
+class MailDispatcherListener_Impl;
 
 enum class MergeStatus
 {
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index ed63b5f..432cf86 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -44,6 +44,7 @@
 #define STR_SW_EVENT_FRM_KEYINPUT_NOALPHA 10
 #define STR_SW_EVENT_FRM_RESIZE   11
 #define STR_SW_EVENT_FRM_MOVE 12
+#define STR_SW_EVENT_MAIL_MERGE_SEND_MAIL 13
 
 class SwFrameFormat;
 class SwFormatINetFormat;
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e69e6e0..050794b 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -132,6 +132,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -295,15 +296,17 @@ void SwDataSourceRemovedListener::Dispose()
 
 struct SwDBManager_Impl
 {
-SwDSParam*pMergeData;
+SwDSParam*pMergeData;
 VclPtr  pMergeDialog;
 rtl::Reference 
m_xDisposeListener;
 rtl::Reference m_xDataSourceRemovedListener;
+osl::Mutexm_aAllEmailSendMutex;
+uno::Reference< mail::XMailMessage> m_xLastMessage;
+SfxObjectShell   *m_pObjectShell;
 
 explicit SwDBManager_Impl(SwDBManager& rDBManager)
-   :pMergeData(nullptr)
-   ,pMergeDialog()
-   , m_xDisposeListener(new 
SwDBManager::ConnectionDisposedListener_Impl(rDBManager))
+: pMergeData( nullptr )
+, m_xDisposeListener(new 
SwDBManager::ConnectionDisposedListener_Impl(rDBManager))
 {}
 
 ~SwDBManager_Impl()
@@ -1021,14 +1024,13 @@ static SfxObjectShell* lcl_CreateWorkingDocument(
 return xWorkObjectShell.get();
 }
 
-uno::Reference< mail::XMailMessage > lcl_CreateMailFromDoc(
+static SwMailMessage* lcl_CreateMailFromDoc(
 const SwMergeDescriptor &rMergeDescriptor,
 const OUString &sFileURL, const OUString &sMailRecipient,
 const OUString &sMailBodyMimeType, rtl_TextEncoding sMailEncoding,
 const OUString &sAttachmentMimeType )
 {
 SwMailMessage* pMessage = new SwMailMessage;
-uno::Reference< mail::XMailMessage > xMessage = pMessage;
 if( rMergeDescriptor.pMailMergeConfigItem->IsMailReplyTo() )
 
pMessage->setReplyToAddress(rMergeDescriptor.pMailMergeConfigItem->GetMailReplyTo());
 pMessage->addRecipient( sMailRecipient );
@@ -1051,7 +1053,7 @@ uno::Reference< mail::XMailMessage > 
lcl_CreateMailFromDoc(
 SvStream* pInStream = aMedium.GetInStream();
 assert( pInStream && "no output file created?" );
 if( !pInStream )
-return xMessage;
+return pMessage;
 
 pInStream->SetStreamCharSet( sMailEncoding );
 OString sLine;
@@ -1071,10 +1073,42 @@ uno::Reference< mail::XMailMessage > 
lcl_CreateMailFromDoc(
 for( const OUString& sBccRecipient : rMergeDescriptor.aBlindCopiesTo )
 pMessage->addBccRecipient( sBccRecipient );
 
-xMessage = pMessage;
-return xMessage;
+return pMessage;
 }
 
+class SwDBManager::MailDispatcherListener_Impl : public IMailDispatcherListener
+{
+SwDBManager &m_rDBManager;
+
+public:
+explicit MailDispatcherListener_Impl( SwDBManager &rDBManager )
+: m_rDBManager( rDBManager ) {}
+
+virtual void started( ::rtl::Reference ) override {};
+virtual void stopped( ::rtl::Reference ) override {};
+virtual void idle( ::rtl::Reference ) override {};
+
+virtual void mailDelivered( ::rtl::Reference,
+ uno::Reference< m

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

[Caolán McNamara]

 editeng/source/editeng/editobj.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2eb035adf756136e7a2eb49b2cfef2bd9b5d21af
Author: Caolán McNamara 
Date:   Fri Jan 13 13:39:32 2017 +

coverity#1371287 don't need to copy and then overwrite

Change-Id: Ica30e4bed463e8e42cbf54f4b81491149a8de8ab

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 5a37083..3f1f70f 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1121,9 +1121,6 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) 
const
 {
 const ContentInfo& rC = *aContents[nPara].get();
 
-// Text...
-OStringBuffer aBuffer(OUStringToOString(rC.GetText(), eEncoding));
-
 // Symbols?
 bool bSymbolPara = false;
 if (rC.GetParaAttribs().GetItemState( EE_CHAR_FONTINFO ) == 
SfxItemState::SET)
@@ -1131,10 +1128,13 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream 
) const
 const SvxFontItem& rFontItem = static_cast(rC.GetParaAttribs().Get(EE_CHAR_FONTINFO));
 if ( rFontItem.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
 {
-aBuffer = OStringBuffer(OUStringToOString(rC.GetText(), 
RTL_TEXTENCODING_SYMBOL));
 bSymbolPara = true;
 }
 }
+
+// eEncoding for Text, RTL_TEXTENCODING_SYMBOL for Symbols
+OStringBuffer aBuffer(OUStringToOString(rC.GetText(), bSymbolPara ? 
RTL_TEXTENCODING_SYMBOL : eEncoding));
+
 for (size_t nA = 0; nA < rC.maCharAttribs.size(); ++nA)
 {
 const XEditAttribute& rAttr = *rC.maCharAttribs[nA].get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zdeněk Crhonek]

 sc/qa/unit/data/functions/statistical/fods/steyx.fods | 6450 ++
 1 file changed, 6450 insertions(+)

New commits:
commit 24dd5bce3ed645678410ff961c8259ab8a8ea031
Author: Zdeněk Crhonek 
Date:   Wed Jan 11 20:06:10 2017 +0100

add STEYX testcase

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/steyx.fods 
b/sc/qa/unit/data/functions/statistical/fods/steyx.fods
new file mode 100644
index 000..8fd3868
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/steyx.fods
@@ -0,0 +1,6450 @@
+
+
+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-12-29T18:23:56.52200P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
+ 
+  
+   0
+   0
+   81398
+   56716
+   
+
+ view1
+ 
+  
+   2
+   13
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   4
+   4
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ true
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ de
+ DE
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   
+   -
+   
+
+   Kč
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+
+   Kč
+   
+  
+  
+   
+
+   Kč
+  
+  
+   -
+   
+

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

[Caolán McNamara]

 filter/qa/cppunit/data/dxf/pass/loop-1.dxf|17320 ++
 filter/source/graphicfilter/idxf/dxf2mtf.cxx  |6 
 filter/source/graphicfilter/idxf/dxfentrd.hxx |   25 
 3 files changed, 17337 insertions(+), 14 deletions(-)

New commits:
commit 57779b5f3a49fedd952aed70ddcce22f48b98ea5
Author: Caolán McNamara 
Date:   Fri Jan 13 13:18:53 2017 +

avoid infinite loops in dxf rendering

Change-Id: Id2eb5540241f0792cde35c444fc2c0c5b7778353

diff --git a/filter/qa/cppunit/data/dxf/pass/loop-1.dxf 
b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
new file mode 100644
index 000..e3277e6
--- /dev/null
+++ b/filter/qa/cppunit/data/dxf/pass/loop-1.dxf
@@ -0,0 +1,17320 @@
+  0
+SECTION
+  2
+HEADER
+  9
+$ACADVER
+  1
+AC1015
+  9
+$ACADMAINTVER
+ 70
+ 6
+  9
+$DWGCODEPAGE
+  3
+ANSI_1252
+  9
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMIN
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$EXTMAX
+ 10
+297.0
+ 20
+420.0
+ 30
+0.0
+  9
+$LIMMIN
+ 10
+0.0
+ 20
+0.0
+  9
+$LIMMAX
+ 10
+297.0
+ 20
+420.0
+  9
+$ORTHOMODE
+ 70
+ 0
+  9
+$REGENMODE
+ 70
+ 1
+  9
+$FILL«ODE
+ 70
+ 1
+  9
+$QTEXTMODE
+ 70
+ 0
+  9
+$MIRRTEXT
+ 70
+ 1
+  9
+$LTSCALE
+ 40
+1.0
+  9
+$ATTMODE
+ 70
+ 1
+  9
+$TEXTSIZE
+ 40
+3.5
+  9
+$TRACEWID
+ 40
+1.0
+  9
+$TEXTSTYLE
+  7
+Standard
+  9
+$CLAYER
+  8
+0
+  9
+$CELTYPE
+  6
+ByLayer
+  9
+$CECOLOR
+ 62
+   256
+  9
+$CELTSCALE
+ 40
+1.0
+  9
+$DISPSILH
+ 70
+ 0
+  9
+$DIMSCALE
+ 40
+1.0
+  9
+$DIMASZ
+ 40
+3.0
+  9
+$DIMEXO
+ 40
+1.0
+  9
+$DIMDLI
+ 40
+3.75
+  9
+$DIMRND
+ 40
+0.0
+  9
+$DIMDLE
+ 40
+0.0
+  9
+$DIMEXE
+ 40
+1.0
+  9
+$DIMTP
+ 40
+0.0
+  9
+$DIMTM
+ 40
+0.0
+  9
+$DIMTXT
+ 40
+3.5
+  9
+$DIMCEN
+ 40
+2.5
+  9
+$DIMTSZ
+ 40
+0.0
+  9
+$DIMTOL
+ 70
+ 0
+  9
+$DIMLIM
+ 70
+ 0
+  9
+$DIMTIH
+ 70
+ 1
+  9
+$DIMTOH
+ 70
+ 1
+  9
+$DIMSE1
+ 70
+ 0
+  9
+$DIMSE2
+ 70
+ 0
+  9
+$DIMTAD
+ 70
+ 1
+  9
+$DIMZIN
+ 70
+ 0
+  9
+$DIMBLK
+  1
+
+  9
+$DIMASO
+ 70
+ 1
+  9
+$DIMSHO
+ 70
+ 1
+  9
+$DIMPOST
+  1
+
+  9
+$DIMAPOST
+  1
+
+  9
+$DIMALT
+ 70
+ 0
+  9
+$DIMALTD
+ 70
+ 3
+  9
+$DIMALTF
+ 40
+0.0393700787
+  9
+$DIMLFAC
+ 40
+100.0
+  9
+$DIMTOFL
+ 70
+ 1
+  9
+$DIMTVP
+ 40
+0.0
+  9
+$DIMTIX
+ 70
+ 0
+  9
+$DIMSOXD
+ 70
+ 0
+  9
+$DIMSAH
+ 70
+ 0
+  9
+$DIMBLK1
+  1
+
+  9
+$DIMBLK2
+  1
+
+  9
+$DIMSTYLE
+  2
+ISO-25
+  9
+$DIMCLRD
+ 70
+ 0
+  9
+$DIMCLRE
+ 70
+ 0
+  9
+$DIMCLRT
+ 70
+ 0
+  9
+$DIMTFAC
+ 40
+1.0
+  9
+$DIMGAP
+ 40
+1.524
+  9
+$DIMJUST
+ 70
+ 0
+  9
+$DIMSD1
+ 70
+ 0
+  9
+$DIMSD2
+ 70
+ 0
+  9
+$DIMTOLJ
+ 70
+ 0
+  9
+$DIMTZIN
+ 70
+ 0
+  9
+$DIMALTZ
+ 70
+ 0
+  9
+$DIMALTTZ
+ 70
+ 0
+  9
+$DIMUPT
+ 70
+ 0
+  9
+$DIMDEC
+ 70
+ 3
+  9
+$DIMTDEC
+ 70
+ 3
+  9
+$DIMALTU
+ 70
+ 2
+  9
+$DIMALTTD
+ 70
+ 3
+  9
+$DIMTXSTY
+  7
+Standard
+  9
+$DIMAUNIT
+ 70
+ 0
+  9
+$DIMADEC
+ 70
+ 2
+  9
+$DIMALTRND
+ 40
+0.0
+  9
+$DIMAZIN
+ 70
+ 0
+  9
+$DIMDSEP
+ 70
+44
+  9
+$DIMATFIT
+ 70
+ 3
+  9
+$DIMFRAC
+ 70
+ 0
+  9
+$DIMLDRBLK
+  1
+
+  9
+$DIMLUNIT
+ 70
+ 2
+  9
+$DIMLWD
+ 70
+-2
+  9
+$DIMLWE
+ 70
+-2
+  9
+$DIMTMOVE
+ 70
+ 0
+  9
+$LUNITS
+ 70
+ 2
+  9
+$LUPREC
+ 70
+ 2
+  9
+$SKETCHINC
+ 40
+1.0
+  9
+$FILLETRAD
+ 40
+10.0
+  9
+$AUNITS
+ 70
+ 0
+  9
+$AUPREC
+ 70
+ 2
+  9
+$MENU
+  1
+.
+  9
+$ELEVATION
+ 40
+0.0
+  9
+$PELEVATION
+ 40
+0.0
+  9
+$THICKNESS
+ 40
+0.0
+  9
+$LIMCHECK
+ 70
+ 0
+  9
+$CHAMFERA
+ 40
+10.0
+  9
+$CHAMFERB
+ 40
+10.0
+  9
+$CHAMFERC
+ 40
+20.0
+  9
+$CHAMFERD
+ 40
+0.0
+  9
+$SKPOLY
+ 70
+ 0
+  9
+$TDCREATE
+ 40
+2456962.662635255
+  9
+$TDUCREATE
+ 40
+2456962.620968588
+  9
+$TDUPDATE
+ 40
+2456962.662636401
+  9
+$TDUUPDATE
+ 40
+2456962.620969734
+  9
+$TDINDWG
+ 40
+0.000116
+  9
+$TDUSRTIMER
+ 40
+0.000116
+  9
+$USRTIMER
+ 70
+ 1
+  9
+$ANGBASE
+ 50
+0.0
+  9
+$ANGDIR
+ 70
+ 0
+  9
+$PDMODE
+ 70
+ 0
+  9
+$PDSIZE
+ 40
+-1.0
+  9
+$PLINEWID
+ 40
+0.0
+  9
+$SPLFRAME
+ 70
+ 0
+  9
+$SPLINETYPE
+ 70
+ 6
+  9
+$SPLINESEGS
+ 70
+ 8
+  9
+$HANDSEED
+  5
+5C0
+  9
+$SURFTAB1
+ 70
+ 6
+  9
+$SURFTAB2
+ 70
+ 6
+  9
+$SURFTYPE
+ 70
+ 6
+  9
+$SURFU
+ 70
+ 6
+  9
+$SURFV
+ 70
+ 6
+  9
+$UCSBASE
+  2
+
+  9
+$UCSNAME
+  2
+
+  9
+$UCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSYDIR
+ 10
+0.0
+ 20
+1.0
+ 30
+0.0
+  9
+$UCSORTHOREF
+  2
+
+  9
+$UCSORTHOVIEW
+ 70
+ 0
+  9
+$UCSORGTOP
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBOTTOM
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGLEFT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGFRONT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$UCSORGBACK
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSBASE
+  2
+
+  9
+$PUCSNAME
+  2
+
+  9
+$PUCSORG
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSXDIR
+ 10
+1.0
+ 20
+0.0
+ 30
+0.0
+  9
+$PUCSYDIR
+

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

[Noel Grandin]

 editeng/source/accessibility/AccessibleHyperlink.cxx |3 --
 editeng/source/accessibility/AccessibleHyperlink.hxx |4 ++-
 editeng/source/editeng/editdoc.cxx   |8 ++
 editeng/source/editeng/editdoc.hxx   |2 -
 editeng/source/editeng/editeng.cxx   |   13 ---
 editeng/source/editeng/editundo.cxx  |4 ---
 editeng/source/editeng/editundo.hxx  |9 ---
 editeng/source/editeng/editview.cxx  |7 ++
 editeng/source/editeng/eehtml.cxx|6 +
 editeng/source/editeng/eehtml.hxx|3 +-
 editeng/source/editeng/eerdll.cxx|3 --
 editeng/source/editeng/impedit.hxx   |2 -
 editeng/source/editeng/impedit3.cxx  |4 +--
 editeng/source/editeng/impedit5.cxx  |9 ++-
 editeng/source/items/bulitem.cxx |   22 +--
 editeng/source/items/flditem.cxx |   11 -
 editeng/source/items/frmitems.cxx|   18 ++-
 editeng/source/items/numitem.cxx |8 ++
 editeng/source/misc/acorrcfg.cxx |8 ++
 editeng/source/misc/unolingu.cxx |   17 --
 editeng/source/outliner/outliner.cxx |4 +--
 editeng/source/outliner/outlobj.cxx  |1 
 editeng/source/outliner/outlvw.cxx   |3 --
 editeng/source/uno/unotext2.cxx  |5 
 editeng/source/xml/xmltxtexp.cxx |9 +++
 include/editeng/acorrcfg.hxx |7 +++---
 include/editeng/bulletitem.hxx   |3 +-
 include/editeng/editdata.hxx |7 +++---
 include/editeng/editeng.hxx  |2 -
 include/editeng/editview.hxx |5 ++--
 include/editeng/eerdll.hxx   |5 ++--
 include/editeng/flditem.hxx  |6 ++---
 include/editeng/lineitem.hxx |7 +++---
 include/editeng/numitem.hxx  |5 ++--
 include/editeng/outliner.hxx |6 +
 include/editeng/outlobj.hxx  |7 +++---
 include/editeng/unotext.hxx  |2 -
 37 files changed, 105 insertions(+), 140 deletions(-)

New commits:
commit cd8fdb46fd9a215532688585f3466d36b1daa1ac
Author: Noel Grandin 
Date:   Wed Jan 11 12:53:32 2017 +0200

new loplugin: useuniqueptr: editeng

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

diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx 
b/editeng/source/accessibility/AccessibleHyperlink.cxx
index 0dddfce..fd4443c 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -39,7 +39,7 @@ namespace accessibility
 AccessibleHyperlink::AccessibleHyperlink( SvxAccessibleTextAdapter& r, 
SvxFieldItem* p, sal_Int32 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, 
const OUString& rD )
 : rTA( r )
 {
-pFld = p;
+pFld.reset( p );
 nPara = nP;
 nRealIdx = nR;
 nStartIdx = nStt;
@@ -49,7 +49,6 @@ namespace accessibility
 
 AccessibleHyperlink::~AccessibleHyperlink()
 {
-delete pFld;
 }
 
 // XAccessibleAction
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx 
b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 9dda555..08201df 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -29,6 +29,8 @@
 #include 
 #include 
 
+#include 
+
 class SvxFieldItem;
 class SvxAccessibleTextAdapter;
 
@@ -40,7 +42,7 @@ namespace accessibility
 private:
 
 SvxAccessibleTextAdapter& rTA;
-SvxFieldItem* pFld;
+std::unique_ptr pFld;
 sal_Int32 nPara;  // EE values
 sal_uInt16 nRealIdx;  // EE values
 sal_Int32 nStartIdx, nEndIdx;   // translated values
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index e0a1784..b2b4390 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -537,19 +537,17 @@ ExtraPortionInfo::ExtraPortionInfo()
 
 ExtraPortionInfo::~ExtraPortionInfo()
 {
-delete[] pOrgDXArray;
 }
 
 void ExtraPortionInfo::SaveOrgDXArray( const long* pDXArray, sal_Int32 nLen )
 {
-delete[] pOrgDXArray;
 if (pDXArray)
 {
-pOrgDXArray = new long[nLen];
-memcpy( pOrgDXArray, pDXArray, nLen * sizeof(long) );
+pOrgDXArray.reset(new long[nLen]);
+memcpy( pOrgDXArray.get(),

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

[Tomaž Vajngerl]

 cui/source/tabpages/tparea.cxx |   29 +
 1 file changed, 29 insertions(+)

New commits:
commit e6d7d737522124350a17a3cfdee055f03200a274
Author: Tomaž Vajngerl 
Date:   Fri Jan 13 13:55:01 2017 +0100

tdf#105259 calculate sizes of all area tab pages on construction

When we open dialog that contains the area tab, we need to
calculate the size of area tab pages (that are triggered by
clicking on a button) and set the page area to the appropriate
combined size. Otherwise we don't account for the needed space
correctly and some page will be squished or have overlapping
controls.

This change creates all pages at dialog construction, gets
all the optimal sizes and sets the size of the page container box
to the combined (minimal) size.

Change-Id: Ie04a121810b96973f6e4502a52af675b2baacf25
Reviewed-on: https://gerrit.libreoffice.org/33040
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index fbe4600..70e7be4 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -66,6 +66,19 @@ const sal_uInt16 SvxAreaTabPage::pAreaRanges[] =
 0
 };
 
+namespace
+{
+
+void lclExtendSize(Size& rSize, const Size& rInputSize)
+{
+if (rSize.Width() < rInputSize.Width())
+rSize.Width() = rInputSize.Width();
+if (rSize.Height() < rInputSize.Height())
+rSize.Height() = rInputSize.Height();
+}
+
+} // end anonymous namespace
+
 /*
 |*
 |*  Dialog to modify fill-attributes
@@ -125,6 +138,22 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, 
const SfxItemSet& rInAttrs
 m_pBtnPattern->SetClickHdl(aLink);
 
 SetExchangeSupport();
+
+// Calculate optimal size of all pages..
+m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(m_pFillTab, 
&m_rXFSet));
+Size aSize = m_pFillTabPage->GetOptimalSize();
+m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(m_pFillTab, 
&m_rXFSet));
+lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize());
+m_pFillTabPage.disposeAndClear();
+
+m_pFillTab->set_width_request(aSize.Width());
+m_pFillTab->set_height_request(aSize.Height());
 }
 
 SvxAreaTabPage::~SvxAreaTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf

[Caolán McNamara]

 distro-configs/LibreOfficeCoverity.conf |4 
 1 file changed, 4 insertions(+)

New commits:
commit fa44327ed791df4d8b2199e9a6d2113235d64d92
Author: Caolán McNamara 
Date:   Fri Jan 13 13:03:26 2017 +

don't build the internal hsqldb and rhino for coverity checking

Change-Id: I7d269b1de29ecc1b0b9e6d58e316d5084e2fdcb6

diff --git a/distro-configs/LibreOfficeCoverity.conf 
b/distro-configs/LibreOfficeCoverity.conf
index bcbdab2..e1a1d24 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -20,3 +20,7 @@
 --enable-ext-wiki-publisher
 --enable-ext-nlpsolver
 --enable-online-update
+--with-system-hsqldb
+--with-hsqldb-jar=/home/coverity/hsqldb.jar
+--with-system-rhino
+--with-rhino-jar=/home/coverity/js.jar
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/maildispatcher.cxx |  126 ---
 sw/source/uibase/inc/maildispatcher.hxx  |   37 -
 2 files changed, 84 insertions(+), 79 deletions(-)

New commits:
commit 66fd9738a5a17e382c3cd329a1ab48e57e354821
Author: Jan-Marek Glogowski 
Date:   Thu Jan 12 13:39:14 2017 +0100

Rename mail dispatcher members

Makes the members conform with most LO variable naming,

This especially switches Active <=> Running in the member names.

"Running" is normally referred to as the thread state, while it
exists (also look into the osl::Thread API) and now active is the
state, when messages are processed, controlled by the start() and
stop() functions.

Change-Id: I3b8437d4ff24731348272a84720ff81fdea90db7

diff --git a/sw/source/uibase/dbui/maildispatcher.cxx 
b/sw/source/uibase/dbui/maildispatcher.cxx
index ca68ba2..fcbdb94 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -94,12 +94,12 @@ namespace /* private */
 } // namespace private
 
 MailDispatcher::MailDispatcher(uno::Reference const & 
mailserver) :
-mailserver_ (mailserver),
-run_(false),
-shutdown_requested_(false)
+m_xMailserver( mailserver ),
+m_bActive( false ),
+m_bShutdownRequested( false )
 {
-wakening_call_.reset();
-mail_dispatcher_active_.reset();
+m_aWakeupCondition.reset();
+m_aRunCondition.reset();
 
 if (!create())
 throw uno::RuntimeException();
@@ -107,7 +107,7 @@ 
MailDispatcher::MailDispatcher(uno::Reference const & mailse
 // wait until the mail dispatcher thread is really alive
 // and has acquired a reference to this instance of the
 // class
-mail_dispatcher_active_.wait();
+m_aRunCondition.wait();
 }
 
 MailDispatcher::~MailDispatcher()
@@ -116,24 +116,24 @@ MailDispatcher::~MailDispatcher()
 
 void MailDispatcher::enqueueMailMessage(uno::Reference 
const & message)
 {
-::osl::MutexGuard thread_status_guard(thread_status_mutex_);
-::osl::MutexGuard message_container_guard(message_container_mutex_);
+::osl::MutexGuard thread_status_guard( m_aThreadStatusMutex );
+::osl::MutexGuard message_container_guard( m_aMessageContainerMutex );
 
-OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down 
already");
+OSL_PRECOND( !m_bShutdownRequested, "MailDispatcher thread is shuting down 
already" );
 
-messages_.push_back(message);
-if (run_)
-wakening_call_.set();
+m_aXMessageList.push_back( message );
+if ( m_bActive )
+m_aWakeupCondition.set();
 }
 
 uno::Reference MailDispatcher::dequeueMailMessage()
 {
-::osl::MutexGuard guard(message_container_mutex_);
+::osl::MutexGuard guard( m_aMessageContainerMutex );
 uno::Reference message;
-if(!messages_.empty())
+if ( !m_aXMessageList.empty() )
 {
-message = messages_.front();
-messages_.pop_front();
+message = m_aXMessageList.front();
+m_aXMessageList.pop_front();
 }
 return message;
 }
@@ -142,18 +142,19 @@ void MailDispatcher::start()
 {
 OSL_PRECOND(!isStarted(), "MailDispatcher is already started!");
 
-::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
+::osl::ClearableMutexGuard thread_status_guard( m_aThreadStatusMutex );
 
-OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down 
already");
+OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down 
already");
 
-if (!shutdown_requested_)
+if ( !m_bShutdownRequested )
 {
-run_ = true;
-wakening_call_.set();
+m_bActive = true;
+m_aWakeupCondition.set();
 thread_status_guard.clear();
 
-MailDispatcherListenerContainer_t listeners_cloned(cloneListener());
-std::for_each(listeners_cloned.begin(), listeners_cloned.end(), 
GenericEventNotifier(&IMailDispatcherListener::started, this));
+MailDispatcherListenerContainer_t aClonedListenerList(cloneListener());
+std::for_each( aClonedListenerList.begin(), aClonedListenerList.end(),
+   GenericEventNotifier(&IMailDispatcherListener::started, 
this) );
 }
 }
 
@@ -161,63 +162,67 @@ void MailDispatcher::stop()
 {
 OSL_PRECOND(isStarted(), "MailDispatcher not started!");
 
-::osl::ClearableMutexGuard thread_status_guard(thread_status_mutex_);
+::osl::ClearableMutexGuard thread_status_guard( m_aThreadStatusMutex );
 
-OSL_PRECOND(!shutdown_requested_, "MailDispatcher thread is shuting down 
already");
+OSL_PRECOND(!m_bShutdownRequested, "MailDispatcher thread is shuting down 
already");
 
-if (!shutdown_requested_)
+if (!m_bShutdownRequested)
 {
-run_ = false;
-wakening_call_.reset();
+m_bActive = false;
+m_aWakeupCondition.reset();
 thread_status_guard.clear();
 
-MailDispatcherListenerContainer_t list

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

[Tor Lillqvist]

 common/Util.cpp |   97 +---
 1 file changed, 45 insertions(+), 52 deletions(-)

New commits:
commit b8897ea29522d303e3038dddab982f30532d9242
Author: Tor Lillqvist 
Date:   Fri Jan 13 14:55:01 2017 +0200

Avoid pointless breaking up of the one same Util namespace in parts

Also, indent the nested rng consistently.

Change-Id: I551c8d0faa78446edf6cad746ca0f9193096f3aa

diff --git a/common/Util.cpp b/common/Util.cpp
index 0b5f991..d3181da 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -52,61 +52,58 @@
 
 namespace Util
 {
-namespace rng
-{
-static std::random_device _rd;
-static std::mutex _rngMutex;
-static Poco::RandomBuf _randBuf;
-
-// Create the prng with a random-device for seed.
-// If we don't have a hardware random-device, we will get the same seed.
-// In that case we are better off with an arbitrary, but changing, seed.
-static std::mt19937_64 _rng = std::mt19937_64(_rd.entropy()
-? _rd()
-: (clock() + getpid()));
-
-// A new seed is used to shuffle the sequence.
-// N.B. Always reseed after getting forked!
-void reseed()
+namespace rng
 {
-_rng.seed(_rd.entropy() ? _rd() : (clock() + getpid()));
-}
+static std::random_device _rd;
+static std::mutex _rngMutex;
+static Poco::RandomBuf _randBuf;
+
+// Create the prng with a random-device for seed.
+// If we don't have a hardware random-device, we will get the same 
seed.
+// In that case we are better off with an arbitrary, but changing, 
seed.
+static std::mt19937_64 _rng = std::mt19937_64(_rd.entropy()
+? _rd()
+: (clock() + getpid()));
+
+// A new seed is used to shuffle the sequence.
+// N.B. Always reseed after getting forked!
+void reseed()
+{
+_rng.seed(_rd.entropy() ? _rd() : (clock() + getpid()));
+}
 
-// Returns a new random number.
-unsigned getNext()
-{
-std::unique_lock lock(_rngMutex);
-return _rng();
-}
+// Returns a new random number.
+unsigned getNext()
+{
+std::unique_lock lock(_rngMutex);
+return _rng();
+}
 
-std::vector getBytes(const size_t length)
-{
-std::vector v(length);
-_randBuf.readFromDevice(v.data(), v.size());
-return v;
-}
+std::vector getBytes(const size_t length)
+{
+std::vector v(length);
+_randBuf.readFromDevice(v.data(), v.size());
+return v;
+}
 
-/// Generates a random string in Base64.
-/// Note: May contain '/' characters.
-std::string getB64String(const size_t length)
-{
-std::stringstream ss;
-Poco::Base64Encoder b64(ss);
-b64.write(getBytes(length).data(), length);
-return ss.str().substr(0, length);
-}
+/// Generates a random string in Base64.
+/// Note: May contain '/' characters.
+std::string getB64String(const size_t length)
+{
+std::stringstream ss;
+Poco::Base64Encoder b64(ss);
+b64.write(getBytes(length).data(), length);
+return ss.str().substr(0, length);
+}
 
-std::string getFilename(const size_t length)
-{
-std::string s = getB64String(length);
-std::replace(s.begin(), s.end(), '/', '_');
-return s.substr(0, length);
+std::string getFilename(const size_t length)
+{
+std::string s = getB64String(length);
+std::replace(s.begin(), s.end(), '/', '_');
+return s.substr(0, length);
+}
 }
-}
-}
 
-namespace Util
-{
 std::string encodeId(const unsigned number, const int padding)
 {
 std::ostringstream oss;
@@ -128,10 +125,6 @@ namespace Util
 return std::getenv("DISPLAY") != nullptr;
 }
 
-} // namespace Util
-
-namespace Util
-{
 int getMemoryUsage(const Poco::Process::PID pid)
 {
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - common/Png.hpp common/Protocol.cpp common/Protocol.hpp common/Unit.cpp common/Unit.hpp common/UnitHTTP.hpp common/Util.cpp common/Util.hpp kit/ChildSessio

[Tor Lillqvist]

 common/Png.hpp   |8 +--
 common/Protocol.cpp  |   33 
 common/Protocol.hpp  |3 -
 common/Unit.cpp  |8 +--
 common/Unit.hpp  |2 
 common/UnitHTTP.hpp  |2 
 common/Util.cpp  |6 +-
 common/Util.hpp  |2 
 kit/ChildSession.cpp |  136 +--
 kit/ChildSession.hpp |4 -
 kit/Kit.cpp  |   70 +-
 kit/Kit.hpp  |2 
 kit/KitHelper.hpp|6 +-
 tools/KitClient.cpp  |6 +-
 wsd/Admin.hpp|2 
 wsd/AdminModel.cpp   |   18 +++---
 wsd/LOOLWSD.cpp  |   20 +++
 wsd/LOOLWSD.hpp  |6 +-
 wsd/TraceFile.hpp|   18 +++---
 19 files changed, 158 insertions(+), 194 deletions(-)

New commits:
commit 11ae90cfcbda1ab24d82a3d2cdf264bbbaffd39d
Author: Tor Lillqvist 
Date:   Fri Jan 13 14:52:08 2017 +0200

No Hungarian notation please

Change-Id: Ia624de45a792db7e39f2245aaea7d940b30b0db2

diff --git a/common/Png.hpp b/common/Png.hpp
index b3c0863..f682772 100644
--- a/common/Png.hpp
+++ b/common/Png.hpp
@@ -181,10 +181,10 @@ uint64_t hashSubBuffer(unsigned char* pixmap, size_t 
startX, size_t startY,
 hash.Update(pixmap + position, width * 4);
 }
 
-uint64_t nHash1;
-uint64_t nHash2;
-hash.Final(&nHash1, &nHash2);
-return nHash1;
+uint64_t hash1;
+uint64_t hash2;
+hash.Final(&hash1, &hash2);
+return hash1;
 }
 
 static
diff --git a/common/Unit.cpp b/common/Unit.cpp
index 5be5f5a..41469be 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -54,12 +54,12 @@ UnitBase *UnitBase::linkAndCreateUnit(UnitType type, const 
std::string &unitLibP
 LOG_ERR("No " << symbol << " symbol in " << unitLibPath);
 return nullptr;
 }
-UnitBase *pHooks = createHooks();
+UnitBase *hooks = createHooks();
 
-if (pHooks)
-pHooks->setHandle(dlHandle);
+if (hooks)
+hooks->setHandle(dlHandle);
 
-return pHooks;
+return hooks;
 }
 
 bool UnitBase::init(UnitType type, const std::string &unitLibPath)
diff --git a/common/Unit.hpp b/common/Unit.hpp
index 84b99a8..6e8ea28 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -159,7 +159,7 @@ public:
 virtual bool createStorage(const Poco::URI& /* uri */,
const std::string& /* jailRoot */,
const std::string& /* jailPath */,
-   std::unique_ptr& /*rStorage */)
+   std::unique_ptr& /* storage */)
 {
 return false;
 }
diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
index ec3882a..0343036 100644
--- a/common/UnitHTTP.hpp
+++ b/common/UnitHTTP.hpp
@@ -45,7 +45,7 @@ public:
 }
 virtual void sendFile(const std::string& /* path */,
   const std::string& /* mediaType */) override {}
-virtual void sendBuffer(const void* /* pBuffer */,
+virtual void sendBuffer(const void* /* buffer */,
 std::size_t /* length */) override {}
 virtual void redirect(const std::string& /* uri */,
   HTTPStatus /* status = HTTP_FOUND */) override {}
diff --git a/common/Util.cpp b/common/Util.cpp
index ef578b8..0b5f991 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -132,12 +132,12 @@ namespace Util
 
 namespace Util
 {
-int getMemoryUsage(const Poco::Process::PID nPid)
+int getMemoryUsage(const Poco::Process::PID pid)
 {
 try
 {
 //TODO: Instead of RSS, return PSS
-const auto cmd = "ps o rss= -p " + std::to_string(nPid);
+const auto cmd = "ps o rss= -p " + std::to_string(pid);
 FILE* fp = popen(cmd.c_str(), "r");
 if (fp == nullptr)
 {
@@ -156,7 +156,7 @@ namespace Util
 }
 catch (const std::exception&)
 {
-LOG_WRN("Trying to find memory of invalid/dead PID " << nPid);
+LOG_WRN("Trying to find memory of invalid/dead PID " << pid);
 }
 
 return -1;
diff --git a/common/Util.hpp b/common/Util.hpp
index c439203..3e3d706 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -82,7 +82,7 @@ namespace Util
 assert(!mtx.try_lock());
 }
 
-int getMemoryUsage(const Poco::Process::PID nPid);
+int getMemoryUsage(const Poco::Process::PID pid);
 
 std::string replace(const std::string& s, const std::string& a, const 
std::string& b);
 
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index cb08f0a..0f984ab 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -491,7 +491,7 @@ void insertUserNames(const std::map& 
viewInfo, std::string& json)
 bool ChildSession::getCommandValues(const char* /*buffer*/, int /*length*/, 
StringTokenizer& tokens)
 {
 bool success;
-char* pValues;
+char* values;
 std::string command;
 if (tokens.count() != 2 || !getTokenString(tokens[1], "command", command))
 {
@@ -505,

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

[Caolán McNamara]

 desktop/unx/source/splashx.c |  182 ++-
 1 file changed, 96 insertions(+), 86 deletions(-)

New commits:
commit ebf541f7c5f080fa3a6f363ec8e823cc37c0c6b2
Author: Caolán McNamara 
Date:   Fri Jan 13 12:43:09 2017 +

refactor this to open the display just once

and use the https://wiki.gnome.org/HowDoI/HiDpi
HiDPI detection rules.

all of this does nothing in practice, cause there is
no hidpi splashscreen image

Change-Id: I609faab0f207d71fd4a17bb54ef688bdd623eaea

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index c474099..43b178b 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -43,6 +43,10 @@ struct splash
 Display* display;
 int screen;
 int depth;
+int display_width;
+int display_height;
+int display_x_pos;
+int display_y_pos;
 Visual* visual;
 
 int width;
@@ -388,24 +392,14 @@ static void suppress_decorations(struct splash* splash)
 }
 
 /**
- * Create the window for the splash screen
+ * Connects to the display and initiales splash with the screen details
  *
  * @return Success: 1; Failure: 0
  */
-static int splash_create_window( struct splash* splash, int argc, char** argv )
+static int splash_init_display( struct splash* splash, int argc, char** argv )
 {
 char *display_name = NULL;
 int i;
-Window root_win;
-int display_width = 0;
-int display_height = 0;
-int display_x_pos = 0;
-int display_y_pos = 0;
-unsigned long value_mask = 0;
-XGCValues values;
-const char* name = "LibreOffice";
-const char* icon = "icon"; // FIXME
-XSizeHints size_hints;
 #ifdef USE_XINERAMA
 int n_xinerama_screens = 1;
 XineramaScreenInfo* p_screens = NULL;
@@ -437,9 +431,10 @@ static int splash_create_window( struct splash* splash, 
int argc, char** argv )
 splash->color_map = DefaultColormap( splash->display, splash->screen );
 splash->visual = DefaultVisual( splash->display, splash->screen );
 
-root_win = RootWindow( splash->display, splash->screen );
-display_width = DisplayWidth( splash->display, splash->screen );
-display_height = DisplayHeight( splash->display, splash->screen );
+splash->display_width = DisplayWidth( splash->display, splash->screen );
+splash->display_height = DisplayHeight( splash->display, splash->screen );
+splash->display_x_pos = 0;
+splash->display_y_pos = 0;
 
 #ifdef USE_XINERAMA
 p_screens = XineramaQueryScreens( splash->display, &n_xinerama_screens );
@@ -449,20 +444,38 @@ static int splash_create_window( struct splash* splash, 
int argc, char** argv )
 {
 if ( p_screens[i].screen_number == splash->screen )
 {
-display_width = p_screens[i].width;
-display_height = p_screens[i].height;
-display_x_pos = p_screens[i].x_org;
-display_y_pos = p_screens[i].y_org;
+splash->display_width = p_screens[i].width;
+splash->display_height = p_screens[i].height;
+splash->display_x_pos = p_screens[i].x_org;
+splash->display_y_pos = p_screens[i].y_org;
 break;
 }
 }
 XFree( p_screens );
 }
 #endif
+return 1;
+}
+
+/**
+ * Create the window for the splash screen
+ *
+ * @return Success: 1; Failure: 0
+ */
+static int splash_create_window(struct splash* splash)
+{
+Window root_win;
+unsigned long value_mask = 0;
+XGCValues values;
+const char* name = "LibreOffice";
+const char* icon = "icon"; // FIXME
+XSizeHints size_hints;
+
+root_win = RootWindow( splash->display, splash->screen );
 
 splash->win = XCreateSimpleWindow( splash->display, root_win,
-(display_x_pos + (display_width - splash->width)/2),
-(display_y_pos + (display_height - splash->height)/2),
+(splash->display_x_pos + (splash->display_width - 
splash->width)/2),
+(splash->display_y_pos + (splash->display_height - 
splash->height)/2),
 splash->width, splash->height, 0,
 BlackPixel( splash->display, splash->screen ), BlackPixel( 
splash->display, splash->screen ) );
 
@@ -481,8 +494,8 @@ static int splash_create_window( struct splash* splash, int 
argc, char** argv )
 splash->gc = XCreateGC( splash->display, splash->win, value_mask, &values 
);
 
 size_hints.flags = PPosition | PSize | PMinSize | PMaxSize;
-size_hints.x = display_x_pos;
-size_hints.y = display_y_pos;
+size_hints.x = splash->display_x_pos;
+size_hints.y = splash->display_y_pos;
 size_hints.width = splash->width;
 size_hints.height = splash->height;
 size_hints.min_width = splash->width;
@@ -531,29 +544,28 @@ static rtl_String* ustr_to_str( rtl_uString* pStr )
 return pOut;
 }
 
-static sal_Bool getScreenSize(int* display_width, int* display_height)
+static sal_B

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

[Abhilash Singh]

 desktop/unx/source/splashx.c |   49 +++
 desktop/unx/source/splashx.h |1 
 2 files changed, 45 insertions(+), 5 deletions(-)

New commits:
commit f424c8f053797bc9d559865f52822d9cbf33ae3f
Author: Abhilash Singh 
Date:   Wed Dec 14 22:18:44 2016 +0530

tdf#90794 Fix the Linux HiDPI start screen

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

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index d227ff5..c474099 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -531,6 +531,32 @@ static rtl_String* ustr_to_str( rtl_uString* pStr )
 return pOut;
 }
 
+static sal_Bool getScreenSize(int* display_width, int* display_height)
+{
+Display* bDisplay = NULL;
+Screen* bScreen = NULL;
+
+bDisplay = XOpenDisplay( NULL );
+if ( !bDisplay )
+{
+fprintf( stderr, "Failed to open default display.\n" );
+return sal_False;
+}
+
+bScreen = DefaultScreenOfDisplay( bDisplay );
+if ( !bScreen )
+{
+fprintf( stderr, "Failed to obtain the default screen of given 
display.\n" );
+return sal_False;
+}
+
+*display_width = bScreen->width;
+*display_height = bScreen->height;
+
+XCloseDisplay( bDisplay );
+return sal_True;
+}
+
 #define IMG_SUFFIX   ".png"
 
 static void splash_load_image( struct splash* splash, rtl_uString* pUAppPath )
@@ -540,7 +566,7 @@ static void splash_load_image( struct splash* splash, 
rtl_uString* pUAppPath )
  * now the splash screen will have to get along with language-territory. */
 
 char *pBuffer, *pSuffix, *pLocale;
-int nLocSize;
+int nLocSize, display_width, display_height;
 rtl_Locale *pLoc = NULL;
 rtl_String *pLang, *pCountry, *pAppPath;
 
@@ -570,9 +596,24 @@ static void splash_load_image( struct splash* splash, 
rtl_uString* pUAppPath )
 if ( splash_load_bmp( splash, pBuffer ) )
 goto cleanup;
 
-strcpy (pSuffix, "intro" IMG_SUFFIX);
-if ( splash_load_bmp( splash, pBuffer ) )
-goto cleanup;
+if ( getScreenSize( &display_width, &display_height ) == sal_True )
+{
+//load high resolution splash image
+if ( display_width > 1920 && display_height > 1024 ) // suggest better 
display size limits?
+{
+//TODO- change progress bar parameters after getting size of 
intro-highres.png
+strcpy (pSuffix, "intro-highres" IMG_SUFFIX);
+if ( splash_load_bmp( splash, pBuffer ) )
+goto cleanup;
+}
+//load low resolution splash image
+else
+{
+strcpy (pSuffix, "intro" IMG_SUFFIX);
+if ( splash_load_bmp( splash, pBuffer ) )
+goto cleanup;
+}
+}
 
 fprintf (stderr, "Failed to find intro image\n");
 
diff --git a/desktop/unx/source/splashx.h b/desktop/unx/source/splashx.h
index a74be00..4e9c72c 100644
--- a/desktop/unx/source/splashx.h
+++ b/desktop/unx/source/splashx.h
@@ -9,7 +9,6 @@
 #ifndef INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H
 #define INCLUDED_DESKTOP_UNX_SOURCE_SPLASHX_H
 
-
 #include 
 
 #ifdef __cplusplus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Java based connectivity drivers

[Bunth Tamás]

Hi,

I'd like to have a better understanding of how the hsqldb and jdbc drivers work.

Is there any wiki page for them like "FirebirdSQL" for firebird that I
couldn't find?

The code in connectivity/source/drivers/jdbc contains a bunch of java
function calls afais. So where are the java codes, and how does the
driver call them?

Thanks in advance,

Tamás Bunth
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: solenv/Module_solenv.mk

[Michael Stahl]

 solenv/Module_solenv.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8cc747ad519ea203df4d77551b1b8c4d626a5618
Author: Michael Stahl 
Date:   Fri Jan 13 13:22:06 2017 +0100

solenv: don't run solenv_python test with make 3.81

see 7a75b39273de47190b7a1fa20e0bcaca6d089033

Change-Id: I575e5d5dc757cc054a49ae6596183f46373072f2

diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index 127007e..528ac89 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Module_add_targets,solenv,\
 endif
 
 ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq ($(MAKE_VERSION),3.81) # gbuildtojson requires 3.82+
 ifneq ($(OS),WNT) # disable on Windows for now, causes gerrit/jenkins failures
 ifneq ($(OS),MACOSX) # disable on macOS too, fails at least for me and would 
be pointless anyway surely
 $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
@@ -32,6 +33,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,solenv,\
 endif
 endif
 endif
+endif
 
 ifneq ($(COMPILER_PLUGINS),)
 $(eval $(call gb_Module_add_check_targets,solenv, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[jan Iversen]

 bin/gbuild-to-ide |   36 +---
 1 file changed, 9 insertions(+), 27 deletions(-)

New commits:
commit 057c526b88cf8b1049fc93319050b480fc2a12ee
Author: jan Iversen 
Date:   Fri Jan 13 13:18:07 2017 +0100

gbuild-to-ide simplifications.

Simplified GbuildLinkTarget, removed functions.

Prepare to clean GbuildParser

Change-Id: I67bb3ba0279f615cb6c361818ade6fe629dca60c

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 6fdcb3f..12f107c 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -40,26 +40,8 @@ class GbuildLinkTarget:
  ilibtarget, linked_static_libs, linktarget,
  objcflags, objcobjects, objcxxflags,
  objcxxobjects, yaccobjects, build_type)
+self.target_name = self.build_type + '_' + self.name
 
-def name(self):
-return self.name
-
-def target_name(self):
-return self.build_type + '_' + self.name
-
-def short_name(self):
-return self.build_type + ' ' + self.name
-
-def module(self):
-return self.location[self.location.rindex('/')+1:]
-
-def is_empty(self):
-return not self.include and not self.defs and not self.cxxobjects and 
not self.linked_libs
-
-def __str__(self):
-return '%s at %s with include path: %s, isystem includes: %s, defines: 
%s, objects: %s, cxxflags: %s and linked libs: %s' % (
-self.short_name(), self.location, self.include, self.include_sys, 
self.defs, self.cxxobjects,
-self.cxxflags, self.linked_libs)
 
 class GbuildParser:
 def __init__(self, makecmd):
@@ -146,7 +128,7 @@ class GbuildParser:
 x = self.target_by_path[path]
 if path != '' and len(set(self.target_by_path[path])) > 1:
 print('fdo#70422: multiple target use dir %s: %s' % (
-path, ', '.join([target.short_name() for target in 
set(self.target_by_path[path])])))
+path, ', '.join([target.target_name for target in 
set(self.target_by_path[path])])))
 for location in self.target_by_location:
 self.modulenamelist.append(os.path.split(location)[1])
 return self
@@ -815,7 +797,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 module = location.split('/')[-1]
 module_directory = os.path.join(self.solution_directory, module)
 for target in self.gbuildparser.target_by_location[location]:
-project_path = os.path.join(module_directory, '%s.vcxproj' % 
target.target_name())
+project_path = os.path.join(module_directory, '%s.vcxproj' % 
target.target_name)
 project_guid = self.write_project(project_path, target)
 p = VisualStudioIntegrationGenerator.Project(project_guid, 
target, project_path)
 projects.append(p)
@@ -841,11 +823,11 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 f.write('Microsoft Visual Studio Solution File, Format Version 
12.00\n')
 for project in projects:
 target = project.target
-print(' %s' % target.target_name(), end='')
+print(' %s' % target.target_name, end='')
 proj_path = os.path.relpath(project.path, 
os.path.abspath(os.path.dirname(solution_path)))
 f.write('Project("{%s}") = "%s", "%s", "{%s}"\n' %
 (VisualStudioIntegrationGenerator.nmake_project_guid,
- target.short_name(), proj_path, project.guid))
+ target.target_name, proj_path, project.guid))
 libs_in_solution = self.get_dependency_libs(target.linked_libs,
 library_projects)
 if libs_in_solution:
@@ -898,7 +880,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 proj_keyword_node = ET.SubElement(globals_node, '{%s}Keyword' % ns)
 proj_keyword_node.text = 'MakeFileProj'
 proj_name_node = ET.SubElement(globals_node, '{%s}ProjectName' % ns)
-proj_name_node.text = target.short_name()
+proj_name_node.text = target.target_name
 
 ET.SubElement(proj_node, '{%s}Import' % ns, 
Project='$(VCTargetsPath)\Microsoft.Cpp.Default.props')
 for configuration in self.configurations:
@@ -930,7 +912,7 @@ class 
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
 'builddir': self.gbuildparser.builddir,
 'location': target.location,
 'makecmd': self.gbuildparser.makecmd,
-'target': target.target_name()}
+'target': target.target_name}
 nmake_build_node = ET.SubElement(conf_node, 
'{%s}NMakeBuildCommandLine' % ns)
 nmake_build_node.text = cfg_targets['build'] % nmake_params
 nmake_clean_

Re: test-bugzilla-files.py issues

[Michael Stahl]

On 12/01/17 17:02, Nagy Ákos wrote:
> Hey,
> 
> I want to run test-bugzilla-files.py to make some test, but I got an error:
> 
> /opt/libreoffice5.3/program/python
> /opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py
> --soffice=/opt/libreoffice5.3/program/soffice /opt/testfiles/untitled1.ods
> Traceback (most recent call last):
>   File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line
> 612, in 
> runLoadFileTests(opts, args)
>   File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line
> 567, in runLoadFileTests
> files.extend(getFiles(file_list_name[0]))
>   File "/opt/dev-tools/test-bugzilla-files/test-bugzilla-files.py", line
> 75, in getFiles
> files = file_list.readlines()
>   File "/opt/libreoffice5.3/program/python-core-3.5.0/lib/codecs.py",
> line 321, in decode
> (result, consumed) = self._buffer_decode(data, self.errors, final)
> UnicodeDecodeError: 'utf-8' codec can't decode byte 0x83 in position 10:
> invalid start byte
> 
> 
> I mention that I'm not an expert deveopoer and try to run the test with
> normal LibreOffice instalation.

i'm afraid you're holding it wrong :)

the file argument to test-bugzilla-files/test-bugzilla-files.py is not a
document file but a file that contains a list of file-names, one per line.

it's not really designed to be invoked manually, i run it via
"new-control.py", which takes a directory with documents and starts up
some number of parallel jobs; the configuration of output dirs and
"soffice" is in the "config" file.

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

[Libreoffice-commits] core.git: Changes to 'private/jmux/tdf#105288'

[Jan-Marek Glogowski]

New branch 'private/jmux/tdf#105288' available with the following commits:
commit 6cfae558815f3a6c7b2e0d6c291da36ed0ae239f
Author: Jan-Marek Glogowski 
Date:   Thu Jan 12 15:48:52 2017 +0100

tdf#105288 MM wait until all emails are send

Seems mail merge is now much faster then the sending of the merged
documents via email. This is why the attached workaround patch to
the tdf#103919 bug report, which simply sleeps after queuing a new
message, helped solving the problem. It slowes down the mail merge
and gives time to the mail dispatcher thread.

But we actually want to wait until all mails are send, so we have
to add a listener and wait for the mail thread to become idle.

This listener also allows us to cancel further mail merge when an
SMTP error has occured.

Change-Id: I9d13bcd8f0d0ff084b20d72ab96f70afa3a764ba

commit 3111a150cb2b30a907dd0a7f534ea14e18d4441b
Author: Jan-Marek Glogowski 
Date:   Thu Jan 12 15:47:31 2017 +0100

MM change listener from friend to a nested class

Change-Id: I245a27e02816d3c96ca059b99c42cb64cca5

commit 92640fba4730f6d9c8190feecb22720ceeec8dd3
Author: Jan-Marek Glogowski 
Date:   Thu Jan 12 13:39:14 2017 +0100

Rename mail dispatcher members

Makes the members conform with most LO variable naming,

This especially switches Active <=> Running in the member names.

"Running" is normally referred to as the thread state, while it
exists (also look into the osl::Thread API) and now active is the
state, when messages are processed, controlled by the Start() and
Stop() functions.

Change-Id: I3b8437d4ff24731348272a84720ff81fdea90db7

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Firebird bug CORE-5452 is fixed : Segfault when engine's dynamic library is unloaded right after closing worker threads

[marius adrian popa]

Firebird bug CORE-5452 is fixed
http://tracker.firebirdsql.org/browse/CORE-5452

And related commit

https://github.com/FirebirdSQL/firebird/commit/40f782ae3e918c4f3842571ff8064be1c4f54961
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - dbaccess/qa

[Michael Stahl]

 dbaccess/qa/complex/dbaccess/RowSet.java |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 8fde9af18698d85f13294ca0990478b707fc748a
Author: Michael Stahl 
Date:   Mon Dec 12 23:17:51 2016 +0100

dbaccess: fix testCloneMovesPlusDeletions test

JunitTest_dbaccess_complex spuriously fails 1% of the time with:

1) testCloneMovesPlusDeletions(complex.dbaccess.RowSet)
java.lang.AssertionError: moving to the next record after |deleteRow| and 
clone moves failed
at complex.dbaccess.RowSet.testCloneMovesPlusDeletions(RowSet.java:756)

The problem is that line RowSet.java:750 deleteRow() manages to delete
the last row in the set, because the positionRandom() is tricked to
position itself on the last row (which it tries not to do), becuase the
RowSet is currently positioned past-the-end on a deleted row and the
ORowSetBase::impl_getRowCount() is a lying bastard that adds 1 to the
result in this special case.

Funnily both the ORowSetBase::impl_getRowCount() and the test using
positionRandom() were added in CWS rowsetdel.  Yay for randomized
tests!

Change-Id: Ic8c7bfa190f6a5269604cf5b3c338f2d0b64205e
(cherry picked from commit ae8bd4267ac2da58f9e476d24e1e894202e92dea)
Reviewed-on: https://gerrit.libreoffice.org/32991
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java 
b/dbaccess/qa/complex/dbaccess/RowSet.java
index 2cbf942..e617d25 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -528,7 +528,12 @@ public class RowSet extends TestCase
  */
 private int positionRandom() throws SQLException, 
UnknownPropertyException, WrappedTargetException
 {
-final int position = (new Random()).nextInt(currentRowCount() - 2) + 2;
+// note: obviously this should subtract 2 but actually subtract 3
+// because if we have just deleted the current row then
+// ORowSetBase::impl_getRowCount() will lie and currentRowCount()
+// returns 1 more than the actual number of rows and then
+// positionRandom() followed by deleteRow() deletes *last* row
+final int position = (new Random()).nextInt(currentRowCount() - 3) + 2;
 assertTrue("sub task failed: could not position to row no. " + 
(Integer.valueOf(position)).toString(),
 m_resultSet.absolute(position));
 return m_resultSet.getRow();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alex McMurchy1917]

 sw/source/uibase/dbui/dbmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ec13271b435dc5b2e1753507e1e470624bb93ae
Author: Alex McMurchy1917 
Date:   Thu Jan 12 11:06:52 2017 +

tdf#105071 MM no emails sent when using doc as mail body

The conditional statement exits if there is data to process and
continues if there is no data to process. Thus all records are lost.

This commit reverses this behaviour so that data is processed
by the rest of the Mail merge activities.

Change-Id: I4c92cbd7ca55be7842b07ad887813e417430ba4f
Reviewed-on: https://gerrit.libreoffice.org/32994
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 
(cherry picked from commit 03ec9c397c676faff51041d992f6d715c475ff13)
Reviewed-on: https://gerrit.libreoffice.org/33013
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index c5b5123..7be5340 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1056,7 +1056,7 @@ uno::Reference< mail::XMailMessage > 
lcl_CreateMailFromDoc(
 SfxMedium aMedium( sFileURL, StreamMode::READ );
 SvStream* pInStream = aMedium.GetInStream();
 assert( pInStream && "no output file created?" );
-if( pInStream )
+if( !pInStream )
 return xMessage;
 
 pInStream->SetStreamCharSet( sMailEncoding );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alex McMurchy1917]

 sw/source/uibase/dbui/dbmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c8be6327f6d71d426bbf9887fd7d8a24ffd06a3
Author: Alex McMurchy1917 
Date:   Thu Jan 12 11:06:52 2017 +

tdf#105071 MM no emails sent when using doc as mail body

The conditional statement exits if there is data to process and
continues if there is no data to process. Thus all records are lost.

This commit reverses this behaviour so that data is processed
by the rest of the Mail merge activities.

Change-Id: I4c92cbd7ca55be7842b07ad887813e417430ba4f
Reviewed-on: https://gerrit.libreoffice.org/32994
Reviewed-by: Jan-Marek Glogowski 
Tested-by: Jan-Marek Glogowski 
(cherry picked from commit 03ec9c397c676faff51041d992f6d715c475ff13)
Reviewed-on: https://gerrit.libreoffice.org/33012
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e9d6363..6052e11 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1055,7 +1055,7 @@ uno::Reference< mail::XMailMessage > 
lcl_CreateMailFromDoc(
 SfxMedium aMedium( sFileURL, StreamMode::READ );
 SvStream* pInStream = aMedium.GetInStream();
 assert( pInStream && "no output file created?" );
-if( pInStream )
+if( !pInStream )
 return xMessage;
 
 pInStream->SetStreamCharSet( sMailEncoding );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jochen Nitschke]

 sc/source/filter/excel/xelink.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9c1b787b5b42837f0586add87f76e78b1eba529
Author: Jochen Nitschke 
Date:   Tue Jan 10 13:31:59 2017 +0100

fix interchanged parameters

first one found by cppcheck
> sc/source/filter/excel/xelink.cxx 637
> funcArgOrderDifferent
>  warning  Function 'InsertExtName' argument order different:
>  declaration 'rnExtSheet, rnExtName, rUrl, rName, rArray'
>  definition 'rnExtSheet, rnExtName, rName, rUrl, rArray'

Change-Id: I6b9bdbf58a8eb271e873bf8dfc30041a72419f59
Reviewed-on: https://gerrit.libreoffice.org/32927
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit ebadc6017827edef2bca7ed389d1af9ebffb96e9)
Reviewed-on: https://gerrit.libreoffice.org/32989
Reviewed-by: Eike Rathke 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/excel/xelink.cxx 
b/sc/source/filter/excel/xelink.cxx
index 2bfe779..bd23511 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -2465,7 +2465,7 @@ bool XclExpLinkManagerImpl8::InsertDde(
 }
 
 bool XclExpLinkManagerImpl8::InsertExtName( sal_uInt16& rnExtSheet, 
sal_uInt16& rnExtName,
-const OUString& rName, const OUString& rUrl, const 
ScExternalRefCache::TokenArrayRef& rArray )
+const OUString& rUrl, const OUString& rName, const 
ScExternalRefCache::TokenArrayRef& rArray )
 {
 sal_uInt16 nSupbook;
 if( maSBBuffer.InsertExtName( nSupbook, rnExtName, rUrl, rName, rArray ) )
@@ -2612,7 +2612,7 @@ bool XclExpLinkManager::InsertDde(
 }
 
 bool XclExpLinkManager::InsertExtName(
-sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rName, 
const OUString& rUrl,
+sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, const 
OUString& rName,
 const ScExternalRefCache::TokenArrayRef& rArray )
 {
 return mxImpl->InsertExtName(rnExtSheet, rnExtName, rUrl, rName, rArray);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/ixpm/xpmread.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 14d9b3519adac8543b52ddb84e49eecbdd1d9eb2
Author: Caolán McNamara 
Date:   Fri Jan 13 11:41:55 2017 +

ofz: ensure all not explicitly set indexes are zero

Change-Id: Idbe6ceeb61d3dfe26f281349181e7a60f7e59000

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 968e6a3..d9d237d 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -217,6 +217,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 if ( mnCpp == 2 )   // by using a 64kb indexing 
table
 {
 mpFastColorTable = new sal_uInt8[ 256 * 256 ];
+memset(mpFastColorTable, 0, 255 * 255);
 for ( pPtr = mpColMap, i = 0; i < mnColors; 
i++, pPtr += mnCpp + 4 )
 {
 sal_uLong   j =  pPtr[ 0 ] << 8;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/win

[Khaled Hosny]

 vcl/win/gdi/salfont.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 88d6675a40034fa786efd75cf14175f3c0c83e2e
Author: Khaled Hosny 
Date:   Thu Jan 12 22:52:08 2017 +0200

tdf#105015: Don’t ignore all printer fonts

For whatever reason we query printer output device for fonts and for
whatever reason GDI will only report fonts from the printer which
often in formats we want to ignore. This results in aborting the
application when we reject all fonts on the printer!

Just special case printer output devices and hope for the best.

I think this commit is partially blamed as it is evidenced now that
there was a good reason to only abort for window output devices, but
I’m leaving this as it is for now:

commit ea7102c93c33884a68d4dba0de7d52f8ed4f4579
Author: Chris Sherlock 
Date:   Tue Mar 25 21:54:20 2014 +1100

fdo#74702 OutputDevice::ImplInitFontList() fails if no fonts on device

It makes no sense that ImplInitFontList() only fails for Window
instances. I have carefully checked all the functions that use
this function, and there are no good cases when no fonts won't cause
problems. In fact, we have a number of functions that specifically
rely on the fact that ImplInitFontList will populate
OutputDevice::mpFontCollection with at least one font.

Therefore, I'm making this abort if it can't populate the collection,
regardless of whether it is a Window, Printer or VirtualDevice.

I have also refactored GetDefaultDevice - I now check the default
pOutDev parameter to see if it is NULL (the default), in which case
it is referring to the default window, so I call on
Application::GetDefaultDevice() instead of going straight to the
pimpl data structure used by the Application class.

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

diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 9de0541..8c120c0 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -1406,22 +1406,27 @@ int CALLBACK SalEnumFontsProcExW( const LOGFONTW* 
lpelfe,
 }
 else
 {
+// Ignore non-device font on printer.
+if (pInfo->mbPrinter)
+{
+if ((nFontType & RASTER_FONTTYPE) && !(nFontType & 
DEVICE_FONTTYPE))
+{
+SAL_INFO("vcl.gdi", "Unsupported printer font ignored: " << 
OUString(pLogFont->elfLogFont.lfFaceName));
+return 1;
+}
+}
 // Only SFNT fonts are supported, ignore anything else.
-if (SalLayout::UseCommonLayout() || 
OpenGLWrapper::isVCLOpenGLEnabled())
+else if (SalLayout::UseCommonLayout() || 
OpenGLWrapper::isVCLOpenGLEnabled())
 {
 if (!(nFontType & TRUETYPE_FONTTYPE) &&
 !(pMetric->ntmTm.ntmFlags & NTM_PS_OPENTYPE) &&
 !(pMetric->ntmTm.ntmFlags & NTM_TT_OPENTYPE))
 {
 SAL_INFO("vcl.gdi", "Unsupported font ignored: " << 
OUString(pLogFont->elfLogFont.lfFaceName));
-return 1;
+return 1;
 }
 }
 
-// Ignore non-device font on printer.
-if (pInfo->mbPrinter && !(nFontType & DEVICE_FONTTYPE))
-return 1;
-
 WinFontFace* pData = ImplLogMetricToDevFontDataW( pLogFont, 
&(pMetric->ntmTm), nFontType );
 pData->SetFontId( sal_IntPtr( pInfo->mnFontCount++ ) );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 wsd/LOOLWSD.cpp |   52 ++--
 1 file changed, 38 insertions(+), 14 deletions(-)

New commits:
commit 40e5a667018c6d801901424882612f400bbf0c07
Author: Tor Lillqvist 
Date:   Fri Jan 13 13:39:10 2017 +0200

No double colon in English text;)

Change-Id: I3e25a5e1be8672a7796a71a28c2979a30ab326a3

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f7c2399..65452fa 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1838,7 +1838,7 @@ void LOOLWSD::initialize(Application& self)
 
 std::string adminURI = getAdminURI(config());
 if (!adminURI.empty())
-std::cerr << "\nOr for the Admin Console see:: \n\n"
+std::cerr << "\nOr for the Admin Console:\n\n"
   << adminURI << '\n' << std::endl;
 #endif
 }
commit 591fc0238474f100d6eab3de6d9a7c2dddb2d1f7
Author: Tor Lillqvist 
Date:   Fri Jan 13 13:36:12 2017 +0200

No Hungarian notation please

Change-Id: I0701dfbecb0b6056c0453d83bac9e85a98eff366

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index eff8aa0..f7c2399 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1475,7 +1475,7 @@ public:
 namespace
 {
 
-inline ServerSocket* getServerSocket(int nPortNumber, bool reuseDetails)
+inline ServerSocket* getServerSocket(int portNumber, bool reuseDetails)
 {
 try
 {
@@ -1491,8 +1491,8 @@ inline ServerSocket* getServerSocket(int nPortNumber, 
bool reuseDetails)
 {
 try
 {
-LOG_INF("Trying first to connect to an existing loolwsd at the 
same port " << nPortNumber);
-StreamSocket s(SocketAddress(("127.0.0.1:" + 
std::to_string(nPortNumber)).c_str()));
+LOG_INF("Trying first to connect to an existing loolwsd at the 
same port " << portNumber);
+StreamSocket s(SocketAddress(("127.0.0.1:" + 
std::to_string(portNumber)).c_str()));
 LOG_FTL("Connection succeeded, so we can't continue");
 return nullptr;
 }
@@ -1504,7 +1504,7 @@ inline ServerSocket* getServerSocket(int nPortNumber, 
bool reuseDetails)
 
 ServerSocket* socket = LOOLWSD::isSSLEnabled() ? new 
SecureServerSocket() : new ServerSocket();
 Poco::Net::IPAddress wildcardAddr;
-SocketAddress address(wildcardAddr, nPortNumber);
+SocketAddress address(wildcardAddr, portNumber);
 socket->bind(address, reuseDetails);
 // 64 is the default value for the backlog parameter in Poco
 // when creating a ServerSocket, so use it here, too.
@@ -1518,26 +1518,26 @@ inline ServerSocket* getServerSocket(int nPortNumber, 
bool reuseDetails)
 }
 }
 
-inline ServerSocket* findFreeServerPort(int& nClientPortNumber)
+inline ServerSocket* findFreeServerPort(int& portNumber)
 {
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nClientPortNumber, false);
+socket = getServerSocket(portNumber, false);
 if (!socket)
 {
-nClientPortNumber++;
-LOG_INF("client port busy - trying " << nClientPortNumber);
+portNumber++;
+LOG_INF("client port busy - trying " << portNumber);
 }
 }
 return socket;
 }
 
-inline ServerSocket* getMasterSocket(int nMasterPortNumber)
+inline ServerSocket* getMasterSocket(int portNumber)
 {
 try
 {
-SocketAddress addr2("127.0.0.1", nMasterPortNumber);
+SocketAddress addr2("127.0.0.1", portNumber);
 return new ServerSocket(addr2);
 }
 catch (const Exception& exc)
@@ -1547,16 +1547,16 @@ inline ServerSocket* getMasterSocket(int 
nMasterPortNumber)
 }
 }
 
-inline ServerSocket* findFreeMasterPort(int &nMasterPortNumber)
+inline ServerSocket* findFreeMasterPort(int &portNumber)
 {
 ServerSocket* socket = nullptr;
 while (!socket)
 {
-socket = getServerSocket(nMasterPortNumber, false);
+socket = getServerSocket(portNumber, false);
 if (!socket)
 {
-nMasterPortNumber++;
-LOG_INF("master port busy - trying " << nMasterPortNumber);
+portNumber++;
+LOG_INF("master port busy - trying " << portNumber);
 }
 }
 return socket;
commit ba733ffad77e95bdac771785feb1366578110221
Author: Tor Lillqvist 
Date:   Fri Jan 13 13:26:36 2017 +0200

Prevent accidentally having duplicate loolwsds on same port, new approach

Before setting up the socket where we listen for client requests, try
connecting to the same port. If that succeeds, another loolwsd process
is already running and listening on that port. That is obviously
undesirable.

Yes, there is a race condition if multiple loolwsd processes are
started simultaneously and do this check before any of them have
actually created the socket. Live with it. Multiple loolwsd processes
is a problem that happens accidentally for developers only anyway. In
a pro

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

[Noel Grandin]

 sc/inc/addincol.hxx |5 +++--
 sc/inc/appoptio.hxx |7 ---
 sc/inc/attrib.hxx   |2 +-
 sc/inc/chartpos.hxx |   15 ---
 sc/inc/chgviset.hxx |3 ++-
 sc/inc/dociter.hxx  |9 ++---
 sc/inc/dpgroup.hxx  |3 ++-
 sc/inc/dpresfilter.hxx  |2 +-
 sc/inc/dpsave.hxx   |4 ++--
 sc/inc/dptabres.hxx |   15 ---
 sc/inc/dptabsrc.hxx |3 ++-
 sc/inc/editutil.hxx |2 +-
 sc/inc/markarr.hxx  |7 ---
 sc/inc/paramisc.hxx |8 
 sc/inc/patattr.hxx  |7 ---
 sc/inc/prnsave.hxx  |5 +++--
 sc/inc/rangenam.hxx |7 ---
 sc/source/core/data/attrib.cxx  |   11 +++
 sc/source/core/data/dociter.cxx |   26 +-
 sc/source/core/data/dpgroup.cxx |3 +--
 sc/source/core/data/dpresfilter.cxx |8 +++-
 sc/source/core/data/dpsave.cxx  |   14 +-
 sc/source/core/data/dptabres.cxx|   10 --
 sc/source/core/data/dptabsrc.cxx|8 +++-
 sc/source/core/data/global2.cxx |7 ++-
 sc/source/core/data/markarr.cxx |   27 ++-
 sc/source/core/data/patattr.cxx |   17 +++--
 sc/source/core/inc/addinlis.hxx |2 +-
 sc/source/core/tool/addincol.cxx|   11 +++
 sc/source/core/tool/addinlis.cxx|7 +++
 sc/source/core/tool/appoptio.cxx|   12 
 sc/source/core/tool/callform.cxx|6 +++---
 sc/source/core/tool/chartpos.cxx|   16 ++--
 sc/source/core/tool/chgviset.cxx|9 ++---
 sc/source/core/tool/editutil.cxx|5 ++---
 sc/source/core/tool/prnsave.cxx |5 +
 sc/source/core/tool/rangenam.cxx|9 +++--
 37 files changed, 134 insertions(+), 183 deletions(-)

New commits:
commit 414ede0435645a2ebf8f1476435b6ec3bb248f33
Author: Noel Grandin 
Date:   Wed Jan 11 14:05:10 2017 +0200

new loplugin: useuniqueptr: sc part 1

Change-Id: Ic96fd3b56b2063df0882168a7d02725d3c50515f
Reviewed-on: https://gerrit.libreoffice.org/32961
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 49d30b6..7915015 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -88,7 +88,8 @@ private:
 css::uno::Reference< css::reflection::XIdlMethod> xFunction;
 css::uno::Any   aObject;
 longnArgCount;
-ScAddInArgDesc* pArgDescs;
+std::unique_ptr
+pArgDescs;
 longnCallerPos;
 sal_uInt16  nCategory;
 OString sHelpId;
@@ -113,7 +114,7 @@ public:
 { return xFunction; }
 const css::uno::Any& GetObject() const   { return aObject; }
 longGetArgumentCount() const{ return nArgCount; }
-const ScAddInArgDesc*   GetArguments() const{ return pArgDescs; }
+const ScAddInArgDesc*   GetArguments() const{ return 
pArgDescs.get(); }
 longGetCallerPos() const{ return nCallerPos; }
 const OUString& GetDescription() const  { return aDescription; 
}
 sal_uInt16  GetCategory() const { return nCategory; }
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 5bc668a..d3d6f5b 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -45,8 +45,8 @@ public:
 SvxZoomType GetZoomType() const { return eZoomType; }
 voidSetSynchronizeZoom( bool bNew ) { bSynchronizeZoom = bNew; }
 boolGetSynchronizeZoom() const  { return bSynchronizeZoom; }
-sal_uInt16  GetLRUFuncListCount() const { return nLRUFuncCount; }
-sal_uInt16* GetLRUFuncList() const  { return pLRUList;  }
+sal_uInt16  GetLRUFuncListCount() const { return nLRUFuncCount; }
+sal_uInt16* GetLRUFuncList() const  { return pLRUList.get();  }
 voidSetLRUFuncList( const sal_uInt16* pList,
 const sal_uInt16  nCount );
 voidSetStatusFunc( sal_uInt32 nNew ){ nStatusFunc = nNew;   }
@@ -83,7 +83,8 @@ public:
 private:
 FieldUnit   eMetric;
 sal_uInt16  nLRUFuncCount;
-sal_uInt16* pLRUList;
+std::unique_ptr
+pLRUList;
 SvxZoomType eZoomType;
 sal_uInt16  nZoom;
 boolbSynchronizeZoom;
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 3b71b8c..83235ac 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -214,7 +214,7 @@ public:
 
 public:
 sal_uInt16  nCount;
-SCTAB*  pTabArr;
+std::unique_ptr  pTabArr;
 };
 
 inline ScTableLis

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

[Maxim Monastirsky]

 svx/source/tbxctrls/tbcontrl.cxx |   37 +++--
 1 file changed, 23 insertions(+), 14 deletions(-)

New commits:
commit 464f109cb6f506b26a500a90eeba32c42432b83d
Author: Maxim Monastirsky 
Date:   Wed Jan 11 00:56:22 2017 +0200

SvxFontNameBox_Impl was not disposed

This is visible after toolbar customization, when the old
font box stays visible. Turns out that currently the toolbox
controller is supposed to own the item window, not the toolbox.

Regression of:

commit 970a66f8c919ea0524f216f40d21b3e2a8c88ccc
Author: Maxim Monastirsky 
Date:   Sun Oct 16 01:27:10 2016 +0300

Use UNO registration for font name toolbox control

Change-Id: I29a1f06d97c9a981507ff62889e2d7fc6ac9d688
Reviewed-on: https://gerrit.libreoffice.org/32943
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 
(cherry picked from commit e1f5db9579602dd02a80c1d1ea1d078606542f16)
Reviewed-on: https://gerrit.libreoffice.org/32956
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 36b57a8..6e7b8e0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2699,10 +2699,16 @@ public:
 // XToolbarController
 virtual css::uno::Reference< css::awt::XWindow > SAL_CALL 
createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent ) 
throw ( css::uno::RuntimeException, std::exception ) override;
 
+// XComponent
+virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, 
std::exception ) override;
+
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() throw ( 
css::uno::RuntimeException, std::exception ) override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 
throw ( css::uno::RuntimeException, std::exception ) override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
throw ( css::uno::RuntimeException, std::exception ) override;
+
+private:
+VclPtr m_pBox;
 };
 
 SvxFontNameToolBoxControl::SvxFontNameToolBoxControl()
@@ -2718,25 +2724,21 @@ void SvxFontNameToolBoxControl::statusChanged( const 
css::frame::FeatureStateEve
 if ( !getToolboxId( nId, &pToolBox ) )
 return;
 
-SvxFontNameBox_Impl* pBox = 
static_cast(pToolBox->GetItemWindow( nId ));
-
-DBG_ASSERT( pBox, "Control not found!" );
-
 if ( !rEvent.IsEnabled )
 {
-pBox->Disable();
-pBox->Update( nullptr );
+m_pBox->Disable();
+m_pBox->Update( nullptr );
 }
 else
 {
-pBox->Enable();
+m_pBox->Enable();
 
 css::awt::FontDescriptor aFontDesc;
 if ( rEvent.State >>= aFontDesc )
-pBox->Update( &aFontDesc );
+m_pBox->Update( &aFontDesc );
 else
-pBox->SetText( "" );
-pBox->SaveValue();
+m_pBox->SetText( "" );
+m_pBox->SaveValue();
 }
 
 pToolBox->EnableItem( nId, rEvent.IsEnabled );
@@ -2746,10 +2748,17 @@ css::uno::Reference< css::awt::XWindow > 
SvxFontNameToolBoxControl::createItemWi
 throw ( css::uno::RuntimeException, std::exception )
 {
 SolarMutexGuard aGuard;
-VclPtrInstance pBox( VCLUnoHelper::GetWindow( rParent 
),
-  Reference< XDispatchProvider >( 
m_xFrame->getController(), UNO_QUERY ),
-  m_xFrame,0);
-return VCLUnoHelper::GetInterface( pBox );
+m_pBox = VclPtr::Create( VCLUnoHelper::GetWindow( 
rParent ),
+  Reference< XDispatchProvider 
>( m_xFrame->getController(), UNO_QUERY ),
+  m_xFrame, 0);
+return VCLUnoHelper::GetInterface( m_pBox );
+}
+
+void SvxFontNameToolBoxControl::dispose()
+throw ( css::uno::RuntimeException, std::exception )
+{
+m_pBox.disposeAndClear();
+ToolboxController::dispose();
 }
 
 OUString SvxFontNameToolBoxControl::getImplementationName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - officecfg/registry

[Mark Hung]

 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09336ca3d8c9cfdc87522802106113d5b00247eb
Author: Mark Hung 
Date:   Sat Dec 31 19:47:38 2016 +0800

tdf#104372 Update UNO command of default formatting in Impress.

The UNO command of default formatting in Impress is .uno:SetDefault
instead of .uno:ResetAttributes, which is the UNO command of clear
direct formatting in Writer.

Change-Id: I1f167e7902c333eaa47a07431f67c76d809838c4
Reviewed-on: https://gerrit.libreoffice.org/32531
Tested-by: Jenkins 
Reviewed-by: Mark Hung 
Reviewed-on: https://gerrit.libreoffice.org/33031
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 26f9028..79ea602 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -3003,13 +3003,13 @@
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:SetDefault
   
 
 
   
 I10N SHORTCUTS - NO 
TRANSLATE
-.uno:ResetAttributes
+.uno:SetDefault
   
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/Reader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e03d012047101043c0b71d79f5497728125e089
Author: Lionel Elie Mamane 
Date:   Fri Jan 13 10:50:35 2017 +0100

jdbc clob character stream: return 1 when returning a single odd byte

if at that point nBytesToRead is 0, it may be that it was 1, but we
have read one byte from the buffer (m_buf). So in this case, return 1,
not 0 (which would signal EOF).

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

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx 
b/connectivity/source/drivers/jdbc/Reader.cxx
index 4e96bfa..be0fc05 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -124,7 +124,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( 
::com::sun::star::uno::Sequence< s
 }
 
 if(nBytesToRead == 0)
-return 0;
+return nBytesWritten;
 
 sal_Int32 nCharsToRead = (nBytesToRead + 1)/2;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/Reader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f17000e35c861de1171a6e2a75403f40ee3bffb0
Author: Lionel Elie Mamane 
Date:   Fri Jan 13 10:50:35 2017 +0100

jdbc clob character stream: return 1 when returning a single odd byte

if at that point nBytesToRead is 0, it may be that it was 1, but we
have read one byte from the buffer (m_buf). So in this case, return 1,
not 0 (which would signal EOF).

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

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx 
b/connectivity/source/drivers/jdbc/Reader.cxx
index 2f39150..aaf5ff5 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -124,7 +124,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( 
css::uno::Sequence< sal_Int8 >& aD
 }
 
 if(nBytesToRead == 0)
-return 0;
+return nBytesWritten;
 
 sal_Int32 nCharsToRead = (nBytesToRead + 1)/2;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/filter/ixpm/xpmread.cxx |   49 +++--
 1 file changed, 26 insertions(+), 23 deletions(-)

New commits:
commit d05f56b160390022fdb0c21eed5e430440cd79ca
Author: Caolán McNamara 
Date:   Fri Jan 13 11:33:19 2017 +

make this a tiny bit less unreadable

Change-Id: Ib8205e76f6d1d59ef06eba6e3365c0b4cad0ecaf

diff --git a/vcl/source/filter/ixpm/xpmread.cxx 
b/vcl/source/filter/ixpm/xpmread.cxx
index 6402802..968e6a3 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -316,44 +316,47 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY )
 bStatus = false;
 else
 {
-sal_uLong i, j;
-if ( mpFastColorTable )
+if (mpFastColorTable)
 {
-for ( i = 0; i < mnWidth; i++ )
+for (sal_uLong i = 0; i < mnWidth; ++i)
 {
-j = (*pString++) << 8;
+sal_uLong j = (*pString++) << 8;
 j += *pString++;
-sal_uInt8 k = (sal_uInt8)mpFastColorTable[ j ];
-mpAcc->SetPixel( nY, i, BitmapColor( (sal_uInt8)k ) );
+const sal_uInt8 k = mpFastColorTable[j];
+mpAcc->SetPixel(nY, i, BitmapColor(k));
 
 if ( mpMaskAcc )
-mpMaskAcc->SetPixel( nY, i,
-( mpColMap[ k * (mnCpp + 4) + mnCpp] ) ? aWhite : 
aBlack );
+{
+const sal_uLong nMapIndex = k * (mnCpp + 4) + mnCpp;
+mpMaskAcc->SetPixel(nY, i, mpColMap[nMapIndex] ? 
aWhite : aBlack);
+}
 }
 }
-else for ( i = 0; i < mnWidth; i++ )
+else
 {
-pColor = mpColMap;
-for ( j = 0; j < mnColors; j++ )
+for (sal_uLong i = 0; i < mnWidth; ++i)
 {
-if ( ImplCompare( pString, pColor, mnCpp, XPMCASESENSITIVE 
) )
+pColor = mpColMap;
+for (sal_uLong j = 0; j < mnColors; ++j)
 {
-if ( mnColors > 256 )
-mpAcc->SetPixel( nY, i, Color ( pColor[3], 
pColor[4], pColor[5] ) );
-else
-mpAcc->SetPixel( nY, i, BitmapColor( (sal_uInt8) j 
) );
+if ( ImplCompare( pString, pColor, mnCpp, 
XPMCASESENSITIVE ) )
+{
+if ( mnColors > 256 )
+mpAcc->SetPixel( nY, i, Color ( pColor[3], 
pColor[4], pColor[5] ) );
+else
+mpAcc->SetPixel( nY, i, BitmapColor( 
(sal_uInt8) j ) );
 
-if ( mpMaskAcc )
-mpMaskAcc->SetPixel( nY, i, (
-pColor[ mnCpp ] ) ? aWhite : aBlack );
+if ( mpMaskAcc )
+mpMaskAcc->SetPixel( nY, i, (
+pColor[ mnCpp ] ) ? aWhite : aBlack );
 
-break;
+break;
+}
+pColor += ( mnCpp + 4 );
 }
-pColor += ( mnCpp + 4 );
+pString += mnCpp;
 }
-pString += mnCpp;
 }
-
 }
 }
 return bStatus;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[pv2k]

 cui/source/tabpages/numpages.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7a275521a5383f24d9a0c1aea7b61f1b64829190
Author: pv2k 
Date:   Sat Jan 7 17:27:41 2017 +0530

tdf#46552 fixing preview for bullets/numbering configuration

Change-Id: I959169428d4ed0498a2b78fc7a6ae0815e780648
Reviewed-on: https://gerrit.libreoffice.org/32816
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index acf23ba..cd81e87 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2544,6 +2544,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& 
rRenderContext, const Rectan
 const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel);
 aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
 sal_uInt16 nXStart( 0 );
+pVDev->SetFillColor( aBackColor );
 
 if (rFmt.GetPositionAndSpaceMode() == 
SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - desktop/source

[Samuel Mehrbrodt]

 desktop/source/app/crashreport.cxx |   30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)

New commits:
commit ea6a24234138eb3cea1cde3c4abcf36845d05d20
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 11:50:12 2017 +0100

Crashdump: Make crash directory configurable

Change-Id: I8106ec674080ede7072581dab2e6700040de5828

diff --git a/desktop/source/app/crashreport.cxx 
b/desktop/source/app/crashreport.cxx
index 04b234f..9359113 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -82,22 +82,34 @@ void CrashReporter::writeCommonInfo()
 
 namespace {
 
-OUString getCrashUserProfileDirectory()
+OUString getCrashDirectory()
 {
-OUString url("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash/");
-rtl::Bootstrap::expandMacros(url);
-osl::Directory::create(url);
+OUString aCrashURL;
 
-OUString aProfilePath;
-osl::FileBase::getSystemPathFromFileURL(url, aProfilePath);
-return aProfilePath;
+// First check whether a user-defined path is available (crashreport.ini)
+OUString aCrashPath("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("crashreport") ":CrashDirectory}");
+rtl::Bootstrap::expandMacros(aCrashPath);
+osl::FileBase::getFileURLFromSystemPath(aCrashPath, aCrashURL);
+
+// Fall back to user profile
+if (aCrashPath.isEmpty())
+{
+aCrashURL = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" 
SAL_CONFIGFILE("bootstrap") ":UserInstallation}/crash";
+rtl::Bootstrap::expandMacros(aCrashURL);
+}
+
+if (!aCrashURL.endsWith("/"))
+aCrashURL += "/";
+osl::FileBase::RC rc = osl::Directory::create(aCrashURL);
+osl::FileBase::getSystemPathFromFileURL(aCrashURL, aCrashPath);
+return aCrashPath;
 }
 
 }
 
 void CrashReporter::updateMinidumpLocation()
 {
-OUString aURL = getCrashUserProfileDirectory();
+OUString aURL = getCrashDirectory();
 OString aOStringUrl = OUStringToOString(aURL, RTL_TEXTENCODING_UTF8);
 
 #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
@@ -115,7 +127,7 @@ void 
CrashReporter::storeExceptionHandler(google_breakpad::ExceptionHandler* pEx
 
 std::string CrashReporter::getIniFileName()
 {
-OUString url = getCrashUserProfileDirectory() + "dump.ini";
+OUString url = getCrashDirectory() + "dump.ini";
 OString aUrl = OUStringToOString(url, RTL_TEXTENCODING_UTF8);
 std::string aRet(aUrl.getStr());
 return aRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Samuel Mehrbrodt]

 distro-configs/LibreOfficeWin32.conf |1 -
 distro-configs/LibreOfficeWin64.conf |1 -
 2 files changed, 2 deletions(-)

New commits:
commit 561840f1319260eca962d2fb1f831c7ac31c3220
Author: Samuel Mehrbrodt 
Date:   Fri Jan 13 09:33:30 2017 +

Remove --disable-gtk from Windows distro configs

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

diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index 2b08ded..87e7bea 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -1,7 +1,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index de9172b..1a50e00 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -2,7 +2,6 @@
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
---disable-gtk
 --enable-scripting-beanshell
 --enable-scripting-javascript
 --enable-ext-wiki-publisher
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/2.0.2-2'

[Andras Timar]

Tag '2.0.2-2' created by Andras Timar  at 
2017-01-13 10:23 +

2.0.2-2

Changes since 2.0.2-1-7:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - debian/changelog

[Andras Timar]

 debian/changelog |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 9b350750460e018ec18eeb462eefec71426d7cb8
Author: Andras Timar 
Date:   Fri Jan 13 11:23:14 2017 +0100

debian changelog for 2.0.2-2

Change-Id: Ib615a13c42ebd5cd1bd670f61a1007fe7b4d0554

diff --git a/debian/changelog b/debian/changelog
index 49d769d..f0415cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (2.0.2-2) unstable; urgency=medium
+
+  * see the git log: http://col.la/cool20
+
+ -- Andras Timar   Fri, 13 Jan 2017 11:20:00 +0100
+
 loolwsd (2.0.2-1) unstable; urgency=medium
 
   * see the git log: http://col.la/cool20
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomáš Chvátal]

 dbaccess/source/ui/dlg/odbcconfig.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3f5584526fd4e8290dac033e1cf3d64acd25d893
Author: Tomáš Chvátal 
Date:   Thu Jan 5 16:06:10 2017 +0100

unixODBC changed soname to .2 so reflect it

we dlopen this library and thus we should be able to find it with any
soname, so far .1 and .2 seem to be used.

Also now the load order on linux is: .so.2 -> .so.1 -> .so

Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280
Reviewed-on: https://gerrit.libreoffice.org/32755
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx 
b/dbaccess/source/ui/dlg/odbcconfig.cxx
index cd1b583..a880f3c 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -38,8 +38,9 @@
 #ifdef MACOSX
 #define ODBC_LIBRARY"libiodbc.dylib"
 #else
+#define ODBC_LIBRARY_PLAIN  "libodbc.so"
 #define ODBC_LIBRARY_1  "libodbc.so.1"
-#define ODBC_LIBRARY"libodbc.so"
+#define ODBC_LIBRARY"libodbc.so.2"
 #endif
 #endif
 
@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration()
 if ( !bLoaded )
 bLoaded = load(ODBC_LIBRARY_1);
 #endif
+#ifdef ODBC_LIBRARY_PLAIN
+if ( !bLoaded )
+bLoaded = load(ODBC_LIBRARY_PLAIN);
+#endif
 
 if ( bLoaded )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/jdbc/Reader.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit afe64b6f0ab839955690f07929268a3d389279bf
Author: Lionel Elie Mamane 
Date:   Fri Jan 13 10:50:35 2017 +0100

jdbc clob character stream: return 1 when returning a single odd byte

if at that point nBytesToRead is 0, it may be that it was 1, but we
have read one byte from the buffer (m_buf). So in this case, return 1,
not 0 (which would signal EOF).

Change-Id: I229e53f1c38c80f709df244a3509caccd69c8ecf
Reviewed-on: https://gerrit.libreoffice.org/33029
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/connectivity/source/drivers/jdbc/Reader.cxx 
b/connectivity/source/drivers/jdbc/Reader.cxx
index 13ab238..665caaf 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -124,7 +124,7 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( 
css::uno::Sequence< sal_Int8 >& aD
 }
 
 if(nBytesToRead == 0)
-return 0;
+return nBytesWritten;
 
 sal_Int32 nCharsToRead = (nBytesToRead + 1)/2;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/loleaflet.css  |   27 -
 loleaflet/dist/loleaflet.html |3 +
 loleaflet/dist/menubar.css|   41 ++
 loleaflet/dist/spreadsheet.css|   16 +++---
 loleaflet/dist/toolbar.css|4 +-
 loleaflet/dist/toolbar/toolbar.js |   10 +++---
 loleaflet/src/control/Control.ColumnHeader.js |6 +--
 loleaflet/src/control/Control.Menubar.js  |   29 --
 loleaflet/src/control/Control.RowHeader.js|4 +-
 9 files changed, 90 insertions(+), 50 deletions(-)

New commits:
commit d26a49ddd3bf13125be77d82dac80418e9b866c1
Author: Pranav Kant 
Date:   Thu Jan 12 18:09:28 2017 +0530

loleaflet: Collapse to a single row in mobile mode

Combination of following cherry picks:

loleaflet: Collapse to a single row in mobile mode, more doc space
(cherry picked from commit c20ff7adda74a5ac7cc6f9355a38c9ee5200a2f0)

loleaflet: Put row column in a container

Change-Id: Ib271a690783c51d19e3fd6c1634620740051e3bc
(cherry picked from commit 15ed828698f12d690b2226f3b409a5e03e8a7650)

Position row/col headers absolutely inside header frame

... so that its easy to move all of it when we switch from mobile
mode and vice versa.

Change-Id: If2db351aafc4a8fefa05bc88f73c0046a3f887b8
(cherry picked from commit 54e2b237b6bc4b1b2c3ab4d6563d243a77d63b6f)

loleaflet: No need of resizebreak now

... as we have a mobile mode now where we remove drop downs
anyways.

Change-Id: Ic08634d25d6a3ae272e50642f34d2124c0472bf5
(cherry picked from commit 77b27255f1ae787e43edc29137e3be556a9d6040)

loleaflet: right padding for hamburger option menu

Change-Id: I1d946f537e66d637e82354ff3af80353a930d8eb
(cherry picked from commit 21d3ef8c3362064303e9536756d7139463e7feb5)

loleaflet: Remove useless rule

This seems to be superfluous. w2ui library automatically set the
width of the toolbar overriding this value always.

Change-Id: Ia87018533f99769ef1dc48463ac58d32cbf40d9d
(cherry picked from commit 17e2d42e9ed284e7fa163227328b72426ce10a7e)

loleaflet: Set toolbar-up-more width to auto in low screen width

Change-Id: I10c41630da3a3003db1663bea211b42335f468c8
(cherry picked from commit 9b564af0034330617377b1fae9f96ef2d5f22863)

loleaflet: Move closebutton to menu bar option in mobile mode

Change-Id: Ie6b9f507862e36ada44fda88acd96b1b495ae002
(cherry picked from commit 456afb50bd3487a4e5637ddf1857fa8b540aabfb)

loleaflet: Remove this hamburger <-> closebutton animation

Change-Id: I0c5a4ad2ee0b1d7041091d54c21f538c1a2912f8
(cherry picked from commit 9a4aba717a8b531d0f84e90f7c554497be9e2ef6)
Reviewed-on: https://gerrit.libreoffice.org/33004
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index c8c5889..787a328 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -32,7 +32,7 @@ body {
 display: block;
 }
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
 /* Show slidesorter beyond 768px only */
 #presentation-controls-wrapper {
display: none;
@@ -41,6 +41,31 @@ body {
 #document-container.parts-preview-document {
left: 0px !important;
 }
+#document-container.spreadsheet-document {
+   top: 93px !important;
+}
+#document-container {
+   top: 40px;
+}
+#spreadsheet-row-column-frame {
+   top: 73px !important;
+}
+/* There seems to be some bug in w2ui library -
+ * when we are in very low screen width, the toolbar-up-more
+ * toolbar's width doesn't adjust according to its children toolbar
+ * items and truncate all items but one. Lets override the width in
+ * mobile mode to prevent that.
+ */
+#toolbar-up-more {
+   width: auto !important;
+}
+/* We need to give space for options menu */
+#tb_toolbar-up_item_rightmenupadding {
+   padding-right: 40px;
+}
+#tb_toolbar-up_item_close {
+   display: none;
+}
 }
 
 .loleaflet-font {
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index d7a9186..bfb3ed6 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -55,6 +55,9 @@
   
 
 
+
+
+
 
   
 
diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index 72c8926..e7e6a86 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -1,9 +1,10 @@
 #main-menu {
-top: 30px;
+top: 39px;
 height: 25px;
 padding-left: 125px;
 z-index: 1000;
 outline: none;
+background-color: transparent;
 }
 
 .header-wrapper {
@@ -12,6 +13,8 @@
 }
 .main-nav {
 height: 30px; /* on mouseover menubar items, bord

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/src

[Pranav Kant]

 loleaflet/src/map/Map.js |4 
 1 file changed, 4 insertions(+)

New commits:
commit 5f544380715f3e96e6d5019dba8e33069d93e25a
Author: Pranav Kant 
Date:   Thu Dec 22 15:46:48 2016 +0530

loleaflet: Focus on textarea after map activation

Change-Id: Iaf1993a9a331ab86c668e718fae5f6a727c120cc
(cherry picked from commit 0ffc37c0455bae4843592a25dbd2938db93b645e)
Reviewed-on: https://gerrit.libreoffice.org/33023
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d699a73..28d2bed 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -566,7 +566,9 @@ L.Map = L.Evented.extend({
},
 
focus: function () {
+   console.debug('focus:');
if (this._docLayer && document.activeElement !== 
this._docLayer._textArea) {
+   console.debug('focus: focussing');
this._docLayer._textArea.focus();
}
},
@@ -753,6 +755,7 @@ L.Map = L.Evented.extend({
var id = vex.dialogID;
vex.dialogID = -1;
this._startInactiveTimer();
+   this.focus();
return vex.close(id);
}
} else {
@@ -761,6 +764,7 @@ L.Map = L.Evented.extend({
}
 
this._startInactiveTimer();
+   this.focus();
return false;
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5717d17a74dc503b2ae8ce135b08d58ff6d283e9
Author: Pranav Kant 
Date:   Tue Dec 20 16:03:24 2016 +0530

loleaflet: reset selection after search-not-found

Change-Id: If1c10cb10d1fce79a4697d5cc548dae781cfb2ec
(cherry picked from commit fedfc75714991c28bfdad882ddc012c1d6ad0a5f)
Reviewed-on: https://gerrit.libreoffice.org/33024
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 33d2bd9..86d034e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1262,6 +1262,7 @@ map.on('search', function (e) {
toolbar.disable('searchnext');
toolbar.hide('cancelsearch');
L.DomUtil.addClass(searchInput, 'search-not-found');
+   map.resetSelection();
setTimeout(function () {
L.DomUtil.removeClass(searchInput, 'search-not-found');
}, 500);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 969ca87c97a254956a0178a834a17475d2524e66
Author: Pranav Kant 
Date:   Tue Dec 20 15:56:42 2016 +0530

loleaflet: Disable bullet/numbering in calc

Change-Id: I7509fbf8cfb593fc23ace3ca02c71342d1112def
(cherry picked from commit 794910e901483c1830fdd6889dfb6ea6be4a6bfd)
Reviewed-on: https://gerrit.libreoffice.org/33025
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index dd99292..33d2bd9 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -958,8 +958,8 @@ map.on('doclayerinit', function () {
 
switch (docType) {
case 'spreadsheet':
-   toolbarUp.remove('inserttable', 'styles', 'alignblock', 
'bullet', 'numbering', 'break-numbering');
-   toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 
'bullet', 'numbering', 'break-numbering');
+   toolbarUp.remove('inserttable', 'styles', 'alignblock', 
'defaultbullet', 'defaultnumbering', 'break-numbering');
+   toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 
'defaultbullet', 'defaultnumbering', 'break-numbering');
statusbar.disable('zoomreset', 'zoomout', 'zoomin', 
'zoomlevel');
statusbar.insert('left', [
{type: 'break', id:'break1'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer]

 android/source/src/java/org/libreoffice/LOEvent.java |8 ++
 android/source/src/java/org/libreoffice/LOKitShell.java  |4 +
 android/source/src/java/org/libreoffice/LOKitThread.java |   33 
++
 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |7 +-
 4 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 2e582ed403c41a07265ef090c5891eab04978117
Author: Mert Tumer 
Date:   Wed Dec 7 13:45:28 2016 +0200

tdf#101689 - Fix returning to first part of documents when resumed

Change-Id: I6d3a9354c702628e991c69176086efbbc28ddd74
Reviewed-on: https://gerrit.libreoffice.org/31753
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/android/source/src/java/org/libreoffice/LOEvent.java 
b/android/source/src/java/org/libreoffice/LOEvent.java
index 2155121..23109e8 100644
--- a/android/source/src/java/org/libreoffice/LOEvent.java
+++ b/android/source/src/java/org/libreoffice/LOEvent.java
@@ -33,6 +33,7 @@ public class LOEvent implements Comparable {
 public static final int SWIPE_LEFT = 12;
 public static final int NAVIGATION_CLICK = 13;
 public static final int UNO_COMMAND = 14;
+public static final int RESUME = 15;
 
 public final int mType;
 public int mPriority = 0;
@@ -73,6 +74,13 @@ public class LOEvent implements Comparable {
 mValue = value;
 }
 
+public LOEvent(int type, String key, int value) {
+mType = type;
+mTypeString = "Resume partIndex";
+mString = key;
+mPartIndex = value;
+}
+
 public LOEvent(int type, int partIndex) {
 mType = type;
 mPartIndex = partIndex;
diff --git a/android/source/src/java/org/libreoffice/LOKitShell.java 
b/android/source/src/java/org/libreoffice/LOKitShell.java
index aff0472..6e32b05 100644
--- a/android/source/src/java/org/libreoffice/LOKitShell.java
+++ b/android/source/src/java/org/libreoffice/LOKitShell.java
@@ -138,6 +138,10 @@ public class LOKitShell {
 LOKitShell.sendEvent(new LOEvent(LOEvent.LOAD, inputFile));
 }
 
+public static void sendResumeEvent(String inputFile, int partIndex) {
+LOKitShell.sendEvent(new LOEvent(LOEvent.RESUME, inputFile, 
partIndex));
+}
+
 public static void sendCloseEvent() {
 LOKitShell.sendEvent(new LOEvent(LOEvent.CLOSE));
 }
diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java 
b/android/source/src/java/org/libreoffice/LOKitThread.java
index 7b2e9b2..5927f5f 100644
--- a/android/source/src/java/org/libreoffice/LOKitThread.java
+++ b/android/source/src/java/org/libreoffice/LOKitThread.java
@@ -153,10 +153,40 @@ public class LOKitThread extends Thread {
 redraw();
 }
 
+
+/**
+ * Resume the document with the current part
+ */
+
+private void resumeDocument(String filename, int partIndex){
+if (mApplication == null) {
+mApplication = LibreOfficeMainActivity.mAppContext;
+}
+
+mLayerClient = LibreOfficeMainActivity.getLayerClient();
+
+mInvalidationHandler = new 
InvalidationHandler(LibreOfficeMainActivity.mAppContext);
+mTileProvider = TileProviderFactory.create(mLayerClient, 
mInvalidationHandler, filename);
+
+if (mTileProvider.isReady()) {
+LOKitShell.showProgressSpinner();
+mTileProvider.changePart(partIndex);
+mViewportMetrics = mLayerClient.getViewportMetrics();
+mLayerClient.setViewportMetrics(mViewportMetrics.scaleTo(0.9f, new 
PointF()));
+refresh();
+LOKitShell.hideProgressSpinner();
+} else {
+closeDocument();
+}
+
+
+}
+
 /**
  * Change part of the document.
  */
 private void changePart(int partIndex) {
+
 LOKitShell.showProgressSpinner();
 mTileProvider.changePart(partIndex);
 mViewportMetrics = mLayerClient.getViewportMetrics();
@@ -206,6 +236,9 @@ public class LOKitThread extends Thread {
 case LOEvent.LOAD:
 loadDocument(event.mString);
 break;
+case LOEvent.RESUME:
+resumeDocument(event.mString, event.mPartIndex);
+break;
 case LOEvent.CLOSE:
 closeDocument();
 break;
diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java 
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 0eb326b..8325d5d 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -72,6 +72,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity {
 private ListView mDrawerList;
 private List mDocumentPartView = new 
ArrayList();
 private DocumentPartViewListAdapter mDocumentPartViewListAdapter;
+private int partIndex=-1;
 private File mInputFil

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

[Noel Grandin]

 compilerplugins/clang/refcounting.cxx  |2 
 toolkit/source/controls/grid/initguard.hxx |   56 -
 toolkit/source/controls/grid/sortablegriddatamodel.cxx |   18 -
 3 files changed, 14 insertions(+), 62 deletions(-)

New commits:
commit 978ff8f55cfa47b6ced80a6adc3d92327e0303f4
Author: Noel Grandin 
Date:   Fri Jan 13 11:58:14 2017 +0200

inline InitGuard

since it is only used in one place

Change-Id: Ie541a255ddbe71105f6b58f02f372f4f45667d7a

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index cc3a56b..ab34624 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -211,8 +211,6 @@ bool containsXInterfaceSubclass(const Type* pType0) {
 || dc.Class("mem_fun_t").StdNamespace()
 || dc.Class("mem_fun1_t").StdNamespace()
 || dc.Class("SwIterator").GlobalNamespace()
-|| (dc.Class("InitGuard").Namespace("toolkit")
-.GlobalNamespace())
 || (dc.Class("SharedUNOComponent").Namespace("utl")
 .GlobalNamespace())
 || (dc.Class("OAutoRegistration").Namespace("utl")
diff --git a/toolkit/source/controls/grid/initguard.hxx 
b/toolkit/source/controls/grid/initguard.hxx
deleted file mode 100644
index 75d84c0..000
--- a/toolkit/source/controls/grid/initguard.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_TOOLKIT_SOURCE_CONTROLS_GRID_INITGUARD_HXX
-#define INCLUDED_TOOLKIT_SOURCE_CONTROLS_GRID_INITGUARD_HXX
-
-#include 
-
-#include 
-
-
-namespace toolkit
-{
-
-
-//= InitGuard
-
-template < class IMPL >
-class InitGuard : public ::comphelper::ComponentGuard
-{
-public:
-InitGuard( IMPL& i_component, ::cppu::OBroadcastHelper & 
i_broadcastHelper )
-:comphelper::ComponentGuard( i_component, i_broadcastHelper )
-{
-if ( !i_component.isInitialized() )
-throw css::lang::NotInitializedException( OUString(), 
*&i_component );
-}
-
-~InitGuard()
-{
-}
-};
-
-
-} // namespace toolkit
-
-
-#endif // INCLUDED_TOOLKIT_SOURCE_CONTROLS_GRID_INITGUARD_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx 
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index af7898d..59463e8 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -17,13 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "initguard.hxx"
-
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -33,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -45,12 +45,11 @@ using namespace css::i18n;
 using namespace css::lang;
 using namespace css::ucb;
 using namespace css::uno;
-using namespace toolkit;
 
 namespace {
 
 class SortableGridDataModel;
-typedef InitGuard< SortableGridDataModel >  MethodGuard;
+class MethodGuard;
 
 typedef ::cppu::WeakComponentImplHelper<   
css::awt::grid::XSortableMutableGridDataModel
 ,   css::lang::XServiceInfo
@@ -197,6 +196,17 @@ private:
 ::std::vector< ::sal_Int32 >  
m_privateToPublicRowIndex;
 };
 
+class MethodGuard : public ::comphelper::ComponentGuard
+{
+public:
+MethodGuard( SortableGridDataModel& i_component, ::cppu::OBroadcastHelper 
& i_broadcastHelper )
+:comphelper::ComponentGuard( i_component, i_broadcastHelper )
+{
+if ( !i_component.isInitialized() )
+throw css::lang::NotInitializedException( OUString(), 
*&i_component );
+}
+};
+
 namespace
 {
 template< class STLCONTAINER >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https:/

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Samuel Mehrbrodt]

 instsetoo_native/CustomTarget_setup.mk |5 +
 scp2/source/ooo/common_brand.scp   |   18 --
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 53a3e0cd48075011e3c29070e8ff8585c02779c6
Author: Samuel Mehrbrodt 
Date:   Thu Jan 12 14:43:35 2017 +

Remove unused ini properties

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

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 2b9429c..3226cd6 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -34,10 +34,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,bootstrap) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
-   echo '[ErrorReport]' \
-   && echo 'ErrorReportPort=80' \
-   && echo 'ErrorReportServer=report.libreoffice.org' \
-   && echo '[Bootstrap]' \
+   echo '[Bootstrap]' \
&& echo 'InstallMode=' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
$(if $(ENABLE_RELEASE_BUILD),\
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1f88ada..7eb4e0e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -644,15 +644,6 @@ End
 
 // ProfileItems
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
-ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = "ErrorReport";
-Order = 8;
-Key = "ErrorReportServer";
-Value = "report.libreoffice.org";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
 ProfileID = gid_Brand_Profile_Bootstrap_Ini;
 ModuleID = gid_Module_Root_Brand;
@@ -662,15 +653,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
 Value = "";
 End
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Port
-ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = "ErrorReport";
-Order = 7;
-Key = "ErrorReportPort";
-Value = "80";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Installmode
 ProfileID = gid_Brand_Profile_Bootstrap_Ini;
 ModuleID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 rsc/source/parser/rscyacc.y |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a409ec6932c6bfeb5f5a931adb5b480755fe245b
Author: Caolán McNamara 
Date:   Fri Jan 13 09:16:44 2017 +

unused variables

Change-Id: I77a3fc5478a068530d9de4cc6962fe439169567e

diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index b3bdf56..25d39c5 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -39,8 +39,6 @@
 #include 
 
 ObjectStack S;
-static RscTop * pCurClass;
-static char szErrBuf[ 100 ];
 
 RSCINST GetVarInst( const RSCINST & rInst, const char * pVarName )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: test-bugzilla-files.py issues

[Nagy Ákos]

Can't solve the problem.

2017. 01. 12. 18:07 keltezéssel, Jan Iversen írta:
>
>> UnicodeDecodeError: 'utf-8' codec can't decode byte 0x83 in position 10:
>> invalid start byte
>
> I have frequently the same problem with differen python scripts on
> different machines. The problem is usually you locale setting.
>
> I added
> export*LANG=*''
> export*LC_ALL=*en_US.UTF-8
> export*LC_CTYPE=*en_US.UTF-8
>
> to .bashrc, and then the scripts I work.
>
> rgds
> jan I.
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice


-- 
Ákos

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

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - 89 commits - bin/symbolstore.py bin/upload_symbols.py cli_ure/Executable_climaker.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/

[Samuel Mehrbrodt]

 Makefile.fetch |1 
 Makefile.gbuild|3 
 Makefile.in|   13 
 Repository.mk  |2 
 RepositoryExternal.mk  |   24 
 bin/symbolstore.py |  644 +
 bin/upload_symbols.py  |   50 +
 cli_ure/Executable_climaker.mk |2 
 cli_ure/Library_cli_cppuhelper_native.mk   |1 
 cli_ure/Library_cli_uno.mk |1 
 config_host.mk.in  |2 
 config_host/config_features.h.in   |5 
 configure.ac   |   37 
 desktop/Executable_minidump_upload.mk  |   27 
 desktop/Library_crashreport.mk |   49 
 desktop/Library_sofficeapp.mk  |8 
 desktop/Module_desktop.mk  |4 
 desktop/StaticLibrary_minidump.mk  |   19 
 desktop/source/app/app.cxx |   68 +
 desktop/source/app/crashreport.cxx |  124 ++
 desktop/source/app/sofficemain.cxx |   64 +
 desktop/source/app/sofficemain.h   |2 
 desktop/source/inc/desktopdllapi.h |   24 
 desktop/source/minidump/minidump.cxx   |  207 
 desktop/source/minidump/minidump_upload.cxx|   32 
 desktop/source/pkgchk/unopkg/unopkg_app.cxx|2 
 desktop/source/pkgchk/unopkg/unopkg_main.h |2 
 distro-configs/LibreOfficeLinux.conf   |1 
 distro-configs/LibreOfficeWin32.conf   |1 
 distro-configs/LibreOfficeWin64.conf   |1 
 download.lst   |2 
 external/Module_external.mk|1 
 external/breakpad/ExternalProject_breakpad.mk  |   29 
 external/breakpad/Makefile |   14 
 external/breakpad/Module_breakpad.mk   |   26 
 external/breakpad/README   |   21 
 external/breakpad/StaticLibrary_breakpad.mk|   37 
 external/breakpad/UnpackedTarball_breakpad.mk  |   21 
 external/breakpad/breakpad-stackwalk.patch.1   |   32 
 external/breakpad/breakpad-use-correct-http-header.patch.1 |   14 
 external/breakpad/breakpad-wshadow.patch.1 |  232 
 external/breakpad/breakpad-wshadow2.patch.1|  144 ++
 external/libpng/configs/pnglibconf.h   |   37 
 framework/Library_fwk.mk   |2 
 framework/source/services/desktop.cxx  |   16 
 include/desktop/crashreport.hxx|   80 +
 include/desktop/dllapi.h   |   30 
 include/desktop/minidump.hxx   |   25 
 include/sal/config.h   |3 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx|3 
 sal/Library_sal.mk |1 
 sal/inc/internal/signalshared.hxx  |   42 
 sal/osl/all/signalshared.cxx   |  164 +++
 sal/osl/unx/signal.cxx |  215 
 sal/osl/w32/salinit.cxx|6 
 sal/osl/w32/signal.cxx |  257 -
 solenv/gbuild/extensions/pre_MergedLibsList.mk |1 
 solenv/gbuild/platform/com_MSC_defs.mk |2 
 svx/Library_svx.mk |7 
 svx/UIConfig_svx.mk|1 
 svx/source/dialog/crashreportdlg.cxx   |  100 ++
 svx/source/dialog/crashreportdlg.hxx   |   45 
 svx/source/dialog/crashreportui.cxx|  100 ++
 svx/uiconfig/ui/crashreportdlg.ui  |  118 ++
 svx/util/svx.component |4 
 vcl/Library_vcl.mk |2 
 vcl/opengl/win/WinDeviceInfo.cxx   |6 
 vcl/opengl/x11/X11DeviceInfo.cxx   |7 
 vcl/source/opengl/OpenGLHelper.cxx |3 
 vcl/source/window/builder.cxx  |6 
 70 files changed, 2838 insertions(+), 438 deletions(-)

New commits:
commit 747f5023c44d709cae8fb6f15306afd9480baff9
Author: Samuel Mehrbrodt 
Date:   Thu Jan 12 16:47:40 2017 +0100

Disa

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

[Rosemary Sebastian]

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

New commits:
commit 95cf7fa25d3b950e0cb576a1e864b54f1a43bc7a
Author: Rosemary Sebastian 
Date:   Fri Jan 13 09:41:14 2017 +0100

tdf#105272: fix wrong namespace URL

regression from f1dcb8b3e2e01848d44dd1beb82cd4e6e68a2acd

Change-Id: I088894711617bd762bf4e9352ddf6d850a5cbe7b

diff --git a/sc/source/filter/excel/xedbdata.cxx 
b/sc/source/filter/excel/xedbdata.cxx
index 7c9d48a..92cb15b 100644
--- a/sc/source/filter/excel/xedbdata.cxx
+++ b/sc/source/filter/excel/xedbdata.cxx
@@ -181,7 +181,7 @@ void XclExpTables::SaveTableXml( XclExpXmlStream& rStrm, 
const Entry& rEntry )
 rData.GetArea( aRange);
 sax_fastparser::FSHelperPtr& pTableStrm = rStrm.GetCurrentStream();
 pTableStrm->startElement( XML_table,
-XML_xmlns, 
XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(xls14Lst))).getStr(),
+XML_xmlns, 
XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(xls))).getStr(),
 XML_id, OString::number( rEntry.mnTableId).getStr(),
 XML_name, XclXmlUtils::ToOString( rData.GetName()).getStr(),
 XML_displayName, XclXmlUtils::ToOString( rData.GetName()).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sw/inc/EnhancedPDFExportHelper.hxx  |2 -
 sw/inc/anchoreddrawobject.hxx   |4 +--
 sw/inc/calc.hxx |2 -
 sw/inc/cellfml.hxx  |2 -
 sw/inc/dpage.hxx|4 +--
 sw/inc/expfld.hxx   |6 ++---
 sw/inc/fmtcntnt.hxx |4 +--
 sw/inc/fmturl.hxx   |7 +++---
 sw/inc/list.hxx |3 +-
 sw/inc/ndnotxt.hxx  |2 -
 sw/inc/numrule.hxx  |2 -
 sw/inc/redline.hxx  |6 ++---
 sw/inc/shellio.hxx  |2 -
 sw/source/core/access/accportions.cxx   |3 --
 sw/source/core/access/accportions.hxx   |2 -
 sw/source/core/bastyp/calc.cxx  |   13 +---
 sw/source/core/crsr/findattr.cxx|8 +++
 sw/source/core/doc/doccomp.cxx  |   17 +++-
 sw/source/core/doc/docfld.cxx   |   13 +---
 sw/source/core/doc/docredln.cxx |   18 ++---
 sw/source/core/doc/htmltbl.cxx  |   11 --
 sw/source/core/doc/list.cxx |1 
 sw/source/core/doc/number.cxx   |   15 ++
 sw/source/core/docnode/ndnotxt.cxx  |   15 +-
 sw/source/core/draw/dpage.cxx   |   12 ---
 sw/source/core/edit/acorrect.cxx|8 ++-
 sw/source/core/fields/cellfml.cxx   |3 --
 sw/source/core/fields/fldlst.cxx|3 --
 sw/source/core/inc/UndoNumbering.hxx|6 ++---
 sw/source/core/inc/acorrect.hxx |2 -
 sw/source/core/inc/objectformatter.hxx  |3 +-
 sw/source/core/inc/swblocks.hxx |3 +-
 sw/source/core/inc/swfont.hxx   |7 +++---
 sw/source/core/inc/txtfly.hxx   |   12 +--
 sw/source/core/layout/anchoreddrawobject.cxx|4 ---
 sw/source/core/layout/atrfrm.cxx|   25 ++--
 sw/source/core/layout/layouter.cxx  |   15 ++
 sw/source/core/layout/objectformatter.cxx   |1 
 sw/source/core/swg/swblocks.cxx |5 +---
 sw/source/core/text/EnhancedPDFExportHelper.cxx |4 ---
 sw/source/core/text/atrhndl.hxx |4 +--
 sw/source/core/text/atrstck.cxx |4 ---
 sw/source/core/text/frmpaint.cxx|   10 -
 sw/source/core/text/guess.cxx   |2 -
 sw/source/core/text/guess.hxx   |6 ++---
 sw/source/core/text/inftxt.cxx  |5 +---
 sw/source/core/text/inftxt.hxx  |2 -
 sw/source/core/text/pormulti.cxx|6 +
 sw/source/core/text/pormulti.hxx|4 +--
 sw/source/core/text/redlnitr.cxx|5 +---
 sw/source/core/text/redlnitr.hxx|   10 -
 sw/source/core/text/txtcache.cxx|   10 ++---
 sw/source/core/text/txtcache.hxx|9 
 sw/source/core/text/txtfly.cxx  |   15 +++---
 sw/source/core/txtnode/swfont.cxx   |   19 +-
 sw/source/core/undo/unnum.cxx   |3 --
 56 files changed, 166 insertions(+), 223 deletions(-)

New commits:
commit a706bb06d5326e7a997dd1d71f3f947bd0ad28e6
Author: Noel Grandin 
Date:   Wed Jan 11 14:26:47 2017 +0200

new loplugin: useuniqueptr: sw part 1

Change-Id: I2bc55634e80976951ede768c97fbc4b7c4eda46c
Reviewed-on: https://gerrit.libreoffice.org/32963
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index c1d3e30..0aab233 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -196,7 +196,7 @@ class SwEnhancedPDFExportHelper
 SwEditShell& mrSh;
 OutputDevice& mrOut;
 
-StringRangeEnumerator* mpRangeEnum;
+std::unique_ptr mpRangeEnum;
 /** The problem is that numbers in StringRangeEnumerator aren't accordant
  * to real page numbers if mbSkipEmptyPages is true, because in this case
  * empty pages are excluded from a page range and numbers in
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 1e63888..38561d7 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public 
SwAnchoredObject
 bool mbValidPos;
 
 // rectangle, keeping the last object rectangle after the positioning
-Rectangle* mpLastObjRect;
+std::unique_ptr mpLastObjRect;
 
 // boolean, indicati