Resolves: tdf#88740 parse with locale decimal separator

And use a proper string to double conversion and early bail out
conditions.

(cherry picked from commit 1884c0bbd40f0ded41d7a1656cb64fb1f6368c36)

tdf#88740 fix sidebar angle rotation i18n

(cherry picked from commit 9a7bf47098fe69b5c6069372708918ef94a9d597)

use a less ugly string to double conversion, tdf#88740 follow-up

And check string length before accessing characters..

(cherry picked from commit 3ba5ac834780fc2565aff99e42dd8c3b2202fba3)

30355f3aaf77b1952e21050e3593e575571d7aaa
ac3c2bf2f67f0cc7fc106515a875512771676e01
f97a25cd2cab0dccf2154465da7c1235ef3ca8c6
Backport: added vcl/settings.hxx

Change-Id: I6c89dd850405ad74ebd175800131cdcac19a8c86
Reviewed-on: https://gerrit.libreoffice.org/14243
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 23 insertions, 10 deletions

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 6956bf6f2c11..a2d8cbe79b73 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -35,6 +35,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/toolbox.hxx>
+#include <vcl/settings.hxx>
 #include <svl/aeitem.hxx>
 #include <svx/svdview.hxx>
 
@@ -488,24 +489,36 @@ IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG )
 IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
 {
     OUString sTmp = mpMtrAngle->GetText();
-    bool    bNegative = false;
+    if (sTmp.isEmpty())
+        return 0;
     sal_Unicode nChar = sTmp[0];
-
     if( nChar == '-' )
     {
-        bNegative = true;
+        if (sTmp.getLength() < 2)
+            return 0;
         nChar = sTmp[1];
     }
 
     if( (nChar < '0') || (nChar > '9') )
         return 0;
-    double dTmp = sTmp.toDouble();
-    if(bNegative)
-    {
-        while(dTmp<0)
-            dTmp += 360;
-    }
-    sal_Int64 nTmp = dTmp*100;
+
+    const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
+    const sal_Unicode cSep = rLocaleWrapper.getNumDecimalSep()[0];
+
+    // Do not check that the entire string was parsed up to its end, there may
+    // be a degree symbol following the number. Note that this also means that
+    // the number recognized just stops at any non-matching character.
+    /* TODO: we could check for the degree symbol stop if there are no other
+     * cases with different symbol characters in any language? */
+    rtl_math_ConversionStatus eStatus;
+    double fTmp = rtl::math::stringToDouble( sTmp, cSep, 0, &eStatus);
+    if (eStatus != rtl_math_ConversionStatus_Ok)
+        return 0;
+
+    while (fTmp < 0)
+        fTmp += 360;
+
+    sal_Int64 nTmp = fTmp*100;
 
     // #i123993# Need to take UIScale into account when executing rotations
     const double fUIScale(mpView && mpView->GetModel() ? double(mpView->GetModel()->GetUIScale()) : 1.0);