diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-07-25 01:12:39 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-07-25 09:47:55 +0200 |
| commit | 823447222c85a5a091e56ee07d1ac233f6e4e52a (patch) | |
| tree | 8ad611c02b5fc301e576c943a55fb7c8cc58b563 /sw | |
| parent | 2af62a7469eb9bb8a3ad7807398f24e291fc08ee (diff) | |
SAVEFLY is a noop, just use a bool
Change-Id: I32255ca073d52616d3e5c9e80f32471e0a7df3fa
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/CntntIdxStore.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/inc/mvsave.hxx | 5 | ||||
| -rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index 42ae9790a5ed..ed009b388b35 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -141,11 +141,11 @@ namespace { return m_aBkmkEntries.empty() && m_aRedlineEntries.empty() && m_aFlyEntries.empty() && m_aUnoCrsrEntries.empty() && m_aShellCrsrEntries.empty(); } - virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, sal_uInt8 nSaveFly=0) SAL_OVERRIDE + virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplt=false) SAL_OVERRIDE { SaveBkmks(pDoc, nNode, nCntnt); SaveRedlines(pDoc, nNode, nCntnt); - SaveFlys(pDoc, nNode, nCntnt, nSaveFly); + SaveFlys(pDoc, nNode, nCntnt, bSaveFlySplt ? SAVEFLY_SPLIT : 0); SaveUnoCrsrs(pDoc, nNode, nCntnt); SaveShellCrsrs(pDoc, nNode, nCntnt); } diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx index 8ed06c994192..b9884703efa3 100644 --- a/sw/source/core/inc/mvsave.hxx +++ b/sw/source/core/inc/mvsave.hxx @@ -77,7 +77,7 @@ namespace sw { namespace mark public: virtual void Clear() =0; virtual bool Empty() =0; - virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, sal_uInt8 nSaveFly=0) =0; + virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit=false) =0; virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) =0; virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) =0; virtual ~CntntIdxStore() {}; @@ -85,8 +85,7 @@ namespace sw { namespace mark }; }} -#define SAVEFLY 1 -#define SAVEFLY_SPLIT 2 +#define SAVEFLY_SPLIT true void _DelBookmarks(const SwNodeIndex& rStt, const SwNodeIndex& rEnd, diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 861ef646cec9..b9c08211203c 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -630,7 +630,7 @@ SwCntntNode *SwTxtNode::JoinNext() { SwDoc* pDoc = rNds.GetDoc(); const boost::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create()); - pCntntStore->Save(pDoc, aIdx.GetIndex(), SAL_MAX_INT32, SAVEFLY); + pCntntStore->Save(pDoc, aIdx.GetIndex(), SAL_MAX_INT32); SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode(); sal_Int32 nOldLen = m_Text.getLength(); @@ -724,7 +724,7 @@ SwCntntNode *SwTxtNode::JoinPrev() { SwDoc* pDoc = rNds.GetDoc(); const boost::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create()); - pCntntStore->Save( pDoc, aIdx.GetIndex(), SAL_MAX_INT32, SAVEFLY ); + pCntntStore->Save( pDoc, aIdx.GetIndex(), SAL_MAX_INT32); SwTxtNode *pTxtNode = aIdx.GetNode().GetTxtNode(); const sal_Int32 nLen = pTxtNode->Len(); |