[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 4 commits - configure.ac include/svl include/svtools sc/source svl/source

2017-04-08 Thread Andras Timar 
 configure.ac |2 +-
 include/svl/zformat.hxx  |3 ++-
 include/svtools/insdlg.hxx   |2 +-
 sc/source/filter/excel/xlformula.cxx |5 +
 sc/source/filter/oox/formulabase.cxx |4 ++--
 svl/source/numbers/zformat.cxx   |   29 +++--
 6 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit cdf8819e60c8c5c0302a73a9a9dbe586a8446123
Author: Andras Timar 
Date:   Sat Apr 8 18:11:19 2017 +0200

Bump version to 5.3-5

Change-Id: I9355f7cd94de3371e8b461e881ce9847c50cc7a6

diff --git a/configure.ac b/configure.ac
index 15563f711ca6..03ba74de3278 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.3.10.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.5],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 41df401c698498a9fd300af127343cc252e9d030
Author: Caolán McNamara 
Date:   Fri Apr 7 16:18:22 2017 +0100

Resolves: tdf#106732 the intent was surely to return a const ref

Change-Id: Iaaa1f76a689645adaebf4fe5b87003ad238f71f2
(cherry picked from commit a7d008a8dfdc0a8b42061329b5e756b1b034abaf)
Reviewed-on: https://gerrit.libreoffice.org/36276
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit d9736ca79ed3205bb091787e09ebb736ffd808a3)

diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 5e18693663b3..58bada8fadd2 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -60,7 +60,7 @@ public:
 return aObjectServerList.size();
 }
 
-const SvObjectServeroperator[]( size_t n ) const
+const SvObjectServer&   operator[]( size_t n ) const
 {
 return aObjectServerList[ n ];
 }
commit 5314bc77e0b6c596170ee142a514c0c390d8c2e7
Author: Laurent Balland-Poirier 
Date:   Thu Mar 16 23:45:13 2017 +0100

tdf#106190 Fix (again) left alignment of denominator

Instead of moving spaces from left to right, like it was done
previously, this patch insert spaces directly on right
when in denominator
This avoid complex calculation when user enter such (stupid)
format:
 # ?/ ???
or
 # ?/" hello world "???

In SvNumberformat::ImpNumberFill, for NF_SYMBOLTYPE_FRAC_FDIV
you need at least to move in sBuf, to insert text at the
expected place for (stupid) format like
 # ?/ 100
or
 # ?/" hello world "100

All these formats works, but are stored in ODF with text
after fraction

Change-Id: I296e60643e93242b8006848a643135219ad4ad0c
Reviewed-on: https://gerrit.libreoffice.org/35320
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 2fd110a78d03510d031c4c6cf6ad380d82899df8)
Reviewed-on: https://gerrit.libreoffice.org/36232
(cherry picked from commit 693c929c1a475e6b4bd737e50d09d6f390700812)

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index ce632ae04920..ceba6a4993ca 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -553,7 +553,8 @@ private:
 sal_Int32& k,
 sal_uInt16& j,
 sal_uInt16 nIx,
-short eSymbolType );
+short eSymbolType,
+bool bInsertRightBlank = false );
 
 // Helper function to fill in the integer part and the group (AKA 
thousand) separators
 SVL_DLLPRIVATE bool ImpNumberFillWithThousands( OUStringBuffer& sStr,
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index ac622bf4cc45..2c018f662784 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2212,7 +2212,8 @@ OUString lcl_GetDenominatorString(const 
ImpSvNumberformatInfo , sal_uInt16
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC )
 {
-while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] == 
NF_SYMBOLTYPE_STRING );
+while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] != 
NF_SYMBOLTYPE_FRAC_FDIV
+   && rInfo.nTypeArray[i] != 
NF_SYMBOLTYPE_DIGIT );
 for( ; i < nAnz; i++ )
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV || 
rInfo.nTypeArray[i] == NF_SYMBOLTYPE_DIGIT )
@@ -2815,21 +2816,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 sal_uInt16 j = nAnz-1; // Last symbol -> backwards

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 4 commits - configure.ac include/svl include/svtools sc/source svl/source

2017-04-08 Thread Andras Timar 
 configure.ac |2 +-
 include/svl/zformat.hxx  |3 ++-
 include/svtools/insdlg.hxx   |2 +-
 sc/source/filter/excel/xlformula.cxx |5 +
 sc/source/filter/oox/formulabase.cxx |4 ++--
 svl/source/numbers/zformat.cxx   |   29 +++--
 6 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit cdf8819e60c8c5c0302a73a9a9dbe586a8446123
Author: Andras Timar 
Date:   Sat Apr 8 18:11:19 2017 +0200

Bump version to 5.3-5

Change-Id: I9355f7cd94de3371e8b461e881ce9847c50cc7a6

diff --git a/configure.ac b/configure.ac
index 15563f711ca6..03ba74de3278 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.3.10.4],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.5],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
commit 41df401c698498a9fd300af127343cc252e9d030
Author: Caolán McNamara 
Date:   Fri Apr 7 16:18:22 2017 +0100

Resolves: tdf#106732 the intent was surely to return a const ref

Change-Id: Iaaa1f76a689645adaebf4fe5b87003ad238f71f2
(cherry picked from commit a7d008a8dfdc0a8b42061329b5e756b1b034abaf)
Reviewed-on: https://gerrit.libreoffice.org/36276
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit d9736ca79ed3205bb091787e09ebb736ffd808a3)

diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx
index 5e18693663b3..58bada8fadd2 100644
--- a/include/svtools/insdlg.hxx
+++ b/include/svtools/insdlg.hxx
@@ -60,7 +60,7 @@ public:
 return aObjectServerList.size();
 }
 
-const SvObjectServeroperator[]( size_t n ) const
+const SvObjectServer&   operator[]( size_t n ) const
 {
 return aObjectServerList[ n ];
 }
commit 5314bc77e0b6c596170ee142a514c0c390d8c2e7
Author: Laurent Balland-Poirier 
Date:   Thu Mar 16 23:45:13 2017 +0100

tdf#106190 Fix (again) left alignment of denominator

Instead of moving spaces from left to right, like it was done
previously, this patch insert spaces directly on right
when in denominator
This avoid complex calculation when user enter such (stupid)
format:
 # ?/ ???
or
 # ?/" hello world "???

In SvNumberformat::ImpNumberFill, for NF_SYMBOLTYPE_FRAC_FDIV
you need at least to move in sBuf, to insert text at the
expected place for (stupid) format like
 # ?/ 100
or
 # ?/" hello world "100

All these formats works, but are stored in ODF with text
after fraction

Change-Id: I296e60643e93242b8006848a643135219ad4ad0c
Reviewed-on: https://gerrit.libreoffice.org/35320
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
(cherry picked from commit 2fd110a78d03510d031c4c6cf6ad380d82899df8)
Reviewed-on: https://gerrit.libreoffice.org/36232
(cherry picked from commit 693c929c1a475e6b4bd737e50d09d6f390700812)

diff --git a/include/svl/zformat.hxx b/include/svl/zformat.hxx
index ce632ae04920..ceba6a4993ca 100644
--- a/include/svl/zformat.hxx
+++ b/include/svl/zformat.hxx
@@ -553,7 +553,8 @@ private:
 sal_Int32& k,
 sal_uInt16& j,
 sal_uInt16 nIx,
-short eSymbolType );
+short eSymbolType,
+bool bInsertRightBlank = false );
 
 // Helper function to fill in the integer part and the group (AKA 
thousand) separators
 SVL_DLLPRIVATE bool ImpNumberFillWithThousands( OUStringBuffer& sStr,
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index ac622bf4cc45..2c018f662784 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2212,7 +2212,8 @@ OUString lcl_GetDenominatorString(const 
ImpSvNumberformatInfo , sal_uInt16
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC )
 {
-while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] == 
NF_SYMBOLTYPE_STRING );
+while ( ( ++i < nAnz ) && rInfo.nTypeArray[i] != 
NF_SYMBOLTYPE_FRAC_FDIV
+   && rInfo.nTypeArray[i] != 
NF_SYMBOLTYPE_DIGIT );
 for( ; i < nAnz; i++ )
 {
 if( rInfo.nTypeArray[i] == NF_SYMBOLTYPE_FRAC_FDIV || 
rInfo.nTypeArray[i] == NF_SYMBOLTYPE_DIGIT )
@@ -2815,21 +2816,7 @@ bool SvNumberformat::ImpGetFractionOutput(double fNumber,
 sal_uInt16 j = nAnz-1; // Last symbol -> backwards