Kaydet (Commit) 1af7f192 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#9894 cut out slow paths

Change-Id: I4be00089740e5d96ceac70505e190769e86b55eb
Reviewed-on: https://gerrit.libreoffice.org/59106
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c2db702c
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <svl/zformat.hxx> #include <svl/zformat.hxx>
#include <formula/token.hxx> #include <formula/token.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <unotools/configmgr.hxx>
#include <document.hxx> #include <document.hxx>
#include <table.hxx> #include <table.hxx>
...@@ -273,6 +274,8 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, ...@@ -273,6 +274,8 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1,
SAL_WARN("sc", "ScDocument::InsertMatrixFormula: No table marked"); SAL_WARN("sc", "ScDocument::InsertMatrixFormula: No table marked");
return; return;
} }
if (utl::ConfigManager::IsFuzzing()) //just too slow
return;
assert( ValidColRow( nCol1, nRow1) && ValidColRow( nCol2, nRow2)); assert( ValidColRow( nCol1, nRow1) && ValidColRow( nCol2, nRow2));
SCTAB nTab1 = *rMark.begin(); SCTAB nTab1 = *rMark.begin();
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <svl/sharedstringpool.hxx> #include <svl/sharedstringpool.hxx>
#include <svl/languageoptions.hxx> #include <svl/languageoptions.hxx>
#include <o3tl/make_unique.hxx> #include <o3tl/make_unique.hxx>
#include <unotools/configmgr.hxx>
namespace { namespace {
...@@ -385,6 +386,9 @@ void ScDocumentImport::setMatrixCells( ...@@ -385,6 +386,9 @@ void ScDocumentImport::setMatrixCells(
if (!pBlockPos) if (!pBlockPos)
return; return;
if (utl::ConfigManager::IsFuzzing()) //just too slow
return;
sc::CellStoreType& rCells = pTab->aCol[rBasePos.Col()].maCells; sc::CellStoreType& rCells = pTab->aCol[rBasePos.Col()].maCells;
// Set the master cell. // Set the master cell.
......
...@@ -97,7 +97,7 @@ enum class SylkVersion ...@@ -97,7 +97,7 @@ enum class SylkVersion
// Whole document without Undo // Whole document without Undo
ScImportExport::ScImportExport( ScDocument* p ) ScImportExport::ScImportExport( ScDocument* p )
: pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ),
nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : 4000), nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : SCROWS32K),
cSep( '\t' ), cStr( '"' ), cSep( '\t' ), cStr( '"' ),
bFormulas( false ), bIncludeFiltered( true ), bFormulas( false ), bIncludeFiltered( true ),
bAll( true ), bSingle( true ), bUndo( false ), bAll( true ), bSingle( true ), bUndo( false ),
...@@ -113,7 +113,7 @@ ScImportExport::ScImportExport( ScDocument* p ) ...@@ -113,7 +113,7 @@ ScImportExport::ScImportExport( ScDocument* p )
ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
: pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ),
aRange( rPt ), aRange( rPt ),
nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : 4000), nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : SCROWS32K),
cSep( '\t' ), cStr( '"' ), cSep( '\t' ), cStr( '"' ),
bFormulas( false ), bIncludeFiltered( true ), bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != nullptr ), bAll( false ), bSingle( true ), bUndo( pDocSh != nullptr ),
...@@ -130,7 +130,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt ) ...@@ -130,7 +130,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
: pDocSh( dynamic_cast<ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), : pDocSh( dynamic_cast<ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ),
aRange( r ), aRange( r ),
nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : 4000), nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : SCROWS32K),
cSep( '\t' ), cStr( '"' ), cSep( '\t' ), cStr( '"' ),
bFormulas( false ), bIncludeFiltered( true ), bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( false ), bUndo( pDocSh != nullptr ), bAll( false ), bSingle( false ), bUndo( pDocSh != nullptr ),
...@@ -148,7 +148,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r ) ...@@ -148,7 +148,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
// If a View exists, the TabNo of the view will be used. // If a View exists, the TabNo of the view will be used.
ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos ) ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
: pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ), : pDocSh( dynamic_cast< ScDocShell* >(p->GetDocumentShell()) ), pDoc( p ),
nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : 4000), nSizeLimit( 0 ), nMaxImportRow(!utl::ConfigManager::IsFuzzing() ? MAXROW : SCROWS32K),
cSep( '\t' ), cStr( '"' ), cSep( '\t' ), cStr( '"' ),
bFormulas( false ), bIncludeFiltered( true ), bFormulas( false ), bIncludeFiltered( true ),
bAll( false ), bSingle( true ), bUndo( pDocSh != nullptr ), bAll( false ), bSingle( true ), bUndo( pDocSh != nullptr ),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment