diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:21:36 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:21:36 +0000 |
| commit | a633a32b93191c0416cec003596741d2a644219e (patch) | |
| tree | 58f900a2a33ef4c8f4a34c60dfcf542bd676721b /xmlhelp | |
| parent | da6b12df66c4c51836daa4638caec7de93bc9de4 (diff) | |
INTEGRATION: CWS ab52 (1.53.6); FILE MERGED
2008/06/18 09:27:43 ab 1.53.6.1: #i90029# Removed unused code
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 75 |
1 files changed, 1 insertions, 74 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 95d8efe571..d370243618 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databases.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.54 $ * * This file is part of OpenOffice.org. * @@ -411,20 +411,6 @@ rtl::OUString Databases::getInstallPathAsURL() } -rtl::OUString Databases::getInstallPathAsURLWithOutEncoding() -{ - osl::MutexGuard aGuard( m_aMutex ); - - return m_aInstallDirectoryWithoutEncoding; -} - - -rtl::OUString Databases::getURLMode() -{ - return rtl::OUString::createFromAscii( "with-jars" ); -} - - const std::vector< rtl::OUString >& Databases::getModuleList( const rtl::OUString& Language ) { if( m_avModules.size() == 0 ) @@ -1163,57 +1149,6 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount } -void Databases::errorDocument( const rtl::OUString& Language, - char** buffer, - int* byteCount ) -{ - if( ! m_pErrorDoc ) - { - rtl::OUString fileURL = - getInstallPathAsURL() - + lang( Language ) - + rtl::OUString::createFromAscii( "/err.html" ); - - osl::DirectoryItem aDirItem; - osl::File aFile( fileURL ); - osl::FileStatus aStatus( FileStatusMask_FileSize ); - - if( osl::FileBase::E_None == osl::DirectoryItem::get( fileURL,aDirItem ) && - osl::FileBase::E_None == aFile.open( OpenFlag_Read ) && - osl::FileBase::E_None == aDirItem.getFileStatus( aStatus ) ) - { - m_nErrorDocLength = int( aStatus.getFileSize() ); - m_pErrorDoc = new char[ 1 + m_nErrorDocLength ]; - m_pErrorDoc[ m_nErrorDocLength ] = 0; - sal_uInt64 a = m_nErrorDocLength,b = m_nErrorDocLength; - aFile.read( m_pErrorDoc,a,b ); - aFile.close(); - } - else - { - // the error file does not exist - const char* errorText = - "<html><body>" - "The requested document does not exist in the database !!" - "</body></html>"; - - m_nErrorDocLength = strlen( errorText ); - m_pErrorDoc = new char[ 1 + m_nErrorDocLength ]; - m_pErrorDoc[ m_nErrorDocLength ] = 0; - rtl_copyMemory( m_pErrorDoc,errorText,m_nErrorDocLength ); - } - - } - - *byteCount = m_nErrorDocLength; - *buffer = new char[ 1 + *byteCount ]; - (*buffer)[*byteCount] = 0; - rtl_copyMemory( *buffer,m_pErrorDoc,m_nErrorDocLength ); -} - - - - void Databases::changeCSS(const rtl::OUString& newStyleSheet) { m_aCSS = newStyleSheet.toAsciiLowerCase(); @@ -1391,14 +1326,6 @@ ExtensionIteratorBase::ExtensionIteratorBase( Databases& rDatabases, init(); } -ExtensionIteratorBase::ExtensionIteratorBase( Reference< XComponentContext > xContext, Databases& rDatabases ) - : m_xContext( xContext ) - , m_rDatabases( rDatabases ) - , m_eState( USER_EXTENSIONS ) -{ - init(); -} - void ExtensionIteratorBase::init() { if( !m_xContext.is() ) |