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

[Laurent Balland-Poirier]

 sc/source/ui/view/viewfunc.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit f1333692475201ce1be7a037397158051d8bd039
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Wed Jul 29 22:18:04 2015 +0200

    tdf#92918 Engineering notation lost with Add/Delete Decimal Place
    
    With scientific format, use the trick of thousand separator to detect
    Engineering notation.
    
    Change-Id: I7acdfb8bec646f9d6c1a17c334b60fa9708c8111
    Reviewed-on: https://gerrit.libreoffice.org/17406
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit f4bdd7989f237e8e90ac94c2798e0ea0fb31af6b)
    Reviewed-on: https://gerrit.libreoffice.org/17440

diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 3783473..2cb7612 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2543,6 +2543,12 @@ void ScViewFunc::ChangeNumFmtDecimals( bool bIncrement )
             nPrecision = aOut.getLength() - nPos - aDecSep.getLength();
         // else keep 0
     }
+    else
+    {
+        if ( (nOldType & css::util::NumberFormat::SCIENTIFIC) && !bThousand &&
+             (pOldEntry->GetFormatIntegerDigits()%3 == 0) && pOldEntry->GetFormatIntegerDigits() > 0 )
+            bThousand =  true;
+    }
 
     if (!bError)
     {