[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source
Petr Mladek
pmladek at kemper.freedesktop.org
Tue Jun 26 07:39:18 PDT 2012
sc/inc/attarray.hxx | 2 +-
sc/inc/column.hxx | 2 +-
sc/inc/document.hxx | 1 -
sc/inc/table.hxx | 2 +-
sc/source/core/data/attarray.cxx | 4 ++--
sc/source/core/data/column2.cxx | 4 ++--
sc/source/core/data/document.cxx | 13 -------------
sc/source/core/data/table1.cxx | 4 ++--
sc/source/filter/excel/xetable.cxx | 2 +-
9 files changed, 10 insertions(+), 24 deletions(-)
New commits:
commit e5f690b3711b61c05671d46d19439dd1100f4bff
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 26 11:16:59 2012 +0200
Revert "export all style information to xls/xlsx, fdo#46738"
It caused huge slow down and even errors when exporting XLS (fdo#49582).
The original problem was less serious because it was old regression
from LO-3.3. There is not easy fix.
=> reverting is the best solution according to Markus.
This reverts commit 6c6a4ed070acc0b106e951864fa5d20927f5c1e0.
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 27a086e..b58472e 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -175,7 +175,7 @@ public:
bool IsEmpty() const;
bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
- bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFullFormattedArea = false ) const;
+ bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;
bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
bool IsVisibleEqual( const ScAttrArray& rOther,
SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 313dcd6..f86bf9b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,7 +183,7 @@ public:
bool HasSelectionMatrixFragment(const ScMarkData& rMark) const;
bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
- bool GetLastVisibleAttr( SCROW& rLastRow, bool bFullFormattedArea = false ) const;
+ bool GetLastVisibleAttr( SCROW& rLastRow ) const;
bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6167634..50bcd27 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -940,7 +940,6 @@ public:
SCCOL& rEndCol, SCROW& rEndRow, bool bIncludeOld, bool bOnlyDown ) const;
SC_DLLPUBLIC bool GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
SC_DLLPUBLIC bool GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
- SC_DLLPUBLIC void GetFormattedAndUsedArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
SC_DLLPUBLIC bool GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
bool bNotes = true ) const;
SC_DLLPUBLIC bool GetPrintAreaHor( SCTAB nTab, SCROW nStartRow, SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 10775e2..4f1fe38 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -405,7 +405,7 @@ public:
bool GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = empty
bool GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
- bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bFullFormattedArea = false ) const;
+ bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const;
bool GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL& rEndCol, bool bNotes ) const;
bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 5714e7c..2aa660a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1831,7 +1831,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
const SCROW SC_VISATTR_STOP = 84;
-bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFullFormattedArea ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
{
// #i30830# changed behavior:
// ignore all attributes starting with the first run of SC_VISATTR_STOP equal rows
@@ -1862,7 +1862,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu
if ( nAttrStartRow <= nLastData )
nAttrStartRow = nLastData + 1;
SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
- if ( nAttrSize >= SC_VISATTR_STOP && !bFullFormattedArea )
+ if ( nAttrSize >= SC_VISATTR_STOP )
{
bFound = false; // ignore this range and below
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 95b6cf8..22d3da4 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1443,14 +1443,14 @@ bool ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const
return false;
}
-bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow, bool bFullFormattedArea ) const
+bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const
{
if (pAttrArray)
{
// row of last cell is needed
SCROW nLastData = GetLastVisDataPos( true ); // always including notes, 0 if none
- return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData, bFullFormattedArea );
+ return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData );
}
else
return false;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index ddfafc2..93a067e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -967,19 +967,6 @@ bool ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) cons
return false;
}
-void ScDocument::GetFormattedAndUsedArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const
-{
- if (VALIDTAB(nTab) && nTab < static_cast<SCTAB> (maTabs.size()))
- if (maTabs[nTab])
- {
- maTabs[nTab]->GetPrintArea( rEndCol, rEndRow, true, true );
- return;
- }
-
- rEndCol = 0;
- rEndRow = 0;
-}
-
bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const
{
if (!ValidTab(nTab) || nTab >= static_cast<SCTAB> (maTabs.size()) || !maTabs[nTab])
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 76f371b..3f18d35 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -554,7 +554,7 @@ bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
const SCCOL SC_COLUMNS_STOP = 30;
-bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bFullFormattedArea ) const
+bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const
{
bool bFound = false;
SCCOL nMaxX = 0;
@@ -577,7 +577,7 @@ bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes, bool bF
for (i=0; i<=MAXCOL; i++) // Attribute testen
{
SCROW nLastRow;
- if (aCol[i].GetLastVisibleAttr( nLastRow, bFullFormattedArea ))
+ if (aCol[i].GetLastVisibleAttr( nLastRow ))
{
bFound = true;
nMaxX = i;
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index d77c1e4..0660d9d 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2210,7 +2210,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
// find used area (non-empty cells)
SCCOL nLastUsedScCol;
SCROW nLastUsedScRow;
- rDoc.GetFormattedAndUsedArea( nScTab, nLastUsedScCol, nLastUsedScRow );
+ rDoc.GetTableArea( nScTab, nLastUsedScCol, nLastUsedScRow );
ScRange aUsedRange( 0, 0, nScTab, nLastUsedScCol, nLastUsedScRow, nScTab );
GetAddressConverter().ValidateRange( aUsedRange, true );
More information about the Libreoffice-commits
mailing list