sc/source/ui/docshell/docfunc.cxx | 12 ++++++------
sc/source/ui/inc/docfunc.hxx | 4 ++--
sc/source/ui/undo/undoblk.cxx | 2 +-
sc/source/ui/unoobj/cellsuno.cxx | 2 +-
sc/source/ui/view/viewfun2.cxx | 2 +-
sc/source/ui/view/viewfun3.cxx | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 5a639557ae6e0e752e68de8e831fef3166c80a3b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Jul 23 19:34:52 2012 +0200
-Werror=unused-parameter
...and no need for ScDocFunc::UnmergeCells to be virtual---there are no
overrides.
Change-Id: Ifc8083926d7b5cb22bb3a28e6b2cc29658d07ebf
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index f6941a1..16aaed8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1608,7 +1608,7 @@ sal_Bool ScDocFunc::InsertCells( const ScRange& rRange,
const ScMarkData* pTabMa
ScRange aRange( *iIter );
if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED |
HASATTR_MERGED ) )
{
- UnmergeCells( aRange, sal_True, sal_True );
+ UnmergeCells( aRange, sal_True );
}
}
}
@@ -2016,7 +2016,7 @@ sal_Bool ScDocFunc::DeleteCells( const ScRange& rRange,
const ScMarkData* pTabMa
ScRange aRange( *iIter );
if( pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED |
HASATTR_MERGED ) )
{
- UnmergeCells( aRange, sal_True, sal_True );
+ UnmergeCells( aRange, sal_True );
}
}
}
@@ -2484,7 +2484,7 @@ sal_Bool ScDocFunc::MoveBlock( const ScRange& rSource,
const ScAddress& rDestPos
// skipped rows and merged cells don't mix
if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
- UnmergeCells( aPasteDest, false, sal_True );
+ UnmergeCells( aPasteDest, false );
VirtualDevice aVirtDev;
sal_Bool bDestHeight = AdjustRowHeight(
@@ -4495,17 +4495,17 @@ sal_Bool ScDocFunc::MergeCells( const
ScCellMergeOption& rOption, sal_Bool bCont
return sal_True;
}
-sal_Bool ScDocFunc::UnmergeCells( const ScRange& rRange, sal_Bool bRecord,
sal_Bool bApi )
+sal_Bool ScDocFunc::UnmergeCells( const ScRange& rRange, sal_Bool bRecord )
{
ScCellMergeOption aOption(rRange.aStart.Col(), rRange.aStart.Row(),
rRange.aEnd.Col(), rRange.aEnd.Row());
SCTAB nTab1 = rRange.aStart.Tab(), nTab2 = rRange.aEnd.Tab();
for (SCTAB i = nTab1; i <= nTab2; ++i)
aOption.maTabs.insert(i);
- return UnmergeCells(aOption, bRecord, bApi);
+ return UnmergeCells(aOption, bRecord);
}
-bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool
bRecord, sal_Bool bApi )
+bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, sal_Bool
bRecord )
{
using ::std::set;
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index fcf851c..8d87bd9 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -186,8 +186,8 @@ public:
virtual sal_Bool MergeCells( const ScCellMergeOption& rOption,
sal_Bool bContents,
sal_Bool bRecord, sal_Bool bApi );
- virtual sal_Bool UnmergeCells( const ScRange& rRange, sal_Bool
bRecord, sal_Bool bApi );
- virtual bool UnmergeCells( const ScCellMergeOption& rOption,
sal_Bool bRecord, sal_Bool bApi );
+ sal_Bool UnmergeCells( const ScRange& rRange, sal_Bool bRecord );
+ bool UnmergeCells( const ScCellMergeOption& rOption, sal_Bool
bRecord );
virtual bool SetNewRangeNames( ScRangeName* pNewRanges, bool
bModifyDoc = true, SCTAB nTab = -1 ); // takes ownership of pNewRanges
//nTab = -1 for local range names
virtual bool ModifyRangeNames( const ScRangeName& rNewRanges,
SCTAB nTab = -1 );
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index b978a5c..cbab521 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -1346,7 +1346,7 @@ void ScUndoDragDrop::Redo()
// skipped rows and merged cells don't mix
if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
- pDocShell->GetDocFunc().UnmergeCells( aDestRange, false, sal_True );
+ pDocShell->GetDocFunc().UnmergeCells( aDestRange, false );
for (nTab=aDestRange.aStart.Tab(); nTab<=aDestRange.aEnd.Tab(); nTab++)
{
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 4781941..b880f23 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -5424,7 +5424,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge )
throw(uno::RuntimeExcepti
if ( bMerge )
pDocSh->GetDocFunc().MergeCells( aMergeOption, false, true, true );
else
- pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true, true );
+ pDocSh->GetDocFunc().UnmergeCells( aMergeOption, true );
//! Fehler abfangen?
}
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index e3515d7..727a7ec 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1241,7 +1241,7 @@ sal_Bool ScViewFunc::RemoveMerge( sal_Bool bRecord )
}
while (bExtended);
- sal_Bool bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord,
false );
+ sal_Bool bOk = pDocSh->GetDocFunc().UnmergeCells(aOption, bRecord );
aExtended = aOption.getFirstSingleRange();
MarkRange( aExtended );
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index b6a2b98..8637193 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1188,7 +1188,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags,
ScDocument* pClipDoc,
ScRange aRange(nCol, nRow1, nStartTab);
pDoc->ExtendOverlapped(aRange);
pDoc->ExtendMerge(aRange, true);
- rDocFunc.UnmergeCells(aRange, bRecord, true);
+ rDocFunc.UnmergeCells(aRange, bRecord);
}
}
}
@@ -1291,7 +1291,7 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags,
ScDocument* pClipDoc,
// skipped rows and merged cells don't mix
if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() )
- rDocFunc.UnmergeCells( aUserRange, false, true );
+ rDocFunc.UnmergeCells( aUserRange, false );
pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow,
aFilteredMark, true ); // Refresh
// und Bereich neu
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
