diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-15 02:10:33 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-11-15 02:10:33 -0500 |
| commit | cdef29ce87fcbf0f05dcaf8086bc2c7eea7dd47a (patch) | |
| tree | 3cacbf97b134c935d00542cd777761fab396003a /sc | |
| parent | e786e2d25ab0105e88d7ca260c7ef4a88c9b821c (diff) | |
String to rtl::OUString.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/dptabres.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/dptabres.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 2c92f22bd5c3..d901d7473008 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 62feb0b1bb80..d10cf7f4799d 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 ); |