date:20170107

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

2017-01-07 Thread Tamás Zolnai

 sc/source/core/data/dpobject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ad86820a2bc99ede49875f8b03d6e64624e7b5f4
Author: TamÃ¡s Zolnai 
Date:   Sun Jan 8 05:04:19 2017 +0100

PivotTable: Avoid adding useless 'Data' column field to table layout

Layout dialog adds this column field by default, but it has
no actual meaning or functionality. It must be added because
of this broken logic here (adding a field only when its hidden?).
This 'Data' field must be related to OOXML format see
OOX_PT_DATALAYOUTFIELD, but might be deprecated actually.

Change-Id: I90f00ef6290b343f84e40e5c94fd0e29a328329b

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index ab220f1..e9b321b 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2308,7 +2308,7 @@ void ScDPObject::FillOldParam(ScPivotParam& rParam) const
 rParam.nTab = aOutRange.aStart.Tab();
 // ppLabelArr / nLabels is not changed
 
-bool bAddData = ( lcl_GetDataGetOrientation( xSource ) == 
sheet::DataPilotFieldOrientation_HIDDEN );
+bool bAddData = ( lcl_GetDataGetOrientation( xSource ) != 
sheet::DataPilotFieldOrientation_HIDDEN );
 lcl_FillOldFields(
 rParam.maPageFields, xSource, sheet::DataPilotFieldOrientation_PAGE, 
false);
 lcl_FillOldFields(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/statistical/fods/rank.avg.fods |  165 
 sc/qa/unit/data/functions/statistical/fods/rank.eq.fods  | 5077 +++
 sc/qa/unit/data/functions/statistical/fods/rsq.fods  | 6494 +++
 3 files changed, 11612 insertions(+), 124 deletions(-)

New commits:
commit 26a5f7d7c2c3fe4a3f3b00b17e0b5a0e4a0880a5
Author: ZdenÄk Crhonek 
Date:   Wed Jan 4 17:44:25 2017 +0100

add RANK.EQ, RSQ; repair RANK.AVG test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/rank.avg.fods 
b/sc/qa/unit/data/functions/statistical/fods/rank.avg.fods
index e57dcf3..9349e19 100644
--- a/sc/qa/unit/data/functions/statistical/fods/rank.avg.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/rank.avg.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2017-01-02T17:08:56.214262084P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/ea860d52ade14b4a16289c81a0f8586799c6617f
+ 
2017-01-02T17:08:56.214262084P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/9fb55f7b1de8be1c3f86a4ae540f648574d3ed45
  
   
0
0
83853
-   9295
+   9211

 
  view1
@@ -31,7 +31,7 @@
false
   
   
-   4
+   1
1
0
0
@@ -132,7 +132,7 @@
true
1
true
-   lgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAtwAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   sgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=
false
0
   
@@ -3332,50 +3332,6 @@
   

   
-  
-   
-   
-   
-  
-  
-   
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-   
-   
-   
-  
-  
-   
-   
-   
-   
-   
-  
-  
-   
-   
-   
-   
-   
-  
-  
-   
-   
-  
-  
-   
-   
-   
-  
   


@@ -3490,6 +3446,10 @@


   
+  
+   
+   
+  
   


@@ -3591,7 +3551,7 @@
  ??? 
(???)
 
 
- 00/00/, 00:00:00
+ 00/00/, 00:00:00
 


@@ -3780,15 +3740,7 @@
   Data 
  
  
- 
-  start time
- 
- 
-  finish time
- 
- 
-  ti

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 841 commits - accessibility/inc accessibility/source android/Bootstrap android/source apple_remote/Library_AppleRemote.mk apple_remot

2017-01-07 Thread Douglas Mencken

Rebased ref, commits from common ancestor:
commit 81f41219174acae1091c994e477a5529a5c5b2ac
Author: Douglas Mencken 
Date:   Sat Jan 7 20:06:53 2017 -0500

external/harfbuzz: compatibility with OS X Leopard

  add reference to kCTTypesetterOptionForcedEmbeddingLevel
  kCTFontURLAttribute is not here prior to 10.6

Change-Id: Iaecaf30c97730b6dc7482766782f8faf67c00266

diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 888251f..9fbd744 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/ubsan.patch \
 external/harfbuzz/clang-cl.patch \
+external/harfbuzz/kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch \
+external/harfbuzz/kCTFontURLAttribute-Leopard.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/kCTFontURLAttribute-Leopard.patch 
b/external/harfbuzz/kCTFontURLAttribute-Leopard.patch
new file mode 100644
index 000..7797c57
--- /dev/null
+++ b/external/harfbuzz/kCTFontURLAttribute-Leopard.patch
@@ -0,0 +1,45 @@
+--- src/hb-coretext.cc
 src/hb-coretext.cc
+@@ -161,7 +161,19 @@
+   return ct_font;
+   }
+ 
+-  CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, 
kCTFontURLAttribute);
++  CFURLRef original_url = nullptr;
++  //original_url = (CFURLRef)CTFontCopyAttribute(ct_font, 
kCTFontURLAttribute);
++  /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6,
++ so letâs go CTFont -> ATSFont -> FSRef -> CFURL */
++  {
++  ATSFontRef atsFont = CTFontGetPlatformFont( ct_font, nullptr );
++  if ( atsFont ) {
++FSRef fsref;
++OSStatus code = ATSFontGetFileReference( atsFont, &fsref );
++if ( code == noErr )
++  original_url = CFURLCreateFromFSRef( nullptr, &fsref );
++  }
++  }
+ 
+   /* Create font copy with cascade list that has LastResort first; this 
speeds up CoreText
+* font fallback which we don't need anyway. */
+@@ -180,7 +192,20 @@
+* system locations that we cannot access from the sandboxed renderer
+* process in Blink. This can be detected by the new file URL location
+* that the newly found font points to. */
+-  CFURLRef new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, 
kCTFontURLAttribute);
++
++  CFURLRef new_url = nullptr;
++  //new_url = (CFURLRef) CTFontCopyAttribute (new_ct_font, 
kCTFontURLAttribute);
++  /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6 */
++  {
++  ATSFontRef atsFont = CTFontGetPlatformFont( new_ct_font, nullptr );
++  if ( atsFont ) {
++FSRef fsref;
++OSStatus code = ATSFontGetFileReference( atsFont, &fsref );
++if ( code == noErr )
++  new_url = CFURLCreateFromFSRef( nullptr, &fsref );
++  }
++  }
++
+   // Keep reconfigured font if URL cannot be retrieved (seems to be the 
case
+   // on Mac OS 10.12 Sierra), speculative fix for crbug.com/625606
+   if (!original_url || !new_url || CFEqual (original_url, new_url)) {
diff --git 
a/external/harfbuzz/kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch 
b/external/harfbuzz/kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch
new file mode 100644
index 000..4fffb9c
--- /dev/null
+++ b/external/harfbuzz/kCTTypesetterOptionForcedEmbeddingLevel-Leopard.patch
@@ -0,0 +1,13 @@
+--- src/hb-coretext.cc
 src/hb-coretext.cc
+@@ -749,6 +749,8 @@
+ 
+   int level = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1;
+   CFNumberRef level_number = CFNumberCreate (kCFAllocatorDefault, 
kCFNumberIntType, &level);
++/* Marked as available in version 10.5 and later, but not in the header until 
SDK 10.6 */
++  extern const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel;
+   CFDictionaryRef options = CFDictionaryCreate (kCFAllocatorDefault,
+   (const void **) 
&kCTTypesetterOptionForcedEmbeddingLevel,
+   (const void **) 
&level_number,
+
+Diff finished.  Mon Dec 15 16:56:50 2014
commit 2a94afc5d4c9f145aaffe418bf220c4110e9
Author: Douglas Mencken 
Date:   Sat Jan 7 18:25:35 2017 -0500

Revert "curl: upgrade to version 7.51.0"

commit 3edb365f2651848ae8bc3b85bf0b56bd00d93270

diff --git a/download.lst b/download.lst
index c28b972..225ad93 100644
--- a/download.lst
+++ b/download.lst
@@ -24,8 +24,8 @@ export COLLADA2GLTF_TARBALL := 
4b87018f7fff1d054939d19920b751a0-collada2gltf-mas
 export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01
 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_MD5SU

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

2017-01-07 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/statistical/fods/skew.fods  | 6880 
 sc/qa/unit/data/functions/statistical/fods/slope.fods | 7286 ++
 2 files changed, 14166 insertions(+)

New commits:
commit 97d6e58fd8cceed862eb93f9c8195316cf0d04e3
Author: ZdenÄk Crhonek 
Date:   Sat Jan 7 09:23:25 2017 +0100

add SLOPE test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/slope.fods 
b/sc/qa/unit/data/functions/statistical/fods/slope.fods
new file mode 100644
index 000..672be8f
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/slope.fods
@@ -0,0 +1,7286 @@
+
+
+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
+   82301
+   56504
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   0
+   7
+   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Ä
+  
+  
+   -
+   
+

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

2017-01-07 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/text/fods/upper.fods | 1377 
 sc/qa/unit/data/functions/text/fods/value.fods | 1384 +
 2 files changed, 2761 insertions(+)

New commits:
commit f79f5cb14c6d5b55ad0cc694a05a3da64835b645
Author: ZdenÄk Crhonek 
Date:   Wed Jan 4 19:04:18 2017 +0100

add UPPER and VALUE test case

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

diff --git a/sc/qa/unit/data/functions/text/fods/upper.fods 
b/sc/qa/unit/data/functions/text/fods/upper.fods
new file mode 100644
index 000..0f3f372
--- /dev/null
+++ b/sc/qa/unit/data/functions/text/fods/upper.fods
@@ -0,0 +1,1377 @@
+
+
+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/9fb55f7b1de8be1c3f86a4ae540f648574d3ed45
+ 
+  
+   0
+   0
+   28589
+   4520
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+  
+   1
+   11
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   85
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 85
+ 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+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+

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

2017-01-07 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/financial/fods/amorlinc.fods | 1929 +
 1 file changed, 1929 insertions(+)

New commits:
commit f4cd26a42996d2f74dbbca5295389cb7f0a2a7c4
Author: ZdenÄk Crhonek 
Date:   Sat Jan 7 09:52:36 2017 +0100

add AMORLINC testcase

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

diff --git a/sc/qa/unit/data/functions/financial/fods/amorlinc.fods 
b/sc/qa/unit/data/functions/financial/fods/amorlinc.fods
new file mode 100644
index 000..d9dbff1
--- /dev/null
+++ b/sc/qa/unit/data/functions/financial/fods/amorlinc.fods
@@ -0,0 +1,1929 @@
+
+
+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-07T09:50:28.299457032P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/92a1ad1f36b6d3cc13135a8c0805508933011577
+ 
+  
+   0
+   0
+   61598
+   16333
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   90
+   60
+   true
+   false
+  
+  
+   2
+   27
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   11
+   0
+   90
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 90
+ 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
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rgH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+
+   
+
+  
+  
+
+
+   (
+   
+   )
+  
+  
+
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   -
+   Â£
+   
+   
+  
+  
+   Â£
+   
+  
+  
+   
+   -
+   Â£
+   
+   
+  
+  
+

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

2017-01-07 Thread kerem

 sc/qa/unit/ucalc_sharedformula.cxx |  209 -
 1 file changed, 69 insertions(+), 140 deletions(-)

New commits:
commit 4d968302479531f7b9ba0f9c35b2efe0dbe39f50
Author: kerem 
Date:   Sat Jan 7 00:57:15 2017 +0200

tdf#90290 use custom asserter in ucalc_sharedformula.cxx

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

diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index a66a093..f5e03c7 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -286,12 +286,9 @@ void Test::testSharedFormulasRefUpdate()
 insertRangeData(m_pDoc, ScAddress(1,0,0), pData, 
SAL_N_ELEMENTS(pData));
 }
 
-if (!checkFormula(*m_pDoc, ScAddress(1,0,0), "A10"))
-CPPUNIT_FAIL("Wrong formula in B1");
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "A11"))
-CPPUNIT_FAIL("Wrong formula in B2");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "A12"))
-CPPUNIT_FAIL("Wrong formula in B3");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,0,0), "A10", "Wrong formula in 
B1");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), "A11", "Wrong formula in 
B2");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in 
B3");
 
 const ScFormulaCell* pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0));
 CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && 
