diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2011-03-09 14:56:21 +0100 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2011-03-09 14:56:21 +0100 |
commit | ff62ed4745a9b2367c68ef3eb863d29022f0fa7d (patch) | |
tree | 86a24f72042acbf232e5d1805150b590acc532a3 /xmlhelp | |
parent | 14fcbd54c96d9f46365f76f8df6b51d2e8074d74 (diff) |
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to
performing the m101 merge from OOo.
Diffstat (limited to 'xmlhelp')
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 110 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 66 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 60 |
3 files changed, 118 insertions, 118 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 3e359dd1fd..dadb58fbf9 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -209,10 +209,10 @@ Databases::~Databases() ++it; } } - + { // ModInfoTable - + ModInfoTable::iterator it = m_aModInfo.begin(); while( it != m_aModInfo.end() ) { @@ -220,10 +220,10 @@ Databases::~Databases() ++it; } } - + { // KeywordInfoTable - + KeywordInfoTable::iterator it = m_aKeywordInfo.begin(); while( it != m_aKeywordInfo.end() ) { @@ -335,16 +335,16 @@ void Databases::replaceName( rtl::OUString& oustring ) const sal_Int32 idx = -1,idx1 = -1,idx2 = -1,k = 0,off; bool cap = false; rtl::OUStringBuffer aStrBuf( 0 ); - + while( true ) { ++idx; idx1 = oustring.indexOf( sal_Unicode('%'),idx); idx2 = oustring.indexOf( sal_Unicode('$'),idx); - + if(idx1 == -1 && idx2 == -1) break; - + if(idx1 == -1) idx = idx2; else if(idx2 == -1) @@ -356,7 +356,7 @@ void Databases::replaceName( rtl::OUString& oustring ) const else if(idx2 < idx1 ) idx = idx2; } - + if( oustring.indexOf( prodName,idx ) == idx ) off = PRODUCTNAME; else if( oustring.indexOf( prodVersion,idx ) == idx ) @@ -373,7 +373,7 @@ void Databases::replaceName( rtl::OUString& oustring ) const off = NEWPRODUCTVERSION; else off = -1; - + if( off != -1 ) { if( ! cap ) @@ -381,13 +381,13 @@ void Databases::replaceName( rtl::OUString& oustring ) const cap = true; aStrBuf.ensureCapacity( 256 ); } - + aStrBuf.append( &oustring.getStr()[k],idx - k ); aStrBuf.append( m_vReplacement[off] ); k = idx + m_vAdd[off]; } } - + if( cap ) { if( k < oustring.getLength() ) @@ -424,7 +424,7 @@ rtl::OUString Databases::getInstallPathAsSystemPath() rtl::OUString Databases::getInstallPathAsURL() { osl::MutexGuard aGuard( m_aMutex ); - + return m_aInstallDirectory; } @@ -521,7 +521,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const rtl::OU if( pos ) { current = rtl::OUString( lineBuffer,pos ); - + if( current.compareToAscii( "Title",5 ) == 0 ) { title = current.copy( current.indexOf(sal_Unicode( '=' ) ) + 1 ); @@ -578,12 +578,12 @@ rtl::OUString Databases::processLang( const rtl::OUString& Language ) rtl::OUString ret; LangSetTable::iterator it = m_aLangSet.find( Language ); - + if( it == m_aLangSet.end() ) { sal_Int32 idx; osl::DirectoryItem aDirItem; - + if( osl::FileBase::E_None == osl::DirectoryItem::get( getInstallPathAsURL() + Language,aDirItem ) ) { ret = Language; @@ -611,7 +611,7 @@ rtl::OUString Databases::country( const rtl::OUString& Language ) if( ( idx = Language.indexOf( '-' ) ) != -1 || ( idx = Language.indexOf( '_' ) ) != -1 ) return Language.copy( 1+idx ); - + return rtl::OUString(); } @@ -623,7 +623,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database, { if( ! Database.getLength() || ! Language.getLength() ) return 0; - + osl::MutexGuard aGuard( m_aMutex ); @@ -671,7 +671,7 @@ Db* Databases::getBerkeley( const rtl::OUString& Database, delete table; table = 0; } - + it->second = table; } @@ -723,38 +723,38 @@ Databases::getCollator( const rtl::OUString& Language, rtl::OUString() ), 0 ); } - + return it->second; } namespace chelp { - + struct KeywordElementComparator { KeywordElementComparator( const Reference< XCollator >& xCollator ) : m_xCollator( xCollator ) { } - + bool operator()( const KeywordInfo::KeywordElement& la, const KeywordInfo::KeywordElement& ra ) const { const rtl::OUString& l = la.key; const rtl::OUString& r = ra.key; - + bool ret; - + if( m_xCollator.is() ) { sal_Int32 l1 = l.indexOf( sal_Unicode( ';' ) ); sal_Int32 l3 = ( l1 == -1 ? l.getLength() : l1 ); - + sal_Int32 r1 = r.indexOf( sal_Unicode( ';' ) ); sal_Int32 r3 = ( r1 == -1 ? r.getLength() : r1 ); - + sal_Int32 c1 = m_xCollator->compareSubstring( l,0,l3,r,0,r3 ); - + if( c1 == +1 ) ret = false; else if( c1 == 0 ) @@ -768,13 +768,13 @@ namespace chelp { } else ret = bool( l < r ); - + return ret; } - + Reference< XCollator > m_xCollator; }; // end struct KeywordElementComparator - + } @@ -811,7 +811,7 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl: anchor.push_back( rtl::OUString() ); } } - + listId.realloc( id.size() ); listAnchor.realloc( id.size() ); listTitle.realloc( id.size() ); @@ -851,9 +851,9 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl: pData = static_cast<sal_Char*>( data.get_data() ); } } - + DbtToStringConverter converter( pData, nSize ); - + rtl::OUString title = converter.getTitle(); pDatabases->replaceName( title ); listTitle[i] = title; @@ -987,7 +987,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, if( !bBelongsToDatabase ) continue; - + aVector.push_back( KeywordInfo::KeywordElement( this, idmap, keyword, @@ -999,11 +999,11 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, pDBHelp->releaseHashMap(); } } - + else if( 0 == table.open( 0,fileName.getStr(),0,DB_BTREE,DB_RDONLY,0644 ) ) { Db* idmap = getBerkeley( Database,Language ); - + bool first = true; Dbc* cursor = 0; @@ -1026,7 +1026,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, if( !bBelongsToDatabase ) continue; - + aVector.push_back( KeywordInfo::KeywordElement( this, idmap, keyword, @@ -1038,7 +1038,7 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, first = false; } } - + if( cursor ) cursor->close(); } table.close( 0 ); @@ -1048,11 +1048,11 @@ KeywordInfo* Databases::getKeyword( const rtl::OUString& Database, Reference< XCollator > xCollator = getCollator( Language,rtl::OUString()); KeywordElementComparator aComparator( xCollator ); std::sort(aVector.begin(),aVector.end(),aComparator); - + KeywordInfo* pInfo = it->second = new KeywordInfo( aVector ); (void)pInfo; } - + return it->second; } @@ -1067,10 +1067,10 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja rtl::OUString key = processLang(Language) + aSlash + jar; osl::MutexGuard aGuard( m_aMutex ); - + ZipFileTable::iterator it = m_aZipFileTable.insert( ZipFileTable::value_type( key,Reference< XHierarchicalNameAccess >(0) ) ).first; - + if( ! it->second.is() ) { rtl::OUString zipFile; @@ -1097,7 +1097,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja } Sequence< Any > aArguments( 2 ); - + XInputStream_impl* p = new XInputStream_impl( zipFile ); if( p->CtorSuccess() ) { @@ -1109,7 +1109,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja delete p; aArguments[ 0 ] <<= zipFile; } - + // let ZipPackage be used ( no manifest.xml is required ) beans::NamedValue aArg; aArg.Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StorageFormat" ) ); @@ -1139,7 +1139,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile( const rtl::OUString& ja { } } - + return it->second; } @@ -1197,7 +1197,7 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath } } } - + return xNA; } @@ -1229,9 +1229,9 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount val = urlPar->get_eid(); rtl::OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 ); const char* pop4 = pop4O.getStr(); - + (*byteCount) = l1 + l2 + l3 + l4 + l5; - + *buffer = new char[ 1+*byteCount ]; rtl_copyMemory( *buffer,pop1,l1 ); @@ -1332,19 +1332,19 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, bHighContrastMode = sal_False; } } - + if( error ) { m_nCustomCSSDocLength = 0; m_pCustomCSSDoc = new char[ 1 ]; // Initialize with 1 to avoid gcc compiler warning } } - + *byteCount = m_nCustomCSSDocLength; *buffer = new char[ 1 + *byteCount ]; (*buffer)[*byteCount] = 0; rtl_copyMemory( *buffer,m_pCustomCSSDoc,m_nCustomCSSDocLength ); - + } @@ -1800,7 +1800,7 @@ Db* DataBaseIterator::nextDb( rtl::OUString* o_pExtensionPath, rtl::OUString* o_ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xPackage, rtl::OUString* o_pExtensionPath, rtl::OUString* o_pExtensionRegistryPath ) { - + beans::Optional< ::rtl::OUString> optRegData; try { @@ -1847,7 +1847,7 @@ Db* DataBaseIterator::implGetDbFromPackage( Reference< deployment::XPackage > xP if( o_pExtensionRegistryPath ) *o_pExtensionRegistryPath = xPackage->getURL() + aSlash + aUsedLanguage; } - + return pRetDb; } @@ -2043,7 +2043,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage sal_Int32 nLastSlash = zipFile.lastIndexOf( '/' ); if( nLastSlash != -1 ) *o_pExtensionPath = zipFile.copy( 0, nLastSlash ); - + if( o_pExtensionRegistryPath != NULL ) { rtl::OUString& rPath = *o_pExtensionPath; @@ -2053,7 +2053,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage *o_pExtensionRegistryPath += rPath.copy( nLastSlashInPath); } } - + return xNA; } @@ -2108,7 +2108,7 @@ rtl::OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o o_rbExtension = true; break; } - + case BUNDLED_EXTENSIONS: { Reference< deployment::XPackage > xParentPackageBundle; diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 59d191cf9e..2cbf115a5c 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -121,7 +121,7 @@ bool URLParameter::isErrorDocument() rtl::OString URLParameter::getByName( const char* par ) { rtl::OUString val; - + if( strcmp( par,"Program" ) == 0 ) val = get_program(); else if( strcmp( par,"Database" ) == 0 ) @@ -138,7 +138,7 @@ rtl::OString URLParameter::getByName( const char* par ) val = get_system(); else if( strcmp( par,"HelpPrefix" ) == 0 ) val = get_prefix(); - + return rtl::OString( val.getStr(),val.getLength(),RTL_TEXTENCODING_UTF8 ); } @@ -152,13 +152,13 @@ rtl::OUString URLParameter::get_id() get_language() ); if( inf ) m_aId = inf->get_id(); - + m_bStart = true; } - + return m_aId; } - + rtl::OUString URLParameter::get_tag() { if( isFile() ) @@ -208,7 +208,7 @@ rtl::OUString URLParameter::get_program() } return m_aProgram; } - + void URLParameter::init( bool bDefaultLanguageIsInitialized ) { @@ -226,9 +226,9 @@ rtl::OUString URLParameter::get_the_tag() if(m_bUseDB) { if( ! m_bBerkeleyRead ) readBerkeley(); - + m_bBerkeleyRead = true; - + return m_aTag; } else @@ -243,14 +243,14 @@ rtl::OUString URLParameter::get_the_path() if( ! m_bBerkeleyRead ) readBerkeley(); m_bBerkeleyRead = true; - + return m_aPath; } else return get_id(); } - + rtl::OUString URLParameter::get_the_title() { @@ -258,7 +258,7 @@ rtl::OUString URLParameter::get_the_title() if( ! m_bBerkeleyRead ) readBerkeley(); m_bBerkeleyRead = true; - + return m_aTitle; } else @@ -272,7 +272,7 @@ rtl::OUString URLParameter::get_the_jar() if( ! m_bBerkeleyRead ) readBerkeley(); m_bBerkeleyRead = true; - + return m_aJar; } else @@ -309,7 +309,7 @@ void URLParameter::readBerkeley() break; rtl::OString keyStr( m_aId.getStr(),m_aId.getLength(),RTL_TEXTENCODING_UTF8 ); - + DBHelp* pDBHelp = db->getDBHelp(); if( pDBHelp != NULL ) { @@ -518,7 +518,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, Reference< XHierarchicalNameAccess > xNA = m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )), get_language() ); - + rtl::OUString path = get_path(); if( xNA.is() ) { @@ -544,11 +544,11 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierException ) { m_aExpr = m_aURL; - + sal_Int32 lstIdx = m_aExpr.lastIndexOf( sal_Unicode( '#' ) ); if( lstIdx != -1 ) m_aExpr = m_aExpr.copy( 0,lstIdx ); - + if( ! scheme() || ! name( module() ) || ! query() || @@ -556,7 +556,7 @@ void URLParameter::parse() throw( com::sun::star::ucb::IllegalIdentifierExceptio ! m_aSystem.getLength() ) throw com::sun::star::ucb::IllegalIdentifierException(); } - + bool URLParameter::scheme() { @@ -664,7 +664,7 @@ bool URLParameter::query() value = query_.copy( equalIdx+1,delimIdx - equalIdx - 1 ).trim(); query_ = query_.copy( delimIdx+1 ).trim(); } - + if( parameter.compareToAscii( "Language" ) == 0 ) m_aLanguage = value; else if( parameter.compareToAscii( "Device" ) == 0 ) @@ -700,12 +700,12 @@ bool URLParameter::query() else ret = false; } - + return ret; } struct UserData { - + UserData( InputStreamTransformer* pTransformer, URLParameter* pInitial, Databases* pDatabases ) @@ -714,7 +714,7 @@ struct UserData { m_pInitial( pInitial ) { } - + InputStreamTransformer* m_pTransformer; Databases* m_pDatabases; URLParameter* m_pInitial; @@ -783,7 +783,7 @@ zipOpen(const char * /*URI*/) { { } } - + if( xInputStream.is() ) { return new Reference<XInputStream>(xInputStream); @@ -797,7 +797,7 @@ helpOpen(const char * URI) { URLParameter urlpar( rtl::OUString::createFromAscii( URI ), ugblData->m_pDatabases ); - + jar = urlpar.get_jar(); language = urlpar.get_language(); path = urlpar.get_path(); @@ -820,7 +820,7 @@ helpOpen(const char * URI) { { } } - + if( xInputStream.is() ) return new Reference<XInputStream>(xInputStream); return 0; @@ -907,13 +907,13 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, else { UserData userData( this,urlParam,pDatabases ); - + // Uses the implementation detail, that rtl::OString::getStr returns a zero terminated character-array - + const char* parameter[47]; rtl::OString parString[46]; int last = 0; - + parString[last++] = "Program"; rtl::OString aPureProgramm( urlParam->getByName( "Program" ) ); parString[last++] = rtl::OString('\'') + aPureProgramm + rtl::OString('\''); @@ -945,7 +945,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, parString[last++] = rtl::OString('\'') + pDatabases->getImagesZipFileURL() + rtl::OString('\''); parString[last++] = "hp"; parString[last++] = rtl::OString('\'') + urlParam->getByName( "HelpPrefix" ) + rtl::OString('\''); - + if( parString[last-1].getLength() ) { parString[last++] = "sm"; @@ -972,7 +972,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, parString[last++] = "vendorshort"; parString[last++] = rtl::OString("''"); } - + // Do we need to add extension path? ::rtl::OUString aExtensionPath; rtl::OUString aJar = urlParam->get_jar(); @@ -1084,7 +1084,7 @@ Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( Any aRet = ::cppu::queryInterface( rType, SAL_STATIC_CAST( XInputStream*,this ), SAL_STATIC_CAST( XSeekable*,this ) ); - + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -1177,7 +1177,7 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA throw IllegalArgumentException(); else pos = sal::static_int_cast<sal_Int32>( location ); - + if( pos > len ) pos = len; } @@ -1196,7 +1196,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getPosition( void ) throw( IOExceptio sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException,RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); - + return len; } @@ -1204,7 +1204,7 @@ sal_Int64 SAL_CALL InputStreamTransformer::getLength( void ) throw( IOException, void InputStreamTransformer::addToBuffer( const char* buffer_,int len_ ) { osl::MutexGuard aGuard( m_aMutex ); - + char* tmp = buffer; buffer = new char[ len+len_ ]; rtl_copyMemory( (void*)(buffer),(void*)(tmp),sal_uInt32( len ) ); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 1cc122a70e..a4a6860b62 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -50,14 +50,14 @@ namespace treeview { - + class TVDom { friend class TVChildTarget; friend class TVRead; - + public: - + TVDom( TVDom* arent = 0 ) : kind( other ), parent( arent ), @@ -145,27 +145,27 @@ namespace treeview { if ( len != 0 ) break; } - + rtl::OUStringBuffer strBuff( 22 + len + id.getLength() ); strBuff.appendAscii( "vnd.sun.star.help://" ).append(id); - + targetURL = strBuff.makeStringAndClear(); } - + return targetURL; } - + private: - + Kind kind; rtl::OUString application; rtl::OUString title; rtl::OUString id; rtl::OUString anchor; rtl::OUString targetURL; - + TVDom *parent; std::vector< TVDom* > childs; }; @@ -199,7 +199,7 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const sal_Int32 idx = -1,k = 0,off; bool cap = false; rtl::OUStringBuffer aStrBuf( 0 ); - + while( ( idx = oustring.indexOf( sal_Unicode('%'),++idx ) ) != -1 ) { if( oustring.indexOf( prodName,idx ) == idx ) @@ -214,7 +214,7 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const off = VENDORSHORT; else off = -1; - + if( off != -1 ) { if( ! cap ) @@ -222,13 +222,13 @@ void SAL_CALL ConfigData::replaceName( rtl::OUString& oustring ) const cap = true; aStrBuf.ensureCapacity( 256 ); } - + aStrBuf.append( &oustring.getStr()[k],idx - k ); aStrBuf.append( m_vReplacement[off] ); k = idx + m_vAdd[off]; } } - + if( cap ) { if( k < oustring.getLength() ) @@ -274,7 +274,7 @@ TVBase::queryInterface( SAL_STATIC_CAST( XHierarchicalNameAccess*, this ), SAL_STATIC_CAST( XChangesNotifier*, this ), SAL_STATIC_CAST( XComponent*, this ) ); - + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } @@ -302,7 +302,7 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom ) { if( ! tvDom ) return; - + Title = tvDom->title; configData.replaceName( Title ); if( tvDom->isLeaf() ) @@ -381,7 +381,7 @@ TVRead::hasByName( const rtl::OUString& aName ) aName.compareToAscii( "TargetURL" ) == 0 || aName.compareToAscii( "Children" ) == 0 ) return true; - + return false; } @@ -395,11 +395,11 @@ TVRead::getByHierarchicalName( const rtl::OUString& aName ) { sal_Int32 idx; rtl::OUString name( aName ); - + if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && name.copy( 0,idx ).compareToAscii( "Children" ) == 0 ) return Children->getByHierarchicalName( name.copy( 1 + idx ) ); - + return getByName( name ); } @@ -412,11 +412,11 @@ TVRead::hasByHierarchicalName( const rtl::OUString& aName ) { sal_Int32 idx; rtl::OUString name( aName ); - + if( ( idx = name.indexOf( sal_Unicode( '/' ) ) ) != -1 && name.copy( 0,idx ).compareToAscii( "Children" ) == 0 ) return Children->hasByHierarchicalName( name.copy( 1 + idx ) ); - + return hasByName( name ); } @@ -444,14 +444,14 @@ extern "C" void start_handler(void *userData, kind = TVDom::tree_leaf; else return; - + TVDom **tvDom = static_cast< TVDom** >( userData ); TVDom *p; p = *tvDom; *tvDom = p->newChild(); p = *tvDom; - + p->setKind( kind ); while( *atts ) { @@ -463,7 +463,7 @@ extern "C" void start_handler(void *userData, p->setId( *(atts+1) ); else if( strcmp( *atts,"anchor" ) == 0 ) p->setAnchor( *(atts+1) ); - + atts+=2; } } @@ -523,7 +523,7 @@ TVChildTarget::TVChildTarget( const Reference< XMultiServiceFactory >& xMSF ) aFile.open( osl_File_OpenFlag_Read ); aFile.read( s,len,ret ); aFile.close(); - + XML_Parser parser = XML_ParserCreate( 0 ); XML_SetElementHandler( parser, start_handler, @@ -581,7 +581,7 @@ TVChildTarget::getElementNames( ) Sequence< rtl::OUString > seq( Elements.size() ); for( unsigned i = 0; i < Elements.size(); ++i ) seq[i] = rtl::OUString::valueOf( sal_Int32( 1+i ) ); - + return seq; } @@ -739,7 +739,7 @@ ConfigData TVChildTarget::init( const Reference< XMultiServiceFactory >& xSMgr ) ret = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); } url = url + ret; - + // first of all, try do determine whether there are any *.tree files present // Start with extensions to set them at the end of the list @@ -846,7 +846,7 @@ TVChildTarget::getConfiguration(const Reference< XMultiServiceFactory >& m_xSMgr OSL_ENSURE( sProvider.is(),"cant instantiate configuration" ); } } - + return sProvider; } @@ -877,7 +877,7 @@ TVChildTarget::getHierAccess( const Reference< XMultiServiceFactory >& sProvider { } } - + return xHierAccess; } @@ -947,9 +947,9 @@ void TVChildTarget::subst( const Reference< XMultiServiceFactory >& m_xSMgr, OSL_ENSURE( xCfgMgr.is()," cant instantiate the special config manager " ); } } - + OSL_ENSURE( xCfgMgr.is(), "specialconfigmanager not found\n" ); - + if( xCfgMgr.is() ) instpath = xCfgMgr->substituteVariables( instpath ); } |