[Libreoffice-commits] .: 2 commits - binfilter/bf_sc oox/Library_oox.mk

[Caolán McNamara]

 binfilter/bf_sc/source/core/tool/sc_autoform.cxx |    4 ++--
 binfilter/bf_sc/source/core/tool/sc_interpr3.cxx |    8 ++++----
 oox/Library_oox.mk                               |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d55186d0117ac603a7b9259ab1be5b5d1689af02
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 18 10:20:59 2011 +0100

    seem to need realpath here to build

diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index db266ba..84316db 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,oox,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
     -I$(OUTDIR)/inc/offuh \
-    -I$(SRCDIR)/oox/inc \
+    -I$(realpath $(SRCDIR)/oox/inc) \
     $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \
 ))
 
commit 9d7982b06b5e720df002d908137fda528e615c92
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 17 22:50:52 2011 +0100

    throw out some warnings

diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index b546589..5e6d692 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -393,14 +393,14 @@ const USHORT AUTOFORMAT_OLD_ID_NEW 	= 4203;
 
 /*N*/  ScAutoFormatDataField& ScAutoFormatData::GetField( USHORT nIndex )
 /*N*/  {
-/*N*/      DBG_ASSERT( (0 <= nIndex) && (nIndex < 16), "ScAutoFormatData::GetField - illegal index" );
+/*N*/      DBG_ASSERT( (nIndex < 16), "ScAutoFormatData::GetField - illegal index" );
 /*N*/      DBG_ASSERT( ppDataField && ppDataField[ nIndex ], "ScAutoFormatData::GetField - no data" );
 /*N*/      return *ppDataField[ nIndex ];
 /*N*/  }
 
 /*N*/ const ScAutoFormatDataField& ScAutoFormatData::GetField( USHORT nIndex ) const
 /*N*/ {
-/*N*/     DBG_ASSERT( (0 <= nIndex) && (nIndex < 16), "ScAutoFormatData::GetField - illegal index" );
+/*N*/     DBG_ASSERT( (nIndex < 16), "ScAutoFormatData::GetField - illegal index" );
 /*N*/     DBG_ASSERT( ppDataField && ppDataField[ nIndex ], "ScAutoFormatData::GetField - no data" );
 /*N*/     return *ppDataField[ nIndex ];
 /*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
index bb28659..8cccb14 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr3.cxx
@@ -2289,7 +2289,7 @@ void ScInterpreter::ScPercentile()
         {
             ULONG nIndex = (ULONG)::rtl::math::approxFloor(alpha*(nSize-1));
             double fDiff = alpha*(nSize-1) - ::rtl::math::approxFloor(alpha*(nSize-1));
-            DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScPercentile: falscher Index (1)");
+            DBG_ASSERT(nIndex < nSize, "ScPercentile: falscher Index (1)");
             if (fDiff == 0.0)
                 PushDouble(pSArray[nIndex]);
             else
@@ -2342,7 +2342,7 @@ void ScInterpreter::ScQuartile()
             {
                 ULONG nIndex = (ULONG)::rtl::math::approxFloor(0.25*(nSize-1));
                 double fDiff = 0.25*(nSize-1) - ::rtl::math::approxFloor(0.25*(nSize-1));
-                DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScQuartile: falscher Index (1)");
+                DBG_ASSERT(nIndex < nSize, "ScQuartile: falscher Index (1)");
                 if (fDiff == 0.0)
                     PushDouble(pSArray[nIndex]);
                 else
@@ -2363,7 +2363,7 @@ void ScInterpreter::ScQuartile()
             {
                 ULONG nIndex = (ULONG)::rtl::math::approxFloor(0.75*(nSize-1));
                 double fDiff = 0.75*(nSize-1) - ::rtl::math::approxFloor(0.75*(nSize-1));
-                DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScQuartile: falscher Index (3)");
+                DBG_ASSERT(nIndex < nSize, "ScQuartile: falscher Index (3)");
                 if (fDiff == 0.0)
                     PushDouble(pSArray[nIndex]);
                 else
@@ -2610,7 +2610,7 @@ void ScInterpreter::ScTrimMean()
         if (nIndex % 2 != 0)
             nIndex--;
         nIndex /= 2;
-        DBG_ASSERT(nIndex >= 0 && nIndex < nSize, "ScTrimMean: falscher Index");
+        DBG_ASSERT(nIndex < nSize, "ScTrimMean: falscher Index");
         double fSum = 0.0;
         for (ULONG i = nIndex; i < nSize-nIndex; i++)
             fSum += pSArray[i];