sc/source/core/data/table1.cxx | 1 -
sc/source/filter/lotus/lotimpop.cxx | 5 +++++
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 3788e31b2ed3cd782180c714a764cec0e02abd3b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 27 21:31:37 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 28 15:39:57 2019 +0200
set parent for file picker dialog
Change-Id: I92c83dcb9fd0fa3305aa2f40f6cc0d28fc0ad022
Reviewed-on: https://gerrit.libreoffice.org/71438
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 5a83b66c4aae..7a2ef3b8311b 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -21,6 +21,7 @@
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/viewdataentry.hxx>
+#include <sfx2/filedlghelper.hxx>
#include <sfx2/objsh.hxx>
#include <comphelper/processfactory.hxx>
@@ -183,7 +184,10 @@ bool ScXMLSourceDlg::Close()
void ScXMLSourceDlg::SelectSourceFile()
{
- uno::Reference<ui::dialogs::XFilePicker3> xFilePicker =
ui::dialogs::FilePicker::createWithMode(
comphelper::getProcessComponentContext(),
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
+ sfx2::FileDialogHelper
aDlgHelper(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+ FileDialogFlags::NONE, GetFrameWeld());
+
+ uno::Reference<ui::dialogs::XFilePicker3> xFilePicker =
aDlgHelper.GetFilePicker();
if (maSrcPath.isEmpty())
// Use default path.
commit f58e69e7e3f0edd53a16ea6d374e401c1284bca4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Apr 27 21:05:35 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 28 15:39:46 2019 +0200
ofz#14167 arbitrary sheet limit to make fuzzing useful
Change-Id: I729d62520e9b59e96984f5d4b1aabd059f60d71d
Reviewed-on: https://gerrit.libreoffice.org/71437
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 057398906f47..2e7a7ffc33cc 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -278,7 +278,6 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const
OUString& rNewName,
mbForceBreaks(false),
aDefaultColAttrArray(static_cast<SCCOL>(-1), nNewTab, pDoc, nullptr)
{
-
if (bColInfo)
{
mpColWidth.reset( new ScCompressedArray<SCCOL, sal_uInt16>( MAXCOL+1,
STD_COL_WIDTH ) );
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 266dc881d317..6848c6caa8b3 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -34,6 +34,8 @@
#include <lotattr.hxx>
#include <stringutil.hxx>
+#include <unotools/configmgr.hxx>
+
LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ )
:
pDoc( pDocP),
@@ -325,6 +327,9 @@ void ImportLotus::NamedSheet()
Read(aName);
SCTAB nLTab(SanitizeTab(static_cast<SCTAB>(nTmpTab)));
+ //ofz#14167 arbitrary sheet limit to make fuzzing useful
+ if (nLTab > 5 && utl::ConfigManager::IsFuzzing())
+ nLTab = 5;
if (pD->HasTable(nLTab))
pD->RenameTab(nLTab, aName);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
