[Libreoffice-commits] .: sc/inc sc/source

[Kohei Yoshida]

 sc/inc/dptabres.hxx              |    4 ++--
 sc/source/core/data/dptabres.cxx |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cdef29ce87fcbf0f05dcaf8086bc2c7eea7dd47a
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Tue Nov 15 02:10:33 2011 -0500

    String to rtl::OUString.

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 2c92f22..d901d74 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -318,8 +318,8 @@ public:
 
     long                GetMeasureCount() const     { return nMeasCount; }
     ScSubTotalFunc      GetMeasureFunction(long nMeasure) const;
-    String              GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
-    String              GetMeasureDimensionName(long nMeasure) const;
+    rtl::OUString       GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
+    rtl::OUString       GetMeasureDimensionName(long nMeasure) const;
     const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
     sal_uInt16              GetMeasureRefOrient(long nMeasure) const;
 
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 62feb0b..d10cf7f 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -862,7 +862,7 @@ sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const
     return pMeasRefOrient[nMeasure];
 }
 
-String ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
+rtl::OUString ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
 {
     //  with bForce==sal_True, return function instead of "result" for single measure
     //  with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc
@@ -902,12 +902,12 @@ String ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFu
     }
 }
 
-String ScDPResultData::GetMeasureDimensionName(long nMeasure) const
+rtl::OUString ScDPResultData::GetMeasureDimensionName(long nMeasure) const
 {
     if ( nMeasure < 0 )
     {
         OSL_FAIL("GetMeasureDimensionName: negative");
-        return String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("***"));
+        return rtl::OUString::createFromAscii("***");
     }
 
     return pSource->GetDataDimName( nMeasure );