diff options
author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /wizards | |
parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'wizards')
20 files changed, 35 insertions, 35 deletions
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java index 6557affe9b34..8d5514056fbc 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java @@ -358,7 +358,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data /** * itemsCache is a Map containing all agenda item. These are object which - * "write themselfs" to the table, given a table cursor. + * "write themselves" to the table, given a table cursor. * A cache is used in order to reuse the objects, instead of recreate them. * This method fills the cache will all items objects (names and headings). */ @@ -483,7 +483,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data } /** - * locates the titles (name, location, date, time) and saves a reference to thier Text ranges. + * locates the titles (name, location, date, time) and saves a reference to their Text ranges. * */ private void initializeTitles() @@ -1019,7 +1019,7 @@ public class AgendaTemplate extends TextDocument implements TemplateConsts, Data String cellName = PropertyNames.EMPTY_STRING; /* now go through all items that belong to this - * table. Check each one agains the model. If it should + * table. Check each one against the model. If it should * be display, call it's write method. * All items are of type AgendaItem which means they write * two cells to the table: a title (text) and a placeholder. diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java index cc4bcb11c295..905564b4799e 100644 --- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java @@ -277,7 +277,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog }); } - /** used in developement to start the wizard */ + /** used in development to start the wizard */ public static void main(String args[]) { String ConnectStr = "uno:socket,host=127.0.0.1,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; @@ -357,10 +357,10 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog private FileAccess fileAccess1; /** convenience method. * instead of creating a FileAccess object every time - * it is needed, I have a FileAccess object memeber. + * it is needed, I have a FileAccess object member. * the first time it is needed it will be created, and * then be reused... - * @return the FileAccess memeber object. + * @return the FileAccess member object. */ private FileAccess getFileAccess() { if (fileAccess1 == null) @@ -411,7 +411,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog /** * is called when the user * changes the path through the "save as" dialog. - * The path displayed is a translated, user-friendly, platform dependant path. + * The path displayed is a translated, user-friendly, platform dependent path. * @param url the new save url. */ private void setFilename(String url) { diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index 1d75819f9ede..ac72b8e01a1c 100644 --- a/wizards/com/sun/star/wizards/agenda/TopicsControl.java +++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.java @@ -51,7 +51,7 @@ import com.sun.star.wizards.ui.event.MethodInvocation; * @author rpiterman * This class implements the UI functionality of the topics scroller control. * <br/> - * During developement, there has been a few changes which were not *fully* done - + * During development, there has been a few changes which were not *fully* done - * mainly in converting the topics and time boxes from combobox and time box to normal textboxes, * so in the code they might be referenced as combobox or timebox. This should be * rather understood as topicstextbox and timetextbox. @@ -142,7 +142,7 @@ public class TopicsControl extends ControlScroller implements XFocusListener /** * create a new TopicControl. Since this is used specifically for the - * agenda dialog, I use step 5, and constant location - and need no paramter... + * agenda dialog, I use step 5, and constant location - and need no parameter... * @param dialog the parent dialog * @param xmsf service factory * @param agenda the Agenda configuration data (contains the current topics data). diff --git a/wizards/com/sun/star/wizards/common/ConfigNode.java b/wizards/com/sun/star/wizards/common/ConfigNode.java index 8b3a85f26348..d07b98be31c6 100644 --- a/wizards/com/sun/star/wizards/common/ConfigNode.java +++ b/wizards/com/sun/star/wizards/common/ConfigNode.java @@ -24,7 +24,7 @@ package com.sun.star.wizards.common; /** * This Interface specifies a method of an object which is - * capable of reading adn writing its data out of the + * capable of reading and writing its data out of the * OO Configuration. <br/> * There are 2 direct implementations: ConfigGroup and ConfigSet. * The root is the first Java Object in the configuration hirarchie. diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java index a659d30f8d71..e627e524ce8e 100644 --- a/wizards/com/sun/star/wizards/common/Helper.java +++ b/wizards/com/sun/star/wizards/common/Helper.java @@ -279,7 +279,7 @@ public class Helper * @author bc93774 * checks if the value of an object that represents an array is null. * check beforehand if the Object is really an array with "AnyConverter.IsArray(oObject) - * @param oValue the paramter that has to represent an object + * @param oValue the parameter that has to represent an object * @return a null reference if the array is empty */ public static Object getArrayValue(Object oValue) diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 9bf6f5ee17a7..4842c644ba67 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -63,7 +63,7 @@ public class NumericalHelper */ private NumericalHelper() { - // private c'tor, so noone can instantiate + // private c'tor, so no one can instantiate } /** @@ -1555,7 +1555,7 @@ public class NumericalHelper /* converison idea: every digit is written with a maximum of two * different roman symbols, using three in total, e.g. CC, CD, * DCC, CM for the hundreds (meaning 200, 400, 700 and 900). - * So every digit is converted seperately with regard to the + * So every digit is converted separately with regard to the * special cases 4 and 9. */ int symbolIndex = 0; diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index 0125f6c4b89c..f72e58e31641 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -353,7 +353,7 @@ public class SystemDialog } /** - * just like the other showMessageBox(...) method, but recieves a + * just like the other showMessageBox(...) method, but receives a * peer argument to use to create the message box. * @param xMSF * @param peer diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index 2903dfe43e88..55c7a75142d2 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -1262,7 +1262,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter XShape aShape = UnoRuntime.queryInterface(XShape.class, aClone); // normally 'createClone' will create a real clone of the component, - // but there seems some problems, we have to controll. + // but there seems some problems, we have to control. copyProperties(aComponent, aClone); // aShape.setPosition(aComponent.getPosition()); diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index 478800773b79..d25d469cb51f 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -134,7 +134,7 @@ public class DocumentPreview /********************************************************************* create a new frame with a new container window inside, - which isnt part of the global frame tree. + which isn't part of the global frame tree. Attention: a) This frame wont be destroyed by the office. It must be closed by you! diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index b50ce3857a61..c0a44802080b 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -336,7 +336,7 @@ public class UnoDialog2 extends UnoDialog implements EventNames }); Helper.setUnoPropertyValues(xControlModel, sPropNames, oPropValues); //setControlPropertiesDebug(xControlModel, sPropNames, oPropValues); - //System.out.println(" Setting props successfull !"); + //System.out.println(" Setting props successful !"); Helper.setUnoPropertyValue(xControlModel, PropertyNames.PROPERTY_NAME, componentName); } catch (Exception ex) diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index d54a1cf74386..50882f4cada1 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -222,12 +222,12 @@ public abstract class DataAware { /** * Value objects read and write a value from and * to an object. Typically using reflection and JavaBeans properties - * or directly using memeber reflection API. + * or directly using member reflection API. * DataAware delegates the handling of the DataObject * to a Value object. * 2 implementations currently exist: PropertyValue, * using JavaBeans properties reflection, and DataAwareFields classes - * which implement different memeber types. + * which implement different member types. */ public interface Value { /** @@ -246,7 +246,7 @@ public abstract class DataAware { * checks if this Value object can handle * the given object type as a target. * @param type the type of a target to check - * @return true if the given class is acceptible for + * @return true if the given class is acceptable for * the Value object. False if not. */ public boolean isAssignable(Class type); diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java index 65e4a787a933..5c7565342654 100644 --- a/wizards/com/sun/star/wizards/web/FTPDialog.java +++ b/wizards/com/sun/star/wizards/web/FTPDialog.java @@ -58,7 +58,7 @@ import com.sun.star.wizards.common.HelpIds; * (*) entering FTP server and user information. * (*) testing the connection. * (*) choosing a directory on the server. - * If a connection was established succesfully, the user may + * If a connection was established successfully, the user may * press OK, which will change * the CGPublish object propertiers according the user's input. * If no connection was established. the OK and Choose-Dir button are disabled. diff --git a/wizards/com/sun/star/wizards/web/ImageListDialog.java b/wizards/com/sun/star/wizards/web/ImageListDialog.java index 275852d6f47b..3794581c2e32 100644 --- a/wizards/com/sun/star/wizards/web/ImageListDialog.java +++ b/wizards/com/sun/star/wizards/web/ImageListDialog.java @@ -56,7 +56,7 @@ import com.sun.star.wizards.ui.ImageList.Counter; * so dialogs which do not need those, should set the corresponding * members showDeselectButton and/or showOtherButton to false. * <br/> - * the consturctor should recieve, among others, an Array of String resources - see + * the consturctor should receive, among others, an Array of String resources - see * constructor documentation for details. * * @author rpiterman diff --git a/wizards/com/sun/star/wizards/web/Process.java b/wizards/com/sun/star/wizards/web/Process.java index bac84fda2baa..e91d172936eb 100644 --- a/wizards/com/sun/star/wizards/web/Process.java +++ b/wizards/com/sun/star/wizards/web/Process.java @@ -530,7 +530,7 @@ public class Process implements WebWizardConst, ProcessErrors String fn = fileAccess.getPath(targetPath, key.substring(0, key.length() - 4)); File f = new File(fn); FileOutputStream oStream = new FileOutputStream(f); - // Due to a problem occuring when using Xalan-Java 2.6.0 and + // Due to a problem occurring when using Xalan-Java 2.6.0 and // Java 1.5.0, wrap f in a FileOutputStream here (otherwise, the // StreamResult's getSystemId would return a "file:/..." URL while // the Xalan code expects a "file:///..." URL): @@ -679,7 +679,7 @@ public class Process implements WebWizardConst, ProcessErrors /* * here I calculate the destination filename. - * I take the original filename (docFilename), substract the extension, (docExt) -> (fn) + * I take the original filename (docFilename), subtract the extension, (docExt) -> (fn) * and find an available filename which starts with * this filename, but with the new extension. (destExt) */ diff --git a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java index 3852c9463f73..83b29cd177ca 100644 --- a/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java +++ b/wizards/com/sun/star/wizards/web/ProcessStatusRenderer.java @@ -29,7 +29,7 @@ import com.sun.star.wizards.common.IRenderer; /** * @author rpiterman - * recieves status calls from the status dialog which + * receives status calls from the status dialog which * apears when the user clicks "create". * allocates strings from the resources to * display the current task status. diff --git a/wizards/com/sun/star/wizards/web/TOCPreview.java b/wizards/com/sun/star/wizards/web/TOCPreview.java index 98c6e0bd7d2e..d11b0d7cbfd2 100644 --- a/wizards/com/sun/star/wizards/web/TOCPreview.java +++ b/wizards/com/sun/star/wizards/web/TOCPreview.java @@ -47,8 +47,8 @@ import com.sun.star.wizards.web.data.CGSettings; * Since the files are both static and dynamic (some are always the same, * while other change according to user choices) * I divide this tasks to two: all necessary - * static files, which should not regularily update are copied upon - * instanciation. + * static files, which should not regularly update are copied upon + * instantiation. * The TOC is generated in refresh(...); */ public class TOCPreview diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java index bd8eaf044073..decb86850e01 100644 --- a/wizards/com/sun/star/wizards/web/WWD_Startup.java +++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java @@ -75,7 +75,7 @@ import com.sun.star.wizards.web.data.CGStyle; * </P> * <p> * A Value is either a JavaBean property with - * a Getter and a Setter or a public class Memeber. + * a Getter and a Setter or a public class Member. * </P> * When the UI Control changes, the Value changes correspondingly. * This depends on settings a Listener which calls the updateData() @@ -89,7 +89,7 @@ import com.sun.star.wizards.web.data.CGStyle; * the updateUI() method whenever I change the Value. * </P> * To contain the Data, I use the Configuration Data Objects - * which read themselfs out of the Configuration. they are all located under + * which read themselves out of the Configuration. they are all located under * the data package. * <p/> * Different groups of DataAware objects are grouped into vectors. @@ -195,7 +195,7 @@ public abstract class WWD_Startup extends WWD_General boolean __ftp; /** * When the wizard starts, a new document opens. - * The backgroundDoc memeber contains the TextDocument + * The backgroundDoc member contains the TextDocument * instance used for that purpose. */ protected XFrame myFrame; @@ -472,7 +472,7 @@ public abstract class WWD_Startup extends WWD_General ConfigSet set = settings.cp_DefaultSession.cp_Publishing; - // now if path variables are used in publisher pathes, they + // now if path variables are used in publisher paths, they // are getting replaced here... for (int i = 0; i < set.getSize(); i++) { diff --git a/wizards/com/sun/star/wizards/web/data/TypeDetection.java b/wizards/com/sun/star/wizards/web/data/TypeDetection.java index 565872ba27aa..862054143ad8 100644 --- a/wizards/com/sun/star/wizards/web/data/TypeDetection.java +++ b/wizards/com/sun/star/wizards/web/data/TypeDetection.java @@ -64,11 +64,11 @@ public class TypeDetection */ public final static String PDF_DOC = "pdf"; /** - * a Sound file (mp3/wav ect.) + * a Sound file (mp3/wav etc.) */ public final static String SOUND_FILE = "sound"; /** - * a File which can not be handled by neither SO or a Web browser (exe, jar, zip ect.) + * a File which can not be handled by neither SO or a Web browser (exe, jar, zip etc.) */ public final static String NO_TYPE = "other"; } diff --git a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java index 17c5ae8db9bf..c7520a1225da 100644 --- a/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ImpressHTMLExporter.java @@ -46,7 +46,7 @@ public class ImpressHTMLExporter extends ConfiguredExporter { /* here set some filter specific properties. - * other properties, which are not dependant on + * other properties, which are not dependent on * user input are set through the exporter * configuration. */ diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba index f94dd9708390..7a00da232db0 100644 --- a/wizards/source/formwizard/tools.xba +++ b/wizards/source/formwizard/tools.xba @@ -228,7 +228,7 @@ Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Ob ' Todo Why does this not work?: oLocObject.DefaultDate = CurDefaultValue ElseIf CurControlType = cTimeBox Then ' com.sun.star.sdbc.DataType.DATE, com.sun.star.sdbc.DataType.TIME oLocObject.DefaultTime = CurDefaultValue -' Todo: Property TimeFormat? frome where? +' Todo: Property TimeFormat? from where? ElseIf CurControlType = cCheckBox Then ' Todo Why does this not work?: oLocObject.DefautState = CurDefaultValue End If |