[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch, 1.4, 1.5



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4455

Modified Files:
	openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch 
Log Message:
remunge patch

openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch:
 agenda/AgendaTemplate.java                                    |   50 +--
 agenda/AgendaTemplate.java.orig                               |only
 agenda/AgendaWizardDialog.java                                |   20 -
 agenda/AgendaWizardDialogImpl.java                            |   26 -
 agenda/CallWizard.java                                        |    4 
 agenda/TopicsControl.java                                     |   76 ++---
 common/ConfigGroup.java                                       |    4 
 common/ConfigSet.java                                         |   18 -
 common/FileAccess.java                                        |    2 
 common/Helper.java                                            |   12 
 common/NumberFormatter.java                                   |    4 
 common/SystemDialog.java                                      |    8 
 common/UCB.java                                               |    4 
 db/BlindtextCreator.java                                      |    2 
 db/ColumnPropertySet.java                                     |   10 
 db/CommandMetaData.java                                       |    6 
 db/CommandName.java                                           |   26 -
 db/DBMetaData.java                                            |   42 +--
 db/FieldColumn.java                                           |   20 -
 db/RecordParser.java                                          |   10 
 db/SQLQueryComposer.java                                      |   12 
 db/TableDescriptor.java                                       |   34 +-
 db/TypeInspector.java                                         |   20 -
 document/Control.java                                         |    4 
 document/DatabaseControl.java                                 |    4 
 document/FormHandler.java                                     |    2 
 document/OfficeDocument.java                                  |    4 
 document/Shape.java                                           |   10 
 fax/CallWizard.java                                           |    4 
 fax/FaxWizardDialogImpl.java                                  |   18 -
 fax/FaxWizardDialogResources.java                             |   18 -
 form/CallFormWizard.java                                      |    4 
 form/FieldLinker.java                                         |   10 
 form/FormConfiguration.java                                   |    2 
 form/FormControlArranger.java                                 |   36 +-
 form/FormDocument.java                                        |   38 +-
 form/FormWizard.java                                          |   10 
 form/StyleApplier.java                                        |   10 
 form/UIControlArranger.java                                   |    6 
 letter/CallWizard.java                                        |    4 
 letter/LetterWizardDialogImpl.java                            |   32 +-
 letter/LetterWizardDialogImpl.java.orig                       |only
 letter/LetterWizardDialogImpl.java.rej                        |only
 letter/LetterWizardDialogResources.java                       |   18 -
 letter/LetterWizardDialogResources.java.orig                  |only
 letter/LetterWizardDialogResources.java.rej                   |only
 query/CallQueryWizard.java                                    |    4 
 query/Finalizer.java                                          |    4 
 query/QuerySummary.java                                       |   20 -
 query/QueryWizard.java                                        |   10 
 report/CallReportWizard.java                                  |    4 
 report/DBColumn.java                                          |   18 -
 report/Dataimport.java                                        |    4 
 report/Finalizer.java                                         |    2 
 report/GroupFieldHandler.java                                 |    2 
 report/RecordTable.java                                       |    2 
 report/ReportDocument.java                                    |   24 -
 report/ReportLayouter.java                                    |    2 
 report/ReportWizard.java                                      |   12 
 table/CGCategory.java                                         |    4 
 table/CGTable.java                                            |    4 
 table/CallTableWizard.java                                    |    4 
 table/FieldDescription.java                                   |   22 -
 table/FieldFormatter.java                                     |    2 
 table/PrimaryKeyHandler.java                                  |   10 
 table/ScenarioSelector.java                                   |    6 
 table/TableWizard.java                                        |    8 
 text/TextFieldHandler.java                                    |    4 
 text/TextFieldHandler.java.orig                               |only
 text/TextSectionHandler.java                                  |    6 
 text/TextStyleHandler.java                                    |    4 
 text/TextTableHandler.java                                    |    6 
 text/ViewHandler.java                                         |   10 
 tutorial/creator/frame/CallTutorialCreatorFramework.java      |    4 
 tutorial/creator/frame/ConnectFrame.java                      |   34 +-
 tutorial/creator/frame/Framework.java                         |    6 
 tutorial/creator/frame/StepFrame.java                         |   78 ++---
 tutorial/creator/frame/StepModel.java                         |    2 
 tutorial/creator/frame/TutorialCreator.java                   |   34 +-
 tutorial/creator/frame/objectFinder/AccessibleObjectFind.java |    6 
 tutorial/creator/frame/objectFinder/ActionFrame.java          |   28 +-
 tutorial/creator/frame/objectFinder/ActionPanel.java          |   14 -
 tutorial/creator/frame/objectFinder/GraphicalDisplay.java     |   10 
 tutorial/creator/frame/objectFinder/MenuFactory.java          |   18 -
 tutorial/creator/frame/objectFinder/MethodDialog.java         |   26 -
 tutorial/creator/frame/objectFinder/TableColumModel.java      |    2 
 tutorial/creator/frame/objectFinder/TextualDisplay.java       |   14 -
 tutorial/executer/CallTutorialFramework.java                  |   12 
 tutorial/executer/ExecuteCache.java                           |   18 -
 tutorial/executer/ExecuteMethod.java                          |   16 -
 tutorial/executer/ExecutePropertiesMethod.java                |   10 
 tutorial/executer/LocalisationCache.java                      |    2 
 tutorial/executer/TranslateMacro.java                         |   16 -
 tutorial/executer/officeHelper/Components.java                |   26 -
 tutorial/executer/officeHelper/Desktop.java                   |   22 -
 tutorial/executer/officeHelper/DesktopDialog.java             |    4 
 tutorial/executer/officeHelper/DesktopMenu.java               |    4 
 tutorial/executer/officeHelper/Presentation_Drawing.java      |    4 
 tutorial/executer/officeHelper/Spreadsheet.java               |   18 -
 tutorial/executer/officeHelper/TextDocument.java              |    4 
 tutorial/executer/officeHelper/XCellTextCompact.java          |    4 
 tutorial/executer/officeHelper/XItemSelection.java            |    4 
 tutorial/executer/officeHelper/XMouse.java                    |    4 
 tutorial/executer/officeHelper/XMoveMouseCompact.java         |    4 
 tutorial/executer/officeHelper/XTabList.java                  |    4 
 tutorial/executer/officeHelper/XTextCompact.java              |    4 
 tutorial/executer/util/AccessibilityTools.java                |   42 +--
 tutorial/executer/util/Child.java                             |    4 
 tutorial/executer/util/Control.java                           |   36 +-
 tutorial/executer/util/File.java                              |    2 
 tutorial/executer/util/FindInterfaces.java                    |    8 
 tutorial/executer/util/Helper.java                            |    8 
 tutorial/executer/util/Localizer.java                         |    4 
 tutorial/executer/util/NameProvider.java                      |    4 
 tutorial/executer/util/PathProperties.java                    |    6 
 tutorial/executer/util/PropertiesFileWriter.java              |    2 
 ui/AggregateComponent.java                                    |   50 +--
 ui/CommandFieldSelection.java                                 |   10 
 ui/ControlScroller.java                                       |  110 +++----
 ui/DBLimitedFieldSelection.java                               |   46 +--
 ui/DocumentPreview.java                                       |   20 -
 ui/FieldSelection.java                                        |   14 -
 ui/FilterComponent.java                                       |   56 ++--
 ui/ImageList.java                                             |  138 +++++-----
 ui/ImageList.java.orig                                        |only
 ui/PathSelection.java                                         |    4 
 ui/SortingComponent.java                                      |   10 
 ui/TitlesComponent.java                                       |   18 -
 ui/UnoDialog.java                                             |    8 
 ui/UnoDialog.java.orig                                        |only
 ui/UnoDialog2.java                                            |    6 
 ui/UnoDialog2.java.orig                                       |only
 ui/WizardDialog.java                                          |   50 +--
 ui/event/AbstractListener.java                                |    2 
 ui/event/DataAware.java                                       |   32 +-
 ui/event/DataAwareFields.java                                 |   34 +-
 ui/event/ListModelBinder.java                                 |   22 -
 ui/event/RadioDataAware.java                                  |    6 
 ui/event/SimpleDataAware.java                                 |   14 -
 ui/event/Task.java                                            |   22 -
 ui/event/TaskEvent.java                                       |    2 
 ui/event/UnoDataAware.java                                    |   24 -
 web/AbstractErrorHandler.java                                 |   12 
 web/BackgroundsDialog.java                                    |   22 -
 web/CallWizard.java                                           |    6 
 web/CallWizard.java.orig                                      |only
 web/ExtensionVerifier.java                                    |    2 
 web/FTPDialog.java                                            |   96 +++---
 web/IconsDialog.java                                          |   16 -
 web/ImageListDialog.java                                      |   56 ++--
 web/LogTaskListener.java                                      |    2 
 web/Process.java                                              |   60 ++--
 web/ProcessErrorHandler.java                                  |    8 
 web/StatusDialog.java                                         |   30 +-
 web/StylePreview.java                                         |   12 
 web/TOCPreview.java                                           |   20 -
 web/WWD_Events.java                                           |   38 +-
 web/WWD_General.java                                          |   50 +--
 web/WWD_Startup.java                                          |   70 ++---
 web/WWD_Startup.java.orig                                     |only
 web/WebWizardDialog.java                                      |   24 -
 web/data/CGContent.java                                       |    2 
 web/data/CGDesign.java                                        |   10 
 web/data/CGDocument.java                                      |   22 -
 web/data/CGGeneralInfo.java                                   |    2 
 web/data/CGLayout.java                                        |    4 
 web/data/CGPublish.java                                       |    2 
 web/data/CGSession.java                                       |    2 
 web/data/CGSettings.java                                      |   18 -
 web/export/AbstractExporter.java                              |   22 -
 web/export/ConfiguredExporter.java                            |    2 
 web/export/FilterExporter.java                                |    4 
 web/export/ImpressHTMLExporter.java                           |   12 
 web/status/ErrorLog.java                                      |    2 
 web/status/LogTaskListener.java                               |    2 
 web/status/Task.java                                          |   20 -
 web/status/TaskEvent.java                                     |    2 
 177 files changed, 1382 insertions(+), 1382 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
Index: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch	31 May 2005 11:09:24 -0000	1.4
+++ openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch	13 Jul 2005 13:36:06 -0000	1.5
@@ -1,11 +1,7 @@
-Index: com/sun/star/wizards/agenda/AgendaTemplate.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java,v
-retrieving revision 1.4
-diff -u -p -r1.4 AgendaTemplate.java
---- openoffice.org.orig/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java	21 Feb 2005 13:50:05 -0000	1.4
-+++ openoffice.org/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java	31 May 2005 09:53:47 -0000
-@@ -231,7 +231,7 @@ public class AgendaTemplate extends Text
+diff -ru SRC680_m116/wizards.orig/com/sun/star/wizards/agenda/AgendaTemplate.java SRC680_m116/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java
+--- SRC680_m116/wizards.orig/com/sun/star/wizards/agenda/AgendaTemplate.java	2005-07-13 09:33:12.000000000 -0400
++++ SRC680_m116/wizards/com/sun/star/wizards/agenda/AgendaTemplate.java	2005-07-13 09:33:30.000000000 -0400
+@@ -232,7 +232,7 @@
      /**
       * used to set the document title property (step 6).
       */
@@ -14,7 +10,7 @@
  	
  	/**
       * loads the given template, and analyze its structure.
-@@ -259,7 +259,7 @@ public class AgendaTemplate extends Text
+@@ -260,7 +260,7 @@
       * @param url
       * @return the template name without the "aw-" at the beginning.
       */
@@ -23,7 +19,7 @@
  		return FileAccess.connectURLs( FileAccess.getParentDir(url) ,FileAccess.getFilename(url).substring(3)); 
  	}
  	
-@@ -271,7 +271,7 @@ public class AgendaTemplate extends Text
+@@ -272,7 +272,7 @@
       * information (it is only actualized on save) the given list
       * supplies this information.
  	 */
@@ -32,7 +28,7 @@
  		for (int i = 0; i < itemsTables.length; i++) {
  			try {
  				itemsTables[i].write("");
-@@ -377,7 +377,7 @@ public class AgendaTemplate extends Text
+@@ -378,7 +378,7 @@
       * 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).
       */
@@ -41,7 +37,7 @@
  		itemsCache = new Hashtable(11);
  		
          XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document);
-@@ -443,7 +443,7 @@ public class AgendaTemplate extends Text
+@@ -444,7 +444,7 @@
       * -locate the titles and actualize them
       * -analyze the topics table
  	 */
@@ -50,7 +46,7 @@
  	{
  		/*
  		 * Get the default locale of the document, and create the date and time formatters.
-@@ -498,7 +498,7 @@ public class AgendaTemplate extends Text
+@@ -499,7 +499,7 @@
       * locates the titles (name, location, date, time) and saves a reference to thier Text ranges.
       *
       */
@@ -59,7 +55,7 @@
  		XTextRange item = null;
  		
  		XMultiServiceFactory xmsf = (XMultiServiceFactory)UnoRuntime.queryInterface(XMultiServiceFactory.class,document);
-@@ -530,12 +530,12 @@ public class AgendaTemplate extends Text
+@@ -531,12 +531,12 @@
  		}
  	}
  	