pFC->IsShared());
@@ -300,12 +297,9 @@ void Test::testSharedFormulasRefUpdate()
 
 // Insert cells over A11:B11 to shift to right. This should split the 
B1:B3 grouping into 3.
 m_pDoc->InsertCol(ScRange(0,10,0,1,10,0));
-if (!checkFormula(*m_pDoc, ScAddress(1,0,0), "A10"))
-CPPUNIT_FAIL("Wrong formula in B1");
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "C11"))
-CPPUNIT_FAIL("Wrong formula in B2");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "A12"))
-CPPUNIT_FAIL("Wrong formula in B3");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,0,0), "A10", "Wrong formula in 
B1");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), "C11", "Wrong formula in 
B2");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in 
B3");
 
 pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0));
 CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && 
!pFC->IsShared());
@@ -317,12 +311,9 @@ void Test::testSharedFormulasRefUpdate()
 // Delete cells over A11:B11 to bring it back to the previous state.
 m_pDoc->DeleteCol(ScRange(0,10,0,1,10,0));
 
-if (!checkFormula(*m_pDoc, ScAddress(1,0,0), "A10"))
-CPPUNIT_FAIL("Wrong formula in B1");
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "A11"))
-CPPUNIT_FAIL("Wrong formula in B2");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "A12"))
-CPPUNIT_FAIL("Wrong formula in B3");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,0,0), "A10", "Wrong formula in 
B1");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), "A11", "Wrong formula in 
B2");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12", "Wrong formula in 
B3");
 
 pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0));
 CPPUNIT_ASSERT_MESSAGE("This must be a shared formula cell.", pFC && 
pFC->IsShared());
@@ -331,12 +322,9 @@ void Test::testSharedFormulasRefUpdate()
 
 // Insert cells over A11:A12 and shift down.
 m_pDoc->InsertRow(ScRange(0,10,0,0,11,0));
-if (!checkFormula(*m_pDoc, ScAddress(1,0,0), "A10"))
-CPPUNIT_FAIL("Wrong formula in B1");
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "A13"))
-CPPUNIT_FAIL("Wrong formula in B2");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "A14"))
-CPPUNIT_FAIL("Wrong formula in B3");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,0,0), "A10", "Wrong formula in 
B1");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), "A13", "Wrong formula in 
B2");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A14", "Wrong formula in 
B3");
 
 pFC = m_pDoc->GetFormulaCell(ScAddress(1,0,0));
 CPPUNIT_ASSERT_MESSAGE("B1 should be a non-shared formula cell.", pFC && 
!pFC->IsShared());
@@ -348,12 +336,9 @@ void Test::testSharedFormulasRefUpdate()
 // Delete A11:A12 to bring it back to the way it was.
 m_pDoc->DeleteRow(ScRange(0,10,0,0,11,0));
 
-if (!checkFormula(*m_pDoc, ScAddress(1,0,0), "A10"))
-CPPUNIT_FAIL("Wrong formula in B1");
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "A11"))
-CPPUNIT_FAIL("Wrong formula in B2");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "A12"))
-CPPUNIT_FAIL("Wrong formula in B3");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,0,0), "A10", "Wrong formula in 
B1");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), "A11", "Wrong formula in 
B2");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), "A12",

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

2017-01-07 Thread Khaled Hosny

 vcl/inc/win/salgdi.h  |1 -
 vcl/inc/win/winlayout.hxx |   16 
 vcl/win/gdi/salfont.cxx   |   12 ++--
 vcl/win/gdi/winlayout.cxx |   34 --
 4 files changed, 10 insertions(+), 53 deletions(-)

New commits:
commit d1bad9c12d61c9f662abe6439b87a057bb54c8ca
Author: Khaled Hosny 
Date:   Mon Jan 2 01:22:32 2017 +0200

Simplify setting Kashida width on Windows

This should also make sure we are getting it from the current font, which
the old, convoluted way does not seem to guarantee.

Change-Id: If0a4cf18e472b1489115eeb7b1b2bdbb5f13abb0
Reviewed-on: https://gerrit.libreoffice.org/32595
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index d974e76..f6faf4a 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -376,7 +376,6 @@ public:
 bool bVertical,
 std::vector< sal_Int32 >& rWidths,
 Ucs2UIntMap& rUnicodeEnc ) 
override;
-int GetMinKashidaWidth();
 
 virtual boolGetGlyphBoundRect(const GlyphItem&, Rectangle&) 
override;
 virtual boolGetGlyphOutline(const GlyphItem&, 
basegfx::B2DPolyPolygon&) override;
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index d339df3..ecd25746 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -157,18 +157,6 @@ public:
 private:
 // TODO: also add HFONT??? Watch out for issues with too many active 
fonts...
 
-public:
-SCRIPT_CACHE&   GetScriptCache() const
-{ return maScriptCache; }
-private:
-mutable SCRIPT_CACHEmaScriptCache;
-
-public:
-boolInitKashidaHandling( HDC );
-int GetMinKashidaWidth() const { return 
mnMinKashidaWidth; }
-int GetMinKashidaGlyph() const { return 
mnMinKashidaGlyph; }
-
-private:
 GlyphCache maGlyphCache;
 public:
 bool CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, SalGraphics& 
rGraphics);
@@ -177,10 +165,6 @@ public:
 {
 return maGlyphCache;
 }
-
-private:
-mutable int mnMinKashidaWidth;
-mutable int mnMinKashidaGlyph;
 };
 
 class TextOutRenderer
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index b8da03d..9860d5f 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -980,6 +980,16 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& 
rxFontMetric, int nFa
 const RawFontData aHheaRawData(getHDC(), nHheaTag);
 const RawFontData aOS2RawData(getHDC(), nOS2Tag);
 
+WCHAR nKashidaCh = 0x0640;
+WORD nKashidaGid;
+DWORD ret = GetGlyphIndicesW(getHDC(), &nKashidaCh, 1, &nKashidaGid, 
GGI_MARK_NONEXISTING_GLYPHS);
+if (ret != GDI_ERROR && nKashidaGid != 0x)
+{
+int nKashidaWidth = 0;
+if (GetCharWidthI(getHDC(), nKashidaGid, 1, nullptr, &nKashidaWidth))
+rxFontMetric->SetMinKashida(nKashidaWidth);
+}
+
 // get the font metric
 OUTLINETEXTMETRICW aOutlineMetric;
 const bool bOK = GetOutlineTextMetricsW(getHDC(), 
sizeof(OUTLINETEXTMETRICW), &aOutlineMetric);
@@ -1004,8 +1014,6 @@ void WinSalGraphics::GetFontMetric( 
ImplFontMetricDataRef& rxFontMetric, int nFa
 const std::vector rHhea(aHheaRawData.get(), aHheaRawData.get() + 
aHheaRawData.size());
 const std::vector rOS2(aOS2RawData.get(), aOS2RawData.get() + 
aOS2RawData.size());
 rxFontMetric->ImplCalcLineSpacing(rHhea, rOS2, aOutlineMetric.otmEMSquare);
-
-rxFontMetric->SetMinKashida( GetMinKashidaWidth() );
 }
 
 const FontCharMapRef WinSalGraphics::GetFontCharMap() const
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 04724d8..6436c61 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -596,14 +596,6 @@ SalLayout* WinSalGraphics::GetTextLayout(ImplLayoutArgs& 
/*rArgs*/, int nFallbac
 return new CommonSalLayout(getHDC(), *mpWinFontEntry[nFallbackLevel], 
*mpWinFontData[nFallbackLevel]);
 }
 
-intWinSalGraphics::GetMinKashidaWidth()
-{
-if( !mpWinFontEntry[0] )
-return 0;
-mpWinFontEntry[0]->InitKashidaHandling( getHDC() );
-return mpWinFontEntry[0]->GetMinKashidaWidth();
-}
-
 LogicalFontInstance * WinSalGraphics::GetWinFontEntry(int const nFallbackLevel)
 {
 return mpWinFontEntry[nFallbackLevel];
@@ -611,37 +603,11 @@ LogicalFontInstance * WinSalGraphics::GetWinFontEntry(int 
const nFallbackLevel)
 
 WinFontInstance::WinFontInstance( FontSelectPattern& rFSD )
 :   LogicalFontInstance( rFSD )
-,mnMinKashidaWidth( -1 )
-,mnMinKashidaGlyph( -1 )
 {
-maScriptCache = nullptr;
 }
 
 WinFontInstance::~WinFontInstance()
 {
-if( maScriptCache != nullptr )
-ScriptFreeCache( &maScriptCache

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

2017-01-07 Thread kerem

 sc/qa/unit/ucalc_sort.cxx |   99 +++---
 1 file changed, 33 insertions(+), 66 deletions(-)

New commits:
commit 9aea56370ae78a43c3543159571ea0454c1619eb
Author: kerem 
Date:   Sat Jan 7 23:49:42 2017 +0200

tdf#90290 use custom asserter in ucalc_sort.cxx

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

diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx
index 7ec786d..b24a3da 100644
--- a/sc/qa/unit/ucalc_sort.cxx
+++ b/sc/qa/unit/ucalc_sort.cxx
@@ -182,12 +182,9 @@ void Test::testSortHorizontal()
 CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess);
 }
 
-if (!checkFormula(*m_pDoc, ScAddress(1,1,0), "CONCATENATE(C2;\"-\";D2)"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), "CONCATENATE(C3;\"-\";D3)"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(1,3,0), "CONCATENATE(C4;\"-\";D4)"))
-CPPUNIT_FAIL("Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,1,0), 
"CONCATENATE(C2;\"-\";D2)", "Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,2,0), 
"CONCATENATE(C3;\"-\";D3)", "Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,3,0), 
"CONCATENATE(C4;\"-\";D4)", "Wrong formula!");
 
 m_pDoc->DeleteTab(0);
 }
@@ -763,8 +760,7 @@ void Test::testSortRefUpdate()
 }
 
 // C2 should now point to A4.
-if (!checkFormula(*m_pDoc, ScAddress(2,1,0), "R[2]C[-2]"))
-CPPUNIT_FAIL("Wrong formula in C2!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,1,0), "R[2]C[-2]", "Wrong 
formula in C2!");
 
 // Undo the sort.
 SfxUndoManager* pUndoMgr = m_pDoc->GetUndoManager();
@@ -787,8 +783,7 @@ void Test::testSortRefUpdate()
 }
 
 // C2 should now point to A2.
-if (!checkFormula(*m_pDoc, ScAddress(2,1,0), "RC[-2]"))
-CPPUNIT_FAIL("Wrong formula in C2!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,1,0), "RC[-2]", "Wrong formula 
in C2!");
 
 // Redo.
 pUndoMgr->Redo();
@@ -809,8 +804,7 @@ void Test::testSortRefUpdate()
 }
 
 // C2 should now point to A4.
-if (!checkFormula(*m_pDoc, ScAddress(2,1,0), "R[2]C[-2]"))
-CPPUNIT_FAIL("Wrong formula in C2!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,1,0), "R[2]C[-2]", "Wrong 
formula in C2!");
 
 // Undo again.
 pUndoMgr->Undo();
@@ -913,8 +907,7 @@ void Test::testSortRefUpdate2()
 // Formulas in column B should still point to their respective left 
neighbor cell.
 for (SCROW i = 1; i <= 4; ++i)
 {
-if (!checkFormula(*m_pDoc, ScAddress(1,i,0), "RC[-1]"))
-CPPUNIT_FAIL("Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(1,i,0), "RC[-1]", "Wrong 
formula!");
 }
 
 // Undo and check the result in column B.
@@ -994,12 +987,9 @@ void Test::testSortRefUpdate3()
 CPPUNIT_ASSERT_EQUAL(12.0, m_pDoc->GetValue(ScAddress(0,5,0)));
 
 // Make sure the formula cells have been adjusted correctly.
-if (!checkFormula(*m_pDoc, ScAddress(0,3,0), "A2+A3"))
-CPPUNIT_FAIL("Wrong formula in A4.");
-if (!checkFormula(*m_pDoc, ScAddress(0,4,0), "A2+10"))
-CPPUNIT_FAIL("Wrong formula in A5.");
-if (!checkFormula(*m_pDoc, ScAddress(0,5,0), "A3+10"))
-CPPUNIT_FAIL("Wrong formula in A6.");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(0,3,0), "A2+A3", "Wrong formula in 
A4.");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(0,4,0), "A2+10", "Wrong formula in 
A5.");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(0,5,0), "A3+10", "Wrong formula in 
A6.");
 
 // Undo and check the result.
 SfxUndoManager* pUndoMgr = m_pDoc->GetUndoManager();
@@ -1405,12 +1395,9 @@ void Test::testSortRefUpdate6()
 }
 
 // Make sure that the formulas in C2:C4 are not adjusted.
-if (!checkFormula(*m_pDoc, ScAddress(2,1,0), "C1+B2"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(2,2,0), "C2+B3"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(2,3,0), "C3+B4"))
-CPPUNIT_FAIL("Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,1,0), "C1+B2", "Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,2,0), "C2+B3", "Wrong formula!");
+ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(2,3,0), "C3+B4", "Wrong formula!");
 
 // Undo and check.
 SfxUndoManager* pUndoMgr = m_pDoc->GetUndoManager();
@@ -1542,22 +1529,14 @@ void Test::testSortBroadcaster()
 }
 
 // Make sure that the formulas in D1:G2 are not adjusted.
-if (!checkFormula(*m_pDoc, ScAddress(3,0,0), "B1"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(3,1,0), "B2"))
-CPPUNIT_FAIL("Wrong formula!");
-if (!checkFormula(*m_pDoc, ScAddress(4,0,0), "$B$1"))
-

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

2017-01-07 Thread Kohei Yoshida

 package/inc/HashMaps.hxx   |8 
 package/inc/ZipPackageFolder.hxx   |3 +--
 package/source/zippackage/ContentInfo.hxx  |   13 ++---
 package/source/zippackage/ZipPackageFolder.cxx |   18 ++
 4 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 4f24613db3fb36d9d7c97026b93819d457754d46
Author: Kohei Yoshida 
Date:   Sat Jan 7 19:40:36 2017 -0500

Rename css::packages::ContentInfo to just ZipContentInfo.

And use std::unique_ptr not rtl::Reference.  This is not a UNO object
anyway...

Change-Id: If43da4f7e0f478b9ad8d62e5f43f04f035c31717
Reviewed-on: https://gerrit.libreoffice.org/32828
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/package/inc/HashMaps.hxx b/package/inc/HashMaps.hxx
index f3d0c65..e83a948 100644
--- a/package/inc/HashMaps.hxx
+++ b/package/inc/HashMaps.hxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 
+#include 
+
 struct eqFunc
 {
 bool operator()( const OUString &r1,
@@ -33,9 +35,7 @@ struct eqFunc
 };
 
 class ZipPackageFolder;
-namespace com { namespace sun { namespace star { namespace packages {
-class ContentInfo;
-} } } }
+struct ZipContentInfo;
 
 typedef std::unordered_map < OUString,
 ZipPackageFolder *,
@@ -43,7 +43,7 @@ typedef std::unordered_map < OUString,
 eqFunc > FolderHash;
 
 typedef std::unordered_map < OUString,
-rtl::Reference < css::packages::ContentInfo >,
+std::unique_ptr,
 OUStringHash,
 eqFunc > ContentHash;
 
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 916c824..1b0cee3 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -59,8 +59,7 @@ public:
 void doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent )
 throw(css::lang::IllegalArgumentException, 
css::container::ElementExistException, css::lang::WrappedTargetException, 
css::uno::RuntimeException);
 
-css::packages::ContentInfo & doGetByName( const OUString& aName )
-throw(css::container::NoSuchElementException, 
css::lang::WrappedTargetException, css::uno::RuntimeException);
+ZipContentInfo& doGetByName( const OUString& aName );
 
 static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource);
 static css::uno::Sequence < sal_Int8 > static_getImplementationId();
diff --git a/package/source/zippackage/ContentInfo.hxx 
b/package/source/zippackage/ContentInfo.hxx
index 89036874..a3e34de 100644
--- a/package/source/zippackage/ContentInfo.hxx
+++ b/package/source/zippackage/ContentInfo.hxx
@@ -24,10 +24,8 @@
 #include 
 #include 
 
-namespace com { namespace sun { namespace star { namespace packages {
-class ContentInfo : public cppu::OWeakObject
+struct ZipContentInfo
 {
-public:
 css::uno::Reference < css::lang::XUnoTunnel > xTunnel;
 bool bFolder;
 union
@@ -35,19 +33,20 @@ public:
 ZipPackageFolder *pFolder;
 ZipPackageStream *pStream;
 };
-ContentInfo ( ZipPackageStream * pNewStream )
+ZipContentInfo ( ZipPackageStream * pNewStream )
 : xTunnel ( pNewStream )
 , bFolder ( false )
 , pStream ( pNewStream )
 {
 }
-ContentInfo ( ZipPackageFolder * pNewFolder )
+ZipContentInfo ( ZipPackageFolder * pNewFolder )
 : xTunnel ( pNewFolder )
 , bFolder ( true )
 , pFolder ( pNewFolder )
 {
 }
-virtual ~ContentInfo () override
+
+~ZipContentInfo()
 {
 if ( bFolder )
 pFolder->clearParent();
@@ -55,7 +54,7 @@ public:
 pStream->clearParent();
 }
 };
-} } } }
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/zippackage/ZipPackageFolder.cxx 
b/package/source/zippackage/ZipPackageFolder.cxx
index 992f82b..22d18ce 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -37,6 +37,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace com::sun::star;
 using namespace com::sun::star::packages::zip::ZipConstants;
 using namespace com::sun::star::packages::zip;
