summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/inc/column.hxx11
-rw-r--r--sc/source/core/data/column.cxx15
-rw-r--r--sc/source/core/data/column3.cxx3
-rw-r--r--sc/source/core/data/document.cxx8
-rw-r--r--sc/source/core/data/table6.cxx5
-rw-r--r--sc/source/ui/docshell/dbdocimp.cxx1
-rw-r--r--sc/source/ui/docshell/docsh.cxx10
-rw-r--r--sc/source/ui/docshell/docsh8.cxx3
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx6
10 files changed, 0 insertions, 64 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3206637e7cfe..a2aad726fb9a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -117,17 +117,6 @@ friend class ScHorizontalCellIterator;
friend class ScHorizontalAttrIterator;
public:
- static bool bDoubleAlloc; // for Import: double size for alloc
-
- class DoubleAllocSwitch
- {
- public:
- DoubleAllocSwitch(bool bNewVal = true);
- ~DoubleAllocSwitch();
- private:
- bool mbOldVal;
- };
-public:
ScColumn();
~ScColumn();
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 683f99dbc549..3636f6009ceb 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -62,21 +62,6 @@ inline bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
nScript != 0 );
}
-// ----------------------------------------------------------------------------
-
-ScColumn::DoubleAllocSwitch::DoubleAllocSwitch(bool bNewVal) :
- mbOldVal(ScColumn::bDoubleAlloc)
-{
- ScColumn::bDoubleAlloc = bNewVal;
-}
-
-ScColumn::DoubleAllocSwitch::~DoubleAllocSwitch()
-{
- ScColumn::bDoubleAlloc = mbOldVal;
-}
-
-// ----------------------------------------------------------------------------
-
ScColumn::ScColumn() :
nCol( 0 ),
pAttrArray( NULL ),
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9afed9cea0a9..f2c4ecad846b 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -65,9 +65,6 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx
using namespace formula;
// STATIC DATA -----------------------------------------------------------
-bool ScColumn::bDoubleAlloc = false; // fuer Import: Groesse beim Allozieren verdoppeln
-
-
void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell )
{
sal_Bool bIsAppended = false;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3715f45a3a0c..c8773db2e29e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2423,12 +2423,6 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
bInsertingFromOtherDoc = true; // kein Broadcast/Listener aufbauen bei Insert
- // bei mindestens 64 Zeilen wird in ScColumn::CopyFromClip voralloziert
- bool bDoDouble = ( nYw < 64 && nAllRow2 - nAllRow1 > 64);
- bool bOldDouble = ScColumn::bDoubleAlloc;
- if (bDoDouble)
- ScColumn::bDoubleAlloc = true;
-
SCCOL nClipStartCol = aClipRange.aStart.Col();
SCROW nClipStartRow = aClipRange.aStart.Row();
SCROW nClipEndRow = aClipRange.aEnd.Row();
@@ -2489,8 +2483,6 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
} while (nR1 <= nRow2);
}
- ScColumn::bDoubleAlloc = bOldDouble;
-
itr = rMark.begin();
for (; itr != itrEnd && *itr < nMax; ++itr)
if (maTabs[*itr] )
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index e198b22f6962..54a1eb8072e3 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -480,10 +480,6 @@ bool ScTable::ReplaceAll(
const SvxSearchItem& rSearchItem, const ScMarkData& rMark, ScRangeList& rMatchedRanges,
rtl::OUString& rUndoStr, ScDocument* pUndoDoc)
{
- bool bOldDouble = ScColumn::bDoubleAlloc; // sollte immer sal_False sein?
- OSL_ENSURE(!bOldDouble,"bDoubleAlloc ???");
- ScColumn::bDoubleAlloc = true; // fuer Undo-Doc
-
SCCOL nCol = 0;
SCROW nRow = -1;
@@ -500,7 +496,6 @@ bool ScTable::ReplaceAll(
else
break;
}
- ScColumn::bDoubleAlloc = bOldDouble;
return bEverFound;
}
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index c3be6648b2e2..8b76aeeebbc9 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -201,7 +201,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
// ImportDoc - also used for Redo
ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO );
pImportDoc->InitUndo( pDoc, nTab, nTab );
- ScColumn::DoubleAllocSwitch aAllocSwitch(true);
//
// get data from database into import document
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 645911d8e5a5..eab9a7453f70 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -273,9 +273,6 @@ void ScDocShell::BeforeXMLLoading()
aDocument.EnableUndo( false );
// prevent unnecessary broadcasts and "half way listeners"
aDocument.SetInsertingFromOtherDoc( sal_True );
-
- if (GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
- ScColumn::bDoubleAlloc = sal_True;
}
void ScDocShell::AfterXMLLoading(sal_Bool bRet)
@@ -358,7 +355,6 @@ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
}
}
}
- ScColumn::bDoubleAlloc = false;
}
else
aDocument.SetInsertingFromOtherDoc( false );
@@ -1084,10 +1080,8 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
sItStr = ScGlobal::GetCharsetString( RTL_TEXTENCODING_IBM_437 );
}
- ScColumn::bDoubleAlloc = sal_True;
FltError eError = ScFormatFilter::Get().ScImportLotus123( rMedium, &aDocument,
ScGlobal::GetCharsetValue(sItStr));
- ScColumn::bDoubleAlloc = false;
if (eError != eERR_OK)
{
if (!GetError())
@@ -1117,9 +1111,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
MakeDrawLayer(); //! im Filter
CalcOutputFactor(); // prepare update of row height
- ScColumn::bDoubleAlloc = true;
FltError eError = ScFormatFilter::Get().ScImportExcel( rMedium, &aDocument, eFormat );
- ScColumn::bDoubleAlloc = false;
aDocument.UpdateFontCharSet();
if ( aDocument.IsChartListenerCollectionNeedsUpdate() )
aDocument.UpdateChartListenerCollection(); //! fuer alle Importe?
@@ -1316,9 +1308,7 @@ sal_Bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
else if (aFltName.EqualsAscii(pFilterQPro6))
{
- ScColumn::bDoubleAlloc = sal_True;
FltError eError = ScFormatFilter::Get().ScImportQuattroPro( rMedium, &aDocument);
- ScColumn::bDoubleAlloc = false;
if (eError != eERR_OK)
{
if (!GetError())
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 6453631f570a..f93c2554163a 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -317,7 +317,6 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
return ERRCODE_IO_GENERAL;
#else
- ScColumn::DoubleAllocSwitch aAllocSwitch(true);
sal_uLong nErr = eERR_OK;
long i;
@@ -395,7 +394,6 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
//! add type descriptions
aProgress.SetState( 0 );
- ScColumn::bDoubleAlloc = true; // row count isn't readily available in advance
vector<long> aScales(nColCount, -1);
for (i=0; i<nColCount; i++)
@@ -487,7 +485,6 @@ sal_uLong ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet
nErr = ERRCODE_IO_GENERAL;
}
- ScColumn::bDoubleAlloc = false;
if ( nColCount > 0 )
aDocument.DoColResize( 0, 0, static_cast<SCCOL>(nColCount) - 1, 0 );
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index f96663069816..b56e93776586 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1273,8 +1273,6 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
rStrm.Seek( nOldPos );
rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() );
- ScColumn::DoubleAllocSwitch aAllocSwitch(true);
-
SCCOL nStartCol = aRange.aStart.Col();
SCCOL nEndCol = aRange.aEnd.Col();
SCROW nStartRow = aRange.aStart.Row();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a5752a70cb5c..f74dfdcfdf0e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1192,11 +1192,6 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
pDoc->DeleteAreaTab( nStartCol, nStartRow, nEndCol, nEndRow, nTab, IDF_CONTENTS );
- /* #164410# Use double allocation, which will speed up import filters
- using XCellRangeData::setDataArray() significantly. */
- bool bDoubleAlloc = ScColumn::bDoubleAlloc;
- ScColumn::bDoubleAlloc = true;
-
sal_Bool bError = false;
SCROW nDocRow = nStartRow;
for (long nRow=0; nRow<nRows; nRow++)
@@ -1247,7 +1242,6 @@ static sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
++nDocRow;
}
- ScColumn::bDoubleAlloc = bDoubleAlloc;
sal_Bool bHeight = rDocShell.AdjustRowHeight( nStartRow, nEndRow, nTab );
generated by cgit (git 2.34.1) at 2024-08-17 05:44:01 +0000