[Libreoffice-commits] .: 2 commits - sc/inc sc/source
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Sun Jul 8 16:35:12 PDT 2012
sc/inc/attarray.hxx | 2 +-
sc/inc/chgtrack.hxx | 1 -
sc/inc/column.hxx | 2 +-
sc/inc/document.hxx | 1 -
sc/inc/table.hxx | 2 +-
sc/source/core/data/attarray.cxx | 2 +-
sc/source/core/data/column2.cxx | 4 ++--
sc/source/core/data/document.cxx | 13 -------------
sc/source/core/data/table1.cxx | 4 ++--
sc/source/core/tool/chgtrack.cxx | 2 +-
sc/source/filter/excel/xetable.cxx | 2 +-
11 files changed, 10 insertions(+), 25 deletions(-)
New commits:
commit 9e9e53a2d961d489440f4addc25af90d3a6b793b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Mon Jul 9 01:32:42 2012 +0200
Revert "export all style information to xls/xlsx, fdo#46738"
This reverts commit 5d123a0b0e827aba59ddb50ef1b961a529a34a15.
Conflicts:
sc/source/core/data/attarray.cxx
Change-Id: Ie4bd09d2350faf0689c375d6a3f0f2b307cedcae
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 9b81440..1509f40 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -172,7 +172,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 6f776e1..721683d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -175,7 +175,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 72d5168..bbb062e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -935,7 +935,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 966c458..78fe25c 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -404,7 +404,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 6cf487f..100dcfe 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1732,7 +1732,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
{
OSL_ENSURE( nCount, "nCount == 0" );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 57a4e87..62fc4ea 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1423,14 +1423,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(); // 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 965f09c..f2cdf5d 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -940,19 +940,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 090345a..f3e0e6e 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -568,7 +568,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;
@@ -605,7 +605,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 150c730..69db2be 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2208,7 +2208,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 );
if(nLastUsedScCol > nMaxScCol)
nLastUsedScCol = nMaxScCol;
commit dfdf39b6e0d7924ebbe783fd03a7f10e7418557d
Author: Sören Möller <soerenmoeller2001 at gmail.com>
Date: Sat Jul 7 10:12:38 2012 +0200
Replaced deprecated String with OUString in sc/../chgtrack
There only was one use of EMPTY_STRING left in a call to a method that is already converted to OUString
Change-Id: Iaeb273f68d1c76d1d40f903a3f782ba5bc75289d
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index eff3725..22492bd 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -34,7 +34,6 @@
#include <set>
#include <stack>
-#include <tools/string.hxx>
#include <tools/datetime.hxx>
#include <tools/mempool.hxx>
#include <unotools/options.hxx>
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index b2f4d01..31449a7 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1953,7 +1953,7 @@ void ScChangeActionContent::PutValueToDoc(
aDestMark.SetMarkArea( aRange );
pDoc->InsertMatrixFormula( aPos.Col(), aPos.Row(),
aRange.aEnd.Col(), aRange.aEnd.Row(),
- aDestMark, EMPTY_STRING,
+ aDestMark, EMPTY_OUSTRING,
((const ScFormulaCell*)pCell)->GetCode() );
}
break;
More information about the Libreoffice-commits
mailing list