diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-06 03:19:05 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-08 14:52:16 +0100 |
| commit | 23c802b85aad6b44da7d7cb630e2e76e6da033a8 (patch) | |
| tree | 0fde60c721f1b8140b8b8e20bef62fe3a7dcd5d0 /sw | |
| parent | a71fb1c911b7104ede9365e7b16513896492ffa8 (diff) | |
make InsertRedline() non-static again
Change-Id: I2eda267b56bc1548930add9c5ef83ad268f881a4
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index f9af771d80ca..156eb08a7789 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -1835,7 +1835,7 @@ namespace const SwRangeRedline* pSrcRedl; SwRangeRedline* pDestRedl; SaveMergeRedline( const SwNode& rDstNd, const SwRangeRedline& rSrcRedl); - static sal_uInt16 InsertRedline(const SwRangeRedline* pSrcRedl, SwRangeRedline* pDestRedl, SwPaM* pLastDestRedline); + sal_uInt16 InsertRedline(SwPaM* pLastDestRedline); }; } @@ -1865,7 +1865,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode& rDstNd, } } -sal_uInt16 SaveMergeRedline::InsertRedline(const SwRangeRedline* pSrcRedl, SwRangeRedline* pDestRedl, SwPaM* pLastDestRedline) +sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline) { sal_uInt16 nIns = 0; SwDoc* pDoc = pDestRedl->GetDoc(); @@ -2058,7 +2058,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) SwPaM* pLastDestRedline(nullptr); for(SaveMergeRedline& rRedline: vRedlines) { - nRet += SaveMergeRedline::InsertRedline(rRedline.pSrcRedl, rRedline.pDestRedl, pLastDestRedline); + nRet += rRedline.InsertRedline(pLastDestRedline); pLastDestRedline = rRedline.pDestRedl; } } |