diff options
20 files changed, 3 insertions, 509 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java index 6d81ac6ae918..15f025ac6738 100644 --- a/bean/com/sun/star/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/beans/LocalOfficeConnection.java @@ -33,7 +33,7 @@ import com.sun.star.lib.uno.helper.UnoUrl; import com.sun.star.lib.util.NativeLibraryLoader; /** - * This class reprecents a connection to the local office application. + * This class represents a connection to the local office application. * @deprecated */ public class LocalOfficeConnection diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 7ab8d88befc8..a1d51f6ae18d 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -50,8 +50,6 @@ public class LocalOfficeConnection public static final String OFFICE_LIB_NAME = "officebean"; public static final String OFFICE_ID_SUFFIX = "_Office"; - private static String mProgramPath; - private Process mProcess; private ContainerFactory mContainerFactory; private XComponentContext mContext; @@ -119,11 +117,6 @@ public class LocalOfficeConnection } //------------------------------------------------------------------------- - // debugging method - private void dbgPrint( String aMessage ) - { - System.err.println( aMessage ); - } /** * Constructor. @@ -182,7 +175,6 @@ public class LocalOfficeConnection try { UnoUrl aURL = UnoUrl.parseUnoUrl( url ); - mProgramPath = null; mConnType = aURL.getConnection(); mPipe = (String) aURL.getConnectionParameters().get( "pipe" ); mPort = (String) aURL.getConnectionParameters().get( "port" ); @@ -464,39 +456,6 @@ public class LocalOfficeConnection /** - * Retrives a path to the office program folder. - * - * @return The path to the office program folder. - */ - static private String getProgramPath() - { - if (mProgramPath == null) - { - // determine name of executable soffice - String aExec = OFFICE_APP_NAME; // default for UNIX - String aOS = System.getProperty("os.name"); - - // running on Windows? - if (aOS.startsWith("Windows")) - aExec = OFFICE_APP_NAME + ".exe"; - - // add other non-UNIX operating systems here - // ... - - // find soffice executable relative to this class's class loader: - File path = NativeLibraryLoader.getResource( - LocalOfficeConnection.class.getClassLoader(), aExec); - if (path != null) - mProgramPath = path.getParent(); - - // default is "" - if ( mProgramPath == null ) - mProgramPath = ""; - } - return mProgramPath; - } - - /** * Parses a connection URL. * This method accepts a UNO URL with following format:<br /> * <pre> @@ -674,8 +633,6 @@ public class LocalOfficeConnection "Invalid UNO connection URL."); // Set up the connection parameters. - if (path != null) - mProgramPath = path; if (pipe != null) mPipe = pipe; } diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index 5ef755cf33a0..a64499363877 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -688,19 +688,11 @@ public class OOoBeanTest } public Dimension getPreferredSize() { - Container c = getParent(); return new Dimension(200, 200); } } - - - private XMultiServiceFactory getMSF() - { - return(UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager())); - } - // setup and close connections @BeforeClass public static void setUpConnection() throws Exception { System.out.println("setUpConnection()"); diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index d7b8b320caf5..576a8f512afd 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -71,9 +71,6 @@ public class EventTest { //------------------------------------------- // member - /** points to the global uno service manager. */ - private XMultiServiceFactory m_xMSF = null; - /** indicates if the mousePressed event was called*/ private boolean m_mousePressed = false; /** indicates if the mouseReleased event was called*/ @@ -131,9 +128,6 @@ public class EventTest { * different components inside. */ @Before public void before() { - // get uno service manager from global test environment - m_xMSF = getMSF(); - // create frame instance try { // get a soffice factory object diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 9c098ac2966e..8c14b812690f 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -64,7 +64,6 @@ public class AcceleratorsConfigurationTest private XAcceleratorConfiguration m_xModuleAccelCfg = null; private XAcceleratorConfiguration m_xDocumentAccelCfg = null; /** XCS/XCU based accelerator configuration. */ - private XNameAccess m_xConfig = null; private XNameAccess m_xPrimaryKeys = null; private XNameAccess m_xSecondaryKeys = null; @@ -113,7 +112,6 @@ public class AcceleratorsConfigurationTest public void after() throws java.lang.Exception { - m_xConfig = null; m_xGlobalAccelCfg = null; m_xModuleAccelCfg = null; m_xDocumentAccelCfg = null; @@ -578,46 +576,6 @@ public class AcceleratorsConfigurationTest //------------------------------------------- /** @todo document me. */ - private void insertKeyToConfiguration(XNameAccess xAccess, String sKey, String sCommand) - throws java.lang.Exception - { - XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess); - if (!xContainer.hasByName(sKey)) - { - XSingleServiceFactory xFac = UnoRuntime.queryInterface(XSingleServiceFactory.class, xContainer); - XInterface xInst = UnoRuntime.queryInterface(XInterface.class, xFac.createInstance()); - xContainer.insertByName(sKey, xInst); - } - - XNameAccess xKey = UnoRuntime.queryInterface(XNameAccess.class, xContainer.getByName(sKey)); - XNameContainer xCommand = UnoRuntime.queryInterface(XNameContainer.class, xKey.getByName("Command")); - String sLocale = getOfficeLocale(); - if (xCommand.hasByName(sLocale)) - { - xCommand.insertByName(sLocale, sCommand); - } - else - { - xCommand.replaceByName(sLocale, sCommand); - } - } - - //------------------------------------------- - /** @todo document me. - */ - private void removeKeyFromConfiguration(XNameAccess xAccess, String sKey) - throws java.lang.Exception - { - XNameContainer xContainer = UnoRuntime.queryInterface(XNameContainer.class, xAccess); - if (xContainer.hasByName(sKey)) - { - xContainer.removeByName(sKey); - } - } - - //------------------------------------------- - /** @todo document me. - */ private void LoadDocumentAcceleratorConfiguration(String sDocCfgName) throws java.lang.Exception { diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java index 66f09fa9bd9a..96d734fd8365 100644 --- a/framework/qa/complex/api_internal/CheckAPI.java +++ b/framework/qa/complex/api_internal/CheckAPI.java @@ -51,9 +51,6 @@ import com.sun.star.uno.UnoRuntime; */ public class CheckAPI { - // The name of the tested service - private final String testName = "StarOfficeAPI"; - /** * Return all test methods. * @return The test methods. diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 000e99c8e1c8..5116d7c762ea 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -166,10 +166,6 @@ public class AutoSave /** can be used to trigger/enable/disable the AutoSave feature. */ private XDispatch m_xAutoSave = null; - /** a test document, which needs some time for saving to simulate concurrent - * save operations. */ - private XStorable m_xTestDoc = null; - private XURLTransformer m_xURLParser = null; //------------------------------------------- diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index fedc92e18fe6..470eabefc522 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -183,17 +183,6 @@ public class RecoveryTest extends ComplexTestCase { } - private void makeRecoveryData(){ - cleanRecoveryData(); - startOffice(); - generateDesktop(); - makeCrash(); - int expectedDocumentCount = windowsPosSize.size() + 1; - handleRecoveryDialogAfterCrash(expectedDocumentCount); - backupRecoveryData(); - cleanRecoveryData(); - } - private void startOffice(){ assure("Could not connect to office", connect()); log.setWatcher(param.get("Watcher")); @@ -243,61 +232,6 @@ public class RecoveryTest extends ComplexTestCase { } /** - * While creating the test environment the positions and sizes of the frames - * was saved. After the Office has recovered the documents, this functions - * compares the saved positions and sizes with the current frame. - */ - private void compareWindowPositions(){ - System.out.println("all frames:########"); - System.out.println(windowsPosSize.entrySet().toString()); - - XEnumeration allComp = DesktopTools.getAllComponents(xMSF); - - String msg=null; - - while (allComp.hasMoreElements()){ - try{ - // get all components from the desktop - XComponent xComponent = UnoRuntime.queryInterface( - XComponent.class, allComp.nextElement()); - - XModel xModel = UnoRuntime.queryInterface(XModel.class, xComponent); - - String frameName = xModel.getCurrentController().getFrame().getName(); - - // check if this frame was used in creation of test environment - if (windowsPosSize.containsKey(frameName)){ - - Rectangle oldRect = windowsPosSize.get(frameName); - - XWindow xWindow = xModel.getCurrentController().getFrame().getContainerWindow(); - Rectangle newRect = xWindow.getPosSize(); - - - boolean ok = oldRect.Height == newRect.Height; - ok &= oldRect.Width == newRect.Width; - ok &= oldRect.X == newRect.X; - ok &= oldRect.Y == newRect.Y; - - if (!ok){ - msg = "The frame '" + frameName + "' has a different position/size:\n"; - msg += "original value -> restored value:\n"; - msg += "X : " + oldRect.X + " -> " + newRect.X + "\n"; - msg += "Y : " + oldRect.Y + " -> " + newRect.Y + "\n"; - msg += "Height: " + oldRect.Height + " -> " + newRect.Height + "\n"; - msg += "Width : " + oldRect.Width + " -> " + newRect.Width + "\n"; - } - - assure(msg, ok, CONTINUE); - - } - } catch (com.sun.star.container.NoSuchElementException e) { - } catch ( com.sun.star.lang.WrappedTargetException e) {} - } - - } - - /** * This function crashes the office */ private void makeCrash(){ @@ -416,12 +350,6 @@ public class RecoveryTest extends ComplexTestCase { handleAreYouSureDialog(true); handleSaveDocumentsDialog(true); } - private void handleRecoveryDialog_Recover(int expectedDocumentCount){ - - } - private void handleRecoveryDialog_RecoverAndCrashreporter(int expectedDocumentCount){ - - } /** * This function uses accessibility to handle the dialog which appears while the * office is started after a crash. It waits until the "next>>" button is enabled @@ -624,30 +552,6 @@ public class RecoveryTest extends ComplexTestCase { } - private void makeImpressDoc(String frameName, boolean withContent){ - log.println("creating Impress document '" + frameName + "'"); - XComponent xImpressDoc = createNewImpressDoc(frameName); - if (withContent) fillImpressDocWithContent(xImpressDoc); - positioningDocument(UnoRuntime.queryInterface(XModel.class, - xImpressDoc)); - } - - private void makeDrawDoc(String frameName, boolean withContent){ - log.println("creating Draw document '" + frameName + "'"); - XComponent xDrawDoc = createNewDrawDoc(frameName); - if (withContent) fillDrawDocWithContent(xDrawDoc); - positioningDocument(UnoRuntime.queryInterface(XModel.class, - xDrawDoc)); - } - - private void makeCalcDoc(String frameName, boolean withContent){ - log.println("creating Calc document '" + frameName + "'"); - XSpreadsheetDocument xSpreadsheetDoc = createNewCalcDoc(frameName); - if (withContent) fillCalcDocWithContent(xSpreadsheetDoc); - positioningDocument(UnoRuntime.queryInterface(XModel.class, - xSpreadsheetDoc)); - } - private void positioningDocument(XModel model){ XWindow xWindow = model.getCurrentController().getFrame().getContainerWindow(); @@ -686,163 +590,6 @@ public class RecoveryTest extends ComplexTestCase { return posSize; } - private void makeMathDoc(String frameName, boolean withContent){ - log.println("creating Math document '" + frameName + "'"); - XComponent xMathDoc = createNewMathDoc(frameName); - if (withContent) fillMathDocWithContent(xMathDoc); - positioningDocument(UnoRuntime.queryInterface(XModel.class, - xMathDoc)); - } - - private XComponent createNewMathDoc(String frameName){ - XComponent xMathDoc = null; - try{ - xMathDoc = SOF.createMathDoc(frameName); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while creating math document '"+frameName+"':"); - failed("Couldn't create test environment"); - } - return xMathDoc; - } - - private void fillMathDocWithContent(XComponent xMathDoc){ - // setting a formula in document - final String expFormula = "sum a cdot b"; - final XPropertySet xPS = UnoRuntime.queryInterface - (XPropertySet.class, xMathDoc); - try { - xPS.setPropertyValue("Formula", expFormula); - } catch(com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occurred while filling math document with content."); - failed("Couldn't create test environment"); - } catch(com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occurred while filling math document with content."); - failed("Couldn't create test environment"); - } catch(com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occurred while filling math document with content."); - failed("Couldn't create test environment"); - } catch(com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occurred while filling math document with content."); - failed("Couldn't create test environment"); - } - } - - private XComponent createNewImpressDoc(String frameName){ - XComponent xImpressDoc = null; - try{ - xImpressDoc = SOF.createImpressDoc(frameName); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while creating impress document '"+frameName+"':"); - failed("Couldn't create test environment"); - } - return xImpressDoc; - } - - - private void fillImpressDocWithContent(XComponent xImpressDoc){ - - log.println( "get presentation" ); - XPresentationSupplier oPS = UnoRuntime.queryInterface(XPresentationSupplier.class, xImpressDoc); - XInterface oObj = oPS.getPresentation(); - - log.println( "get custom presentation" ); - XCustomPresentationSupplier oCPS = UnoRuntime.queryInterface( - XCustomPresentationSupplier.class, xImpressDoc); - XNameContainer xCP = oCPS.getCustomPresentations(); - - XInterface oInstance = null; - - XSingleServiceFactory oSingleMSF = UnoRuntime.queryInterface(XSingleServiceFactory.class, xCP); - - try{ - oInstance = (XInterface) oSingleMSF.createInstance(); - } catch (com.sun.star.uno.Exception e) { - log.println("Could not create custom presentation while filling impress document with content."); - failed("Couldn't create test environment"); - } - - try { - xCP.insertByName("FirstPresentation",oInstance); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Could not instert custom presentation while filling impress document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.container.ElementExistException e) { - log.println("Could not instert custom presentation while filling impress document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Could not instert custom presentation while filling impress document with content."); - failed("Couldn't create test environment"); - } - } - - private XComponent createNewDrawDoc(String frameName){ - XComponent xDrawDoc = null; - try{ - xDrawDoc = SOF.createDrawDoc(frameName); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while creating draw document '"+frameName+"':"); - failed("Couldn't create test environment"); - } - return xDrawDoc; - } - - private void fillDrawDocWithContent(XComponent xDrawDoc){ - XDrawPagesSupplier oDPS = UnoRuntime.queryInterface(XDrawPagesSupplier.class, xDrawDoc); - XDrawPages oDPn = oDPS.getDrawPages(); - XIndexAccess oDPi = UnoRuntime.queryInterface(XIndexAccess.class, oDPn); - XDrawPage oDP = null; - try { - oDP = (XDrawPage) AnyConverter.toObject( - new Type(XDrawPage.class),oDPi.getByIndex(0)); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Could not get draw pages while filling draw document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Could not get draw pages while filling draw document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Could not get draw pages while filling draw document with content."); - failed("Couldn't create test environment"); - } - - //get a Shape - log.println( "getting Shape" ); - XShapes oShapes = UnoRuntime.queryInterface - (XShapes.class, oDP); - XInterface oObj = SOF.createShape - (xDrawDoc, 5000, 3500, 7500, 5000, "Rectangle"); - for (int i=0; i < 10; i++) { - oShapes.add( - SOF.createShape(xDrawDoc, - 5000, 3500, 7510 + 10 * i, 5010 + 10 * i, "Rectangle")); - } - XShape oShape = SOF.createShape - (xDrawDoc, 3000, 4500, 15000, 1000, "Ellipse"); - oShapes.add((XShape) oObj); - oShapes.add(oShape); - - - XPropertySet oShapeProps = UnoRuntime.queryInterface(XPropertySet.class, oObj); - XStyle aStyle = null; - try { - aStyle = (XStyle) AnyConverter.toObject( - new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); - oShapeProps.setPropertyValue("ZOrder", new Integer(1)); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occurred while setting or getting property value while filling draw document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.beans.UnknownPropertyException e) { - log.println("Exception occurred while setting or getting property value while filling draw document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occurred while setting or getting property value while filling draw document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.beans.PropertyVetoException e) { - log.println("Exception occurred while setting or getting property value while filling draw document with content."); - failed("Couldn't create test environment"); - } - } - private void makeWriterDoc(String frameName, boolean withContent){ log.println("creating Writer document '" + frameName + "'"); XTextDocument xTextDoc = createNewWriterDoc(frameName); @@ -888,69 +635,6 @@ public class RecoveryTest extends ComplexTestCase { } } - private XSpreadsheetDocument createNewCalcDoc(String frameName){ - - XSpreadsheetDocument xSheetDoc = null; - - try { - xSheetDoc = SOF.createCalcDoc(frameName); - } catch (com.sun.star.uno.Exception e) { - log.println("Exception occurred while creating calc document '"+frameName+"':"); - failed("Couldn't create test environment"); - } - return xSheetDoc; - } - - private void fillCalcDocWithContent(XSpreadsheetDocument xSpreadsheetDoc){ - - try{ - XSpreadsheets oSpreadsheets = xSpreadsheetDoc.getSheets(); - - XSpreadsheet oSheet = (XSpreadsheet) AnyConverter.toObject( - new Type(XSpreadsheet.class), - oSpreadsheets.getByName( - oSpreadsheets.getElementNames()[0])); - - XCellRange testRange = oSheet.getCellRangeByName("$A$1:$D$4"); - - XSheetCellRange testSheetRange = UnoRuntime.queryInterface( - XSheetCellRange.class, - testRange); - oSheet.getCellByPosition(1, 1).setValue(1); - oSheet.getCellByPosition(4, 5).setValue(1); - oSheet.getCellByPosition(3, 2).setFormula("xTextDoc"); - oSheet.getCellByPosition(3, 3).setFormula("xTextDoc"); - } catch (com.sun.star.lang.WrappedTargetException e) { - log.println("Exception occurred while filling calc document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.container.NoSuchElementException e) { - log.println("Exception occurred while filling calc document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IndexOutOfBoundsException e) { - log.println("Exception occurred while filling calc document with content."); - failed("Couldn't create test environment"); - } catch (com.sun.star.lang.IllegalArgumentException e) { - log.println("Exception occurred while filling calc document with content."); - failed("Couldn't create test environment"); - } - } - - /** - * copies all files from the backup folder into a folder called backup.recoveryTest - * and copies the Recovery.xcu to recovery.xcu.recoeryTest - */ - private void backupRecoveryData() - { - log.println("backup recovery data..."); - try{ - rt.copyRecoveryData(true); - }catch (com.sun.star.io.IOException e){ - failed("could not copy recovery data: " + e.toString()); - }catch (java.io.IOException e){ - failed("could not copy recovery data: " + e.toString()); - } - } - /** * copies all files from the backup.recoveryTest folder into the backup folder * and copies the Recovery.xcu.recoveryTest to recovery.xcu diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java index 8e43536e6c4f..4d1d78e27efd 100644 --- a/framework/qa/complex/imageManager/CheckImageManager.java +++ b/framework/qa/complex/imageManager/CheckImageManager.java @@ -97,7 +97,7 @@ public class CheckImageManager { private void performChecks(XImageManager xImageManager, String testObjectName, XUIConfigurationManager xManager) { util.dbg.printInterfaces(xImageManager); - OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(xManager, xMSF); + OXUIConfigurationListenerImpl configListener = new OXUIConfigurationListenerImpl(); param.put("XUIConfiguration.XUIConfigurationListenerImpl", configListener); XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImageManager); @@ -146,14 +146,6 @@ public class CheckImageManager { class OXUIConfigurationListenerImpl implements _XUIConfiguration.XUIConfigurationListenerImpl { private boolean triggered = false; - private XUIConfigurationManager xUIManager = null; - private XMultiServiceFactory xMSF = null; - - public OXUIConfigurationListenerImpl(XUIConfigurationManager xUIManager, XMultiServiceFactory xMSF) { - - this.xUIManager = xUIManager; - this.xMSF = xMSF; - } public boolean actionWasTriggered() { return triggered; diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java index 4addee6c7704..947d7cde8359 100644 --- a/framework/qa/complex/imageManager/_XComponent.java +++ b/framework/qa/complex/imageManager/_XComponent.java @@ -40,7 +40,6 @@ import lib.TestParameters; public class _XComponent { public static XComponent oObj = null; - private XNameContainer xContainer = null; private XComponent altDispose = null; TestParameters tEnv = null; boolean listenerDisposed[] = new boolean[2]; diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java index 95a8fa591cd4..c562ea25ae3e 100644 --- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java +++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java @@ -677,15 +677,6 @@ public class CheckXComponentLoader } } - private void loadURL(XComponentLoader m_xLoader, int nRequiredResult, - String[] sURL, String sTarget, int nFlags, - PropertyValue[] lProps) { - for (int i = 0; i < sURL.length; i++) - { - loadURL(m_xLoader, nRequiredResult, sURL[i], sTarget, nFlags, lProps); - } - } - /** * it match the int result value to a string, which can be used for logging */ diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java index 6e2129e52d1c..ab6b22613705 100644 --- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java +++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java @@ -57,16 +57,9 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator // ____________________ /** - * @member m_sText text, which describe the current status * @member m_nRange max value for any progress - * @member m_nValue the progress value - * @member m_nOut regulate, how the status will be shown - * @member m_aProtocol used for logging and transport information about used interface of this object */ - private String m_sText ; private int m_nRange ; - private int m_nValue ; - private int m_nOut ; private boolean m_bWasUsed ; // ____________________ @@ -77,10 +70,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator */ public StatusIndicator( int nOut) { - m_sText = new String() ; m_nRange = 100 ; - m_nValue = 0 ; - m_nOut = nOut ; m_bWasUsed = false; } @@ -100,9 +90,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator synchronized(this) { m_bWasUsed = true; - m_sText = sText ; m_nRange = nRange; - m_nValue = 0 ; } impl_show(); } @@ -117,9 +105,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator synchronized(this) { m_bWasUsed = true; - m_sText = new String(); m_nRange = 100; - m_nValue = 0; } impl_show(); } @@ -137,7 +123,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator synchronized(this) { m_bWasUsed = true; - m_sText = sText; } impl_show(); } @@ -156,9 +141,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator synchronized(this) { m_bWasUsed = true; - - if (nValue<=m_nRange) - m_nValue = nValue; } impl_show(); } @@ -173,8 +155,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator synchronized(this) { m_bWasUsed = true; - m_sText = new String(); - m_nValue = 0; } impl_show(); } diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java index 9a2631222ab5..aa503b4529cd 100644 --- a/framework/qa/complex/path_settings/PathSettingsTest.java +++ b/framework/qa/complex/path_settings/PathSettingsTest.java @@ -247,27 +247,6 @@ public class PathSettingsTest return false; } - private String getPropertyValueAsString(String _sName) - { - final XPropertySet xPropSet_of_PathSettings = UnoRuntime.queryInterface(XPropertySet.class, aPathSettings); - String sValue = ""; - { - Object o; - try - { - o = xPropSet_of_PathSettings.getPropertyValue(_sName); - sValue = convertToString(o); - } - catch (UnknownPropertyException ex) - { - } - catch (WrappedTargetException ex) - { - } - } - return sValue; - } - /** * Shows the path settings * @throws UnknownPropertyException @@ -934,7 +913,6 @@ public class PathSettingsTest private boolean propChanged = false; private boolean propertiesChanged = false; - private boolean disposeCalled = false; private boolean vetoableChanged = false; public void propertiesChange( @@ -956,14 +934,12 @@ public class PathSettingsTest public void disposing(com.sun.star.lang.EventObject eventObject) { - disposeCalled = true; } public void resetListener() { propChanged = false; propertiesChanged = false; - disposeCalled = false; vetoableChanged = false; } diff --git a/framework/qa/complex/path_substitution/PathSubstitutionTest.java b/framework/qa/complex/path_substitution/PathSubstitutionTest.java index 664c0bc7963a..b2d7c86410fc 100644 --- a/framework/qa/complex/path_substitution/PathSubstitutionTest.java +++ b/framework/qa/complex/path_substitution/PathSubstitutionTest.java @@ -239,13 +239,6 @@ public class PathSubstitutionTest resubst = new ArrayList<Boolean>(); } - public void add(String var) - { - varName.add(var); - substAtBegin.add(Boolean.TRUE); - resubst.add(Boolean.TRUE); - } - public void add(String var, boolean onlySubstAtBegin, boolean canResubst) { @@ -269,11 +262,6 @@ public class PathSubstitutionTest return varName.get(i); } - public String getValue(int i) - { - return varName.get(i); - } - public String getValue(String var) { return varValue.get(varName.indexOf(var)); diff --git a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java index 69cbc0ec4fc3..7ed846e2b9a7 100644 --- a/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java +++ b/javaunohelper/com/sun/star/comp/JavaUNOHelperServices.java @@ -29,9 +29,6 @@ import com.sun.star.comp.juhtest.SmoketestCommandEnvironment; */ public class JavaUNOHelperServices { - static private final String __service_smoketestCommandEnv = - "com.sun.star.deployment.test.SmoketestCommandEnvironment"; - /** * Gives a factory for creating the service. * This method is called by the <code>JavaLoader</code> diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java index b3f7b24c41c5..ca401532fc97 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java @@ -40,7 +40,6 @@ public class XOutputStreamToByteArrayAdapter private int size = 0; private int position = 0; private boolean externalBuffer = false; - private boolean closed = false; private byte[] buffer; /** Creates a new instance of ByteArrayXOutputStream */ @@ -77,7 +76,6 @@ public class XOutputStreamToByteArrayAdapter System.arraycopy(buffer, 0, newBuffer, 0, position); buffer = newBuffer; } - closed = true; } public void flush() diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java index fbf9035dc683..1992ceb1094a 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java @@ -1125,7 +1125,6 @@ class TestClass extends PropertySet boolean boolPropC; public Property propBoolD= new Property("PropBoolD", 301, new Type(Boolean.TYPE), (short) 0); - private boolean boolPropD; public Property propBoolClass= new Property("PropBoolClass", 1001, new Type(Boolean.class), (short) 0); public Boolean boolClassProp; @@ -1453,7 +1452,6 @@ class TestClass extends PropertySet enumPropertyState = com.sun.star.beans.PropertyState.DEFAULT_VALUE; boolPropB= false; boolPropC= false; - boolPropD= false; boolClassProp= null; charClassProp= null; byteClassProp= null; diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java index e6ee09f9390e..1174becfb6a2 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java @@ -209,6 +209,7 @@ public class java_remote_bridge } private final Type type; + private final Object object; private int count = 1; } diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java index 92265d232718..17983a855c07 100644 --- a/sfx2/qa/complex/sfx2/UndoManager.java +++ b/sfx2/qa/complex/sfx2/UndoManager.java @@ -1240,7 +1240,6 @@ public class UndoManager public void redo() throws UndoFailedException { - m_redoCalled = true; } public void dispose() @@ -1259,12 +1258,10 @@ public class UndoManager } boolean undoCalled() { return m_undoCalled; } - boolean redoCalled() { return m_redoCalled; } boolean disposed() { return m_disposed; } private final String m_title; private boolean m_undoCalled = false; - private boolean m_redoCalled = false; private boolean m_disposed = false; } diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java index a92e44e911f3..ae637b512171 100644 --- a/sw/qa/complex/writer/CheckBookmarks.java +++ b/sw/qa/complex/writer/CheckBookmarks.java @@ -88,7 +88,6 @@ public class CheckBookmarks { private XMultiServiceFactory m_xMsf = null; private XTextDocument m_xDoc = null; private XTextDocument m_xOdfReloadedDoc = null; - private XTextDocument m_xMsWordReloadedDoc = null; private final BookmarkHashes actualHashes = new BookmarkHashes(); private BookmarkHashes get20111110Expectations() { |