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

Eike Rathke erack at redhat.com
Fri Jul 11 03:29:30 PDT 2014


 sc/source/ui/docshell/docsh8.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 972c92c84e6f95e8fa8818794280a16e681e5edd
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 11 12:25:58 2014 +0200

    CID#982304 logically dead code
    
    Change-Id: I8ffc8249a4d1b7530ee208cf84b48af832758a4d

diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 570e0d6..ef8e78b 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -686,11 +686,20 @@ void lcl_GetColumnTypes(
                 }
                 else
                 {
+#if 1
+                    // Adjust length to predefined precision.
+                    nLen = nLen + ( nPrecision - nPrec );
+#else
+    /* If the above override for (nPrecision < nPrec) was not in place then
+     * nPrecision could be 0 and this would be the code path to correctly
+     * calculate nLen. But as is, nPrecision is never 0 here, see CID#982304 */
+
                     // Adjust length to predefined precision.
                     if ( nPrecision )
                         nLen = nLen + ( nPrecision - nPrec );
                     else
                         nLen -= nPrec+1;    // also remove the decimal separator
+#endif
                 }
             }
             if (nFieldLen < nLen)


More information about the Libreoffice-commits mailing list