@@ -86,7 +88,7 @@ bool ZipPackageFolder::LookForUnexpectedODF12Streams( const 
OUString& aPath )
   ++aCI)
 {
 const OUString &rShortName = (*aCI).first;
-const ContentInfo &rInfo = *(*aCI).second;
+const ZipContentInfo &rInfo = *(*aCI).second;
 
 if ( rInfo.bFolder )
 {
@@ -143,7 +145,7 @@ void ZipPackageFolder::setChildStreamsTypeByExtension( 
const beans::StringPair&
   ++aCI)
 {
 const OUString &rShortName = (*aCI).first;
-const ContentInfo &rInfo = *(*aCI).second;
+const ZipContentInfo &rInfo = *(*aCI).second;
 
 if ( rInfo.bFolder )
 rInfo.pFolder->setChildStreamsTypeByExtension( aPair );
@@ -238,14 +240,14 @@ sal_Bool S

CppCheck Report Update

2017-01-07 Thread cppcheck.libreoff...@gmail.com


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


Note:
The script generating this report was run at :
2017-08-01_02:35:32 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

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


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

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

2017-01-07 Thread Kohei Yoshida

 package/source/zippackage/ZipPackage.cxx |   52 ---
 1 file changed, 34 insertions(+), 18 deletions(-)

New commits:
commit 7c117c508c1eaa5c930481fb82c21fee6d71af0c
Author: Kohei Yoshida 
Date:   Sat Jan 7 19:22:48 2017 -0500

Clean up and annotate the code a bit.

Change-Id: I5f0c6130e5cf21f93bb1309f7bf148bd40b3821d
Reviewed-on: https://gerrit.libreoffice.org/32827
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index 3c6eb48..c550321 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -777,49 +777,62 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const 
OUString& aName )
 throw( NoSuchElementException, RuntimeException, std::exception )
 {
 OUString sTemp, sDirName;
-sal_Int32 nOldIndex, nIndex, nStreamIndex;
+sal_Int32 nOldIndex, nStreamIndex;
 FolderHash::iterator aIter;
 
-if ( ( nIndex = aName.getLength() ) == 1 && *aName.getStr() == '/' )
+sal_Int32 nIndex = aName.getLength();
+
+if (aName == "/")
+// root directory.
 return makeAny ( uno::Reference < XUnoTunnel > ( m_pRootFolder ) );
 
 nStreamIndex = aName.lastIndexOf ( '/' );
-bool bFolder = nStreamIndex == nIndex-1;
+bool bFolder = nStreamIndex == nIndex-1; // last character is '/'.
+
 if ( nStreamIndex != -1 )
 {
+// The name contains '/'.
 sDirName = aName.copy ( 0, nStreamIndex );
 aIter = m_aRecent.find ( sDirName );
 if ( aIter != m_aRecent.end() )
 {
+// There is a cached entry for this name.
+
+ZipPackageFolder* pFolder = aIter->second;
+
 if ( bFolder )
 {
+// Determine the directory name.
 sal_Int32 nDirIndex = aName.lastIndexOf ( '/', nStreamIndex );
 sTemp = aName.copy ( nDirIndex == -1 ? 0 : nDirIndex+1, 
nStreamIndex-nDirIndex-1 );
-if ( sTemp == ( *aIter ).second->getName() )
-return makeAny ( uno::Reference < XUnoTunnel > ( ( *aIter 
).second ) );
 
-m_aRecent.erase ( aIter );
+if (sTemp == pFolder->getName())
+return makeAny(uno::Reference(pFolder));
 }
 else
 {
+// Determine the file name.
 sTemp = aName.copy ( nStreamIndex + 1 );
-if ( ( *aIter ).second->hasByName( sTemp ) )
-return ( *aIter ).second->getByName( sTemp );
 
-m_aRecent.erase( aIter );
+if (pFolder->hasByName(sTemp))
+return pFolder->getByName(sTemp);
 }
+
+m_aRecent.erase( aIter );
 }
 }
-else
-{
-if ( m_pRootFolder->hasByName ( aName ) )
-return m_pRootFolder->getByName ( aName );
-}
+else if ( m_pRootFolder->hasByName ( aName ) )
+// top-level element.
+return m_pRootFolder->getByName ( aName );
+
+// Not in the cache. Search normally.
 
 nOldIndex = 0;
 ZipPackageFolder * pCurrent = m_pRootFolder;
 ZipPackageFolder * pPrevious = nullptr;
 
+// Find the right directory for the given path.
+
 while ( ( nIndex = aName.indexOf( '/', nOldIndex )) != -1 )
 {
 sTemp = aName.copy ( nOldIndex, nIndex - nOldIndex );
@@ -838,7 +851,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const 
OUString& aName )
 if ( bFolder )
 {
 if ( nStreamIndex != -1 )
-m_aRecent[sDirName] = pPrevious;
+m_aRecent[sDirName] = pPrevious; // cache it.
 return makeAny ( uno::Reference < XUnoTunnel > ( pCurrent ) );
 }
 
@@ -847,7 +860,7 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const 
OUString& aName )
 if ( pCurrent->hasByName ( sTemp ) )
 {
 if ( nStreamIndex != -1 )
-m_aRecent[sDirName] = pCurrent;
+m_aRecent[sDirName] = pCurrent; // cache it.
 return pCurrent->getByName( sTemp );
 }
 
@@ -858,10 +871,13 @@ sal_Bool SAL_CALL ZipPackage::hasByHierarchicalName( 
const OUString& aName )
 throw( RuntimeException, std::exception )
 {
 OUString sTemp, sDirName;
-sal_Int32 nOldIndex, nIndex, nStreamIndex;
+sal_Int32 nOldIndex, nStreamIndex;
 FolderHash::iterator aIter;
 
-if ( ( nIndex = aName.getLength() ) == 1 && *aName.getStr() == '/' )
+sal_Int32 nIndex = aName.getLength();
+
+if (aName == "/")
+// root directory
 return true;
 
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Gerrit: mark patches as waiting for review

2017-01-07 Thread Khaled Hosny

On Tue, Jan 03, 2017 at 12:29:52PM +0100, Bjoern Michaelsen wrote:
> On Tue, Jan 03, 2017 at 12:25:10PM +0100, Bjoern Michaelsen wrote:
> >  #/q/status:open+-label:Code-Review=0+-ownerin:Committers
> 
> #/q/status:open+label:Code-Review=0+-ownerin:Committers

Works just fine, thanks!

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

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

2017-01-07 Thread Kohei Yoshida

 package/source/zippackage/ZipPackage.cxx |  118 +++
 1 file changed, 59 insertions(+), 59 deletions(-)

New commits:
commit 63ddc8dc4ae1f3c3ee2f860c34886688b0ed2d57
Author: Kohei Yoshida 
Date:   Sat Jan 7 16:47:58 2017 -0500

Reduce scope by removing unnecessary else clauses.

This makes the code a bit easier to follow.

Change-Id: Ia55d963c97b33dd8462e6084adc4820856e126bf
Reviewed-on: https://gerrit.libreoffice.org/32825
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/package/source/zippackage/ZipPackage.cxx 
b/package/source/zippackage/ZipPackage.cxx
index d17fee0..3c6eb48 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -782,76 +782,76 @@ Any SAL_CALL ZipPackage::getByHierarchicalName( const 
OUString& aName )
 
 if ( ( nIndex = aName.getLength() ) == 1 && *aName.getStr() == '/' )
 return makeAny ( uno::Reference < XUnoTunnel > ( m_pRootFolder ) );
-else
+
+nStreamIndex = aName.lastIndexOf ( '/' );
+bool bFolder = nStreamIndex == nIndex-1;
+if ( nStreamIndex != -1 )
 {
-nStreamIndex = aName.lastIndexOf ( '/' );
-bool bFolder = nStreamIndex == nIndex-1;
-if ( nStreamIndex != -1 )
+sDirName = aName.copy ( 0, nStreamIndex );
+aIter = m_aRecent.find ( sDirName );
+if ( aIter != m_aRecent.end() )
 {
-sDirName = aName.copy ( 0, nStreamIndex );
-aIter = m_aRecent.find ( sDirName );
-if ( aIter != m_aRecent.end() )
+if ( bFolder )
 {
-if ( bFolder )
-{
-sal_Int32 nDirIndex = aName.lastIndexOf ( '/', 
nStreamIndex );
-sTemp = aName.copy ( nDirIndex == -1 ? 0 : nDirIndex+1, 
nStreamIndex-nDirIndex-1 );
-if ( sTemp == ( *aIter ).second->getName() )
-return makeAny ( uno::Reference < XUnoTunnel > ( ( 
*aIter ).second ) );
-else
-m_aRecent.erase ( aIter );
-}
-else
-{
-sTemp = aName.copy ( nStreamIndex + 1 );
-if ( ( *aIter ).second->hasByName( sTemp ) )
-return ( *aIter ).second->getByName( sTemp );
-else
-m_aRecent.erase( aIter );
-}
+sal_Int32 nDirIndex = aName.lastIndexOf ( '/', nStreamIndex );
+sTemp = aName.copy ( nDirIndex == -1 ? 0 : nDirIndex+1, 
nStreamIndex-nDirIndex-1 );
+if ( sTemp == ( *aIter ).second->getName() )
+return makeAny ( uno::Reference < XUnoTunnel > ( ( *aIter 
).second ) );
+
+m_aRecent.erase ( aIter );
 }
-}
-else
-{
-if ( m_pRootFolder->hasByName ( aName ) )
-return m_pRootFolder->getByName ( aName );
-}
-nOldIndex = 0;
-ZipPackageFolder * pCurrent = m_pRootFolder;
-ZipPackageFolder * pPrevious = nullptr;
-while ( ( nIndex = aName.indexOf( '/', nOldIndex )) != -1 )
-{
-sTemp = aName.copy ( nOldIndex, nIndex - nOldIndex );
-if ( nIndex == nOldIndex )
-break;
-if ( pCurrent->hasByName( sTemp ) )
+else
 {
-pPrevious = pCurrent;
-pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
+sTemp = aName.copy ( nStreamIndex + 1 );
+if ( ( *aIter ).second->hasByName( sTemp ) )
+return ( *aIter ).second->getByName( sTemp );
+
+m_aRecent.erase( aIter );
 }
-else
-throw NoSuchElementException(THROW_WHERE );
-nOldIndex = nIndex+1;
 }
-if ( bFolder )
+}
+else
+{
+if ( m_pRootFolder->hasByName ( aName ) )
+return m_pRootFolder->getByName ( aName );
+}
+
+nOldIndex = 0;
+ZipPackageFolder * pCurrent = m_pRootFolder;
+ZipPackageFolder * pPrevious = nullptr;
+
+while ( ( nIndex = aName.indexOf( '/', nOldIndex )) != -1 )
+{
+sTemp = aName.copy ( nOldIndex, nIndex - nOldIndex );
+if ( nIndex == nOldIndex )
+break;
+if ( pCurrent->hasByName( sTemp ) )
 {
-if ( nStreamIndex != -1 )
-m_aRecent[sDirName] = pPrevious;
-return makeAny ( uno::Reference < XUnoTunnel > ( pCurrent ) );
+pPrevious = pCurrent;
+pCurrent = pCurrent->doGetByName( sTemp ).pFolder;
 }
 else
-{
-sTemp = aName.copy( nOldIndex, aName.getLength() - nOldIndex );
-if ( pCurrent->hasByName ( sTemp ) )
-{
-if ( nStreamIndex != -1 )
-m_aRecent[sDirName] = pCurrent;
-

[Libreoffice-commits] core.git: 8 commits - comphelper/source cppu/source include/basegfx include/comphelper include/svx sc/source svx/source sw/source unoxml/source vcl/source xmloff/source

2017-01-07 Thread Caolán McNamara

 comphelper/source/misc/sequenceashashmap.cxx   |4 
 cppu/source/typelib/static_types.cxx   |2 +-
 include/basegfx/point/b2ipoint.hxx |   12 
 include/basegfx/tuple/b2ituple.hxx |   20 
 include/comphelper/sequenceashashmap.hxx   |5 -
 include/svx/optgrid.hxx|1 -
 sc/source/filter/excel/tokstack.cxx|1 +
 svx/source/dialog/optgrid.cxx  |4 
 sw/source/core/text/txtfrm.cxx |4 ++--
 unoxml/source/dom/node.cxx |2 +-
 vcl/source/filter/ixpm/xpmread.hxx |2 ++
 xmloff/source/transform/ChartOASISTContext.cxx |2 +-
 xmloff/source/transform/StyleOOoTContext.cxx   |2 +-
 13 files changed, 9 insertions(+), 52 deletions(-)

New commits:
commit 87f9e8945fde37182bec1e674dd6ccee4133209c
Author: CaolÃ¡n McNamara 
Date:   Sat Jan 7 20:58:25 2017 +

default copy ctor and assignment operator are good enough

and block default move equivalents

Change-Id: Ib8a1050803446c2e099f66602fae0465bd8165cf

diff --git a/comphelper/source/misc/sequenceashashmap.cxx 
b/comphelper/source/misc/sequenceashashmap.cxx
index 46df283..999c89c 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -51,10 +51,6 @@ SequenceAsHashMap::SequenceAsHashMap(const 
css::uno::Sequence< css::beans::Named
 (*this) << lSource;
 }
 
-SequenceAsHashMap::~SequenceAsHashMap()
-{
-}
-
 void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
 {
 // An empty Any reset this instance!
diff --git a/include/basegfx/point/b2ipoint.hxx 
b/include/basegfx/point/b2ipoint.hxx
index e092e35..7a930d6 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -60,15 +60,6 @@ namespace basegfx
 :   B2ITuple(nX, nY)
 {}
 
-/** Create a copy of a 2D Point
-
-@param rPoint
-The 2D Point which will be copied.
-*/
-B2IPoint(const B2IPoint& rPoint)
-:   B2ITuple(rPoint)
-{}
-
 /** constructor with tuple to allow copy-constructing
 from B2ITuple-based classes
 */
@@ -76,9 +67,6 @@ namespace basegfx
 :   B2ITuple(rTuple)
 {}
 
-~B2IPoint()
-{}
-
 /** *=operator to allow usage from B2IPoint, too
 */
 B2IPoint& operator*=( const B2IPoint& rPnt )
diff --git a/include/basegfx/tuple/b2ituple.hxx 
b/include/basegfx/tuple/b2ituple.hxx
index 7c859d5..f8df10f 100644
--- a/include/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
@@ -66,19 +66,6 @@ namespace basegfx
 mnY( fY )
 {}
 
-/** Create a copy of a 2D Tuple
-
-@param rTup
-The 2D Tuple which will be copied.
-*/
-B2ITuple(const B2ITuple& rTup)
-:   mnX( rTup.mnX ),
-mnY( rTup.mnY )
-{}
-
-~B2ITuple()
-{}
-
 /// Get X-Coordinate of 2D Tuple
 sal_Int32 getX() const
 {
@@ -185,13 +172,6 @@ namespace basegfx
 {
 return !(*this == rTup);
 }
-
-B2ITuple& operator=( const B2ITuple& rTup )
-{
-mnX = rTup.mnX;
-mnY = rTup.mnY;
-return *this;
-}
 };
 
 // external operators
diff --git a/include/comphelper/sequenceashashmap.hxx 
b/include/comphelper/sequenceashashmap.hxx
index fdec8cc..aaa45fd 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -78,11 +78,6 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public 
SequenceAsHashMapBase
 SequenceAsHashMap(const css::uno::Sequence< css::beans::NamedValue >& 
lSource);
 
 
-/** @short  not really used but maybe useful :-)
- */
-~SequenceAsHashMap();
-
-
 /** @short  fill this map from the given
 Any, which of course must contain
 a suitable sequence of element types
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index ab00b9f..f69ab59 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -46,7 +46,6 @@ protected:
 
 public:
 SvxOptionsGrid();
-~SvxOptionsGrid();
 
 voidSetFieldDrawX(sal_uInt32 nSet){nFldDrawX  = nSet;}
 voidSetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX  = nSet;}
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f759d7c..c503427 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -58,10 +58,6 @@ SvxOptionsGrid::SvxOptionsGrid() :
 {
 }
 
-SvxOptionsGrid::~SvxOptionsGrid()
-{
-}
-
 SvxGridItem::SvxGridItem( const SvxGridItem& rItem )
 :   SvxOptionsGrid()
 ,   SfxPoolItem(rItem)
commit 8b6e914305d978892e106a575662a2a5217242dc
Author: CaolÃ¡n McNamara 
Date:   Sat Jan 7 20:54:08 20

[Libreoffice-commits] core.git: unusedcode.README

2017-01-07 Thread Michael Meeks

 unusedcode.README |   20 ++--
 1 file changed, 6 insertions(+), 14 deletions(-)

New commits:
commit f57dd1e34caa4f5e92490fbebdca0ddce256ad54
Author: Michael Meeks 
Date:   Sat Jan 7 21:48:56 2017 +

Update call-catcher readme.

Change-Id: I777f05a66038ada8aff9a65637475b56ebbf5ad9

diff --git a/unusedcode.README b/unusedcode.README
index e957238..a0c4d3b 100644
--- a/unusedcode.README
+++ b/unusedcode.README
@@ -11,30 +11,23 @@ Code listed as unused is code that gcc outputs but that 
nothing calls
 
 a) It's possible that some other platform or configuration uses the code,
so manual inspection is always required.
-b) At the time of writing the majority of unused code now originates via 
-   macros, mostly from pre-STL containers, see [2] for killing two birds
-   with one stone. These are typically methods of signatures...
-   *::Insert
-   *::Remove
-   *::DeleteAndDestroy
-   *::Replace
-c) callcatcher ignores virtuals. But implementations of "pure virtuals"
+b) callcatcher ignores virtuals. But implementations of "pure virtuals"
are not actually virtual methods. If something is declared pure virtual
and provides an impl and that base-class impl is not explicitly called
anywhere, then that impl can go away.
-d) gcc will only emit code for inlines if those inlines are used, so
+c) gcc will only emit code for inlines if those inlines are used, so
sometimes something is listed correctly as unused but some inline
-   code takes a pointer or reference to something which cannot be 
+   code takes a pointer or reference to something which cannot be
instantiated so removal of some method/class fails at build time because
gcc never emits any code for the unused inline but trips over it at
compile time after an attempt at removal. i.e. generally the inline method
can go as well because nothing calls it either, a double win.
-e) if a constructor is listed as unused, and it's the *only* ctor in the class,
+d) if a constructor is listed as unused, and it's the *only* ctor in the class,
then no object of that class can be constructed, so the whole thing is
unused, which can lead to a whole cascade of tricky but logical fallout.
-f) if a destructor is listed as unused, and a constructor isn't, then there's
+e) if a destructor is listed as unused, and a constructor isn't, then there's
a leak somewhere, and the destructor most likely *should* be called.
-g) there's more actually unused code then what's listed. The idea is that 
what's
+f) there's more actually unused code then what's listed. The idea is that 
what's
listed is definitely unused under the generation configuration, not that
it's a list of all unused code. If the count of unused easy hits 0 then
we can have a look at the non-easy and if that hits 0, then strip out
@@ -44,4 +37,3 @@ g) there's more actually unused code then what's listed. The 
idea is that what's
 Symbols that are known to be false alarms are listed in: unusedcode.exclude
 
 [1] http://www.skynet.ie/~caolan/Packages/callcatcher.html
-[2] https://bugs.libreoffice.org/show_bug.cgi?id=38832
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3' - source/sl

2017-01-07 Thread Andras Timar

 source/sl/avmedia/source/framework.po  |4 -
 source/sl/chart2/uiconfig/ui.po|6 -
 source/sl/cui/source/dialogs.po|4 -
 source/sl/cui/source/tabpages.po   |4 -
 source/sl/cui/uiconfig/ui.po   |4 -
 source/sl/extensions/source/bibliography.po|4 -
 source/sl/filter/source/config/fragments/filters.po|4 -
 source/sl/helpcontent2/source/text/sbasic/shared.po|8 +-
 source/sl/helpcontent2/source/text/scalc/01.po |   12 +--
 source/sl/helpcontent2/source/text/schart/01.po|4 -
 source/sl/helpcontent2/source/text/sdraw/04.po |   12 +--
 source/sl/helpcontent2/source/text/shared/00.po|   10 +--
 source/sl/helpcontent2/source/text/shared/01.po|   32 
+-
 source/sl/helpcontent2/source/text/shared/02.po|8 +-
 source/sl/helpcontent2/source/text/shared/04.po|6 -
 source/sl/helpcontent2/source/text/shared/05.po|   10 +--
 source/sl/helpcontent2/source/text/shared/autopi.po|6 -
 source/sl/helpcontent2/source/text/shared/explorer/database.po |4 -
 source/sl/helpcontent2/source/text/shared/guide.po |   10 +--
 source/sl/helpcontent2/source/text/shared/optionen.po  |   20 +++---
 source/sl/helpcontent2/source/text/simpress/01.po  |6 -
 source/sl/helpcontent2/source/text/simpress/04.po  |   10 +--
 source/sl/helpcontent2/source/text/smath.po|4 -
 source/sl/helpcontent2/source/text/smath/00.po |4 -
 source/sl/helpcontent2/source/text/smath/01.po |6 -
 source/sl/helpcontent2/source/text/smath/04.po |4 -
 source/sl/helpcontent2/source/text/smath/guide.po  |4 -
 source/sl/helpcontent2/source/text/swriter.po  |4 -
 source/sl/helpcontent2/source/text/swriter/01.po   |4 -
 source/sl/helpcontent2/source/text/swriter/guide.po|4 -
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |4 -
 source/sl/reportdesign/source/ui/report.po |6 -
 source/sl/sc/source/ui/navipi.po   |4 -
 source/sl/sc/source/ui/src.po  |   10 +--
 source/sl/sc/uiconfig/scalc/ui.po  |4 -
 source/sl/sd/source/core.po|   10 +--
 source/sl/sd/source/ui/app.po  |4 -
 source/sl/sd/uiconfig/simpress/ui.po   |4 -
 source/sl/sfx2/source/view.po  |4 -
 source/sl/sfx2/uiconfig/ui.po  |4 -
 source/sl/svtools/source/java.po   |4 -
 source/sl/svtools/source/misc.po   |4 -
 source/sl/svx/source/dialog.po |   18 ++---
 source/sl/svx/source/form.po   |4 -
 source/sl/svx/source/src.po|6 -
 source/sl/svx/uiconfig/ui.po   |4 -
 source/sl/sw/source/ui/app.po  |   10 +--
 source/sl/sw/uiconfig/swriter/ui.po|8 +-
 source/sl/uui/uiconfig/ui.po   |4 -
 source/sl/vcl/source/src.po|4 -
 source/sl/xmlsecurity/uiconfig/ui.po   |4 -
 51 files changed, 173 insertions(+), 173 deletions(-)

New commits:
commit c54ca62057567513359adf7d7dce38167b54eb29
Author: Andras Timar 
Date:   Sat Jan 7 22:05:01 2017 +0100

Updated Slovenian translation

Change-Id: Ifbe0a2092a580deef5a4accc8ab4124789eaedae

diff --git a/source/sl/avmedia/source/framework.po 
b/source/sl/avmedia/source/framework.po
index f0c07d7..d58a32f 100644
--- a/source/sl/avmedia/source/framework.po
+++ b/source/sl/avmedia/source/framework.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 4.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2016-11-20 22:22+0100\n"
+"POT-Creation-Date: 2017-01-06 11:51+0100\n"
 "PO-Revision-Date: 2016-12-26 02:16+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
diff --git a/source/sl/c

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations

2017-01-07 Thread Andras Timar

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

New commits:
commit 37c797f8e77cc132de0139a2e60e65613a9a141a
Author: Andras Timar 
Date:   Sat Jan 7 22:05:01 2017 +0100

Updated core
Project: translations  c54ca62057567513359adf7d7dce38167b54eb29

Updated Slovenian translation

Change-Id: Ifbe0a2092a580deef5a4accc8ab4124789eaedae

diff --git a/translations b/translations
index 0bc0635..c54ca62 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0bc06350e1640c80204ff5d77d36f8721083f5e5
+Subproject commit c54ca62057567513359adf7d7dce38167b54eb29
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: discovery.xml

2017-01-07 Thread Andras Timar

 discovery.xml |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 81ca552d36279e5dc8db796d7cb5d6fb63d0eb58
Author: Andras Timar 
Date:   Sat Jan 7 21:26:00 2017 +0100

add text/rtf and text/plain as supported MIME types

Change-Id: Ic46e8ccaeecc24ef2c6b6fce6b342c976c3ddc60
Reviewed-on: https://gerrit.libreoffice.org/32822
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/discovery.xml b/discovery.xml
index 0edd631..c8b87c5 100644
--- a/discovery.xml
+++ b/discovery.xml
@@ -254,6 +254,12 @@
 
 
 
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Caolán McNamara

 vcl/source/filter/igif/gifread.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 7160b8fb05dc45f9d896a3269b732f2101021521
Author: CaolÃ¡n McNamara 
Date:   Sat Jan 7 17:22:25 2017 +

come up with a conservative max compression ratio for gifs

Change-Id: I01bc452a0bcc003bf9b7b65d9a2a49b6c1acebc1

diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index 3789ebb..90f744f 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -61,6 +61,7 @@ class GIFReader : public GraphicReader
 Bitmap::ScopedWriteAccess pAcc1;
 longnYAcc;
 longnLastPos;
+sal_uInt64  nMaxStreamData;
 sal_uInt32  nLogWidth100;
 sal_uInt32  nLogHeight100;
 sal_uInt16  nTimer;
@@ -113,6 +114,7 @@ GIFReader::GIFReader( SvStream& rStm )
 , rIStm ( rStm )
 , nYAcc ( 0 )
 , nLastPos ( rStm.Tell() )
+, nMaxStreamData( rStm.remainingSize() )
 , nLogWidth100 ( 0UL )
 , nLogHeight100 ( 0UL )
 , nGlobalWidth ( 0 )
@@ -169,6 +171,20 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
 }
 #endif
 
+// "Overall data compression asymptotically approaches 3839 Ã 8 / 12 = 
2559 1/3"
+// so assume compression of 1:2560 is possible
+// 
(http://cloudinary.com/blog/a_one_color_image_is_worth_two_thousand_words 
suggests
+// 1:1472.88 [184.11 x 8] is more realistic)
+const sal_uInt64 nMinFileData = nWidth * nHeight / 2560;
+if (nMaxStreamData < nMinFileData)
+{
+//there is nowhere near enough data in this stream to fill the claimed 
dimensions
+SAL_WARN("vcl.filter", "gif claims dimensions " << nWidth << " x " << 
nHeight <<
+   " but filesize of " << nMaxStreamData << " is 
surely insufficiently large to fill it");
+bStatus = false;
+return;
+}
+
 if( bGCTransparent )
 {
 const Color aWhite( COL_WHITE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Michael Meeks

 vcl/source/window/window2.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3d24da12c271c2a5aa60325bc33b733f17397207
Author: Michael Meeks 
Date:   Fri Jan 6 15:23:30 2017 +

tdf#105151 - be more conservative about EndTracking / Tracking calls.

We really shouldn't be emitting these into widgets after they are
disposed - it serves only to confuse things. Restore behaviour to how
it was before the VclPtr change for this.

Change-Id: Ife666929f8aac0e4431a5e43970769692c11888c
Reviewed-on: https://gerrit.libreoffice.org/32785
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
(cherry picked from commit d788d37a16d382d7ff32a19e8d65e5c605ac55dd)
Reviewed-on: https://gerrit.libreoffice.org/32790
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 4536809..dd0d856 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -365,7 +365,11 @@ void Window::EndTracking( TrackingEventFlags nFlags )
mpWindowImpl->mpFrameData->mnMouseCode,
mpWindowImpl->mpFrameData->mnMouseCode );
 TrackingEvent   aTEvt( aMEvt, nFlags | TrackingEventFlags::End );
-Tracking( aTEvt );
+// CompatTracking effectively
+if (!mpWindowImpl || mpWindowImpl->mbInDispose)
+return Window::Tracking( aTEvt );
+else
+return Tracking( aTEvt );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Vedic Sharma license statement

2017-01-07 Thread Vedic Sharma

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac

2017-01-07 Thread Andras Timar

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 316137a3e2ff62eecfe965da397a5886bf389100
Author: Andras Timar 
Date:   Sat Jan 7 15:00:40 2017 +0100

Bump version to 5.1-16

Change-Id: I6207fd7a10915cc58a82d0e7ce99dd0f1fdf5a14

diff --git a/configure.ac b/configure.ac
index 7bb8b93..7175be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.1.10.15],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.1.10.16],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Henry Castro

 loleaflet/dist/loleaflet-help.html|2 +-
 loleaflet/src/map/handler/Map.Keyboard.js |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e1b7e53b3a6f006eec5728c3ec88079c34b4f3c6
Author: Henry Castro 
Date:   Sat Jan 7 08:44:35 2017 -0400

tdf#103779: Help menu accessibility, part 3

Change shortcut to Ctrl + Shift + ?

diff --git a/loleaflet/dist/loleaflet-help.html 
b/loleaflet/dist/loleaflet-help.html
index bfed701..15c79d3 100644
--- a/loleaflet/dist/loleaflet-help.html
+++ b/loleaflet/dist/loleaflet-help.html
@@ -31,7 +31,7 @@
  Cut Ctrl + 
X 
  Paste as unformatted text Ctrl + Alt + Shift + V 
  Print (Download as PDF) Ctrl + P 
- Display the Keyboard shortcuts help 
Ctrl + H 
+ Display the Keyboard shortcuts help 
Ctrl + Shift + ? 
 
 
 
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js 
b/loleaflet/src/map/handler/Map.Keyboard.js
index 77302a8..0da5e09 100644
--- a/loleaflet/src/map/handler/Map.Keyboard.js
+++ b/loleaflet/src/map/handler/Map.Keyboard.js
@@ -398,7 +398,7 @@ L.Map.Keyboard = L.Handler.extend({
e.originalEvent.preventDefault();
}
 
-   if (e.originalEvent.ctrlKey && (e.originalEvent.key === 'h' || 
e.originalEvent.key === 'H')) {
+   if (e.originalEvent.ctrlKey && e.originalEvent.shiftKey && 
e.originalEvent.key === '?') {
map.showLOKeyboardHelp();
e.originalEvent.preventDefault();
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

George Korepanov license statement

2017-01-07 Thread Георгий Корепанов

All of my future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - helpcontent2

2017-01-07 Thread Gabor Kelemen

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

New commits:
commit 95e6ef5907436b886f58bc99fb8841e9b25a6139
Author: Gabor Kelemen 
Date:   Fri Jan 6 22:58:26 2017 +0100

Updated core
Project: help  e8d93437e93da580ecb9d46a441b8610900c4f32

Drop 'Network Identity' page

The corresponding feature was removed in 2012 with
098be920e012a3ae133d23cffdb161a0816d29c4

Change-Id: I40168499dc3d7a9cf8ba308b942bd46445e608fe
Reviewed-on: https://gerrit.libreoffice.org/32801
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index fd44cdd..e8d9343 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fd44cddea40406cbdde5621e0e25c6c6be3e9955
+Subproject commit e8d93437e93da580ecb9d46a441b8610900c4f32
commit 04c95704b38efdc2e0341d648e2763bc97d96dc5
Author: Gabor Kelemen 
Date:   Fri Jan 6 22:21:04 2017 +0100

Updated core
Project: help  fd44cddea40406cbdde5621e0e25c6c6be3e9955

test-hid-vs-ui: Fix bookmarks and ahelps to floatingelements.ui

From one of ['source/text/smath/01/03090200.xhp',
'source/text/smath/01/03090400.xhp'], we did not find file
 starmath/uiconfig/smath/ui/floatingelements.ui.
From one of ['source/text/smath/01/03090700.xhp',
'source/text/smath/01/03090500.xhp',
'source/text/smath/01/03090800.xhp',
'source/text/smath/01/03090300.xhp',
'source/text/smath/01/03090600.xhp',
'source/text/smath/01/03090100.xhp'], we did not find file
smath/uiconfig/ui/floatingelements.ui.

File was dropped in 3dfe2fc394ca1e168e800ffcc3ac0f69b4eeb173

Change-Id: I896778156c41755cc1d979e75018e1b9b5806d5b
Reviewed-on: https://gerrit.libreoffice.org/32799
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 65af088..fd44cdd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 65af088bf1a712cd234e0e97e2820c44f6327f81
+Subproject commit fd44cddea40406cbdde5621e0e25c6c6be3e9955
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Gabor Kelemen

 AllLangHelp_shared.mk|1 
 source/text/shared/optionen/01014000.xhp |   60 ---
 source/text/smath/01/03090100.xhp|3 -
 source/text/smath/01/03090200.xhp|3 -
 source/text/smath/01/03090300.xhp|3 -
 source/text/smath/01/03090400.xhp|3 -
 source/text/smath/01/03090500.xhp|3 -
 source/text/smath/01/03090600.xhp|5 +-
 source/text/smath/01/03090700.xhp|4 +-
 source/text/smath/01/03090800.xhp|3 -
 10 files changed, 10 insertions(+), 78 deletions(-)

New commits:
commit e8d93437e93da580ecb9d46a441b8610900c4f32
Author: Gabor Kelemen 
Date:   Fri Jan 6 22:58:26 2017 +0100

Drop 'Network Identity' page

The corresponding feature was removed in 2012 with
098be920e012a3ae133d23cffdb161a0816d29c4

Change-Id: I40168499dc3d7a9cf8ba308b942bd46445e608fe
Reviewed-on: https://gerrit.libreoffice.org/32801
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 661ecb9..2899038 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -836,7 +836,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/optionen/01011000 \
 helpcontent2/source/text/shared/optionen/01012000 \
 helpcontent2/source/text/shared/optionen/01013000 \
-helpcontent2/source/text/shared/optionen/01014000 \
 helpcontent2/source/text/shared/optionen/0102 \
 helpcontent2/source/text/shared/optionen/01020100 \
 helpcontent2/source/text/shared/optionen/01020300 \
diff --git a/source/text/shared/optionen/01014000.xhp 
b/source/text/shared/optionen/01014000.xhp
deleted file mode 100644
index 5fc8425..000
--- a/source/text/shared/optionen/01014000.xhp
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-   
-
-
-
-Network Identity
-/text/shared/optionen/01014000.xhp
-
-
-Sun Microsystems, Inc.
-
-
-
-
-network identity options
-options; network identity
-single sign on options
-LDAP server; sign on options
-remote configurations
-Configuration Manager
-
-Network Identity
-Sets the options for a remote configuration access to 
your personal $[officename] settings stored on an LDAP server. To see 
this tab page and to use this feature, remote configuration must be active: You 
need an account on an LDAP server that is running and configured to store 
$[officename] user settings.
-
-Using remote configuration, you can start a copy of $[officename] on 
any computer in the network with your own user data and personal 
configuration.link to how-to ldap config, single signon 
how-to, etc
-
-Authentication Method
-Choose your 
security mechanism for access to the LDAP server. Choices are Simple or 
Kerberos.
-
-User name
-Using "simple" 
authentication method, you enter your user name on the LDAP server 
here. Using "Kerberos", you just see your user name, but cannot edit 
it.
-
-Password
-Using "simple" 
authentication method, enter your password for access to the LDAP server 
here. Using "Kerberos", this box is not active.
-
-Save password
-Using 
"simple" authentication method, check this box to make your password 
persistent. If the password is persistent and the same user starts 
$[officename] later on, the user name and password will not be requested again. 
Using "Kerberos", this box is not active.
-The password will be stored encrypted in a file called .ssop in 
your home directory 
-"My Documents" 
folder.
-
-
commit fd44cddea40406cbdde5621e0e25c6c6be3e9955
Author: Gabor Kelemen 
Date:   Fri Jan 6 22:21:04 2017 +0100

test-hid-vs-ui: Fix bookmarks and ahelps to floatingelements.ui

From one of ['source/text/smath/01/03090200.xhp',
'source/text/smath/01/03090400.xhp'], we did not find file
 starmath/uiconfig/smath/ui/floatingelements.ui.
From one of ['source/text/smath/01/03090700.xhp',
'source/text/smath/01/03090500.xhp',
'source/text/smath/01/03090800.xhp',
'source/text/smath/01/03090300.xhp',
'source/text/smath/01/03090600.xhp',
'source/text/smath/01/03090100.xhp'], we did not find file
smath/uiconfig/ui/floatingelements.ui.

File was dropped in 3dfe2fc394ca1e168e800ffcc3ac0f69b4eeb173

Change-Id: I896778156c41755cc1d979e75018e1b9b5806d5b
Reviewed-on: https://gerrit.libreoffice.org/32799
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/smath/01/03090100.xhp 
b/source/text/smath/01/03090100.xhp
index f9036df..1891b4f 100644
--- a/source/text/smath/01/03090100.xhp
+++ b/source/text/smath/01/03090100.xhp
@@ -57,9 +57,8 @@
 user-defined operators;unary and binary
 
 
-
 Unary/Binary Operators
-You can choose various unary 
and binary operators to build your $[officename] Math formula. Unary refers to 
operators that affect one placeholder. Binary refers to operators that connect 
two placeholders. The lower area of the Elements pane displays the indi

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

2017-01-07 Thread Arnaud Versini

 accessibility/inc/helper/characterattributeshelper.hxx|1 
 accessibility/source/helper/characterattributeshelper.cxx |   36 ++
 2 files changed, 7 insertions(+), 30 deletions(-)

New commits:
commit c1f4d4ddf27814b1d86b7d35dcf70a28aa217885
Author: Arnaud Versini 
Date:   Mon Dec 19 11:18:28 2016 +0100

accessibility: simplify CharacterAttributesHelper.

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

diff --git a/accessibility/inc/helper/characterattributeshelper.hxx 
b/accessibility/inc/helper/characterattributeshelper.hxx
index 6b679a9..bbffd80 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/accessibility/inc/helper/characterattributeshelper.hxx
@@ -41,7 +41,6 @@ private:
 public:
 
 CharacterAttributesHelper( const vcl::Font& rFont, sal_Int32 nBackColor, 
sal_Int32 nColor );
-~CharacterAttributesHelper();
 
 std::vector< css::beans::PropertyValue > GetCharacterAttributes();
 css::uno::Sequence< css::beans::PropertyValue > GetCharacterAttributes( 
const css::uno::Sequence< OUString >& aRequestedAttributes );
diff --git a/accessibility/source/helper/characterattributeshelper.cxx 
b/accessibility/source/helper/characterattributeshelper.cxx
index 4e33d1b..e4896fa 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/accessibility/source/helper/characterattributeshelper.cxx
@@ -43,23 +43,14 @@ CharacterAttributesHelper::CharacterAttributesHelper( const 
vcl::Font& rFont, sa
 }
 
 
-CharacterAttributesHelper::~CharacterAttributesHelper()
-{
-m_aAttributeMap.clear();
-}
-
-
 std::vector< PropertyValue > 
CharacterAttributesHelper::GetCharacterAttributes()
 {
-std::vector< PropertyValue > aValues( m_aAttributeMap.size() );
+std::vector< PropertyValue > aValues;
+aValues.reserve( m_aAttributeMap.size() );
 
-int i = 0;
-for ( AttributeMap::iterator aIt = m_aAttributeMap.begin(); aIt != 
m_aAttributeMap.end(); ++aIt, ++i )
+for ( const auto& aIt : m_aAttributeMap)
 {
-aValues[i].Name   = aIt->first;
-aValues[i].Handle = (sal_Int32) -1;
-aValues[i].Value  = aIt->second;
-aValues[i].State  = PropertyState_DIRECT_VALUE;
+aValues.emplace_back(aIt.first, (sal_Int32) -1, aIt.second, 
PropertyState_DIRECT_VALUE);
 }
 
 return aValues;
@@ -72,27 +63,14 @@ Sequence< PropertyValue > 
CharacterAttributesHelper::GetCharacterAttributes( con
 return comphelper::containerToSequence(GetCharacterAttributes());
 
 std::vector< PropertyValue > aValues;
-sal_Int32 nLength = aRequestedAttributes.getLength();
 
-AttributeMap aAttributeMap;
-
-for ( sal_Int32 i = 0; i < nLength; ++i )
+for ( const auto& aRequestedAttribute: aRequestedAttributes)
 {
-AttributeMap::iterator aFound = m_aAttributeMap.find( 
aRequestedAttributes[i] );
+AttributeMap::iterator aFound = m_aAttributeMap.find( 
aRequestedAttribute );
 if ( aFound != m_aAttributeMap.end() )
-aAttributeMap.insert( *aFound );
+aValues.emplace_back(aFound->first, (sal_Int32) -1, 
aFound->second, PropertyState_DIRECT_VALUE);
 }
 
-aValues.reserve( aAttributeMap.size() );
-
-int i = 0;
-for ( AttributeMap::iterator aIt = aAttributeMap.begin(); aIt != 
aAttributeMap.end(); ++aIt, ++i )
-{
-aValues[i].Name   = aIt->first;
-aValues[i].Handle = (sal_Int32) -1;
-aValues[i].Value  = aIt->second;
-aValues[i].State  = PropertyState_DIRECT_VALUE;
-}
 return comphelper::containerToSequence(aValues);
 }
 
___
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

2017-01-07 Thread Bjoern Michaelsen

 sw/inc/frmfmt.hxx |8 
 sw/source/core/draw/dcontact.cxx  |4 
 sw/source/core/layout/atrfrm.cxx  |1 +
 sw/source/core/layout/fly.cxx |8 +++-
 sw/source/core/layout/frmtool.cxx |   24 +---
 5 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit f2d9e2984155fa383adb33a52fec69be70a84cb7
Author: Bjoern Michaelsen 
Date:   Sat Jan 7 03:54:22 2017 +0100

use proper message passing

Change-Id: I5655dd4c07769d3c9832a3e7246e750cd2f1908d
Reviewed-on: https://gerrit.libreoffice.org/32806
Reviewed-by: BjÃ¶rn Michaelsen 
Tested-by: BjÃ¶rn Michaelsen 

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index f5e8140..f8ee778 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -34,6 +34,7 @@ class IMapObject;
 class SwRect;
 class SwContact;
 class SdrObject;
+class SwRootFrame;
 namespace sw
 {
 class DocumentLayoutManager;
@@ -335,6 +336,13 @@ namespace sw
 GetZOrderHint(sal_uInt32& rnZOrder) : m_rnZOrder(rnZOrder) {};
 virtual ~GetZOrderHint() override;
 };
+struct SW_DLLPUBLIC GetObjectConnectedHint final : SfxHint
+{
+bool& m_risConnected;
+const SwRootFrame* m_pRoot;
+GetObjectConnectedHint(bool& risConnected, const SwRootFrame* pRoot) : 
m_risConnected(risConnected), m_pRoot(pRoot) {};
+virtual ~GetObjectConnectedHint() override;
+};
 }
 
 class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index c0755c0..714dc40 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1609,6 +1609,10 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, 
const SfxHint& rHint)
 if(pFormat->Which() == RES_DRAWFRMFMT)
 pGetZOrdnerHint->m_rnZOrder = GetMaster()->GetOrdNum();
 }
+else if (auto pConnectedHint = dynamic_cast(&rHint))
+{
+pConnectedHint->m_risConnected |= (GetAnchorFrame() != nullptr);
+}
 }
 
 // #i26791#
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 8df92d3..6ca6ef1 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3325,6 +3325,7 @@ namespace sw
 FindSdrObjectHint::~FindSdrObjectHint() {}
 CollectTextObjectsHint::~CollectTextObjectsHint() {}
 GetZOrderHint::~GetZOrderHint() {}
+GetObjectConnectedHint::~GetObjectConnectedHint() {}
 }
 
 SwDrawFrameFormat::~SwDrawFrameFormat()
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 651dbcc..be4c7e5 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -684,7 +684,13 @@ void SwFlyFrame::SwClientNotify(const SwModify& rMod, 
const SfxHint& rHint)
 auto pFormat(dynamic_cast(&rMod));
 if(pFormat->Which() == RES_FLYFRMFMT && 
pFormat->getIDocumentLayoutAccess().GetCurrentViewShell()) // #i11176#
 pGetZOrdnerHint->m_rnZOrder = GetVirtDrawObj()->GetOrdNum();
- }
+}
+else if(auto pConnectedHint = dynamic_cast(&rHint))
+{
+auto pFormat(dynamic_cast(&rMod));
+if(!pConnectedHint->m_risConnected && pFormat->Which() == 
RES_FLYFRMFMT && (!pConnectedHint->m_pRoot || pConnectedHint->m_pRoot == 
getRootFrame()))
+pConnectedHint->m_risConnected = true;
+}
 };
 
 void SwFlyFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew )
diff --git a/sw/source/core/layout/frmtool.cxx 
b/sw/source/core/layout/frmtool.cxx
index f8b126d..e574c5b 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1071,26 +1071,12 @@ void AppendObjs( const SwFrameFormats *pTable, 
sal_uLong nIndex,
 #endif
 }
 
-static bool lcl_ObjConnected( const SwFrameFormat *pFormat, const SwFrame* 
pSib )
+static inline bool lcl_ObjConnected(const SwFrameFormat* pFormat, const 
SwFrame* pSib)
 {
-if ( RES_FLYFRMFMT == pFormat->Which() )
-{
-SwIterator aIter( *pFormat );
-const SwRootFrame* pRoot = pSib ? pSib->getRootFrame() : nullptr;
-const SwFlyFrame* pTmpFrame;
-for( pTmpFrame = aIter.First(); pTmpFrame; pTmpFrame = aIter.Next() )
-{
-if(! pRoot || pRoot == pTmpFrame->getRootFrame() )
-return true;
-}
-}
-else
-{
-SwDrawContact *pContact = 
SwIterator(*pFormat).First();
-if ( pContact )
-return pContact->GetAnchorFrame() != nullptr;
-}
-return false;
+const SwRootFrame* pRoot = pSib ? pSib->getRootFrame() : nullptr;
+bool isConnected(false);
+pFormat->CallSwClientNotify(sw::GetObjectConnectedHint(isConnected, 
pRoot));
+return isConnected;
 }
 
 /** helper method to determine, if a , which has an object 
connected,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.

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

2017-01-07 Thread Julien Nabet

 sw/inc/crstate.hxx  |6 +++---
 sw/source/core/crsr/crstrvl.cxx |2 +-
 sw/source/core/text/itrcrsr.cxx |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 776aec70ba22b4a658b3b7abb5660c809129f54b
Author: Julien Nabet 
Date:   Sat Jan 7 08:46:38 2017 +0100

Typo: Postion->Portion

Found thanks to Buovjaga

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

diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 4d59782..8c361dee 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -158,7 +158,7 @@ struct SwCursorMoveState
  */
 bool m_bInFrontOfLabel;
 bool m_bInNumPortion; ///< point is in number portion #i23726#
-int m_nInNumPostionOffset;///< distance from number portion's start
+int m_nInNumPortionOffset;///< distance from number portion's start
 
 SwCursorMoveState( CursorMoveState eSt = MV_NONE ) :
 m_pFill( nullptr ),
@@ -181,7 +181,7 @@ struct SwCursorMoveState
 m_bContentCheck( false ), // #i43742#
 m_bInFrontOfLabel( false ), // #i27615#
 m_bInNumPortion(false), // #i26726#
-m_nInNumPostionOffset(0) // #i26726#
+m_nInNumPortionOffset(0) // #i26726#
 {}
 SwCursorMoveState( SwFillCursorPos *pInitFill ) :
 m_pFill( pInitFill ),
@@ -204,7 +204,7 @@ struct SwCursorMoveState
 m_bContentCheck( false ), // #i43742#
 m_bInFrontOfLabel( false ), // #i27615#
 m_bInNumPortion(false), // #i23726#
-m_nInNumPostionOffset(0) // #i23726#
+m_nInNumPortionOffset(0) // #i23726#
 {}
 };
 
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e171b23..4424cf4 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1167,7 +1167,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
 bRet = aTmpState.m_bInNumPortion;
 rContentAtPos.aFnd.pNode = pTextNd;
 
-Size aSizeLogic(aTmpState.m_nInNumPostionOffset, 0);
+Size aSizeLogic(aTmpState.m_nInNumPortionOffset, 0);
 Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
 rContentAtPos.nDist = aSizePixel.Width();
 }
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 295006e..293cdfd 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1433,7 +1433,7 @@ sal_Int32 SwTextCursor::GetCursorOfst( SwPosition *pPos, 
const Point &rPoint,
 pCMS->m_bFootnoteNoInfo = true;
 else if (pPor->InNumberGrp() ) // #i23726#
 {
-pCMS->m_nInNumPostionOffset = nX;
+pCMS->m_nInNumPortionOffset = nX;
 pCMS->m_bInNumPortion = true;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source filter/source include/vbahelper include/xmloff sc/source sw/source vbahelper/source wizards/com

2017-01-07 Thread Julien Nabet

 dbaccess/source/ui/browser/dsbrowserDnD.cxx  | 
   4 -
 dbaccess/source/ui/browser/unodatbr.cxx  | 
  18 
 dbaccess/source/ui/inc/unodatbr.hxx  | 
   2 
 dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx   | 
   4 -
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx| 
  10 ++--
 filter/source/xslt/export/wordml/ooo2wordml_path.xsl | 
   4 -
 filter/source/xslt/import/wordml/wordml2ooo_path.xsl | 
   4 -
 filter/source/xslt/odf2xhtml/export/common/table_of_content.xsl  | 
   2 
 include/vbahelper/vbacollectionimpl.hxx  | 
   2 
 include/xmloff/XMLEventExport.hxx| 
   4 -
 sc/source/filter/excel/excimp8.cxx   | 
   2 
 sc/source/filter/excel/xistyle.cxx   | 
   2 
 sc/source/ui/vba/vbaoleobjects.cxx   | 
   2 
 sc/source/ui/vba/vbapalette.cxx  | 
   2 
 sc/source/ui/vba/vbaworksheets.cxx   | 
   2 
 sw/source/core/access/acccell.hxx| 
   2 
 sw/source/core/access/accdoc.hxx | 
   2 
 sw/source/core/access/accnotextframe.hxx | 
   2 
 sw/source/core/access/accpara.hxx| 
   2 
 sw/source/core/access/acctable.hxx   | 
   2 
 sw/source/ui/vba/vbabookmarks.cxx| 
   2 
 sw/source/ui/vba/vbapalette.cxx  | 
   2 
 sw/source/ui/vba/vbastyles.cxx   | 
   2 
 sw/source/ui/vba/vbatables.cxx   | 
   2 
 vbahelper/source/msforms/vbacontrols.cxx | 
   2 
 vbahelper/source/vbahelper/vbashape.cxx  | 
   4 -
 wizards/com/sun/star/wizards/form/FormControlArranger.java   | 
  22 +-
 wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java  | 
   2 
 wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java| 
   2 
 wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java   | 
   2 
 wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java| 
   2 
 wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 
   6 +-
 wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java   | 
  10 ++--
 33 files changed, 67 insertions(+), 67 deletions(-)

New commits:
commit d911663f0fa919fc66e10328482948a730e9c2e8
Author: Julien Nabet 
Date:   Sat Jan 7 08:59:09 2017 +0100

Typo: Acess->Access

Found thanks to Buovjaga

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

diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx 
b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 95dd290..51221cc 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -66,7 +66,7 @@ namespace dbaui
 try
 {
 OUString aName = GetEntryText( _pApplyTo );
-OUString aDSName = getDataSourceAcessor( 
m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) );
+OUString aDSName = getDataSourceAccessor( 
m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) );
 
 ODataClipboard* pData = nullptr;
 SharedConnection xConnection;
@@ -227,7 +227,7 @@ namespace dbaui
 if ( ensureConnection( m_aAsyncDrop.pDroppedAt, xDestConnection ) 
&& xDestConnection.is() )
 {
 SvTreeListEntry* pDataSourceEntry = 
m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.pDroppedAt);
-m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, 
getDataSourceAcessor( pDataSourceEntry ), xDestConnection );
+m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, 
getDataSourceAccessor( pDataSourceEntry ), xDestConnection );
 }
 }
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx 
b/dbaccess/source/ui/browser/unodatbr.cxx
index e442beb..7c05f3e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -1108,13 +1108,13 @@ namespace
 }
 }
 
