diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-14 18:32:57 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-14 18:34:20 -0400 |
commit | 625c595fc30d2e6153735dc2ed2359ff4f8a1e3a (patch) | |
tree | b24941adb87381dcb5ef651b593fa4aadd2e3c2f /sc/source/ui/formdlg | |
parent | fdo#76294: Properly intern string literals in formula on xls import. (diff) | |
download | core-625c595fc30d2e6153735dc2ed2359ff4f8a1e3a.tar.gz core-625c595fc30d2e6153735dc2ed2359ff4f8a1e3a.zip |
fdo#76294: Intern strings in AddFormulaToken() as well.
And a whole bunch of changes needed to make that happen.
Change-Id: Idd98fbc99322c0d72fb0a7848d89cb1a6abc88b6
Diffstat (limited to 'sc/source/ui/formdlg')
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index f8bd44e21607..c2bcb3ed2564 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -655,7 +655,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList) { ::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray()); - pArray->Fill( _aTokenList, pDoc->GetExternalRefManager()); + pArray->Fill(_aTokenList, pDoc->GetSharedStringPool(), pDoc->GetExternalRefManager()); return pArray; } // for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit |