[Libreoffice-commits] core.git: sw/inc sw/source

[Stephan Bergmann]

 sw/inc/undobj.hxx               |    2 +-
 sw/source/core/undo/undobj.cxx  |    5 ++---
 sw/source/core/undo/unredln.cxx |    8 +++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 3d66457b0b64660815b1c52698cd9dd92726d044
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 28 14:04:26 2014 +0100

    -Werror,-Wunused-parameter
    
    Change-Id: Ib468220253c494279cfd4f46235a91522fb0889c

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 751be36..19889a9 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -115,7 +115,7 @@ public:
 
     // Save and set Redline data.
     static sal_Bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
-                            sal_Bool bDelRange = sal_True, sal_Bool bCopyNext = sal_True );
+                            sal_Bool bDelRange = sal_True );
     static sal_Bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
     static void SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData );
     static sal_Bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index b20d91c..35cd84f 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -848,7 +848,7 @@ void SwUndoSaveSection::SaveSection(
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, sal_True, sal_True ))
+    if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, sal_True ))
         delete pRedlSaveData, pRedlSaveData = 0;
 
     nStartPos = rRange.aStart.GetIndex();
@@ -997,8 +997,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam )
 sal_Bool SwUndo::FillSaveData(
     const SwPaM& rRange,
     SwRedlineSaveDatas& rSData,
-    sal_Bool bDelRange,
-    sal_Bool /* bCopyNext */ )
+    sal_Bool bDelRange )
 {
     rSData.DeleteAndDestroyAll();
 
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index a7df649..465fd68 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -58,8 +58,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM& rRange )
     sal_uLong nEndExtra = rDoc.GetNodes().GetEndOfExtras().GetIndex();
 
     mpRedlSaveData = new SwRedlineSaveDatas;
-    if( !FillSaveData( rRange, *mpRedlSaveData, sal_False,
-                        UNDO_REJECT_REDLINE != mnUserId ))
+    if( !FillSaveData( rRange, *mpRedlSaveData, sal_False ))
         delete mpRedlSaveData, mpRedlSaveData = 0;
     else
     {
@@ -117,8 +116,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext & rContext)
     if( mpRedlSaveData && mbHiddenRedlines )
     {
         sal_uLong nEndExtra = pDoc->GetNodes().GetEndOfExtras().GetIndex();
-        FillSaveData(rPam, *mpRedlSaveData, sal_False,
-                        UNDO_REJECT_REDLINE != mnUserId );
+        FillSaveData(rPam, *mpRedlSaveData, sal_False );
 
         nEndExtra -= pDoc->GetNodes().GetEndOfExtras().GetIndex();
         nSttNode -= nEndExtra;
@@ -381,7 +379,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline& rRedl )
     }
 
     pRedlSaveData = new SwRedlineSaveDatas;
-    if( !FillSaveData( rRedl, *pRedlSaveData, sal_False, sal_True ))
+    if( !FillSaveData( rRedl, *pRedlSaveData, sal_False ))
         delete pRedlSaveData, pRedlSaveData = 0;
 }