-OUString SbaTableQueryBrowser::getDataSourceAcessor( SvTreeListEntry* 
_pDataSourceEntry ) const
+OUString SbaTableQueryBrowser::getDataSourceAccessor( SvTreeListEntry* 
_pDataS

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

2017-01-07 Thread David Ostrovsky

 scp2/source/ooo/vc_redist.scp |   22 --
 1 file changed, 22 deletions(-)

New commits:
commit 252e42cb5448f40c4bb26dbdf732168ff466b8ea
Author: David Ostrovsky 
Date:   Fri Jan 6 22:04:17 2017 +0100

Clean up stale merge modules

Change-Id: I2489238d5295650a3c51581a037185440f641005
Reviewed-on: https://gerrit.libreoffice.org/32797
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index 23214f0..8f21124 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -18,28 +18,6 @@
 
 #include "macros.inc"
 
-#if defined(WITH_VC100_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC100_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC100_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
-#if defined(WITH_VC110_REDIST)
-
-MergeModule gid_MergeModule_Microsoft_VC110_CRT_x86
-Feature = gm_Root;
-Name = "Microsoft_VC110_CRT_x86.msm";
-RootDir = "TARGETDIR";
-ComponentCondition = "VC_REDIST=1";
-End
-
-#endif
-
 #if defined(WITH_VC120_REDIST)
 
 #if defined WINDOWS_X64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Julien Nabet

 wizards/com/sun/star/wizards/db/TableDescriptor.java |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1274efb0a18aef50c78ca07997572a8f2b7145c7
Author: Julien Nabet 
Date:   Sat Jan 7 08:29:33 2017 +0100

Typo: isColunnNameDuplicate->isColumnNameDuplicate

Found thanks to Buovjaga

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

diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java 
b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index e83ea5b..fca2619 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -201,7 +201,7 @@ public class TableDescriptor extends CommandMetaData 
implements XContainerListen
 return false;
 }
 
