[Libreoffice-commits] .: 2 commits - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/subsequent_filters-test.cxx |   48 +++++++++++----------------------
 sc/source/core/data/colorscale.cxx     |    4 +-
 2 files changed, 18 insertions(+), 34 deletions(-)

New commits:
commit 4c2a87d6e70040182d328c25d561b0de69e96a2b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Sep 23 21:22:29 2012 +0200

    int to sal_Int32
    
    Change-Id: I44c5027c15b4f77a3ee76b62673641cc200fbefe

diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 4ca1bc7..257ff1b 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -176,7 +176,7 @@ void ScColorScaleEntry::dumpInfo(rtl::OUStringBuffer& rBuf) const
         default:
             rBuf.append( "Unsupported Type\n" );
     }
-    rBuf.append( "Color: " ).append( (int)maColor.GetRed() ).append( "," ).append( (int)maColor.GetGreen() ).append( "," ).append( (int)maColor.GetBlue() ).append( "\n" );
+    rBuf.append( "Color: " ).append( (sal_Int32)maColor.GetRed() ).append( "," ).append( (sal_Int32)maColor.GetGreen() ).append( "," ).append( (sal_Int32)maColor.GetBlue() ).append( "\n" );
     if(meType == COLORSCALE_FORMULA)
         rBuf.append( "Formula: " ).append( GetFormula( formula::FormulaGrammar::GRAM_DEFAULT ) ).append("\n");
     else if( meType != COLORSCALE_MIN && meType != COLORSCALE_MAX )
@@ -549,7 +549,7 @@ void ScColorScaleFormat::dumpInfo(rtl::OUStringBuffer& rBuf) const
             {
                 boost::scoped_ptr<Color> pColor( GetColor(ScAddress(nCol, nRow, nTab)) );
                 rBuf.append(nCol).append(",").append(nRow).append(",").append(nTab).append(",");
-                rBuf.append(((int)pColor->GetRed())).append(",").append(((int)pColor->GetGreen())).append(",").append(((int)pColor->GetBlue())).append("\n");
+                rBuf.append(((sal_Int32)pColor->GetRed())).append(",").append(((sal_Int32)pColor->GetGreen())).append(",").append(((sal_Int32)pColor->GetBlue())).append("\n");
             }
         }
     }
commit 1245c2a7daba66e78a8548b0e5193d7e2b1f2a92
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Sep 23 21:22:01 2012 +0200

    little refactoring and code simplification
    
    Change-Id: I41c7507d668eb0853b97c24217ff04f7dd4acd40

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 8670345..2b6193f 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1489,62 +1489,46 @@ void ScFiltersTest::testPivotTableBasicODS()
 
 namespace {
 
+void testColorScaleFormat_Impl(ScDocument* pDoc, const rtl::OUString& rFilePath, const ScConditionalFormat* pFormat)
+{
+    rtl::OUStringBuffer aBuf;
+    CPPUNIT_ASSERT(pFormat);
+    pFormat->dumpInfo(aBuf);
+    rtl::OUString aString = aBuf.makeStringAndClear();
+    std::string aStdString;
+    loadFile(rFilePath, aStdString);
+    rtl::OUString aRefString = rtl::OUString::createFromAscii(aStdString.c_str());
+    CPPUNIT_ASSERT_EQUAL(aRefString, aString);
+}
+
 void testColorScale_Impl(ScDocument* pDoc, const rtl::OUString& aBaseString)
 {
     // first color scale
     {
-        rtl::OUStringBuffer aBuf;
         const ScConditionalFormat* pFormat = pDoc->GetCondFormat(1,1,0);
-        CPPUNIT_ASSERT(pFormat);
-        pFormat->dumpInfo(aBuf);
-        rtl::OUString aString = aBuf.makeStringAndClear();
         rtl::OUString aFilePath = aBaseString + rtl::OUString("colorScale_1.txt");
-        std::string aStdString;
-        loadFile(aFilePath, aStdString);
-        rtl::OUString aRefString = rtl::OUString::createFromAscii(aStdString.c_str());
-        CPPUNIT_ASSERT_EQUAL(aRefString, aString);
+        testColorScaleFormat_Impl(pDoc, aFilePath, pFormat);
     }
 
     // second cond format
     {
-        rtl::OUStringBuffer aBuf;
         const ScConditionalFormat* pFormat = pDoc->GetCondFormat(4,1,0);
-        CPPUNIT_ASSERT(pFormat);
-        pFormat->dumpInfo(aBuf);
-        rtl::OUString aString = aBuf.makeStringAndClear();
         rtl::OUString aFilePath = aBaseString + rtl::OUString("colorScale_2.txt");
-        std::string aStdString;
-        loadFile(aFilePath, aStdString);
-        rtl::OUString aRefString = rtl::OUString::createFromAscii(aStdString.c_str());
-        CPPUNIT_ASSERT_EQUAL(aRefString, aString);
+        testColorScaleFormat_Impl(pDoc, aFilePath, pFormat);
     }
 
     // third cond format
     {
-        rtl::OUStringBuffer aBuf;
         const ScConditionalFormat* pFormat = pDoc->GetCondFormat(7,1,0);
-        CPPUNIT_ASSERT(pFormat);
-        pFormat->dumpInfo(aBuf);
-        rtl::OUString aString = aBuf.makeStringAndClear();
         rtl::OUString aFilePath = aBaseString + rtl::OUString("colorScale_3.txt");
-        std::string aStdString;
-        loadFile(aFilePath, aStdString);
-        rtl::OUString aRefString = rtl::OUString::createFromAscii(aStdString.c_str());
-        CPPUNIT_ASSERT_EQUAL(aRefString, aString);
+        testColorScaleFormat_Impl(pDoc, aFilePath, pFormat);
     }
 
     // forth cond format
     {
-        rtl::OUStringBuffer aBuf;
         const ScConditionalFormat* pFormat = pDoc->GetCondFormat(10,1,0);
-        CPPUNIT_ASSERT(pFormat);
-        pFormat->dumpInfo(aBuf);
-        rtl::OUString aString = aBuf.makeStringAndClear();
         rtl::OUString aFilePath = aBaseString + rtl::OUString("colorScale_4.txt");
-        std::string aStdString;
-        loadFile(aFilePath, aStdString);
-        rtl::OUString aRefString = rtl::OUString::createFromAscii(aStdString.c_str());
-        CPPUNIT_ASSERT_EQUAL(aRefString, aString);
+        testColorScaleFormat_Impl(pDoc, aFilePath, pFormat);
     }
 }