diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-06-05 15:26:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:02:26 +0000 |
| commit | bc1e738708c4b343a63c78bf024cc2df5160b207 (patch) | |
| tree | a84fa5ebbe6e08579d2bab1f10b6d7961189d5a7 /xmlhelp/source/treeview | |
| parent | 11b4a6ddce31f173f10b703eb63fde2c88c0bc70 (diff) | |
Convert IteratorState to scoped enum
Change-Id: I71850584a727261e9e7b2115bdfb488ba76b6d21
Reviewed-on: https://gerrit.libreoffice.org/25919
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlhelp/source/treeview')
| -rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 28dafedf0583..c93e5b90b94a 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -865,7 +865,7 @@ void TVChildTarget::subst( OUString& instpath ) static const char aHelpMediaType[] = "application/vnd.sun.star.help"; ExtensionIteratorBase::ExtensionIteratorBase( const OUString& aLanguage ) - : m_eState( USER_EXTENSIONS ) + : m_eState( IteratorState::UserExtensions ) , m_aLanguage( aLanguage ) { init(); @@ -958,7 +958,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextUserHelpPack if( m_iUserPackage == m_aUserPackagesSeq.getLength() ) { - m_eState = SHARED_EXTENSIONS; // Later: SHARED_MODULE + m_eState = IteratorState::SharedExtensions; // Later: SHARED_MODULE } else { @@ -988,7 +988,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextSharedHelpPa if( m_iSharedPackage == m_aSharedPackagesSeq.getLength() ) { - m_eState = BUNDLED_EXTENSIONS; + m_eState = IteratorState::BundledExtensions; } else { @@ -1018,7 +1018,7 @@ Reference< deployment::XPackage > ExtensionIteratorBase::implGetNextBundledHelpP if( m_iBundledPackage == m_aBundledPackagesSeq.getLength() ) { - m_eState = END_REACHED; + m_eState = IteratorState::EndReached; } else { @@ -1074,11 +1074,11 @@ OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) { OUString aRetFile; - while( aRetFile.isEmpty() && m_eState != END_REACHED ) + while( aRetFile.isEmpty() && m_eState != IteratorState::EndReached ) { switch( m_eState ) { - case USER_EXTENSIONS: + case IteratorState::UserExtensions: { Reference< deployment::XPackage > xParentPackageBundle; Reference< deployment::XPackage > xHelpPackage = implGetNextUserHelpPackage( xParentPackageBundle ); @@ -1089,7 +1089,7 @@ OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) break; } - case SHARED_EXTENSIONS: + case IteratorState::SharedExtensions: { Reference< deployment::XPackage > xParentPackageBundle; Reference< deployment::XPackage > xHelpPackage = implGetNextSharedHelpPackage( xParentPackageBundle ); @@ -1099,7 +1099,7 @@ OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) aRetFile = implGetTreeFileFromPackage( rnFileSize, xHelpPackage ); break; } - case BUNDLED_EXTENSIONS: + case IteratorState::BundledExtensions: { Reference< deployment::XPackage > xParentPackageBundle; Reference< deployment::XPackage > xHelpPackage = implGetNextBundledHelpPackage( xParentPackageBundle ); @@ -1110,8 +1110,8 @@ OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) break; } - case END_REACHED: - OSL_FAIL( "DataBaseIterator::nextTreeFile(): Invalid case END_REACHED" ); + case IteratorState::EndReached: + OSL_FAIL( "DataBaseIterator::nextTreeFile(): Invalid case IteratorState::EndReached" ); break; } } |