diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-08 17:34:06 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-08 20:44:26 +0100 |
commit | 02740cbe0a21939e3720b72a074ce71798e78d1d (patch) | |
tree | ec0e88e6f9e03bbc81e2caaa804a9a849574406d /sc/source/filter | |
parent | 6e016d0dc74c986073ae1428a16464a59c331d2d (diff) |
Related: fdo#38838 drop String::EmptyString now as well
Change-Id: I849dbf3a40189e700036249b15dd8bde493083b6
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/excel/xechart.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xichart.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/excel/xiroot.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xlescher.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/xichart.hxx | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 64e3f0d755d9..d7a62b698196 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -975,7 +975,7 @@ sal_uInt16 XclExpChSourceLink::ConvertStringSequence( const Sequence< Reference< sal_uInt16 nFontIdx = EXC_FONT_APP; if( rStringSeq.hasElements() ) { - mxString = XclExpStringHelper::CreateString( GetRoot(), String::EmptyString(), EXC_STR_FORCEUNICODE | EXC_STR_8BITLENGTH | EXC_STR_SEPARATEFORMATS ); + mxString = XclExpStringHelper::CreateString( GetRoot(), OUString(), EXC_STR_FORCEUNICODE | EXC_STR_8BITLENGTH | EXC_STR_SEPARATEFORMATS ); Reference< XBreakIterator > xBreakIt = GetDoc().GetBreakIterator(); namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index fb16dda287b2..1df40dfb7b1a 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2747,12 +2747,12 @@ bool XclImpChTypeGroup::HasConnectorLines() const return ( xConLine != maChartLines.end() && xConLine->second->HasLine() ); } -const String& XclImpChTypeGroup::GetSingleSeriesTitle() const +OUString XclImpChTypeGroup::GetSingleSeriesTitle() const { // no automatic title for series with trendlines or error bars // pie charts always show an automatic title, even if more series exist return (mxFirstSeries && !mxFirstSeries->HasChildSeries() && (maTypeInfo.mbSingleSeriesVis || (maSeries.size() == 1))) ? - mxFirstSeries->GetTitle() : String::EmptyString(); + mxFirstSeries->GetTitle() : OUString(); } void XclImpChTypeGroup::ConvertChart3d( ScfPropertySet& rPropSet ) const @@ -3590,9 +3590,9 @@ XclImpChLegendRef XclImpChAxesSet::GetLegend() const return xLegend; } -const String& XclImpChAxesSet::GetSingleSeriesTitle() const +OUString XclImpChAxesSet::GetSingleSeriesTitle() const { - return (maTypeGroups.size() == 1) ? maTypeGroups.begin()->second->GetSingleSeriesTitle() : String::EmptyString(); + return (maTypeGroups.size() == 1) ? maTypeGroups.begin()->second->GetSingleSeriesTitle() : OUString(); } void XclImpChAxesSet::Convert( Reference< XDiagram > xDiagram ) const diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 206a0930dfda..6d53ae9dc9cb 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -111,7 +111,7 @@ void XclImpRoot::InitializeTable( SCTAB nScTab ) GetPageSettings().Initialize(); GetTabViewSettings().Initialize(); // delete the automatically generated codename - GetDoc().SetCodeName( nScTab, String::EmptyString() ); + GetDoc().SetCodeName( nScTab, OUString() ); } void XclImpRoot::FinalizeTable() diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 974155aac6d4..00def4658a36 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -339,7 +339,7 @@ String XclControlHelper::ExtractFromMacroDescriptor( rDescriptor.ListenerType.equalsAscii( spTbxListenerData[ eEventType ].mpcListenerType ) && rDescriptor.EventMethod.equalsAscii( spTbxListenerData[ eEventType ].mpcEventMethod ) ) return XclTools::GetXclMacroName( rDescriptor.ScriptCode ); - return String::EmptyString(); + return OUString(); } // ============================================================================ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 308ca4c2ce07..4f10b75753cc 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -414,7 +414,7 @@ public: /** Returns true, if the source link contains explicit string data. */ inline bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Returns explicit string data or an empty string. */ - inline const String& GetString() const { return mxString ? mxString->GetText() : String::EmptyString(); } + OUString GetString() const { return mxString ? mxString->GetText() : OUString(); } /** Returns the number of data points of this source link. */ sal_uInt16 GetCellCount() const; @@ -828,7 +828,7 @@ public: /** Returns true, if the series contains child series (e.g. trend lines). */ inline bool HasChildSeries() const { return !maTrendLines.empty() || !maErrorBars.empty(); } /** Returns series title or an empty string, if the series does not contain a title. */ - inline const String& GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : String::EmptyString(); } + OUString GetTitle() const { return mxTitleLink ? mxTitleLink->GetString() : OUString(); } /** Returns true, if the series line is smoothed. */ inline bool HasSpline() const { return mxSeriesFmt && mxSeriesFmt->HasSpline(); } @@ -1066,7 +1066,7 @@ public: /** Returns the default series data format. */ inline XclImpChDataFormatRef GetGroupFormat() const { return mxGroupFmt; } /** Returns series title, if the chart type group contains only one single series. */ - const String& GetSingleSeriesTitle() const; + OUString GetSingleSeriesTitle() const; /** Converts and writes all 3D settings to the passed diagram. */ void ConvertChart3d( ScfPropertySet& rPropSet ) const; @@ -1303,7 +1303,7 @@ public: /** Looks for a legend in all chart type groups and returns it. */ XclImpChLegendRef GetLegend() const; /** Returns series title, if the axes set contains only one single series. */ - const String& GetSingleSeriesTitle() const; + OUString GetSingleSeriesTitle() const; /** Creates a coordinate system and converts all series and axis settings. */ void Convert( XDiagramRef xDiagram ) const; |