[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Tue Oct 4 03:23:02 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 2
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 5 --
binfilter/bf_sc/source/core/data/sc_document.cxx | 48 ++++++++---------------
binfilter/bf_sc/source/core/data/sc_table1.cxx | 3 -
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 2
binfilter/inc/bf_sc/document.hxx | 23 ++++-------
binfilter/inc/bf_sc/table.hxx | 3 -
7 files changed, 33 insertions(+), 53 deletions(-)
New commits:
commit 67db757ab744cbea949e64b94c0162b10ef985f3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Oct 4 12:22:53 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index cbfb02d..63c081d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -983,7 +983,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ short nDz = ((short)nDestPos) - (short)nSrcPos;
/*N*/ pTab[nDestPos]->UpdateReference(URM_COPY, 0, 0, nDestPos,
/*N*/ MAXCOL, MAXROW, nDestPos,
-/*N*/ 0, 0, nDz, NULL);
+/*N*/ 0, 0, nDz);
/*N*/ // Test for outside absolute references for info box
/*N*/ BOOL bIsAbsRef = pSrcDoc->pTab[nSrcPos]->TestTabRefAbs(nSrcPos);
/*N*/ // Readjust self-contained absolute references to this sheet
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index c28f5c3..f0f863d 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -403,8 +403,7 @@ using namespace ::com::sun::star;
/*N*/ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
/*N*/ USHORT nCol1, USHORT nRow1, USHORT nTab1,
/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2,
-/*N*/ short nDx, short nDy, short nDz,
-/*N*/ ScDocument* pUndoDoc, BOOL bIncludeDraw )
+/*N*/ short nDx, short nDy, short nDz )
/*N*/ {
/*N*/ PutInOrder( nCol1, nCol2 );
/*N*/ PutInOrder( nRow1, nRow2 );
@@ -445,7 +444,7 @@ using namespace ::com::sun::star;
/*N*/ if (pTab[i])
/*N*/ pTab[i]->UpdateReference(
/*N*/ eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2,
-/*N*/ nDx, nDy, nDz, pUndoDoc, bIncludeDraw );
+/*N*/ nDx, nDy, nDz );
/*N*/
/*N*/ if ( bIsEmbedded )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 5fa6c2d..649a5f7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -461,7 +461,7 @@ namespace binfilter {
/*N*/ BOOL ScDocument::InsertRow( USHORT nStartCol, USHORT nStartTab,
/*N*/ USHORT nEndCol, USHORT nEndTab,
-/*N*/ USHORT nStartRow, USHORT nSize, ScDocument* pRefUndoDoc )
+/*N*/ USHORT nStartRow, USHORT nSize )
/*N*/ {
/*N*/ PutInOrder( nStartCol, nEndCol );
/*N*/ PutInOrder( nStartTab, nEndTab );
@@ -484,7 +484,7 @@ namespace binfilter {
/*N*/ ScAddress( nEndCol, MAXROW, nEndTab )), 0, nSize, 0 );
/*N*/ UpdateReference( URM_INSDEL, nStartCol, nStartRow, nStartTab,
/*N*/ nEndCol, MAXROW, nEndTab,
-/*N*/ 0, nSize, 0, pRefUndoDoc, FALSE ); // without drawing objects
+/*N*/ 0, nSize, 0 );
/*N*/ for (i=nStartTab; i<=nEndTab; i++)
/*N*/ if (pTab[i])
/*N*/ pTab[i]->InsertRow( nStartCol, nEndCol, nStartRow, nSize );
@@ -515,19 +515,17 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc )
+/*N*/ BOOL ScDocument::InsertRow( const ScRange& rRange )
/*N*/ {
/*N*/ return InsertRow( rRange.aStart.Col(), rRange.aStart.Tab(),
/*N*/ rRange.aEnd.Col(), rRange.aEnd.Tab(),
-/*N*/ rRange.aStart.Row(), rRange.aEnd.Row()-rRange.aStart.Row()+1,
-/*N*/ pRefUndoDoc );
+/*N*/ rRange.aStart.Row(), rRange.aEnd.Row()-rRange.aStart.Row()+1 );
/*N*/ }
/*N*/ void ScDocument::DeleteRow( USHORT nStartCol, USHORT nStartTab,
/*N*/ USHORT nEndCol, USHORT nEndTab,
-/*N*/ USHORT nStartRow, USHORT nSize,
-/*N*/ ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+/*N*/ USHORT nStartRow, USHORT nSize )
/*N*/ {
/*N*/ PutInOrder( nStartCol, nEndCol );
/*N*/ PutInOrder( nStartTab, nEndTab );
@@ -553,16 +551,13 @@ namespace binfilter {
/*N*/ {
/*N*/ UpdateReference( URM_INSDEL, nStartCol, nStartRow+nSize, nStartTab,
/*N*/ nEndCol, MAXROW, nEndTab,
-/*N*/ 0, -(short) nSize, 0, pRefUndoDoc );
+/*N*/ 0, -(short) nSize, 0 );
/*N*/ }
/*N*/
-/*N*/ if (pUndoOutline)
-/*N*/ *pUndoOutline = FALSE;
-/*N*/
/*N*/ USHORT i=0;
/*N*/ for (i=nStartTab; i<=nEndTab; i++)
/*N*/ if (pTab[i])
-/*N*/ pTab[i]->DeleteRow( nStartCol, nEndCol, nStartRow, nSize, pUndoOutline );
+/*N*/ pTab[i]->DeleteRow( nStartCol, nEndCol, nStartRow, nSize, NULL );
/*N*/
/*N*/ if ( nStartRow+nSize <= MAXROW )
/*N*/ { // Name listeners have been removed in UpdateReference
@@ -581,12 +576,11 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+/*N*/ void ScDocument::DeleteRow( const ScRange& rRange )
/*N*/ {
/*N*/ DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(),
/*N*/ rRange.aEnd.Col(), rRange.aEnd.Tab(),
-/*N*/ rRange.aStart.Row(), rRange.aEnd.Row()-rRange.aStart.Row()+1,
-/*N*/ pRefUndoDoc, pUndoOutline );
+/*N*/ rRange.aStart.Row(), rRange.aEnd.Row()-rRange.aStart.Row()+1 );
/*N*/ }
@@ -614,7 +608,7 @@ namespace binfilter {
/*N*/ BOOL ScDocument::InsertCol( USHORT nStartRow, USHORT nStartTab,
/*N*/ USHORT nEndRow, USHORT nEndTab,
-/*N*/ USHORT nStartCol, USHORT nSize, ScDocument* pRefUndoDoc )
+/*N*/ USHORT nStartCol, USHORT nSize )
/*N*/ {
/*N*/ PutInOrder( nStartRow, nEndRow );
/*N*/ PutInOrder( nStartTab, nEndTab );
@@ -634,7 +628,7 @@ namespace binfilter {
/*N*/ ScAddress( MAXCOL, nEndRow, nEndTab )), nSize, 0, 0 );
/*N*/ UpdateReference( URM_INSDEL, nStartCol, nStartRow, nStartTab,
/*N*/ MAXCOL, nEndRow, nEndTab,
-/*N*/ nSize, 0, 0, pRefUndoDoc );
+/*N*/ nSize, 0, 0 );
/*N*/ for (i=nStartTab; i<=nEndTab; i++)
/*N*/ if (pTab[i])
/*N*/ pTab[i]->InsertCol( nStartCol, nStartRow, nEndRow, nSize );
@@ -665,18 +659,16 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc )
+/*N*/ BOOL ScDocument::InsertCol( const ScRange& rRange )
/*N*/ {
/*N*/ return InsertCol( rRange.aStart.Row(), rRange.aStart.Tab(),
/*N*/ rRange.aEnd.Row(), rRange.aEnd.Tab(),
-/*N*/ rRange.aStart.Col(), rRange.aEnd.Col()-rRange.aStart.Col()+1,
-/*N*/ pRefUndoDoc );
+/*N*/ rRange.aStart.Col(), rRange.aEnd.Col()-rRange.aStart.Col()+1 );
/*N*/ }
/*N*/ void ScDocument::DeleteCol(USHORT nStartRow, USHORT nStartTab, USHORT nEndRow, USHORT nEndTab,
-/*N*/ USHORT nStartCol, USHORT nSize, ScDocument* pRefUndoDoc,
-/*N*/ BOOL* pUndoOutline )
+/*N*/ USHORT nStartCol, USHORT nSize )
/*N*/ {
/*N*/ PutInOrder( nStartRow, nEndRow );
/*N*/ PutInOrder( nStartTab, nEndTab );
@@ -702,16 +694,13 @@ namespace binfilter {
/*N*/ {
/*N*/ UpdateReference( URM_INSDEL, nStartCol+nSize, nStartRow, nStartTab,
/*N*/ MAXCOL, nEndRow, nEndTab,
-/*N*/ -(short) nSize, 0, 0, pRefUndoDoc );
+/*N*/ -(short) nSize, 0, 0 );
/*N*/ }
/*N*/
-/*N*/ if (pUndoOutline)
-/*N*/ *pUndoOutline = FALSE;
-/*N*/
/*N*/ USHORT i=0;
/*N*/ for (i=nStartTab; i<=nEndTab; i++)
/*N*/ if (pTab[i])
-/*N*/ pTab[i]->DeleteCol( nStartCol, nStartRow, nEndRow, nSize, pUndoOutline );
+/*N*/ pTab[i]->DeleteCol( nStartCol, nStartRow, nEndRow, nSize, NULL );
/*N*/
/*N*/ if ( nStartCol+nSize <= MAXCOL )
/*N*/ { // Name listeners have been removed in UpdateReference
@@ -730,12 +719,11 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL* pUndoOutline )
+/*N*/ void ScDocument::DeleteCol( const ScRange& rRange )
/*N*/ {
/*N*/ DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(),
/*N*/ rRange.aEnd.Row(), rRange.aEnd.Tab(),
-/*N*/ rRange.aStart.Col(), rRange.aEnd.Col()-rRange.aStart.Col()+1,
-/*N*/ pRefUndoDoc, pUndoOutline );
+/*N*/ rRange.aStart.Col(), rRange.aEnd.Col()-rRange.aStart.Col()+1 );
/*N*/ }
/*N*/ void ScDocument::DeleteArea(USHORT nCol1, USHORT nRow1,
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 9e1fb48..ac35d9c 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -501,8 +501,7 @@ extern BOOL bIsOlk, bOderSo;
/*N*/ }
/*N*/ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
-/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, short nDy, short nDz,
-/*N*/ ScDocument* /*pUndoDoc*/, BOOL /*bIncludeDraw*/ )
+/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, short nDy, short nDz )
/*N*/ {
/*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index 8e412cc..c3fb7f7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -1301,7 +1301,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ aFrmRange.aEnd.Col(), aFrmRange.aEnd.Row(), aFrmRange.aEnd.Tab(),
/*N*/ (short) aFrmRange.aStart.Col() - aToRange.aStart.Col(),
/*N*/ (short) aFrmRange.aStart.Row() - aToRange.aStart.Row(),
-/*N*/ (short) aFrmRange.aStart.Tab() - aToRange.aStart.Tab(), NULL );
+/*N*/ (short) aFrmRange.aStart.Tab() - aToRange.aStart.Tab() );
/*N*/
/*N*/ // LinkDependent freigeben, nachfolgendes UpdateReference-Undo setzt
/*N*/ // ToRange->FromRange Dependents
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index 9580249..4d03641 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -706,24 +706,20 @@ public:
/*N*/ BOOL InsertRow( USHORT nStartCol, USHORT nStartTab,
/*N*/ USHORT nEndCol, USHORT nEndTab,
-/*N*/ USHORT nStartRow, USHORT nSize, ScDocument* pRefUndoDoc = NULL );
-/*N*/ BOOL InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+/*N*/ USHORT nStartRow, USHORT nSize );
+/*N*/ BOOL InsertRow( const ScRange& rRange );
/*N*/ void DeleteRow( USHORT nStartCol, USHORT nStartTab,
/*N*/ USHORT nEndCol, USHORT nEndTab,
-/*N*/ USHORT nStartRow, USHORT nSize,
-/*N*/ ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
-/*N*/ void DeleteRow( const ScRange& rRange,
-/*N*/ ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
+/*N*/ USHORT nStartRow, USHORT nSize );
+/*N*/ void DeleteRow( const ScRange& rRange );
/*N*/ BOOL InsertCol( USHORT nStartRow, USHORT nStartTab,
/*N*/ USHORT nEndRow, USHORT nEndTab,
-/*N*/ USHORT nStartCol, USHORT nSize, ScDocument* pRefUndoDoc = NULL );
-/*N*/ BOOL InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+/*N*/ USHORT nStartCol, USHORT nSize );
+/*N*/ BOOL InsertCol( const ScRange& rRange );
/*N*/ void DeleteCol( USHORT nStartRow, USHORT nStartTab,
/*N*/ USHORT nEndRow, USHORT nEndTab,
-/*N*/ USHORT nStartCol, USHORT nSize,
-/*N*/ ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
-/*N*/ void DeleteCol( const ScRange& rRange,
-/*N*/ ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
+/*N*/ USHORT nStartCol, USHORT nSize );
+/*N*/ void DeleteCol( const ScRange& rRange );
/*N*/ BOOL CanInsertRow( const ScRange& rRange ) const;
/*N*/ BOOL CanInsertCol( const ScRange& rRange ) const;
@@ -769,8 +765,7 @@ public:
/*N*/ void UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2,
-/*N*/ short nDx, short nDy, short nDz,
-/*N*/ ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE );
+/*N*/ short nDx, short nDy, short nDz );
diff --git a/binfilter/inc/bf_sc/table.hxx b/binfilter/inc/bf_sc/table.hxx
index d1f079f..c5bdb6a 100644
--- a/binfilter/inc/bf_sc/table.hxx
+++ b/binfilter/inc/bf_sc/table.hxx
@@ -298,8 +298,7 @@ public:
void UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
USHORT nCol2, USHORT nRow2, USHORT nTab2,
- short nDx, short nDy, short nDz,
- ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE );
+ short nDx, short nDy, short nDz );
void UpdateInsertTab(USHORT nTable);
void UpdateDeleteTab( USHORT nTable, BOOL bIsMove, ScTable* pRefUndo = NULL );
More information about the Libreoffice-commits
mailing list