diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-16 14:41:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-16 16:14:46 +0200 |
| commit | fe1b87eb831d6e85b2db0591f933a9eede2e78cf (patch) | |
| tree | a76fb5394821abc1280df7aa0cef73f6185affec /sw/source/filter/basflt/shellio.cxx | |
| parent | d22cc61705239d9fcf6ee9597da8c883e3c79da4 (diff) | |
convert SW*READER constants to scoped enum
Change-Id: I7cf635e238a16e7ec96e585e6eb5e2e9c39b545a
Reviewed-on: https://gerrit.libreoffice.org/57497
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/basflt/shellio.cxx')
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 24e92e23412b..ccfd9d69c74e 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -574,7 +574,7 @@ bool Reader::SetStrmStgPtr() if( m_pMedium->IsStorage() ) { - if( SW_STORAGE_READER & GetReaderType() ) + if( SwReaderType::Storage & GetReaderType() ) { m_xStorage = m_pMedium->GetStorage(); return true; @@ -583,12 +583,12 @@ bool Reader::SetStrmStgPtr() else { m_pStream = m_pMedium->GetInStream(); - if ( m_pStream && SotStorage::IsStorageFile(m_pStream) && (SW_STORAGE_READER & GetReaderType()) ) + if ( m_pStream && SotStorage::IsStorageFile(m_pStream) && (SwReaderType::Storage & GetReaderType()) ) { m_pStorage = new SotStorage( *m_pStream ); m_pStream = nullptr; } - else if ( !(SW_STREAM_READER & GetReaderType()) ) + else if ( !(SwReaderType::Stream & GetReaderType()) ) { m_pStream = nullptr; return false; @@ -599,9 +599,9 @@ bool Reader::SetStrmStgPtr() return false; } -int Reader::GetReaderType() +SwReaderType Reader::GetReaderType() { - return SW_STREAM_READER; + return SwReaderType::Stream; } void Reader::SetFltName( const OUString& ) @@ -678,9 +678,9 @@ bool Reader::ReadGlossaries( SwTextBlocks&, bool ) const return false; } -int StgReader::GetReaderType() +SwReaderType StgReader::GetReaderType() { - return SW_STORAGE_READER; + return SwReaderType::Storage; } /* |