@@ -74,7 +70,7 @@
  	{
  		_allItems = searchFillInItems();
  	}
-@@ -544,7 +544,7 @@ public class AgendaTemplate extends Text
+@@ -545,7 +545,7 @@
  	 * searches the document for items in the format "&gt;*&lt;"
  	 * @return a vector containing the XTextRanges of the found items
  	 */
@@ -83,7 +79,7 @@
  		try {
  			XSearchable xSearchable = (XSearchable)UnoRuntime.queryInterface(XSearchable.class,document);
  			XSearchDescriptor sd = xSearchable.createSearchDescriptor();
-@@ -574,7 +574,7 @@ public class AgendaTemplate extends Text
+@@ -575,7 +575,7 @@
       * analyze the item sections in the template. delegates the analyze of each table to the
       * ItemsTable class.
  	 */
@@ -92,7 +88,7 @@
  	{
  		String[] sections = getSections(document, TemplateConsts.SECTION_ITEMS);
  
-@@ -593,7 +593,7 @@ public class AgendaTemplate extends Text
+@@ -594,7 +594,7 @@
  		
  	}
  	
@@ -101,7 +97,7 @@
  	{
  		XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document);
  		String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames();
-@@ -627,7 +627,7 @@ public class AgendaTemplate extends Text
+@@ -628,7 +628,7 @@
  		
  	}
  	
@@ -110,7 +106,7 @@
  		if (controlName.equals("txtTitle"))
  			writeTitle(teTitle, trTitle, agenda.cp_Title);
  		else if (controlName.equals("txtDate"))
-@@ -640,13 +640,13 @@ public class AgendaTemplate extends Text
+@@ -641,13 +641,13 @@
  	}
  	
  
@@ -127,7 +123,7 @@
  		if (d == null || d.equals("")) 
  			return "";
  		
-@@ -666,7 +666,7 @@ public class AgendaTemplate extends Text
+@@ -667,7 +667,7 @@
  		return dateFormatter.convertNumberToString(dateFormat, daysDiff);
  	}
  	
@@ -136,7 +132,7 @@
  		if (s == null || s.equals(""))
  			return "";
  		int time = new Integer(s).intValue();
-@@ -692,7 +692,7 @@ public class AgendaTemplate extends Text
+@@ -693,7 +693,7 @@
       * user specified not to display any items which it contains.
       * When finishing the wizard removes this sections entireley from the document.
       */ 
@@ -145,7 +141,7 @@
  		XTextSectionsSupplier xTextSectionsSupplier = (XTextSectionsSupplier) UnoRuntime.queryInterface(XTextSectionsSupplier.class, document);
  		String[] allSections = xTextSectionsSupplier.getTextSections().getElementNames();
  		try {
-@@ -824,7 +824,7 @@ public class AgendaTemplate extends Text
+@@ -825,7 +825,7 @@
  	 * @param text the text to fill to the text range object.
  	 * @param placeholder the placeholder text to use, if the text argument is empty (null or "")
  	 */
@@ -154,7 +150,7 @@
  		String paraStyle = (String)Helper.getUnoPropertyValue(range,"ParaStyleName");
  		range.setString((String)text);
  		Helper.setUnoPropertyValue(range,"ParaStyleName",paraStyle);
-@@ -1226,7 +1226,7 @@ public class AgendaTemplate extends Text
+@@ -1227,7 +1227,7 @@
  		 * @return the number of rows that have been added
  		 * to the table. 0 or a negative number: no rows added.
  		 */
@@ -163,7 +159,7 @@
              while (topic >= writtenTopics.size())
                  writtenTopics.add(null);
              
-@@ -1270,7 +1270,7 @@ public class AgendaTemplate extends Text
+@@ -1271,7 +1271,7 @@
           * (false would mean new rows must be added to the table in order to 
           * be able to write this topic).
           */
@@ -172,7 +168,7 @@
              return (writtenTopics.size() > topic && writtenTopics.get(topic) != null );
          }
          
-@@ -1406,7 +1406,7 @@ public class AgendaTemplate extends Text
+@@ -1407,7 +1407,7 @@
          /**
           * reapply the format of the first (header) row.
           */
@@ -181,7 +177,7 @@
  			XTextTableCursor cursor = table.createCursorByCellName("A1");
  			formatTable(cursor,firstRowFormat, false );
  		}
-@@ -1414,7 +1414,7 @@ public class AgendaTemplate extends Text
+@@ -1415,7 +1415,7 @@
          /**
           * reaply the format of the last row.
           */
@@ -190,7 +186,7 @@
              XTextTableCursor cursor = table.createCursorByCellName("A1");
              cursor.gotoEnd(false);
              formatTable(cursor,lastRowFormat, true);
-@@ -1428,7 +1428,7 @@ public class AgendaTemplate extends Text
+@@ -1429,7 +1429,7 @@
           * @return a TextElement object which will write the given value
           * to the given cell.
           */
@@ -199,7 +195,7 @@
              if (cell >= 0) {
                  TextElement te = ((TextElement)topicCells.get(cell));
      			if (te != null)
-@@ -1448,7 +1448,7 @@ public class AgendaTemplate extends Text
[...12199 lines suppressed...]
-+	public int max = 0;
-+	public String taskName;
-+	public List listeners = new Vector();
-+	public String subtaskName;
- 	
- 	
- 	public Task(String taskName_ , String subtaskName_, int max_) {
-@@ -71,28 +71,28 @@ public class Task {
- 		listeners.remove(tl);
+-	private XFrame getFrame(Object model) {
++	public XFrame getFrame(Object model) {
+ 	    XModel xmodel = (XModel)UnoRuntime.queryInterface(XModel.class,model);
+         return xmodel.getCurrentController().getFrame();
+     }
+@@ -456,7 +456,7 @@
+ 	/**
+ 	 * initializes the style preview.
+ 	 */
+-	private void addStylePreview() {
++	public void addStylePreview() {
+ 		try {
+ 			dpStylePreview = new DocumentPreview(xMSF, imgPreview);
+ 			stylePreview = new StylePreview(xMSF, settings.workPath);
+@@ -471,7 +471,7 @@
+ 	/**
+ 	 * Loads the web wizard settings from the registry.
+ 	 */
+-	private void loadSettings(Object document) {
++	public void loadSettings(Object document) {
+ 		try {
+             // instanciate
+             String[] settingsResources = new String[] {
+@@ -520,7 +520,7 @@
  	}
- 	
--	protected void fireTaskStatusChanged() {
-+	public void fireTaskStatusChanged() {
- 		TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STATUS_CHANGED);
- 		
- 		for (int i = 0; i<listeners.size(); i++)
- 		  ((TaskListener)listeners.get(i)).taskStatusChanged(te);
+     
+     
+-    protected void prepareSessionLists() {
++    public void prepareSessionLists() {
+         // now copy the sessions list...
+         Object[] sessions = settings.cp_SavedSessions.items();
+         settings.savedSessions.clear();
+@@ -539,7 +539,7 @@
+      * Also set the selected "load" session to the last session
+      * which was saved.
+ 	 */
+-	private void fillLists() {
++	public void fillLists() {
+         // fill the saved session list.
+ 		ListModelBinder.fillList(lstLoadSettings, settings.cp_SavedSessions.items(), null);
+         
+@@ -555,7 +555,7 @@
+         
  	}
- 	
--	protected void fireTaskStarted() {	
-+	public void fireTaskStarted() {	
- 		TaskEvent te = new TaskEvent(this, TaskEvent.TASK_STARTED);
+ 
+-    protected void selectSession() {
++    public void selectSession() {
+         int selectedSession = 0;
+         if (settings.cp_LastSavedSession != null  && !settings.cp_LastSavedSession.equals("")) {
+             
+@@ -572,7 +572,7 @@
+ 	 * textbox, no buttons though), a DataObject's JavaBean Property, 
+ 	 * or class member.
+ 	 */
+-	private void makeDataAware() {
++	public void makeDataAware() {
+ 		//page 1
+ 		new ListModelBinder(lstLoadSettings, settings.cp_SavedSessions);
  		
- 		for (int i = 0; i<listeners.size(); i++)
- 		  ((TaskListener)listeners.get(i)).taskStarted(te);
+@@ -657,7 +657,7 @@
+ 	 * @param checkbox
+ 	 * @param textbox
+ 	 */
+-	private void pubAware(String publish, Object checkbox, Object textbox, boolean isLabel) {
++	public void pubAware(String publish, Object checkbox, Object textbox, boolean isLabel) {
+ 		Object p = settings.cp_DefaultSession.cp_Publishing.getElement(publish);
+ 		UnoDataAware uda = UnoDataAware.attachCheckBox(p, "cp_Publish", checkbox, checkPublish, true);
+ 		uda.setInverse(true);
+@@ -687,7 +687,7 @@
+ 	 * and ??? times for each document in the session.
+ 	 * 
+ 	 */
+-	protected void mount(CGSession session, Task task, boolean refreshStyle, XControl xC ) {
++	public void mount(CGSession session, Task task, boolean refreshStyle, XControl xC ) {
+ 		/* This checks the documents. If the user
+ 		 * chooses to cancel, the session is not loaded.
+ 		 */
+@@ -734,7 +734,7 @@
+ 	 * @param data the CGPublish object
+ 	 * @param i the number of the object (0 = local, 1 = ftp, 2 = zip)
+ 	 */
+-	private void mount(Object data, int i) {
++	public void mount(Object data, int i) {
+ 		((DataAware) pubAware.get(i * 2)).setDataObject(data, true);
+ 		((DataAware) pubAware.get(i * 2 + 1)).setDataObject(data, true);
  	}
- 	
--	protected void fireTaskFinished() {
-+	public void fireTaskFinished() {
- 		TaskEvent te = new TaskEvent(this, TaskEvent.TASK_FINISHED);
- 		
- 		for (int i = 0; i<listeners.size(); i++)
- 		  ((TaskListener)listeners.get(i)).taskFinished(te);
+@@ -744,7 +744,7 @@
+ 	 * @param root the CGContent object
+ 	 * that contains the documents (a ListModel)
+ 	 */
+-	private void mount(CGContent root) {
++	public void mount(CGContent root) {
+ 		ListModelBinder.fillList(lstDocuments, root.cp_Documents.items(), null);
+ 		docsBinder.setListModel(root.cp_Documents);
+ 		disableDocUpDown();
+@@ -757,7 +757,7 @@
+ 	 * @param data
+ 	 * @param list
+ 	 */
+-	protected void mount(Object data, List list) {
++	public void mount(Object data, List list) {
+ 		for (int i = 0; i < list.size(); i++)
+ 			 ((DataAware) list.get(i)).setDataObject(data, true);
+ 	}
+@@ -773,7 +773,7 @@
+ 	 * displayed, using the Task object to monitor progress.
+ 	 * @return true if the document is ok (a file exists in the given url).
+ 	 */
+-	protected boolean checkDocument(CGDocument doc, Task task, XControl xC) {
++	public boolean checkDocument(CGDocument doc, Task task, XControl xC) {
+ 		try {
+ 			doc.validate(xMSF, task);
+ 			return true;
+@@ -819,7 +819,7 @@
+ 	 * @param content
+ 	 * @param task
+ 	 */
+-	private void checkContent(CGContent content, Task task, XControl xC) {
++	public void checkContent(CGContent content, Task task, XControl xC) {
+ 		for (int i = 0; i < content.cp_Documents.getSize(); i++)
+ 			if (!checkDocument((CGDocument) content.cp_Documents.getElementAt(i), task, xC))
+ 				// I use here 'i--' since, when the document is removed 
+@@ -835,7 +835,7 @@
+ 	 * changes the "create" button enable state accordingly.
+ 	 * @author rpiterman
+ 	 */
+-	private class CheckPublish implements DataAware.Listener {
++	public class CheckPublish implements DataAware.Listener {
+ 		public void eventPerformed(Object event) {
+ 			checkPublish();
+ 		}
+@@ -848,7 +848,7 @@
+ 	 * down disabled and so on...)
+ 	 *
+ 	 */
+-	protected void disableDocUpDown() {
++	public void disableDocUpDown() {
+ 		try {
+ 			setEnabled(btnDocUp, selectedDoc.length == 0 ? Boolean.FALSE : (selectedDoc[0] == 0 ? Boolean.FALSE : Boolean.TRUE));
+ 			setEnabled(btnDocDown, selectedDoc.length == 0 ? Boolean.FALSE : (selectedDoc[0] + 1 < settings.cp_DefaultSession.cp_Content.cp_Documents.getSize() ? Boolean.TRUE : Boolean.FALSE));
+@@ -900,7 +900,7 @@
  	}
  	
--	protected void fireSubtaskNameChanged() {
-+	public void fireSubtaskNameChanged() {
- 			TaskEvent te = new TaskEvent(this, TaskEvent.SUBTASK_NAME_CHANGED);
- 		
- 			for (int i = 0; i<listeners.size(); i++)
-Index: com/sun/star/wizards/web/status/TaskEvent.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/status/TaskEvent.java,v
-retrieving revision 1.2
-diff -u -p -r1.2 TaskEvent.java
---- openoffice.org.orig/wizards/com/sun/star/wizards/web/status/TaskEvent.java	19 May 2004 13:22:01 -0000	1.2
-+++ openoffice.org/wizards/com/sun/star/wizards/web/status/TaskEvent.java	31 May 2005 09:54:25 -0000
-@@ -21,7 +21,7 @@ public class TaskEvent extends EventObje
- 	public static final int TASK_STATUS_CHANGED = 3;
- 	public static final int SUBTASK_NAME_CHANGED = 4;
- 	
--	private int type;
-+	public int type;
- 	
- 	/**
- 	 * general constructor-
+     
+-    private class StylesComparator implements Comparator {
++    public class StylesComparator implements Comparator {
+ 
+         /* (non-Javadoc)
+          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+Only in SRC680_m116/wizards/com/sun/star/wizards/web: WWD_Startup.java.orig


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]