This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push: new ef6cbe3cb1 Fixed typos, removed whitespace ef6cbe3cb1 is described below commit ef6cbe3cb12c4ff3b91bda6df15cfa64440a5258 Author: mseidel <msei...@apache.org> AuthorDate: Sun Nov 19 12:17:51 2023 +0100 Fixed typos, removed whitespace (cherry picked from commit ac186415c6dad2a9daf05ff4be6f27c5bc921331) --- .../sun/star/wizards/agenda/TemplateConsts.java | 229 +++++++++++---------- .../com/sun/star/wizards/web/WebWizard.java | 59 +++--- 2 files changed, 145 insertions(+), 143 deletions(-) diff --git a/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java b/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java index d005a5864b..8a38f39e46 100644 --- a/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java +++ b/main/wizards/com/sun/star/wizards/agenda/TemplateConsts.java @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,19 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + package com.sun.star.wizards.agenda; /** @@ -29,114 +30,114 @@ package com.sun.star.wizards.agenda; public interface TemplateConsts { - public final static String FILLIN_TITLE = "<title>"; - public final static String FILLIN_DATE = "<date>"; - public final static String FILLIN_TIME = "<time>"; - public final static String FILLIN_LOCATION = "<location>"; - /** - * section name <b>prefix</b> for sections that contain items. - * this is also used as table name prefix, since each items section - * must contain a table whos name is identical name to the section's name. - */ - public final static String SECTION_ITEMS = "AGENDA_ITEMS"; - /** - * the name of the section which contains the topics. - */ - public final static String SECTION_TOPICS = "AGENDA_TOPICS"; - /** - * the name of the parent minutes section. - */ - public final static String SECTION_MINUTES_ALL = "MINUTES_ALL"; - /** - * the name of the child nimutes section. - * This section will be duplicated for each topic. - */ - public final static String SECTION_MINUTES = "MINUTES"; //public final static String AGENDA_ITEM = "AGENDA_ITEM"; - /** - * taged headings and names. - * These will be searched in item tables (in the template) and will be - * replaced with resource strings. - * - * headings... - */ - public final static String FILLIN_MEETING_TYPE = "<meeting-type>"; - public final static String FILLIN_BRING = "<bring>"; - public final static String FILLIN_READ = "<read>"; - public final static String FILLIN_NOTES = "<notes>"; - /** - * names... - */ - public final static String FILLIN_CALLED_BY = "<called-by>"; - public final static String FILLIN_FACILITATOR = "<facilitator>"; - public final static String FILLIN_PARTICIPANTS = "<attendees>"; - public final static String FILLIN_NOTETAKER = "<notetaker>"; - public final static String FILLIN_TIMEKEEPER = "<timekeeper>"; - public final static String FILLIN_OBSERVERS = "<observers>"; - public final static String FILLIN_RESOURCE_PERSONS = "<resource-persons>"; - /** - * Styles (paragraph styles) used for agenda items. - * headings styles - * - */ - public final static String STYLE_MEETING_TYPE = "MeetingType"; - public final static String STYLE_BRING = "Bring"; - public final static String STYLE_READ = "Read"; - public final static String STYLE_NOTES = "Notes"; - /** - * names styles - */ - public final static String STYLE_CALLED_BY = "CalledBy"; - public final static String STYLE_FACILITATOR = "Facilitator"; - public final static String STYLE_PARTICIPANTS = "Attendees"; - public final static String STYLE_NOTETAKER = "Notetaker"; - public final static String STYLE_TIMEKEEPER = "Timekeeper"; - public final static String STYLE_OBSERVERS = "Observers"; - public final static String STYLE_RESOURCE_PERSONS = "ResourcePersons"; - /** - * Styles (paragraph styles) used for the <b>text</b> of agenda items - * The agenda wizard creates fill-in fields with the given styles...) - * - * headings fields styles - */ - public final static String STYLE_MEETING_TYPE_TEXT = "MeetingTypeText"; - public final static String STYLE_BRING_TEXT = "BringText"; - public final static String STYLE_READ_TEXT = "ReadText"; - public final static String STYLE_NOTES_TEXT = "NotesText"; - /** - * names field styles - */ - public final static String STYLE_CALLED_BY_TEXT = "CalledByText"; - public final static String STYLE_FACILITATOR_TEXT = "FacilitatorText"; - public final static String STYLE_PARTICIPANTS_TEXT = "AttendeesText"; - public final static String STYLE_NOTETAKER_TEXT = "NotetakerText"; - public final static String STYLE_TIMEKEEPER_TEXT = "TimekeeperText"; - public final static String STYLE_OBSERVERS_TEXT = "ObserversText"; - public final static String STYLE_RESOURCE_PERSONS_TEXT = "ResourcePersonsText"; - /** - * Fillins for the topic table. - * These strings will be searched inside the topic table as - * part of detecting its structure. - */ - public final static String FILLIN_TOPIC_NUMBER = "<num>"; - public final static String FILLIN_TOPIC_TOPIC = "<topic>"; - public final static String FILLIN_TOPIC_RESPONSIBLE = "<responsible>"; - public final static String FILLIN_TOPIC_TIME = "<topic-time>"; - /** - * fillins for minutes. - * These will be searched in the minutes section and will be replaced - * with the appropriate data. - */ - public final static String FILLIN_MINUTES_TITLE = "<minutes-title>"; - public final static String FILLIN_MINUTES_LOCATION = "<minutes-location>"; - public final static String FILLIN_MINUTES_DATE = "<minutes-date>"; - public final static String FILLIN_MINUTES_TIME = "<minutes-time>"; - /** - * Minutes-topic fillins - * These will be searched in the minutes-child-section, and - * will be replaced with topic data. - */ - public final static String FILLIN_MINUTE_NUM = "<mnum>"; - public final static String FILLIN_MINUTE_TOPIC = "<mtopic>"; - public final static String FILLIN_MINUTE_RESPONSIBLE = "<mresponsible>"; - public final static String FILLIN_MINUTE_TIME = "<mtime>"; + public final static String FILLIN_TITLE = "<title>"; + public final static String FILLIN_DATE = "<date>"; + public final static String FILLIN_TIME = "<time>"; + public final static String FILLIN_LOCATION = "<location>"; + /** + * section name <b>prefix</b> for sections that contain items. + * this is also used as table name prefix, since each items section + * must contain a table whose name is identical to the section's name. + */ + public final static String SECTION_ITEMS = "AGENDA_ITEMS"; + /** + * the name of the section which contains the topics. + */ + public final static String SECTION_TOPICS = "AGENDA_TOPICS"; + /** + * the name of the parent minutes section. + */ + public final static String SECTION_MINUTES_ALL = "MINUTES_ALL"; + /** + * the name of the child minutes section. + * This section will be duplicated for each topic. + */ + public final static String SECTION_MINUTES = "MINUTES"; //public final static String AGENDA_ITEM = "AGENDA_ITEM"; + /** + * tagged headings and names. + * These will be searched in item tables (in the template) and will be + * replaced with resource strings. + * + * headings... + */ + public final static String FILLIN_MEETING_TYPE = "<meeting-type>"; + public final static String FILLIN_BRING = "<bring>"; + public final static String FILLIN_READ = "<read>"; + public final static String FILLIN_NOTES = "<notes>"; + /** + * names... + */ + public final static String FILLIN_CALLED_BY = "<called-by>"; + public final static String FILLIN_FACILITATOR = "<facilitator>"; + public final static String FILLIN_PARTICIPANTS = "<attendees>"; + public final static String FILLIN_NOTETAKER = "<notetaker>"; + public final static String FILLIN_TIMEKEEPER = "<timekeeper>"; + public final static String FILLIN_OBSERVERS = "<observers>"; + public final static String FILLIN_RESOURCE_PERSONS = "<resource-persons>"; + /** + * Styles (paragraph styles) used for agenda items. + * headings styles + * + */ + public final static String STYLE_MEETING_TYPE = "MeetingType"; + public final static String STYLE_BRING = "Bring"; + public final static String STYLE_READ = "Read"; + public final static String STYLE_NOTES = "Notes"; + /** + * names styles + */ + public final static String STYLE_CALLED_BY = "CalledBy"; + public final static String STYLE_FACILITATOR = "Facilitator"; + public final static String STYLE_PARTICIPANTS = "Attendees"; + public final static String STYLE_NOTETAKER = "Notetaker"; + public final static String STYLE_TIMEKEEPER = "Timekeeper"; + public final static String STYLE_OBSERVERS = "Observers"; + public final static String STYLE_RESOURCE_PERSONS = "ResourcePersons"; + /** + * Styles (paragraph styles) used for the <b>text</b> of agenda items + * The agenda wizard creates fill-in fields with the given styles...) + * + * headings fields styles + */ + public final static String STYLE_MEETING_TYPE_TEXT = "MeetingTypeText"; + public final static String STYLE_BRING_TEXT = "BringText"; + public final static String STYLE_READ_TEXT = "ReadText"; + public final static String STYLE_NOTES_TEXT = "NotesText"; + /** + * names field styles + */ + public final static String STYLE_CALLED_BY_TEXT = "CalledByText"; + public final static String STYLE_FACILITATOR_TEXT = "FacilitatorText"; + public final static String STYLE_PARTICIPANTS_TEXT = "AttendeesText"; + public final static String STYLE_NOTETAKER_TEXT = "NotetakerText"; + public final static String STYLE_TIMEKEEPER_TEXT = "TimekeeperText"; + public final static String STYLE_OBSERVERS_TEXT = "ObserversText"; + public final static String STYLE_RESOURCE_PERSONS_TEXT = "ResourcePersonsText"; + /** + * Fillins for the topic table. + * These strings will be searched inside the topic table as + * part of detecting its structure. + */ + public final static String FILLIN_TOPIC_NUMBER = "<num>"; + public final static String FILLIN_TOPIC_TOPIC = "<topic>"; + public final static String FILLIN_TOPIC_RESPONSIBLE = "<responsible>"; + public final static String FILLIN_TOPIC_TIME = "<topic-time>"; + /** + * fillins for minutes. + * These will be searched in the minutes section and will be replaced + * with the appropriate data. + */ + public final static String FILLIN_MINUTES_TITLE = "<minutes-title>"; + public final static String FILLIN_MINUTES_LOCATION = "<minutes-location>"; + public final static String FILLIN_MINUTES_DATE = "<minutes-date>"; + public final static String FILLIN_MINUTES_TIME = "<minutes-time>"; + /** + * Minutes-topic fillins + * These will be searched in the minutes-child-section, and + * will be replaced with topic data. + */ + public final static String FILLIN_MINUTE_NUM = "<mnum>"; + public final static String FILLIN_MINUTE_TOPIC = "<mtopic>"; + public final static String FILLIN_MINUTE_RESPONSIBLE = "<mresponsible>"; + public final static String FILLIN_MINUTE_TIME = "<mtime>"; } diff --git a/main/wizards/com/sun/star/wizards/web/WebWizard.java b/main/wizards/com/sun/star/wizards/web/WebWizard.java index 6a1cd7a4c6..53437c2f27 100644 --- a/main/wizards/com/sun/star/wizards/web/WebWizard.java +++ b/main/wizards/com/sun/star/wizards/web/WebWizard.java @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,19 +7,20 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ + /* * Start1.java * @@ -31,37 +32,37 @@ import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.wizards.common.Desktop; /** - * The last class in the WebWizard Dialog class hirarchy. - * Has no functionality, is just nice to have it instanciated. + * The last class in the WebWizard Dialog class hierarchy. + * Has no functionality, is just nice to have it instantiated. * @author rpiterman */ public class WebWizard extends WWD_Events { - /** - * @param xmsf - */ - public WebWizard(XMultiServiceFactory xmsf) throws Exception - { - super(xmsf); - } + /** + * @param xmsf + */ + public WebWizard(XMultiServiceFactory xmsf) throws Exception + { + super(xmsf); + } - public static void main(String args[]) - { + public static void main(String args[]) + { - String ConnectStr = - "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; - try - { - XMultiServiceFactory xmsf = Desktop.connect(ConnectStr); - WebWizard ww = new WebWizard(xmsf); - ww.show(); - ww.cleanup(); + String ConnectStr = + "uno:socket,host=localhost,port=8100;urp,negotiate=0,forcesynchronous=1;StarOffice.ServiceManager"; + try + { + XMultiServiceFactory xmsf = Desktop.connect(ConnectStr); + WebWizard ww = new WebWizard(xmsf); + ww.show(); + ww.cleanup(); - } - catch (Exception exception) - { - exception.printStackTrace(System.out); - } - } + } + catch (Exception exception) + { + exception.printStackTrace(System.out); + } + } }