-private boolean isColunnNameDuplicate(XNameAccess _xColumns, XPropertySet 
_xToBeAppendedPropertySet)
+private boolean isColumnNameDuplicate(XNameAccess _xColumns, XPropertySet 
_xToBeAppendedPropertySet)
 {
 try
 {
@@ -235,7 +235,7 @@ public class TableDescriptor extends CommandMetaData 
implements XContainerListen
 for (int i = 0; i < columncontainer.size(); i++)
 {
 XPropertySet xColPropertySet = getByIndex(i);
-if (xColPropertySet != null && 
!isColunnNameDuplicate(xNameAccessColumns, xColPropertySet))
+if (xColPropertySet != null && 
!isColumnNameDuplicate(xNameAccessColumns, xColPropertySet))
 {
 xAppendColumns.appendByDescriptor(xColPropertySet);
//xColPropertySet.setPropertyValue("Type", 32423)
 }
@@ -256,7 +256,7 @@ public class TableDescriptor extends CommandMetaData 
implements XContainerListen
 for (int i = 0; i < keycolumncontainer.size(); i++)
 {
 XPropertySet xKeyColPropertySet = 
keycolumncontainer.get(i);
-if 
(!isColunnNameDuplicate(xKeyColumnSupplier.getColumns(), xKeyColPropertySet))
+if 
(!isColumnNameDuplicate(xKeyColumnSupplier.getColumns(), xKeyColPropertySet))
 {
 
xKeyColAppend.appendByDescriptor(xKeyColPropertySet);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-01-07 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/statistical/fods/percentrank.exc.fods | 4935 
+
 sc/qa/unit/data/functions/statistical/fods/percentrank.fods | 4808 
+
 sc/qa/unit/data/functions/statistical/fods/percentrank.inc.fods | 4990 
++
 3 files changed, 14733 insertions(+)

New commits:
commit b6b380576fdf81deae30cb6c85a56f688804a489
Author: ZdenÄk Crhonek 
Date:   Fri Jan 6 19:24:27 2017 +0100

add PERCENTRANK, PERCENTRANK.INC, PERCENTRANK.EXC test case

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

diff --git a/sc/qa/unit/data/functions/statistical/fods/percentrank.exc.fods 
b/sc/qa/unit/data/functions/statistical/fods/percentrank.exc.fods
new file mode 100644
index 000..01c9378
--- /dev/null
+++ b/sc/qa/unit/data/functions/statistical/fods/percentrank.exc.fods
@@ -0,0 +1,4935 @@
+
+
+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-06T19:19:52.733168365P0D1LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/6bd7451ecd66417a4e8b8dff3874c15ba4d1536e
+ 
+  
+   0
+   0
+   59356
+   34584
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   2
+   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Ä
+   
+  
+  
+
+   
+
+  
+  
+

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

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

[Libreoffice-commits] core.git: Branch 'ports/macosx10.5/master' - 841 commits - accessibility/inc accessibility/source android/Bootstrap android/source apple_remote/Library_AppleRemote.mk apple_remot

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

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

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

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

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

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

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

CppCheck Report Update

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

Re: Gerrit: mark patches as waiting for review

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

[Libreoffice-commits] core.git: 8 commits - comphelper/source cppu/source include/basegfx include/comphelper include/svx sc/source svx/source sw/source unoxml/source vcl/source xmloff/source

[Libreoffice-commits] core.git: unusedcode.README

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-3' - source/sl

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations

[Libreoffice-commits] online.git: discovery.xml

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

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

Vedic Sharma license statement

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - configure.ac

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

George Korepanov license statement

[Libreoffice-commits] core.git: 2 commits - helpcontent2

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

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

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

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

[Libreoffice-commits] core.git: 2 commits - dbaccess/source filter/source include/vbahelper include/xmloff sc/source sw/source vbahelper/source wizards/com

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

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

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

34 matches

Site Navigation

Mail list logo

Footer information