Skip to content

C
core
Kaydet (Commit) 23c802b8 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

make InsertRedline() non-static again 

Change-Id: I2eda267b56bc1548930add9c5ef83ad268f881a4
üst a71fb1c9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
sw/source/core/doc/doccomp.cxx
Dosyayı görüntüle @ 23c802b8
...@@ -1835,7 +1835,7 @@ namespace ...@@ -1835,7 +1835,7 @@ namespace
const SwRangeRedline* pSrcRedl; const SwRangeRedline* pSrcRedl;
SwRangeRedline* pDestRedl; SwRangeRedline* pDestRedl;
SaveMergeRedline( const SwNode& rDstNd, const SwRangeRedline& rSrcRedl); 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, ...@@ -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; sal_uInt16 nIns = 0;
SwDoc* pDoc = pDestRedl->GetDoc(); SwDoc* pDoc = pDestRedl->GetDoc();
...@@ -2058,7 +2058,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc ) ...@@ -2058,7 +2058,7 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
SwPaM* pLastDestRedline(nullptr); SwPaM* pLastDestRedline(nullptr);
for(SaveMergeRedline& rRedline: vRedlines) for(SaveMergeRedline& rRedline: vRedlines)
{ {
nRet += SaveMergeRedline::InsertRedline(rRedline.pSrcRedl, rRedline.pDestRedl, pLastDestRedline); nRet += rRedline.InsertRedline(pLastDestRedline);
pLastDestRedline = rRedline.pDestRedl; pLastDestRedline = rRedline.pDestRedl;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment