summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-04-17 23:09:45 +0200
committerEike Rathke <erack@redhat.com>2014-04-17 23:15:04 +0200
commitb9ba0528d96c7c38824db7f9b3f5ba17a49c82be (patch)
tree139909ec28432c405e11248ed590a222f32ea122 /svx
parent5684e67aa8f046d43ac0e97730bd8cd30dcf31f0 (diff)
no temporary instance of SvtLanguageTable necessary here
Change-Id: I7a32bc6391630266eb548c4fa2c7b9dedec3697c
Diffstat (limited to 'svx')
-rw-r--r--svx/source/items/numfmtsh.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 5c4b0af7449d..9e464d0db02c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -1515,13 +1515,11 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool
const NfCurrencyTable& rCurrencyTable=SvNumberFormatter::GetTheCurrencyTable();
sal_uInt16 nCount=rCurrencyTable.size();
- SvtLanguageTable* pLanguageTable=new SvtLanguageTable;
-
sal_uInt16 nStart=1;
OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol()));
aString += " ";
- aString += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[0].GetLanguage()));
+ aString += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( rCurrencyTable[0].GetLanguage()));
rList.push_back(aString);
sal_uInt16 nAuto=(sal_uInt16)-1;
@@ -1545,7 +1543,7 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool
aStr += aTwoSpace;
aStr += ApplyLreOrRleEmbedding( rCurrencyTable[i].GetSymbol());
aStr += aTwoSpace;
- aStr += ApplyLreOrRleEmbedding( pLanguageTable->GetString( rCurrencyTable[i].GetLanguage()));
+ aStr += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString( rCurrencyTable[i].GetLanguage()));
sal_uInt16 j = nStart;
for(; j < rList.size(); ++j)
@@ -1580,8 +1578,6 @@ void SvxNumberFormatShell::GetCurrencySymbols(std::vector<OUString>& rList, bool
aCurCurrencyList.insert(aCurCurrencyList.begin()+j, i);
}
}
-
- delete pLanguageTable;
}
void SvxNumberFormatShell::SetCurrencySymbol(sal_uInt32 nPos)