summaryrefslogtreecommitdiff
path: root/sc/source/core/data
diff options
context:
space:
mode:
authorJean-Noël Rouvignac <jn.rouvignac@gmail.com>2013-02-14 20:15:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-02-19 13:52:30 +0000
commit742515639168cd35a0c2036a5bf6c46b2a3a554e (patch)
treeb730261a267719fe737315ab375eea88638aa331 /sc/source/core/data
parent1dace0c3e0972c2bde8db177433b7d095025bcca (diff)
fdo#38838 ScGlobal::GetRscString() now returns OUString instead of String.
Cleaned up the call sites. Change-Id: I6c688cecd4f872ed064ccfa3af4b402a779860dc Reviewed-on: https://gerrit.libreoffice.org/2155 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/core/data')
-rw-r--r--sc/source/core/data/docpool.cxx4
-rw-r--r--sc/source/core/data/global.cxx10
-rw-r--r--sc/source/core/data/table3.cxx4
3 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 8a4e870bf32a..535a48061b02 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -994,7 +994,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
- rText = OUString(ScGlobal::GetRscString(STR_HEADER)) + " ( " + aBuffer + " ) ";
+ rText = ScGlobal::GetRscString(STR_HEADER) + " ( " + aBuffer + " ) ";
}
}
break;
@@ -1005,7 +1005,7 @@ SfxItemPresentation ScDocumentPool::GetPresentation(
if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE )
{
- rText = OUString(ScGlobal::GetRscString(STR_FOOTER)) + " ( " + aBuffer + " ) ";
+ rText = ScGlobal::GetRscString(STR_FOOTER) + " ( " + aBuffer + " ) ";
}
}
break;
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 3a00dd5f9806..0d0a3d0b5536 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -88,7 +88,7 @@ ScAutoFormat* ScGlobal::pAutoFormat = NULL;
FuncCollection* ScGlobal::pFuncCollection = NULL;
ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL;
ScUserList* ScGlobal::pUserList = NULL;
-String** ScGlobal::ppRscString = NULL;
+OUString** ScGlobal::ppRscString = NULL;
LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM;
::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL;
SvtSysLocale* ScGlobal::pSysLocale = NULL;
@@ -339,7 +339,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList )
}
}
-const String& ScGlobal::GetRscString( sal_uInt16 nIndex )
+const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex )
{
OSL_ENSURE( nIndex < STR_COUNT, "ScGlobal::GetRscString - invalid string index");
if( !ppRscString[ nIndex ] )
@@ -373,10 +373,10 @@ const String& ScGlobal::GetRscString( sal_uInt16 nIndex )
; // nothing
}
if (eOp != ocNone)
- ppRscString[ nIndex ] = new String(
+ ppRscString[ nIndex ] = new OUString(
ScCompiler::GetNativeSymbol( eOp));
else
- ppRscString[ nIndex ] = new String(
+ ppRscString[ nIndex ] = new OUString(
ScRscStrLoader( RID_GLOBSTR, nIndex ).GetString());
}
return *ppRscString[ nIndex ];
@@ -543,7 +543,7 @@ void ScGlobal::Init()
pCharClass = pSysLocale->GetCharClassPtr();
pLocaleData = pSysLocale->GetLocaleDataPtr();
- ppRscString = new String *[ STR_COUNT ];
+ ppRscString = new OUString *[ STR_COUNT ];
for( sal_uInt16 nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL;
pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index af5c3cb1b5b5..52c45a8ded81 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2057,12 +2057,12 @@ bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2
if (nIndex > 0)
{
GetUpperCellString(nCol1, nRow, aCellStr);
- if ( aCellStr == rtl::OUString(ScGlobal::GetRscString(STR_TABLE_UND)) )
+ if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_UND) )
{
rEntry.eConnect = SC_AND;
bValid = true;
}
- else if ( aCellStr == rtl::OUString(ScGlobal::GetRscString(STR_TABLE_ODER)) )
+ else if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_ODER) )
{
rEntry.eConnect = SC_OR;
bValid = true;