sc/source/filter/excel/excel.cxx | 10 ++++++++++ sc/source/ui/docshell/docsh.cxx | 4 ++++ 2 files changed, 14 insertions(+)
New commits: commit 91c6fecc208f8242d2ff04c17ec56b4a5e2c1620 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 31 09:00:35 2017 +0100 ofz#2896 turn off auto look up col/row names for import testing Change-Id: I346a9760c0692449ce5301f5075b3de0271fdadf diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 8abbd30a71b5..7f3e30b2a42e 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -34,6 +34,7 @@ #include <svl/stritem.hxx> #include "filter.hxx" #include "document.hxx" +#include "optuno.hxx" #include "xistream.hxx" #include "scerrors.hxx" @@ -223,6 +224,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportQPW(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; + ScDocOptions aDocOpt = aDocument.GetDocOptions(); + aDocOpt.SetLookUpColRowNames(false); + aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); return ScFormatFilter::Get().ScImportQuattroPro(&rStream, &aDocument) == ERRCODE_NONE; } @@ -231,6 +235,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportCalcRTF(SvStream &rStrea { ScDLL::Init(); ScDocument aDocument; + ScDocOptions aDocOpt = aDocument.GetDocOptions(); + aDocOpt.SetLookUpColRowNames(false); + aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); ScRange aRange; return ScFormatFilter::Get().ScImportRTF(rStream, OUString(), &aDocument, aRange) == ERRCODE_NONE; @@ -241,6 +248,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportXLS(const OUString &rURL ScDLL::Init(); SfxMedium aMedium(rURL, StreamMode::READ); ScDocument aDocument; + ScDocOptions aDocOpt = aDocument.GetDocOptions(); + aDocOpt.SetLookUpColRowNames(false); + aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); return ScFormatFilter::Get().ScImportExcel(aMedium, &aDocument, EIF_AUTO) == ERRCODE_NONE; } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 3c9d8c5d3c73..c6fd2f0ea317 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -125,6 +125,7 @@ #include "cellsuno.hxx" #include "dpobject.hxx" #include "markdata.hxx" +#include "optuno.hxx" #include "orcusfilters.hxx" #include <datastream.hxx> #include <documentlinkmgr.hxx> @@ -3244,6 +3245,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL TestImportSLK(SvStream &rStream) { ScDLL::Init(); ScDocument aDocument; + ScDocOptions aDocOpt = aDocument.GetDocOptions(); + aDocOpt.SetLookUpColRowNames(false); + aDocument.SetDocOptions(aDocOpt); aDocument.MakeTable(0); ScImportExport aImpEx(&aDocument); return aImpEx.ImportStream(rStream, OUString(), SotClipboardFormatId::SYLK);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits