[Libreoffice-commits] .: sc/qa

Caolán McNamara caolan at kemper.freedesktop.org
Fri Jan 14 02:34:23 PST 2011


 sc/qa/unit/ucalc.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 73fa256319ff398e74445563fd60209fc34f8126
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 14 10:34:13 2011 +0000

    Can't use RTL_CONSTASCII_USTRINGPARAM on pointers

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1f9b7f3..3683854 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -381,14 +381,14 @@ void Test::testDataPilot()
 
     // Insert field names in row 0.
     for (sal_uInt32 i = 0; i < nFieldCount; ++i)
-        m_pDoc->SetString(0, static_cast<SCCOL>(i), 0, OUString(RTL_CONSTASCII_USTRINGPARAM(aFields[i].pName)));
+        m_pDoc->SetString(0, static_cast<SCCOL>(i), 0, OUString::createFromAscii(aFields[i].pName));
 
     // Insert data into row 1 and downward.
     for (sal_uInt32 i = 0; i < nDataCount; ++i)
     {
         SCROW nRow = static_cast<SCROW>(i) + 1;
-        m_pDoc->SetString(0, nRow, 0, OUString(RTL_CONSTASCII_USTRINGPARAM(aData[i].pName)));
-        m_pDoc->SetString(1, nRow, 0, OUString(RTL_CONSTASCII_USTRINGPARAM(aData[i].pGroup)));
+        m_pDoc->SetString(0, nRow, 0, OUString::createFromAscii(aData[i].pName));
+        m_pDoc->SetString(1, nRow, 0, OUString::createFromAscii(aData[i].pGroup));
         m_pDoc->SetValue(2, nRow, 0, aData[i].nScore);
     }
 
@@ -420,7 +420,7 @@ void Test::testDataPilot()
     // Set the dimension information.
     for (sal_uInt32 i = 0; i < nFieldCount; ++i)
     {
-        OUString aDimName(RTL_CONSTASCII_USTRINGPARAM(aFields[i].pName));
+        OUString aDimName(OUString::createFromAscii(aFields[i].pName));
         ScDPSaveDimension* pDim = aSaveData.GetDimensionByName(aDimName);
         pDim->SetOrientation(aFields[i].eOrient);
         if (aFields[i].eOrient == sheet::DataPilotFieldOrientation_DATA)


More information about the Libreoffice-commits mailing list