diff options
Diffstat (limited to 'l10ntools')
27 files changed, 98 insertions, 93 deletions
diff --git a/l10ntools/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx index d1f2267820e0..b7f1f8571799 100644 --- a/l10ntools/inc/wtranode.hxx +++ b/l10ntools/inc/wtranode.hxx @@ -45,7 +45,7 @@ const BRANCH_T C_NR_OF_BRANCHES = 34; /** @task This is a node of the parsing-tree which implements the fuctionality of class WordTransTree. - WordTransTree is dependant of this class, but NOT the other way! + WordTransTree is dependent of this class, but NOT the other way! **/ class WTT_Node // WordTransTree-Node { diff --git a/l10ntools/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx index 03309a9dbe4d..2aa7de715502 100644 --- a/l10ntools/inc/wtratree.hxx +++ b/l10ntools/inc/wtratree.hxx @@ -45,7 +45,7 @@ class WTT_Node; /** @task This class implements the functionality, that class WordTransformer offers. - WordTransformer is dependant of this class, but NOT the other way! + WordTransformer is dependent of this class, but NOT the other way! **/ class WordTransTree { @@ -118,7 +118,7 @@ class WordTransTree // Data which are valid only after a completed call to TransformNextToken() E_Result eCurResult; - u_char cCurHotkey; // Letter wich is used as hotkey + u_char cCurHotkey; // Letter which is used as hotkey u_char cCurHotkeySign; // Letter which is used to assign hotkey ('~'or '&') . }; diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java index 37f6b879395a..cdc28d5926cb 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java @@ -173,10 +173,10 @@ public class Convert { OutputHandler.closeAll(); } catch(Exception e){ - System.out.print("An EXCEPTION occured, please check your commad line settings \n"+e.getMessage()); + System.out.print("An EXCEPTION occurred, please check your commad line settings \n"+e.getMessage()); System.exit(-1); }catch(Throwable t){ - System.out.print("A FATAL ERROR occured, please check your commad line settings \n"+t.getMessage()); + System.out.print("A FATAL ERROR occurred, please check your commad line settings \n"+t.getMessage()); System.exit(-1); } @@ -451,7 +451,7 @@ public class Convert { OutputHandler.out("ERROR: "+e.getMessage()); System.exit(-1); } catch (Throwable t){ - System.out.print("An Error occured while parsing the command line,\n please check your commad line settings.\n "+t.getMessage()); + System.out.print("An Error occurred while parsing the command line,\n please check your commad line settings.\n "+t.getMessage()); System.exit(-1); } diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java index 8fde3cd874c1..5c1e5a5336a1 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java @@ -22,7 +22,7 @@ /* * a simple exception - * just to seperate + * just to separate * it from other * exceptions */ diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java index e3991f7c6cb5..859c8f1f0f77 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java @@ -41,7 +41,7 @@ import java.io.IOException; public final class FileMaker { /** - * Create a new file if overwriting is not alowed + * Create a new file if overwriting is not allowed * ask if existing files should be overwritten * * @param fileName the files name to overwrite diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java index acf0ce473c73..269cc99c76eb 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java @@ -33,7 +33,7 @@ import com.sun.star.tooling.languageResolver.LanguageResolver.LanguageResolvingE */ public class GSIWriter extends DataWriter { /** - * The seperator used to seperate GSI columns + * The seperator used to separate GSI columns */ final String seperator=new String("($$)"); @@ -155,16 +155,16 @@ public class GSIWriter extends DataWriter { else { // put them together for output buffer.append(this.blockNr); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(ResTypeResolver.getExternKey(resType)); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(this.sourceLanguage); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append("int"); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(outData.get(resString)); @@ -189,16 +189,16 @@ public class GSIWriter extends DataWriter { else { // put them together for output buffer.append(this.blockNr); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(ResTypeResolver.getExternKey(resType)); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(this.targetLanguage); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append("ext"); - // seperate the fields with ($$) + // separate the fields with ($$) buffer.append(this.seperator); buffer.append(outData.get(resString)); diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java index b6a8b055d542..b98cdd49edad 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java @@ -137,7 +137,7 @@ public class GSIandSDFMerger extends SDFReader { }else{ // skip=true; // -// // we cant match this gsi block to the current sdf block +// // we can't match this gsi block to the current sdf block // try matching the next sdf block with this gsi line dontLoadGSI=true; } diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java index ab27e894450d..94ee4ad03ee2 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java @@ -581,7 +581,7 @@ public class SDFReader extends DataReader { if ((splitLine = line.split("\t")).length == 15) return splitLine; else - //an error occured + //an error occurred return null; } diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java index a49b2cbf06de..f7fb5643df2c 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java @@ -38,7 +38,7 @@ import java.util.Map; */ public class SDFWriter extends DataWriter { /** - * the seperator the seperate columns + * the seperator the separate columns */ final String seperator=new String("\t"); /** @@ -109,7 +109,7 @@ public class SDFWriter extends DataWriter { // put them together for output buffer.append(outData.get(sourceLineNames[i])); if(i!=sourceLineNames.length-1) { - // seperate the fields with tab + // separate the fields with tab buffer.append(seperator); }else{ // this line is full @@ -125,7 +125,7 @@ public class SDFWriter extends DataWriter { // put them together for output buffer.append(outData.get(targetLineNames[i])); if(i!=targetLineNames.length-1) { - // seperate the fields with tab + // separate the fields with tab buffer.append(seperator); }else{ // this line is full diff --git a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java index be1e87d22307..5de18104d0a5 100644 --- a/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java +++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java @@ -492,9 +492,9 @@ public class XLIFFWriter extends DataWriter { return "<header></header>\n"; } /** - * Create the begining of the line holding the body tag of this XIFFFile + * Create the beginning of the line holding the body tag of this XIFFFile * - * @return a string with the begining of the body tag of this XIFFFile + * @return a string with the beginning of the body tag of this XIFFFile */ private String openBodyTag() { return "\t\t<body>\n"; diff --git a/l10ntools/scripts/localize.pl b/l10ntools/scripts/localize.pl index 811ea6eae0a8..9e0db396c1b0 100755 --- a/l10ntools/scripts/localize.pl +++ b/l10ntools/scripts/localize.pl @@ -1036,7 +1036,7 @@ sub usage{ print STDERR " -f <sdffile> To split a big SDF file into particles\n"; print STDERR " <outputfile> To collect and join all particles to one big file\n"; print STDERR " -s <sourceroot> Path to the modules, if no \$SRC_ROOT is set\n"; - print STDERR " -l ( all | <isocode> | <isocode>=fallback ) comma seperated languages\n"; + print STDERR " -l ( all | <isocode> | <isocode>=fallback ) comma separated languages\n"; print STDERR " -d Use default date in extracted sdf file\n"; print STDERR " -c Create needed directories\n"; print STDERR " -g Sort sdf file before mergeing\n"; diff --git a/l10ntools/scripts/localize_old.pl b/l10ntools/scripts/localize_old.pl index 17c63272d048..8de7f5877adf 100755 --- a/l10ntools/scripts/localize_old.pl +++ b/l10ntools/scripts/localize_old.pl @@ -1031,7 +1031,7 @@ sub usage{ print STDERR " -f <sdffile> To split a big SDF file into particles\n"; print STDERR " <outputfile> To collect and join all particles to one big file\n"; print STDERR " -s <sourceroot> Path to the modules, if no \$SRC_ROOT is set\n"; - print STDERR " -l ( all | <isocode> | <isocode>=fallback ) comma seperated languages\n"; + print STDERR " -l ( all | <isocode> | <isocode>=fallback ) comma separated languages\n"; print STDERR " -d Use default date in extracted sdf file\n"; print STDERR " -v Verbose\n"; print STDERR "\nExample:\n"; diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index bab8d714ae8e..0f796b1f920e 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -246,7 +246,7 @@ extern FILE *GetCfgFile() aEntry += DirEntry( sPrjRoot ); ByteString sPrjEntry( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - // create file name, beginnig with project root + // create file name, beginning with project root // (e.g.: source\ui\src\menue.src) // printf("sFullEntry = %s\n",sFullEntry.GetBuffer()); sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 ); diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 04b23959d646..0ecca7d9231d 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -263,7 +263,7 @@ extern FILE *GetNextFile() aEntry += DirEntry( sPrjRoot ); ByteString sPrjEntry( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - // create file name, beginnig with project root + // create file name, beginning with project root // (e.g.: source\ui\src\menue.src) sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 ); diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 34df550280fb..fb9df40b966e 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -36,6 +36,7 @@ #include <tools/urlobj.hxx> #include <time.h> #include <stdlib.h> +#include <boost/shared_ptr.hpp> using namespace std; // @@ -339,9 +340,6 @@ void Export::RemoveUTF8ByteOrderMarkerFromFile( const ByteString &rFilename ){ bool Export::CopyFile( const ByteString& source , const ByteString& dest ) { // cout << "CopyFile( " << source.GetBuffer() << " , " << dest.GetBuffer() << " )\n"; - const int BUFFERSIZE = 8192; - char buf[ BUFFERSIZE ]; - FILE* IN_FILE = fopen( source.GetBuffer() , "r" ); if( IN_FILE == NULL ) { @@ -357,27 +355,34 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest ) return false; } - while( fgets( buf , BUFFERSIZE , IN_FILE ) != NULL ) + static const int BUFFERSIZE = 0x100000; + boost::shared_ptr<char> aScopedBuffer( new char[BUFFERSIZE] ); + char* buf = aScopedBuffer.get(); + + bool bOk = true; + while( bOk ) { - if( fputs( buf , OUT_FILE ) == EOF ) + if( feof( IN_FILE ) ) + break; + const size_t nBytesRead = fread( buf, 1, BUFFERSIZE, IN_FILE ); + if( nBytesRead <= 0 ) + { + if( ferror( IN_FILE ) ) + { + cerr << "Export::CopyFile WARNING: Read problems " << dest.GetBuffer() << "\n"; + bOk = false; + } + } + else if( fwrite( buf, 1, nBytesRead, OUT_FILE ) <= 0 ) { cerr << "Export::CopyFile WARNING: Write problems " << source.GetBuffer() << "\n"; - fclose( IN_FILE ); - fclose( OUT_FILE ); - return false; + bOk = false; } } - if( ferror( IN_FILE ) ) - { - cerr << "Export::CopyFile WARNING: Read problems " << dest.GetBuffer() << "\n"; - fclose( IN_FILE ); - fclose( OUT_FILE ); - return false; - } fclose ( IN_FILE ); fclose ( OUT_FILE ); - return true; + return bOk; } /*****************************************************************************/ diff --git a/l10ntools/source/filter/merge/FCFGMerge.cfg b/l10ntools/source/filter/merge/FCFGMerge.cfg index eaba83610bd7..c7f4e5b7231e 100644 --- a/l10ntools/source/filter/merge/FCFGMerge.cfg +++ b/l10ntools/source/filter/merge/FCFGMerge.cfg @@ -32,7 +32,7 @@ loglevel = 2 #************************************************ -# This extension is used for all XML files. It doesnt +# This extension is used for all XML files. It doesn't # matter if its used for reading fragments or writing # XML packages. # Must be given without any additional signes like "." @@ -44,7 +44,7 @@ loglevel = 2 extension_xcu=xcu #************************************************ -# This extension is used for all Package files. It doesnt +# This extension is used for all Package files. It doesn't # matter if its used for reading such files or writing # it. # Must be given without any additional signes like "." @@ -91,7 +91,7 @@ subdir_contenthandlers = contenthandlers #************************************************ # This delimiter is used to split every # item list of the package configuration files -# (which are temp. created by the make proccess) +# (which are temp. created by the make process) # into its tokens. # # [REQUIRED] diff --git a/l10ntools/source/filter/merge/FCFGMerge.java b/l10ntools/source/filter/merge/FCFGMerge.java index 6600733d6635..9804181bb11f 100644 --- a/l10ntools/source/filter/merge/FCFGMerge.java +++ b/l10ntools/source/filter/merge/FCFGMerge.java @@ -115,7 +115,7 @@ public class FCFGMerge sOut.append("parameters:\n" ); sOut.append("\tcfg=<file name>\n" ); sOut.append("\t\tmust point to a system file, which contains\n" ); - sOut.append("\t\tall neccessary configuration data for the merge process.\n"); + sOut.append("\t\tall necessary configuration data for the merge process.\n"); sOut.append("\n\tFurther cou can specify every parameter allowed in the\n" ); sOut.append("\n\tconfig file as command line parameter too, to overwrite\n" ); sOut.append("\n\tthe value from the file.\n" ); diff --git a/l10ntools/source/filter/merge/Merger.java b/l10ntools/source/filter/merge/Merger.java index 5cb2b40f2e75..8f3e47cdc08c 100644 --- a/l10ntools/source/filter/merge/Merger.java +++ b/l10ntools/source/filter/merge/Merger.java @@ -199,7 +199,7 @@ public class Merger m_aCfg.getString (PROP_XMLPACKAGE ), m_aCfg.getBoolean(PROP_LANGUAGEPACK, false))); - // counts all transfered fragments + // counts all transferred fragments // Can be used later to decide, if a generated package file // contains "nothing"! int nItemCount = 0; @@ -307,7 +307,7 @@ public class Merger // special mode for generating language packs. // In such case we must live with some missing fragment files. - // Reason behind; Not all filters are realy localized. + // Reason behind; Not all filters are really localized. // But we dont use a different fragment list. We try to locate // any fragment file in its language-pack version ... boolean bHandleLanguagePacks = m_aCfg.getBoolean(PROP_LANGUAGEPACK, false); @@ -340,7 +340,7 @@ public class Merger } // copy file content of original fragment - // Note: A FileNotFoundException will be thrown automaticly by the + // Note: A FileNotFoundException will be thrown automatically by the // used reader objects. Let it break this method too. Our calli is interested // on such errors :-) m_aLog.setDetailedInfo("merge fragment \""+aFragment.getPath()+"\" ..."); diff --git a/l10ntools/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java index be1b56f0ddb7..9e6feff30a4c 100644 --- a/l10ntools/source/filter/utils/Cache.java +++ b/l10ntools/source/filter/utils/Cache.java @@ -67,7 +67,7 @@ public class Cache public static final int FORMAT_60 = 0; /** identify the configuration format of an office 6.y. - * Properties are realy xml tags again. */ + * Properties are really xml tags again. */ public static final int FORMAT_6Y = 1; /** identify the configuration format which is used inside @@ -336,7 +336,7 @@ public class Cache * * @param aXML * must be a system file of a suitable XML file, which - * include all neccessary type/filter items. + * include all necessary type/filter items. * * @param nFormat * identifies the format of the specified xml file, @@ -605,7 +605,7 @@ public class Cache * specify the file encoding for the generated xml file. * * @throws [java.lang.Exception] - * if something fail during convertion. + * if something fail during conversion. */ public synchronized void toXML(java.io.File aXML , int nFormat , @@ -700,7 +700,7 @@ public class Cache * contains the properties in the requested format. * * @throws [java.lang.Exception - * if something fail during convertion. + * if something fail during conversion. */ private static java.util.HashMap convertTypePropsToExternal(java.util.HashMap aMap , int nFormat) @@ -800,7 +800,7 @@ public class Cache * contains the properties in the requested format. * * @throws [java.lang.Exception - * if something fail during convertion. + * if something fail during conversion. */ private static java.util.HashMap convertFilterPropsToExternal(java.util.HashMap aMap , int nFormat) @@ -855,10 +855,10 @@ public class Cache //----------------------------------- case FORMAT_6Y : { - // supress "Order" property. + // suppress "Order" property. // Will be moved to type entries in 6.y version! - // supress "UIName" property. + // suppress "UIName" property. // Only type entries will be localized in 6.y version! /* TODO make it configurable :-) */ aResultMap.put(PROPNAME_UINAME , aMap.get(PROPNAME_UINAME )); @@ -903,7 +903,7 @@ public class Cache * contains the properties in the requested format. * * @throws [java.lang.Exception - * if something fail during convertion. + * if something fail during conversion. */ private static java.util.HashMap convertDetectServicePropsToExternal(java.util.HashMap aMap , int nFormat) @@ -1009,7 +1009,7 @@ public class Cache /** converts a type property set (using an external format) to * our internal cache format. * - * Especialy the data format string will be expanded + * Especially the data format string will be expanded * to its real properties. * * Schema: @@ -1051,7 +1051,7 @@ public class Cache // generate new property "DetectService" // Every type know its detector diretcly from now. No search - // will be neccessary any longer. + // will be necessary any longer. aResultMap.put(PROPNAME_DETECTSERVICE, new java.lang.String()); // analyze the Data property of the original map @@ -1132,7 +1132,7 @@ public class Cache /** converts a filter property set (using an external format) to * our internal cache format. * - * Especialy the data format string will be expanded + * Especially the data format string will be expanded * to its real properties. * * Schema: @@ -1783,7 +1783,7 @@ public class Cache { // last token was not a delimiter - new one is such delim // => ignore this delimiter - but save the information, that - // it occured + // it occurred bLastWasDelim = true; } } @@ -1939,7 +1939,7 @@ public class Cache java.lang.String sType = (java.lang.String)aIt1.next(); java.util.HashMap aType = (java.util.HashMap)m_lTypes.get(sType); if (aType == null) - throw new java.lang.Exception("type ["+sType+"] dos not exist realy?!"); + throw new java.lang.Exception("type ["+sType+"] dos not exist really?!"); if ( (!aType.containsKey(PROPNAME_MEDIATYPE )) || @@ -1951,7 +1951,7 @@ public class Cache (!aType.containsKey(PROPNAME_UINAME )) ) { - throw new java.lang.Exception("Type \""+sType+"\" does not contain all neccessary properties for a 6.0/6.Y format."); + throw new java.lang.Exception("Type \""+sType+"\" does not contain all necessary properties for a 6.0/6.Y format."); } if ( @@ -1973,7 +1973,7 @@ public class Cache (!aType.containsKey(PROPNAME_DETECTSERVICE )) ) { - throw new java.lang.Exception("Type \""+sType+"\" does not contain all neccessary properties for a 6.Y format."); + throw new java.lang.Exception("Type \""+sType+"\" does not contain all necessary properties for a 6.Y format."); } if (((java.lang.Integer)aType.get(PROPNAME_UIORDER)).intValue() < 0) @@ -2023,7 +2023,7 @@ public class Cache java.lang.String sFilter = (java.lang.String)aIt1.next(); java.util.HashMap aFilter = (java.util.HashMap)m_lFilters.get(sFilter); if (aFilter == null) - throw new java.lang.Exception("filter ["+sFilter+"] dos not exist realy?!"); + throw new java.lang.Exception("filter ["+sFilter+"] dos not exist really?!"); if ( (!aFilter.containsKey(PROPNAME_DOCUMENTSERVICE )) || @@ -2036,7 +2036,7 @@ public class Cache (!aFilter.containsKey(PROPNAME_USERDATA )) ) { - throw new java.lang.Exception("Filter \""+sFilter+"\" does not contain all neccessary properties for a 6.0/6.Y format."); + throw new java.lang.Exception("Filter \""+sFilter+"\" does not contain all necessary properties for a 6.0/6.Y format."); } if (((java.lang.Integer)aFilter.get(PROPNAME_FLAGS)).intValue() < 1) @@ -2052,7 +2052,7 @@ public class Cache (!aFilter.containsKey(PROPNAME_UINAME)) ) { - throw new java.lang.Exception("Filter \""+sFilter+"\" does not contain all neccessary properties for a 6.0 format."); + throw new java.lang.Exception("Filter \""+sFilter+"\" does not contain all necessary properties for a 6.0 format."); } if (((java.lang.Integer)aFilter.get(PROPNAME_ORDER)).intValue() < 0) @@ -2112,7 +2112,7 @@ public class Cache java.util.HashMap aFilter = (java.util.HashMap)m_lFilters.get(sFilter); // remove the "graphic helper filters" used by draw and impress - // They dont have any valid document service name set and cant be handled + // They dont have any valid document service name set and can't be handled // by our generic FrameLoader! // They must be moved to her own configuration ... diff --git a/l10ntools/source/filter/utils/ConfigHelper.java b/l10ntools/source/filter/utils/ConfigHelper.java index 9a35201c4417..855eb52ff8a9 100644 --- a/l10ntools/source/filter/utils/ConfigHelper.java +++ b/l10ntools/source/filter/utils/ConfigHelper.java @@ -66,7 +66,7 @@ public class ConfigHelper extends java.util.Properties * * @throws [Exception] * in case the command line contains an unknown - * schema for specifiying parameters or the + * schema for specifying parameters or the * specified property file does not exists * or seem to be corrupted. */ @@ -245,7 +245,7 @@ public class ConfigHelper extends java.util.Properties * * @param bTrim * if its set to true, trailing and leading whitespace - * characters will be ommited. + * characters will be omitted. * * @param bDecode * if its set to TRUE all liste items will be diff --git a/l10ntools/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java index 21c65c4b0b99..64dc5d71b954 100644 --- a/l10ntools/source/filter/utils/FileHelper.java +++ b/l10ntools/source/filter/utils/FileHelper.java @@ -34,7 +34,7 @@ import java.util.*; /** * It collects some static helper functons to handle file system specific problems. - * Sometimes it's neccessary to convert URL from/to system pathes; + * Sometimes it's necessary to convert URL from/to system paths; * or from string notation to structural versions (e.g. com.sun.star.util.URL). * And sometimes java had another notation then the office it has. * Further it provides functionality to work easiear with the java.io.File class of java. @@ -47,7 +47,7 @@ public class FileHelper /** * Because the office need URLs for loading/saving documents - * we must convert used system pathes. + * we must convert used system paths. * And java use another notation for file URLs ... correct it. * * @param aSystemPath @@ -92,7 +92,7 @@ public class FileHelper /** * The same as getFileURLFromSystemPath() before but uses string parameter instead - * of a java.io.File type. It exist to supress converting of neccessary parameters in the + * of a java.io.File type. It exist to suppress converting of necessary parameters in the * outside code. But of course getFileURLFromSystemPath(File) will be a little bit faster * then this method ... * @@ -160,7 +160,7 @@ public class FileHelper /** * The same as getURLWithProtocolFromSystemPath() before but uses string parameter instead - * of a java.io.File types. It exist to supress converting of neccessary parameters in the + * of a java.io.File types. It exist to suppress converting of necessary parameters in the * outside code. But of course getURLWithProtocolFromSystemPath(File,File,String) will be * a little bit faster then this method ... * diff --git a/l10ntools/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java index 3074ed182923..9b877f35fd94 100644 --- a/l10ntools/source/filter/utils/XMLHelper.java +++ b/l10ntools/source/filter/utils/XMLHelper.java @@ -33,7 +33,7 @@ import java.io.*; /** * It provides some constant values and some static helper routines - * which are neccessary to work with a xml file - especialy + * which are necessary to work with a xml file - especially * the filter configuration. * * @@ -92,8 +92,8 @@ public class XMLHelper private static final java.lang.String[] DELIMS = {" ", ",", ";", ".", ":", "-", "_", "#", "'", "+", "*", "~", "=", "?"}; /** index of the default separator inside list DELIMS. - * Its neccessary to know such default separator; because it can - * be supressed as xml attribute of the corresponding value tag. */ + * Its necessary to know such default separator; because it can + * be suppressed as xml attribute of the corresponding value tag. */ private static final int DEFAULT_SEPARATOR = 0; //___________________________________________ @@ -102,7 +102,7 @@ public class XMLHelper * return a property set of all found sub nodes. * * Such properties are organized as [name, value] pairs. - * The type of a xml node will be detected automaticly. + * The type of a xml node will be detected automatically. * Following types are supported: * xs:int => java.lang.Integer * xs:bool => java.lang.Boolean @@ -291,7 +291,7 @@ public class XMLHelper * the xml string representation. * * @throws [java.lang.Exception] - * if anything during convertion fill fail. + * if anything during conversion fill fail. */ public static java.lang.String convertPropSetToXML(java.util.HashMap aPropSet , int nPrettyTabs) @@ -386,7 +386,7 @@ public class XMLHelper * the xml string representation. * * @throws [java.lang.Exception] - * if anything during convertion fill fail. + * if anything during conversion fill fail. */ private static java.lang.String convertSimpleObjectToXML(java.lang.String sName , java.lang.Object aValue , @@ -454,7 +454,7 @@ public class XMLHelper * the xml string representation. * * @throws [java.lang.Exception] - * if anything during convertion fill fail. + * if anything during conversion fill fail. */ private static java.lang.String convertListToXML(java.lang.String sName , java.util.Vector aValue , @@ -498,7 +498,7 @@ public class XMLHelper sValue = encodeHTMLSigns(sValue); // append item with default separator, which isn a valid separator at all - // But supress adding of the separator if last element is reached. + // But suppress adding of the separator if last element is reached. sValBuff.append(sValue); if (i<(c-1)) sValBuff.append("\n"); @@ -559,7 +559,7 @@ public class XMLHelper * the xml string representation. * * @throws [java.lang.Exception] - * if anything during convertion fill fail. + * if anything during conversion fill fail. */ private static java.lang.String convertLocalizedValueToXML(java.lang.String sName , java.util.HashMap aValue , @@ -570,7 +570,7 @@ public class XMLHelper int c = aValue.size(); if (c < 1) - throw new java.lang.Exception("Cant detect type of localized values. Because the given list is empty."); + throw new java.lang.Exception("Can't detect type of localized values. Because the given list is empty."); for (int t=0; t<nPrettyTabs; ++t) sXML.append("\t"); @@ -644,7 +644,7 @@ public class XMLHelper return null; } - // may it supports attributes in general ... but doesn't have anyone realy. + // may it supports attributes in general ... but doesn't have anyone really. org.w3c.dom.NamedNodeMap lAttribs = aNode.getAttributes(); if (lAttribs==null) { diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index ea28f111116d..a68e1fd52fc1 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -865,7 +865,7 @@ void HelpLinker::main( std::vector<std::string> &args, { //No extension mode and extension mode using commandline //!extsource.empty indicates extension mode using commandline - // -idxcaption paramter is required + // -idxcaption parameter is required std::stringstream aStrStream; aStrStream << "no index caption stylesheet given" << std::endl; throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); @@ -889,7 +889,7 @@ void HelpLinker::main( std::vector<std::string> &args, { //No extension mode and extension mode using commandline //!extsource.empty indicates extension mode using commandline - // -idxcontent paramter is required + // -idxcontent parameter is required std::stringstream aStrStream; aStrStream << "no index content stylesheet given" << std::endl; throw HelpProcessingException( HELPPROCESSING_GENERAL_ERROR, aStrStream.str() ); diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index ac63bff7aa05..b72ab28e387c 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -361,7 +361,7 @@ void MergeDataFile::InsertEntry( pData->Insert( rPFO , pFEntrys ); } - // finaly insert the cur string + // finally insert the cur string pFEntrys->InsertEntry( nLANG , rTEXT, rQHTEXT, rTITLE ); } diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 572f330bcd3b..a246bf544869 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -1246,7 +1246,7 @@ void TokenParser::TagRef() match( aTag, TAG_ENDGRAPHIC ); else match( aTag, TAG_VERSIONEND ); - // don't reset since alowed only once per paragraph + // don't reset since allowed only once per paragraph // RESET_FLAG( nActiveRefTypes, TAG_NOGROUP( aThisToken ) ); } else diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx index a843eda1ffaf..1ee33cfb4b27 100644 --- a/l10ntools/source/xmlparse.cxx +++ b/l10ntools/source/xmlparse.cxx @@ -1246,7 +1246,7 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream ) if ( pXMLFile->GetName().Len()) { aErrorInformation.sMessage = String::CreateFromAscii( "File " ); aErrorInformation.sMessage += pXMLFile->GetName(); - aErrorInformation.sMessage += String::CreateFromAscii( " parsed succesfully" ); + aErrorInformation.sMessage += String::CreateFromAscii( " parsed successfully" ); } else aErrorInformation.sMessage = String::CreateFromAscii( "XML-File parsed successfully" ); diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 79982afd8b05..222058446eb0 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -235,7 +235,7 @@ extern FILE *GetXrmFile() aEntry += DirEntry( sPrjRoot ); ByteString sPrjEntry( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US ); - // create file name, beginnig with project root + // create file name, beginning with project root // (e.g.: source\ui\src\menue.src) sActFileName = sFullEntry.Copy( sPrjEntry.Len() + 1 ); |