helpmerge.cxx (3cd96b95) helpmerge.cxx (ebd57642)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 289 unchanged lines hidden (view full) ---

298 sXmlFile = String( sHelpFile , RTL_TEXTENCODING_ASCII_US );
299 }
300
301 OUString sOUHelpFile( sXmlFile );
302 String fullFilePath;
303 DirEntry aFile( sXmlFile );
304
305 XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new XMLFile( '0' ) ) );
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 289 unchanged lines hidden (view full) ---

298 sXmlFile = String( sHelpFile , RTL_TEXTENCODING_ASCII_US );
299 }
300
301 OUString sOUHelpFile( sXmlFile );
302 String fullFilePath;
303 DirEntry aFile( sXmlFile );
304
305 XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new XMLFile( '0' ) ) );
306 if (xmlfile == NULL) {
307 printf("%s\n",ByteString(aParser.GetError().sMessage,
308 RTL_TEXTENCODING_ASCII_US).GetBuffer());
309 exit(-1);
310 }
306 printf("Dest file %s\n",rDestinationFile.GetBuffer());
307 hasNoError = MergeSingleFile( xmlfile , aMergeDataFile , sLanguage , rDestinationFile );
308 delete xmlfile;
309 if( !sUsedTempFile.EqualsIgnoreCaseAscii( "" ) ){
310 DirEntry aTempFile( sUsedTempFile );
311 aTempFile.Kill();
312 }
313 return hasNoError;

--- 69 unchanged lines hidden (view full) ---

383 }
384
385
386 OUString sOUHelpFile( sXmlFile );
387 String fullFilePath;
388 DirEntry aFile( sXmlFile );
389
390 XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new XMLFile( '0' ) ) );
311 printf("Dest file %s\n",rDestinationFile.GetBuffer());
312 hasNoError = MergeSingleFile( xmlfile , aMergeDataFile , sLanguage , rDestinationFile );
313 delete xmlfile;
314 if( !sUsedTempFile.EqualsIgnoreCaseAscii( "" ) ){
315 DirEntry aTempFile( sUsedTempFile );
316 aTempFile.Kill();
317 }
318 return hasNoError;

--- 69 unchanged lines hidden (view full) ---

388 }
389
390
391 OUString sOUHelpFile( sXmlFile );
392 String fullFilePath;
393 DirEntry aFile( sXmlFile );
394
395 XMLFile* xmlfile = ( aParser.Execute( aFile.GetFull() , sOUHelpFile, new XMLFile( '0' ) ) );
391 xmlfile->Extract();
392
393 if( xmlfile == NULL)
394 {
395 printf("%s\n",ByteString(aParser.GetError().sMessage,RTL_TEXTENCODING_UTF8).GetBuffer());
396 exit(-1);
397 //return false;
398 }
396
397 if( xmlfile == NULL)
398 {
399 printf("%s\n",ByteString(aParser.GetError().sMessage,RTL_TEXTENCODING_UTF8).GetBuffer());
400 exit(-1);
401 //return false;
402 }
403 xmlfile->Extract();
399
400
401 ByteString sCur;
402 for( unsigned int n = 0; n < aLanguages.size(); n++ ){
403 sCur = aLanguages[ n ];
404
405 ByteString sFilepath;
406 if( bISO ) sFilepath = GetOutpath( rPathX , sCur , rPathY );

--- 306 unchanged lines hidden --- 		404
405
406 ByteString sCur;
407 for( unsigned int n = 0; n < aLanguages.size(); n++ ){
408 sCur = aLanguages[ n ];
409
410 ByteString sFilepath;
411 if( bISO ) sFilepath = GetOutpath( rPathX , sCur , rPathY );

--- 306 unchanged lines hidden ---