diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-10 10:49:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 08:17:42 +0200 |
| commit | 4f52b3b052b5684c28bf48196980e5a6b73f1c07 (patch) | |
| tree | f44879459ca8e79f4afb09f8272bb8acd67027bf | |
| parent | f149f5abed3307e013a7c03f2e9e699d1797b480 (diff) | |
drop read-only FileType::SW2 enumerator
Change-Id: Ic14fb46fea04c7b039bd0768108d89e759de4c86
| -rw-r--r-- | sw/source/core/inc/swblocks.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/swg/swblocks.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx index 4899e353a6c9..abe374891c72 100644 --- a/sw/source/core/inc/swblocks.hxx +++ b/sw/source/core/inc/swblocks.hxx @@ -71,7 +71,6 @@ protected: enum class FileType { NoFile, // Not present None, // No TB file - SW2, // SW2 file SW3, // SW3 file XML // XML Block List }; diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx index c84b29ee2bdd..e9fb2a284757 100644 --- a/sw/source/core/swg/swblocks.cxx +++ b/sw/source/core/swg/swblocks.cxx @@ -267,7 +267,7 @@ bool SwTextBlocks::IsOld() const if (pImp) { SwImpBlocks::FileType nType = pImp->GetFileType(); - if (SwImpBlocks::FileType::SW3 == nType || SwImpBlocks::FileType::SW2 == nType ) + if (SwImpBlocks::FileType::SW3 == nType) return true; } return false; @@ -375,7 +375,7 @@ sal_uLong SwTextBlocks::CopyBlock( SwTextBlocks& rSource, OUString& rSrcShort, if (rSource.pImp) { SwImpBlocks::FileType nType = rSource.pImp->GetFileType(); - if (SwImpBlocks::FileType::SW2 == nType || SwImpBlocks::FileType::SW3 == nType ) + if (SwImpBlocks::FileType::SW3 == nType) bIsOld = true; } if( bIsOld ) //rSource.IsOld() ) |