diff options
103 files changed, 253 insertions, 426 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 2717a35f964e..acfe2d31e9f3 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -46,7 +46,7 @@ public class LocalOfficeConnection implements OfficeConnection { private static final String OFFICE_APP_NAME = "soffice"; - public static final String OFFICE_LIB_NAME = "officebean"; + private static final String OFFICE_ID_SUFFIX = "_Office"; private Process mProcess; diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java index 528a4a2a475d..c22372d0853b 100644 --- a/framework/qa/complex/framework/autosave/Protocol.java +++ b/framework/qa/complex/framework/autosave/Protocol.java @@ -72,16 +72,16 @@ public class Protocol extends JComponent private static final int TYPE_LINK = 1024; public static final int FILTER_NONE = 0; - public static final int FILTER_OK = TYPE_OK; - public static final int FILTER_ERROR = TYPE_ERROR; - public static final int FILTER_WARNING = TYPE_WARNING; - public static final int FILTER_INFO = TYPE_INFO; - public static final int FILTER_SCOPES = TYPE_SCOPE_OPEN | TYPE_SCOPE_CLOSE; - public static final int FILTER_TESTMARK = TYPE_TESTMARK; - public static final int FILTER_ERROR_INFO = TYPE_ERROR_INFO; - public static final int FILTER_WARNING_INFO = TYPE_WARNING_INFO; - public static final int FILTER_STATISTIC = TYPE_STATISTIC; - public static final int FILTER_LINK = TYPE_LINK; + + + + + + + + + + /** diff --git a/framework/qa/complex/imageManager/_XImageManager.java b/framework/qa/complex/imageManager/_XImageManager.java index 12a3da817654..96ea2a3f9ead 100644 --- a/framework/qa/complex/imageManager/_XImageManager.java +++ b/framework/qa/complex/imageManager/_XImageManager.java @@ -28,14 +28,12 @@ import lib.TestParameters; */ public class _XImageManager { - private TestParameters tEnv = null; + private String[]imageNames = null; private XGraphic[] xGraphicArray = null; private XImageManager oObj; public _XImageManager( TestParameters tEnv, XImageManager oObj) { - - this.tEnv = tEnv; this.oObj = oObj; } diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index 1f45f9a3492b..4af3a74a42a8 100644 --- a/framework/qa/complex/imageManager/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -37,13 +37,11 @@ import lib.TestParameters; public class _XTypeProvider { - private TestParameters tEnv = null; + private static XTypeProvider oObj = null; private static Type[] types = null; public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { - - this.tEnv = tEnv; _XTypeProvider.oObj = oObj; } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java index 8c21d8de3f1f..e1ba8786033e 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java @@ -12,29 +12,29 @@ package net.adaptivebox.global; public class BasicTag { - public static final String COMMAND_TAG = "%"; - public static final String TAB_TAG = "\t"; - public static final String LEFT_SMALL_BRACKET_TAG = "("; - public static final String RIGHT_SMALL_BRACKET_TAG = ")"; - public static final String LEFT_LARGE_BRACKET_TAG = "{"; - public static final String RIGHT_LARGE_BRACKET_TAG = "}"; - public static final String LEFT_BRACKET_TAG = "["; - public static final String RIGHT_BRACKET_TAG = "]"; - public static final String EQUAL_TAG = "="; - public static final String SPACE_TAG = " "; - public static final String SEMICOLON_TAG = ";"; - public static final String COLON_TAG = ":"; - public static final String COMMA_TAG = ","; + + + + + + + + + + + + + public static final String DOT_TAG = "."; - public static final String NULL_SEPARATE_TAG = " \t"; - public static final String SEPARATE_TAG = "|"; - public static final String UNDERLINE_TAG = "_"; - public static final String INC_TAG = "+"; - public static final String DEC_TAG = "-"; - public static final String ZERO_TAG = "0"; - public static final String EXP_TAG = "E"; - public static final String S_EXP_TAG = "e"; + + + + + + + + public static final String FILE_SEP_TAG = System.getProperty("file.separator"); - public static final String RETURN_TAG = System.getProperty("line.separator"); + } diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java index b00ece9652ee..78f08e5dc213 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java @@ -28,7 +28,7 @@ import java.util.*; public class GlobalString { private static final String NEGLECT_TAG = "#$@"; - public static final String EQUAL_TAG = "="; + /** * Tokenize a String with given key. diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java index a1de9d28ff29..23ba098c37f3 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java @@ -47,7 +47,7 @@ public abstract class BaseControl { private Object unoModel; protected Object unoControl; private XPropertySet properties; - private BaseControl parentControl; + public abstract String getName(); @@ -79,7 +79,6 @@ public abstract class BaseControl { XControlContainer controlContainer = UnoRuntime.queryInterface(XControlContainer.class, parentControl.unoControl); unoControl = controlContainer.getControl(name); - this.parentControl = parentControl; } catch (IllegalArgumentException ex) { Logger.getLogger(BaseControl.class.getName()).log(Level.SEVERE, null, ex); } catch (ElementExistException ex) { @@ -93,7 +92,6 @@ public abstract class BaseControl { this.context = context; unoModel = null; unoControl = null; - parentControl = null; } protected void setProperty(String name, Object value) { diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java index 65c6b5301302..6c4bdf287926 100644 --- a/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java +++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java @@ -70,7 +70,7 @@ public class DialogComponent { private static final String __serviceName= "com.sun.star.test.TestDialogHandler"; - static byte[] _implementationId; + private XComponentContext m_xCmpCtx; private XFrame m_xFrame; diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index 345c70b59c2e..27df9513b953 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -113,9 +113,9 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // protected XNameAccess m_xDlgModelNameAccess; protected XControl m_xDialogControl; protected XDialog xDialog; - private XReschedule mxReschedule; + protected XWindowPeer m_xWindowPeer = null; - private XTopWindow m_xTopWindow = null; + protected XFrame m_xFrame = null; protected XComponent m_xComponent = null; @@ -254,7 +254,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // The scope of the control container is public... m_xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, oUnoDialog); - m_xTopWindow = UnoRuntime.queryInterface(XTopWindow.class, m_xDlgContainer); + UnoRuntime.queryInterface(XTopWindow.class, m_xDlgContainer); // link the dialog and its model... XControlModel xControlModel = UnoRuntime.queryInterface(XControlModel.class, oDialogModel); @@ -317,7 +317,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis xWindow.setVisible(false); Object tk = m_xMCF.createInstanceWithContext("com.sun.star.awt.Toolkit", m_xContext); XToolkit xToolkit = UnoRuntime.queryInterface(XToolkit.class, tk); - mxReschedule = UnoRuntime.queryInterface(XReschedule.class, xToolkit); + UnoRuntime.queryInterface(XReschedule.class, xToolkit); m_xDialogControl.createPeer(xToolkit, _xWindowParentPeer); m_xWindowPeer = m_xDialogControl.getPeer(); return m_xWindowPeer; diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java index af70c10cadc1..cc3b79cf19ea 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java @@ -58,13 +58,13 @@ class OnewayExecutor extends Thread */ public static final int REQUEST_FRAMEACTION = 1 ; - public static final int REQUEST_STATUSCHANGED = 2 ; - public static final int REQUEST_ADDSTATUSLISTENER = 3 ; - public static final int REQUEST_REMOVESTATUSLISTENER = 4 ; + + + public static final int REQUEST_DISPATCH = 5 ; - public static final boolean ENCODE_PARAMS = true ; - public static final boolean DECODE_PARAMS = false ; + + diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 165d917330cd..edd7c7eb8abb 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -545,7 +545,7 @@ public class SourceCodeGenerator { private class UnoObjectDefinition{ private Object m_oUnoObject = null; - Type aType = null; + private String sVariableStemName = ""; private String m_sCentralVariableStemName = ""; private String sVariableName = ""; @@ -839,7 +839,7 @@ private class UnoObjectDefinition{ private class JavaCodeGenerator implements XLanguageSourceCodeGenerator{ - String sStatementsCode = ""; + private boolean bAddAnyConverter = false; private boolean bIsPropertyUnoObjectDefined = false; @@ -1186,7 +1186,7 @@ private class UnoObjectDefinition{ private class BasicCodeGenerator implements XLanguageSourceCodeGenerator{ - String sStatementsCode = ""; + public BasicCodeGenerator(){ } @@ -1390,7 +1390,7 @@ private class UnoObjectDefinition{ } private class CPlusPlusCodeGenerator implements XLanguageSourceCodeGenerator{ - String sStatementsCode = ""; + private boolean bIncludeStringHeader = false; private boolean bIncludeAny = false; private boolean bIncludeSequenceHeader = false; diff --git a/odk/examples/java/Inspector/UnoNode.java b/odk/examples/java/Inspector/UnoNode.java index fa48a25a9dd9..0439554e0108 100644 --- a/odk/examples/java/Inspector/UnoNode.java +++ b/odk/examples/java/Inspector/UnoNode.java @@ -50,7 +50,7 @@ import com.sun.star.util.XURLTransformer; public class UnoNode{ - String sPath = null; + Object m_oUnoObject; private XMultiComponentFactory m_xMultiComponentFactory; private XComponentContext m_xComponentContext; diff --git a/odk/examples/java/Inspector/XTreeControlProvider.java b/odk/examples/java/Inspector/XTreeControlProvider.java index ca40d70afae2..ca67ac364bbc 100644 --- a/odk/examples/java/Inspector/XTreeControlProvider.java +++ b/odk/examples/java/Inspector/XTreeControlProvider.java @@ -39,7 +39,7 @@ import com.sun.star.uno.Type; public interface XTreeControlProvider { - public static String sTitle = "User defined"; + public String enableFilterElements(XUnoNode _oUnoNode); diff --git a/odk/examples/java/Inspector/XUnoPropertyNode.java b/odk/examples/java/Inspector/XUnoPropertyNode.java index e4aa4caba668..96d1f2c925fc 100644 --- a/odk/examples/java/Inspector/XUnoPropertyNode.java +++ b/odk/examples/java/Inspector/XUnoPropertyNode.java @@ -38,7 +38,7 @@ public interface XUnoPropertyNode extends XUnoNode { public static int nDEFAULT = 0; public static int nPROPERTYSETINFOTYPE = 1; - public static int nPROPERTYVALUETYPE = 2; + public Object getUnoReturnObject(); diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 3df834d97236..7eacef28338e 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -44,8 +44,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest **/ private int m_nThreadTimeOut = 0; - /** End a test if it did fail **/ - public static final boolean BREAK = true; + private boolean m_bBeforeCalled; diff --git a/qadevOOo/runner/convwatch/ConvWatch.java b/qadevOOo/runner/convwatch/ConvWatch.java index d64de0543c12..7187ec5f52a3 100644 --- a/qadevOOo/runner/convwatch/ConvWatch.java +++ b/qadevOOo/runner/convwatch/ConvWatch.java @@ -166,7 +166,6 @@ public class ConvWatch String sInputPath = FileHelper.getPath(_sAbsoluteInputFile); String sReferencePath = FileHelper.getPath(_sAbsoluteReferenceFile); - a.setInputPath( sInputPath ); a.setReferencePath( sReferencePath ); a.setOutputPath( _sOutputPath ); a.setReferenceFile( sReferenceFile ); diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java b/qadevOOo/runner/convwatch/GraphicalTestArguments.java index 82083679afa3..b9b195afd9d3 100644 --- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java +++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java @@ -91,9 +91,9 @@ public class GraphicalTestArguments private boolean m_bStoreFile = true; private boolean m_bResuseOffice = false; - boolean m_bDebugMode = false; - private String m_sLeaveOutNames = null; + + private String m_sDistinct = null; @@ -241,10 +241,6 @@ public class GraphicalTestArguments } String sLeaveOutNames = (String)param.get(PropertyName.DOC_COMPARATOR_LEAVE_OUT_FILES); - if (sLeaveOutNames != null) - { - m_sLeaveOutNames = sLeaveOutNames; - } String sDBInfoString = (String)param.get(PropertyName.DOC_COMPARATOR_DB_INFO_STRING); if (sDBInfoString != null) diff --git a/qadevOOo/runner/convwatch/INIOutputter.java b/qadevOOo/runner/convwatch/INIOutputter.java index dccef7351954..673b8789be46 100644 --- a/qadevOOo/runner/convwatch/INIOutputter.java +++ b/qadevOOo/runner/convwatch/INIOutputter.java @@ -25,7 +25,7 @@ public class INIOutputter { private FileWriter m_aOut; private String m_sFilename; - private String m_sNamePrefix; // the HTML files used a suffix to build it's right name + /** * ls is the current line separator (carridge return) @@ -52,7 +52,6 @@ public class INIOutputter return null; } a.m_sFilename = sFilename; - a.m_sNamePrefix = _sNamePrefix; return a; } diff --git a/qadevOOo/runner/convwatch/ImageHelper.java b/qadevOOo/runner/convwatch/ImageHelper.java index c5b2f11c0093..1a297704249a 100644 --- a/qadevOOo/runner/convwatch/ImageHelper.java +++ b/qadevOOo/runner/convwatch/ImageHelper.java @@ -30,7 +30,7 @@ class ImageHelper private int[] m_aPixels; private int m_w = 0; private int m_h = 0; - private boolean m_bGrabbed = false; + private ImageHelper(Image _aImage) { @@ -53,7 +53,6 @@ class ImageHelper System.err.println("image fetch aborted or errored"); return; } - m_bGrabbed = true; } public int getWidth() {return m_aImage.getWidth(null);} public int getHeight() {return m_aImage.getHeight(null);} diff --git a/qadevOOo/runner/convwatch/PRNCompare.java b/qadevOOo/runner/convwatch/PRNCompare.java index 4b3974840bfc..e7aea95609dc 100644 --- a/qadevOOo/runner/convwatch/PRNCompare.java +++ b/qadevOOo/runner/convwatch/PRNCompare.java @@ -91,10 +91,10 @@ public class PRNCompare return nMaxNumber; } - private String m_sInputPath; + private String m_sReferencePath; private String m_sOutputPath; - private String m_sDocFile; + private String m_sReferenceFile; private String m_sPostScriptFile; private int m_nMaxPages = 0; @@ -102,14 +102,10 @@ public class PRNCompare private TriState m_tUseBorderMove; private String m_sDocumentType; - public void setInputPath(String _sInputPath) { m_sInputPath = _sInputPath; } - public void setReferencePath(String _sReferencePath) { m_sReferencePath = _sReferencePath; } public void setOutputPath(String _sOutPath) { m_sOutputPath = _sOutPath; } - public void setDocFile(String _sDocFile) { m_sDocFile = _sDocFile;} - public void setReferenceFile(String _sPRNFile){ m_sReferenceFile = _sPRNFile;} public void setPostScriptFile(String _sPSFile){ m_sPostScriptFile = _sPSFile;} diff --git a/qadevOOo/runner/convwatch/StatusHelper.java b/qadevOOo/runner/convwatch/StatusHelper.java index bb494508128f..939a64ae8108 100644 --- a/qadevOOo/runner/convwatch/StatusHelper.java +++ b/qadevOOo/runner/convwatch/StatusHelper.java @@ -26,7 +26,7 @@ public class StatusHelper final static public int DIFF_AFTER_MOVE_DONE_NO_PROBLEMS = 4; final static public int DIFF_AFTER_MOVE_DONE_DIFFERENCES_FOUND = 5; - public String m_sMainName; + public String m_sOldGfx; public String m_sNewGfx; diff --git a/qadevOOo/runner/graphical/ImageHelper.java b/qadevOOo/runner/graphical/ImageHelper.java index ec2a5cee573d..b1ec0ca649de 100644 --- a/qadevOOo/runner/graphical/ImageHelper.java +++ b/qadevOOo/runner/graphical/ImageHelper.java @@ -30,7 +30,7 @@ class ImageHelper private int[] m_aPixels; private int m_w = 0; private int m_h = 0; - private boolean m_bGrabbed = false; + private ImageHelper(Image _aImage) { @@ -57,7 +57,6 @@ class ImageHelper System.err.println("image fetch aborted or errored"); return; } - m_bGrabbed = true; } public int getWidth() {return m_aImage.getWidth(null);} public int getHeight() {return m_aImage.getHeight(null);} diff --git a/qadevOOo/runner/graphical/PropertyName.java b/qadevOOo/runner/graphical/PropertyName.java index b95567fe7ba3..66f4d46e97fe 100644 --- a/qadevOOo/runner/graphical/PropertyName.java +++ b/qadevOOo/runner/graphical/PropertyName.java @@ -27,18 +27,18 @@ public interface PropertyName final public static String DOC_COMPARATOR_INCLUDE_SUBDIRS = "DOC_COMPARATOR_INCLUDE_SUBDIRS"; final public static String DOC_COMPARATOR_PRINT_MAX_PAGE = "DOC_COMPARATOR_PRINT_MAX_PAGE"; final public static String DOC_COMPARATOR_PRINT_ONLY_PAGE = "DOC_COMPARATOR_PRINT_ONLY_PAGE"; - final public static String DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION = "DOC_COMPARATOR_GFX_OUTPUT_DPI_RESOLUTION"; + final public static String DOC_COMPARATOR_OVERWRITE_REFERENCE = "DOC_COMPARATOR_OVERWRITE_REFERENCE"; final public static String DOC_COMPARATOR_HTML_OUTPUT_PREFIX = "DOC_COMPARATOR_HTML_OUTPUT_PREFIX"; - final public static String DOC_CONVERTER_IMPORT_FILTER_NAME = "DOC_CONVERTER_IMPORT_FILTER_NAME"; + final public static String DOC_CONVERTER_EXPORT_FILTER_NAME = "DOC_CONVERTER_EXPORT_FILTER_NAME"; - final public static String DOC_CONVERTER_OFFICE_PROGRAM = "DOC_CONVERTER_OFFICE_PROGRAM"; - final public static String DOC_COMPARATOR_LEAVE_OUT_FILES = "DOC_COMPARATOR_LEAVE_OUT_FILES"; - final public static String DOC_COMPARATOR_DB_INFO_STRING = "DOC_COMPARATOR_DB_INFO_STRING"; + + + final public static String OFFICE_VIEWABLE = "OFFICE_VIEWABLE"; diff --git a/qadevOOo/runner/helper/StreamSimulator.java b/qadevOOo/runner/helper/StreamSimulator.java index 205925dcb9f1..b5b025932436 100644 --- a/qadevOOo/runner/helper/StreamSimulator.java +++ b/qadevOOo/runner/helper/StreamSimulator.java @@ -51,8 +51,8 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , private com.sun.star.io.XOutputStream m_xOutStream ; private com.sun.star.io.XSeekable m_xSeek ; - private boolean m_bInWasUsed ; - private boolean m_bOutWasUsed ; + + /** @@ -81,8 +81,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { ////m_aProtocol = new ComplexTestEnvironment(); m_sFileName = sFileName ; - m_bInWasUsed = false ; - m_bOutWasUsed = false ; try { @@ -128,8 +126,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.BufferSizeExceededException, com.sun.star.io.IOException { - m_bInWasUsed = true; - if (m_xInStream == null) { throw new com.sun.star.io.NotConnectedException("stream not open"); @@ -160,7 +156,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("readSomeBytes(lData["+lData.length+"]["+lData[0]+"],"+nMaxBytesToRead+")\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -197,7 +192,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("skipBytes("+nBytesToSkip+")\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -227,7 +221,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("available()\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -257,7 +250,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("closeInput()\n{\n"); - m_bInWasUsed = true; if (m_xInStream == null) { @@ -291,7 +283,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("writeBytes(lData["+lData.length+"])\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -322,7 +313,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("flush()\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -352,7 +342,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , com.sun.star.io.IOException { //m_aProtocol.log("closeOutput()\n{\n"); - m_bOutWasUsed = true; if (m_xOutStream == null) { @@ -388,14 +377,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("seek("+nLocation+")\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); @@ -422,14 +403,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("getPosition()\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); @@ -456,14 +429,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream , { //m_aProtocol.log("getLength()\n{\n"); - if (m_xInStream != null) - m_bInWasUsed = true; - else - if (m_xOutStream != null) - m_bOutWasUsed = true; - else - //m_aProtocol.log("\tno stream open!\n"); - if (m_xSeek == null) { //m_aProtocol.log("\tstream not seekable. throw IOException\n\tfailed\n}\n"); diff --git a/qadevOOo/runner/helper/WindowListener.java b/qadevOOo/runner/helper/WindowListener.java index e1622327a069..00395c6f75cd 100644 --- a/qadevOOo/runner/helper/WindowListener.java +++ b/qadevOOo/runner/helper/WindowListener.java @@ -30,16 +30,12 @@ package helper; */ public class WindowListener implements com.sun.star.awt.XWindowListener { - // hidden called - private boolean hiddenTrigger; - // move called - private boolean movedTrigger; + + // resize called public boolean resizedTrigger; - // show called - private boolean shownTrigger; - // dispose called - private boolean disposeTrigger; + + /** * Creates a new WindowListener @@ -52,14 +48,12 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { * The window hidden event */ public void windowHidden(com.sun.star.lang.EventObject eventObject) { - hiddenTrigger = true; } /** * The window move event */ public void windowMoved(com.sun.star.awt.WindowEvent windowEvent) { - movedTrigger = true; } /** @@ -73,24 +67,18 @@ public class WindowListener implements com.sun.star.awt.XWindowListener { * The window show event */ public void windowShown(com.sun.star.lang.EventObject eventObject) { - shownTrigger = true; } /** * The dispose event */ public void disposing(com.sun.star.lang.EventObject eventObject) { - disposeTrigger = true; } /** * Reset all triggers to "not fired". */ public void resetTrigger() { - hiddenTrigger = false; - movedTrigger = false; resizedTrigger = false; - shownTrigger = false; - disposeTrigger = false; } } diff --git a/qadevOOo/runner/lib/SimpleStatus.java b/qadevOOo/runner/lib/SimpleStatus.java index 2639faea50d1..631ecc5b2f2f 100644 --- a/qadevOOo/runner/lib/SimpleStatus.java +++ b/qadevOOo/runner/lib/SimpleStatus.java @@ -58,10 +58,7 @@ class SimpleStatus { */ public final static boolean FAILED = false; - /** - * The constant represents OK state. - */ - public final static boolean OK = true; + /** * The field is holding state of the status. diff --git a/qadevOOo/runner/util/PropertyName.java b/qadevOOo/runner/util/PropertyName.java index 21d78ec4393f..baeb78b1805b 100644 --- a/qadevOOo/runner/util/PropertyName.java +++ b/qadevOOo/runner/util/PropertyName.java @@ -98,10 +98,7 @@ public interface PropertyName { * parameter name: "NewOfficeInstance" */ final public static String NEW_OFFICE_INSTANCE = "NewOfficeInstance"; - /** - * parameter name: "KeepDocument" - */ - final public static String KEEP_DOCUMENT = "KeepDocument"; + /** * parameter name: "SRC_ROOT"<p> * path to the source root of OpenOffice.org diff --git a/reportbuilder/java/org/libreoffice/report/OfficeToken.java b/reportbuilder/java/org/libreoffice/report/OfficeToken.java index 76bc897d09be..9c2b59dcaaaa 100644 --- a/reportbuilder/java/org/libreoffice/report/OfficeToken.java +++ b/reportbuilder/java/org/libreoffice/report/OfficeToken.java @@ -44,7 +44,7 @@ public class OfficeToken public static final String IMAGE_DATA = "image-data"; public static final String PRESERVE_IRI = "preserve-IRI"; public static final String SCALE = "scale"; - public static final String NAME = "name"; + public static final String SHAPES = "shapes"; public static final String ISOTROPIC = "isotropic"; public static final String ANISOTROPIC = "anisotropic"; diff --git a/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java index 8e6593ead7c7..8d76cd1c66d6 100644 --- a/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java +++ b/reportbuilder/java/org/libreoffice/report/ReportEngineParameterNames.java @@ -35,7 +35,7 @@ public class ReportEngineParameterNames public static final String INPUT_MASTER_COLUMNS = "input.master-columns"; public static final String INPUT_MASTER_VALUES = "input.master-values"; public static final String INPUT_DETAIL_COLUMNS = "input.detail-columns"; - public static final String MIMETYPE = "output.mimetype"; + public static final String AUTHOR = "Author"; public static final String TITLE = "Title"; public static final String MAXROWS = "MaxRows"; diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java index 1a45f1f4347a..27743593277a 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/OfficeNamespaces.java @@ -51,10 +51,7 @@ public class OfficeNamespaces public static final String OOREPORT_NS = "http://openoffice.org/2005/report"; public static final String GRDDL_NS = "http://www.w3.org/2003/g/data-view#"; public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0"; - /** - * @deprecated - */ - public static final String NUMBER_NS = DATASTYLE_NS; + private OfficeNamespaces() { diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java index 157dec4bf017..1baa24080774 100644 --- a/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java +++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/text/PageContext.java @@ -29,7 +29,7 @@ import org.jfree.layouting.input.style.values.CSSNumericValue; public class PageContext { - public static final int KEEP_TOGETHER_OFF = 0; + public static final int KEEP_TOGETHER_GROUP = 1; public static final int KEEP_TOGETHER_FIRST_DETAIL = 2; private PageContext parent; diff --git a/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java index 4f24dd99d474..54dce8e6e039 100644 --- a/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java +++ b/reportbuilder/java/org/libreoffice/report/util/DefaultReportJobDefinition.java @@ -30,7 +30,7 @@ import org.libreoffice.report.ReportJobDefinition; public class DefaultReportJobDefinition implements ReportJobDefinition { - public static final String OUTPUT_TYPE = "output-type"; + private final DefaultParameterMap parameters; private final DefaultJobProperties properties; diff --git a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java index 9971c74e0419..abb0a4e375c8 100644 --- a/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java +++ b/sc/qa/complex/dataPilot/_XDataPilotDescriptor.java @@ -54,7 +54,7 @@ public class _XDataPilotDescriptor { private XDataPilotDescriptor oObj = null; private CellRangeAddress CRA = new CellRangeAddress((short)1, 0, 0, 5, 5); - private CellRangeAddress oldCRA = null ; + private String sTag = new String ("XDataPilotDescriptor_Tag"); private String fieldsNames[]; private int fieldsAmount = 0; @@ -132,7 +132,6 @@ public class _XDataPilotDescriptor { executeMethod("getHiddenFields()") ; executeMethod("getPageFields()") ; */ - oldCRA = oObj.getSourceRange() ; oObj.setSourceRange(CRA); return true; diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java index 75e4771ddf78..437b3265345b 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java @@ -57,10 +57,10 @@ public class ParcelBrowseNode extends PropertySet private Collection<XBrowseNode> browsenodes; private ParcelContainer container; private Parcel parcel; - private boolean deletable = true; - private boolean editable = false; - private boolean creatable = false; - private boolean renamable = true; + + + + public ParcelBrowseNode( ScriptProvider provider, ParcelContainer container, String parcelName ) { this.provider = provider; @@ -86,10 +86,6 @@ public class ParcelBrowseNode extends PropertySet (short)0, "creatable"); registerProperty("Renamable", new Type(boolean.class), (short)0, "renamable"); - if (provider.hasScriptEditor() == true) - { - this.creatable = true; - } String parcelDirUrl = parcel.getPathToParcel(); XComponentContext xCtx = provider.getScriptingContext().getComponentContext(); @@ -100,14 +96,6 @@ public class ParcelBrowseNode extends PropertySet xFac.createInstanceWithContext( "com.sun.star.ucb.SimpleFileAccess", xCtx ) ); - if ( xSFA != null && ( xSFA.isReadOnly( parcelDirUrl ) || - container.isUnoPkg() ) ) - { - deletable = false; - editable = false; - creatable = false; - renamable = false; - } } catch ( com.sun.star.uno.Exception e ) { diff --git a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java index 2ef57466457e..900a4b3bee5d 100644 --- a/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java @@ -33,10 +33,6 @@ public class PkgProviderBrowseNode extends ProviderBrowseNode LogUtils.DEBUG("*** PkgProviderBrowseNode ctor container name = " + container.getName()); LogUtils.DEBUG("*** PkgProviderBrowseNode ctor container path = " + container.getParcelContainerDir()); LogUtils.DEBUG("*** PkgProviderBrowseNode ctor, container has num parcels = " + container.getElementNames().length); - deletable = false; - editable = false; - creatable = false; - } @Override diff --git a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java index 3f0f7c2b4ce2..5bb65b861f29 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java @@ -50,12 +50,12 @@ public class ProviderBrowseNode extends PropertySet private Collection<XBrowseNode> browsenodes; private String name; protected ParcelContainer container; - protected Parcel parcel; + private XComponentContext m_xCtx; - public boolean deletable = true; - public boolean creatable = true; - public boolean editable = false; + + + public ProviderBrowseNode( ScriptProvider provider, ParcelContainer container, XComponentContext xCtx ) { LogUtils.DEBUG("*** ProviderBrowseNode ctor"); @@ -78,11 +78,6 @@ public class ProviderBrowseNode extends PropertySet xFac.createInstanceWithContext( "com.sun.star.ucb.SimpleFileAccess", xCtx ) ); - if ( container.isUnoPkg() || xSFA.isReadOnly( container.getParcelContainerDir() ) ) - { - deletable = false; - creatable = false; - } } // TODO propage errors catch( com.sun.star.uno.Exception e ) diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java index 88557010d9bf..1e5df7130dec 100644 --- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java +++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java @@ -52,8 +52,8 @@ public class ScriptBrowseNode extends PropertySet private Parcel parent; private String name; - private String uri; - private String description; + + private boolean editable = false; private boolean deletable = false; private boolean renamable = false; @@ -83,9 +83,6 @@ public class ScriptBrowseNode extends PropertySet LogUtils.DEBUG("** caught exception getting script data for " + name + " ->" + e.toString() ); } - uri = data.getShortFormScriptURL(); - description = data.getDescription(); - if (provider.hasScriptEditor() == true) { @@ -155,7 +152,6 @@ public class ScriptBrowseNode extends PropertySet { LogUtils.DEBUG("** caught exception getting script data for " + name + " ->" + e.toString() ); } - uri = data.getShortFormScriptURL(); } // implementation of XInvocation interface public XIntrospectionAccess getIntrospection() { @@ -271,7 +267,6 @@ public class ScriptBrowseNode extends PropertySet LogUtils.DEBUG("Now remove old script"); parent.removeByName( name ); - uri = data.getShortFormScriptURL(); name = languageName; result = new Any(new Type(XBrowseNode.class), this); } diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index bb6c6fd39781..cf860de625b4 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -683,8 +683,6 @@ public ParsedScriptUri parseScriptUri( String scriptURI ) throws com.sun.star.l } ParsedScriptUri parsedUri = new ParsedScriptUri(); - // parse language - parsedUri.language = sfUri.getParameter("language"); parsedUri.function= sfUri.getName(); parsedUri.parcel = ""; diff --git a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java index 8ca004b99287..477604c721ac 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java +++ b/scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java @@ -19,7 +19,7 @@ package com.sun.star.script.framework.container; public class ParsedScriptUri { - public String language; + public String location; public String function; public String parcel; diff --git a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java index 63e8296e0b91..307d3460b9ab 100644 --- a/scripting/java/com/sun/star/script/framework/provider/PathUtils.java +++ b/scripting/java/com/sun/star/script/framework/provider/PathUtils.java @@ -27,7 +27,7 @@ import com.sun.star.uno.IQueryInterface; public class PathUtils { - private static String FILE_URL_PREFIX; + public static String BOOTSTRAP_NAME; private static boolean m_windows = false; @@ -36,7 +36,6 @@ public class PathUtils { if (System.getProperty("os.name").startsWith("Windows")) m_windows = true; - FILE_URL_PREFIX = m_windows ? "file:///" : "file://"; BOOTSTRAP_NAME = m_windows ? "bootstrap.ini" : "bootstraprc"; } public static String getOidForModel( XModel xModel ) diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java index 0f21981b8678..8e7d0ec4f986 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java @@ -42,9 +42,9 @@ public class ScriptContext extends PropertySet implements XScriptContext private XModel m_xModel = null; private XScriptInvocationContext m_xInvocationContext = null; - public String m_sDocURI = null; + private XDesktop m_xDeskTop = null; - public Integer m_iStorageID = null; + private XComponentContext m_xComponentContext = null; private ScriptContext( XComponentContext xmComponentContext, diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index ad0c7b07fcad..5b0209a32c4d 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -87,7 +87,7 @@ public abstract class ScriptProvider "com.sun.star.script.provider.LanguageScriptProvider" }; - public final static String CLASSPATH = "classpath"; + protected String language; diff --git a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java index e4854d26f1bb..30ad0bb81aca 100644 --- a/scripting/java/org/openoffice/idesupport/SVersionRCFile.java +++ b/scripting/java/org/openoffice/idesupport/SVersionRCFile.java @@ -41,9 +41,7 @@ public class SVersionRCFile { System.getProperty("os.name").startsWith("Windows") == true ? "file:///" : "file://"; - public static final String PKGCHK = - System.getProperty("os.name").startsWith("Windows") == true ? - "pkgchk.exe" : "pkgchk"; + private static final String VERSIONS_LINE = "[Versions]"; diff --git a/swext/mediawiki/src/com/sun/star/wiki/Helper.java b/swext/mediawiki/src/com/sun/star/wiki/Helper.java index af5934eb2dda..ed78dae482da 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/Helper.java +++ b/swext/mediawiki/src/com/sun/star/wiki/Helper.java @@ -80,9 +80,9 @@ public class Helper public final static int DLG_SENDTITLE = 6; public final static int DLG_WIKIARTICLE = 7; - public final static int DLG_NO = 8; + public final static int DLG_OK = 9; - public final static int DLG_YES = 10; + // 11 is reserved public final static int DLG_ADDBUTTON = 12; public final static int DLG_EDITBUTTON = 13; @@ -92,7 +92,7 @@ public class Helper public final static int DLG_EDITSETTING_URLLABEL = 16; public final static int DLG_EDITSETTING_USERNAMELABEL = 17; public final static int DLG_EDITSETTING_PASSWORDLABEL = 18; - public final static int DLG_NEWWIKIPAGE_LABEL1 = 19; + public final static int DLG_SENDTOMEDIAWIKI_LABEL1 = 20; public final static int DLG_SENDTOMEDIAWIKI_LABEL2 = 21; public final static int DLG_SENDTOMEDIAWIKI_LABEL3 = 22; diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java index 969af1689474..f251fc485777 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java @@ -53,9 +53,8 @@ public final class WikiEditorImpl extends WeakBase private static final String m_implementationName = WikiEditorImpl.class.getName(); private static final String[] m_serviceNames = {"com.sun.star.wiki.WikiEditor" }; - // information needed for component registration - public static final String[] supportedServiceNames = {"com.sun.star.frame.ProtocolHandler"}; - public static final Class implementationClass = WikiEditorImpl.class; + + // protocol name that this protocol handler handles private static final String protocolName = "vnd.com.sun.star.wiki:"; diff --git a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java index b69066403768..d5b30f17dbb2 100644 --- a/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XCommandInfoChangeNotifier.java @@ -26,7 +26,7 @@ import share.LogWriter; */ public class _XCommandInfoChangeNotifier { public XCommandInfoChangeNotifier oObj = null; - public LogWriter log = null; + private CommandInfoChangeListener listener = new CommandInfoChangeListener(); public boolean _addCommandInfoChangeListener() { diff --git a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java index 4f945d09f94e..8cee835cc5b4 100644 --- a/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertiesChangeNotifier.java @@ -26,7 +26,7 @@ import share.LogWriter; */ public class _XPropertiesChangeNotifier { public XPropertiesChangeNotifier oObj = null; - public LogWriter log = null; + private PropertiesChangeListener listener = new PropertiesChangeListener(); private String[] args = null; diff --git a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java index 0505c6796108..f514dd8ec31c 100644 --- a/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java +++ b/ucb/qa/complex/tdoc/_XPropertySetInfoChangeNotifier.java @@ -26,10 +26,10 @@ import share.LogWriter; */ public class _XPropertySetInfoChangeNotifier { public XPropertySetInfoChangeNotifier oObj = null; - public LogWriter log = null; + private PropertySetInfoChangeListener listener = new PropertySetInfoChangeListener(); - String[] args = null; + public boolean _addPropertiesChangeListener() { diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java index 0471acb29c6e..c6ce5f3d7ad0 100644 --- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java +++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.java @@ -37,8 +37,7 @@ import helper.WindowListener; public class DocumentHandle { // the component loader to load a document private XComponentLoader xCompLoader = null; - // the document - private XComponent xComp = null; + // the current window private XWindow xWin = null; // a own window listener @@ -85,8 +84,7 @@ public class DocumentHandle { // load document in this frame XComponentLoader xFrameLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame); - xComp = xFrameLoader.loadComponentFromURL( - docName, "_self", 0, szArgs); + xFrameLoader.loadComponentFromURL(docName, "_self", 0, szArgs); // wait for the document to load. try { Thread.sleep(10000); diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 95c24a0b061e..f8dfbc163d3a 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -44,9 +44,9 @@ public class NumericalHelper private static final int STRING_TYPE = -1; private static final int BOOLEAN_TYPE = -2; private static final int SEQUENCE_TYPE = -3; - public static final int ASCII_VALUE_0 = 48; - public static final int ASCII_VALUE_A = 65; - public static final int COUNT_CHARS_IN_ALPHABET = 26; + + + private static final int HEX_BASE = 16; private static final int DEC_BASE = 10; private static final int ASCII_LETTER_A_OFFSET = 55; diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index e9aa2f42c858..1169179c9508 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -32,7 +32,7 @@ public class PlaceholderTextElement extends TextElement private String hint; private String placeHolderText; private XMultiServiceFactory xmsf; - TextDocument templateDocument; + public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) { diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java index c851b7432b3b..af23a119d20d 100644 --- a/wizards/com/sun/star/wizards/common/PropertyNames.java +++ b/wizards/com/sun/star/wizards/common/PropertyNames.java @@ -36,7 +36,7 @@ public class PropertyNames public static String PROPERTY_TITLE = "Title"; public static String PROPERTY_BORDER = "Border"; public static String PROPERTY_MOVEABLE = "Moveable"; - public static String PROPERTY_CLOSEABLE = "Closeable"; + public static String PROPERTY_ALIGN = "Align"; public static String COMMAND = "Command"; public static String COMMAND_TYPE = "CommandType"; diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index cf744fe779c5..49674b243e5d 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -40,7 +40,7 @@ public class SystemDialog private XFilterManager xFilterManager; private XInitialization xInitialize; private XExecutableDialog xExecutable; - private XComponent xComponent; + private XFilePickerControlAccess xFilePickerControlAccess; private XMultiServiceFactory xMSF; private XStringSubstitution xStringSubstitution; @@ -61,7 +61,7 @@ public class SystemDialog xFilterManager = UnoRuntime.queryInterface(XFilterManager.class, systemDialog); xInitialize = UnoRuntime.queryInterface(XInitialization.class, systemDialog); xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, systemDialog); - xComponent = UnoRuntime.queryInterface(XComponent.class, systemDialog); + UnoRuntime.queryInterface(XComponent.class, systemDialog); xFilePickerControlAccess = UnoRuntime.queryInterface(XFilePickerControlAccess.class, systemDialog); xStringSubstitution = createStringSubstitution(xMSF); Short[] listAny = new Short[] diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java index 161af0457c6c..285e3e47725f 100644 --- a/wizards/com/sun/star/wizards/db/CommandName.java +++ b/wizards/com/sun/star/wizards/db/CommandName.java @@ -34,7 +34,7 @@ public class CommandName private String AliasName = PropertyNames.EMPTY_STRING; private boolean bCatalogAtStart; private String sCatalogSep; - private String sIdentifierQuote; + private boolean baddQuotation = true; public CommandName(CommandMetaData _CommandMetaData, String _DisplayName) @@ -176,7 +176,6 @@ public class CommandName { bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart(); sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator(); - sIdentifierQuote = oCommandMetaData.xDBMetaData.getIdentifierQuoteString(); return true; } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 980221dba203..d05d0aef0daf 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -85,8 +85,8 @@ public class DBMetaData private XPropertySet m_dataSourceSettings; private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; - private String[] DataSourceNames; - public String[] CommandNames; + + private java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1); private Locale aLocale; private int[] CommandTypes; @@ -201,7 +201,6 @@ public class DBMetaData this.xMSF = xMSF; xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext"); xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext ); - DataSourceNames = xNameAccess.getElementNames(); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index 31a443dd1619..8987d254d88e 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -28,7 +28,7 @@ public class QueryMetaData extends CommandMetaData { private SQLQueryComposer oSQLQueryComposer = null; - FieldColumn CurFieldColumn; + public String Command; // Vector CommandNamesV; private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */ diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 4f8cb8994e14..1eba9a59bad7 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -41,12 +41,12 @@ public class RecordParser extends QueryMetaData { private XNameAccess xColumns; - com.sun.star.sdbc.XRow xRow; + private com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; private XInterface xRowSet; private XCompletedExecution xExecute; - private XColumnsSupplier xRowSetColumnsSupplier; + private XComponent xRowSetComponent; private XInteractionHandler xInteraction; public FieldColumn[] GroupFieldColumns; @@ -70,7 +70,7 @@ public class RecordParser extends QueryMetaData try { xRowSet = (XInterface) xMSF.createInstance("com.sun.star.sdb.RowSet"); - xRowSetColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); + UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet); xRowSetComponent = UnoRuntime.queryInterface(XComponent.class, xRowSet); xExecute = UnoRuntime.queryInterface(XCompletedExecution.class, xRowSet); XInterface oInteraction = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler"); diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 7cdc8678b8d2..2423cc11ceba 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -40,7 +40,7 @@ import java.util.ArrayList; public class SQLQueryComposer { - public XColumnsSupplier xColSuppl; + private QueryMetaData CurDBMetaData; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index db77203b62c6..77c46538902b 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -65,7 +65,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private String[] sTableFilters = null; private ArrayList<ColumnDescriptor> columncontainer; private ArrayList<XPropertySet> keycolumncontainer; - public XHierarchicalNameAccess xTableHierarchicalNameAccess; + private CommandName ComposedTableName; private XAppend xKeyColAppend; private XColumnsSupplier xKeyColumnSupplier; diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index b0dbda221857..75f4f82ad837 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -51,15 +51,10 @@ public class TypeInspector public class TypeInfo { - - private int nDataType; - private String sDataTypeName; public boolean bisAutoIncrementable; private TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable) { - nDataType = _nDataType; - sDataTypeName = _sDataTypeName; bisAutoIncrementable = _bisAutoIncrementable; } } diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 1da3b217548b..e3320d877896 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -43,12 +43,12 @@ public class Control extends Shape XControlModel xControlModel; private XControl xControl; public XPropertySet xPropertySet; - private XPropertySet xControlPropertySet; + XWindowPeer xWindowPeer; - Object oDefaultValue; - GridControl oGridControl; + + private String sServiceName; - XNamed xNamed; + private final int SOMAXTEXTSIZE = 50; private int icontroltype; private XNameContainer xFormName; @@ -108,7 +108,7 @@ public class Control extends Shape _xGroupShapes.add(xShape); } xControl = oFormHandler.xControlAccess.getControl(xControlModel); - xControlPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xControl ); + UnoRuntime.queryInterface( XPropertySet.class, xControl ); xWindowPeer = xControl.getPeer(); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java index 74d2f54a14dd..7c675a2c141b 100644 --- a/wizards/com/sun/star/wizards/document/FormHandler.java +++ b/wizards/com/sun/star/wizards/document/FormHandler.java @@ -97,9 +97,9 @@ public class FormHandler int DataType; private int ControlType; - private String ControlService; + String GridColumnName; - private boolean bIsText; + } /** Creates a new instance of FormHandler */ @@ -197,9 +197,7 @@ public class FormHandler ControlData curControlData = new ControlData(); curControlData.DataType = _datatype; curControlData.ControlType = _controltype; - curControlData.ControlService = _scontrolservicename; curControlData.GridColumnName = _gridcolumnname; - curControlData.bIsText = _bIsTextControl; return curControlData; } diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index 13436ee5eebc..f7bab37436e5 100644 --- a/wizards/com/sun/star/wizards/document/GridControl.java +++ b/wizards/com/sun/star/wizards/document/GridControl.java @@ -40,7 +40,7 @@ public class GridControl extends Shape public XGridColumnFactory xGridColumnFactory; public XPropertySet xPropertySet; XNameAccess xNameAccess; - final String SODEFAULTNAME = "Grid1"; + private XControlModel xControlModel; public XComponent xComponent; diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index b627c7ed8baf..300459197c61 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -41,7 +41,7 @@ public class TimeStampControl extends DatabaseControl private Resource oResource; private String sDateAppendix; // = GetResText(RID_FORM + 4) private String sTimeAppendix; // = GetResText(RID_FORM + 5) - XShapes xGroupShapes = null; + private double nreldatewidth; private double nreltimewidth; private int nTimeWidth; diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index 81f3d87e3b58..19a8044c4729 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -34,7 +34,7 @@ public class Finalizer private WizardDialog CurUnoDialog; private short curtabindex; private XRadioButton optModifyForm; - XRadioButton optWorkWithForm; + private XTextComponent txtFormName; private FormDocument oFormDocument; diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 170a32bdd197..c478745fb810 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -41,7 +41,7 @@ public class FormConfiguration private XRadioButton optOnExistingRelation; private XCheckBox chkcreateSubForm; private XRadioButton optSelectManually; - private XFixedText lblSubFormDescription; + private XFixedText lblRelations; private XListBox lstRelations; private String[] sreferencedTables; @@ -109,7 +109,7 @@ public class FormConfiguration { Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, new Short(curtabindex++), 103 }); - lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription", + CurUnoDialog.insertLabel("lblSubFormDescription", new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 60fc8f61a481..1fd4dbd38487 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -56,8 +56,8 @@ public class CallQueryWizard private static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor { private PropertyValue[] m_wizardContext; - private String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; + + /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param i_serviceFactory A special service factory could be introduced while initializing. @@ -77,7 +77,7 @@ public class CallQueryWizard if (sEvent.equals(PropertyNames.START)) { QueryWizard CurQueryWizard = new QueryWizard( m_serviceFactory, m_wizardContext ); - Command = CurQueryWizard.start(); + CurQueryWizard.start(); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 7abe24f985bc..e6999b63be85 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -30,7 +30,7 @@ public class QuerySummary extends QueryMetaData { final private int RID_QUERY = 2300; - final protected int RID_REPORT = 2400; + private String sSummary; private Resource oResource; private String sSeparator; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 008c0510295d..a931f0bbbb9c 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -43,7 +43,7 @@ import com.sun.star.wizards.ui.TitlesComponent; public class QueryWizard extends DatabaseObjectWizard { - public static final String SFILLUPFIELDSLISTBOX = "fillUpFieldsListbox"; + private static final int SOFIELDSELECTION_PAGE = 1; private static final int SOSORTING_PAGE = 2; private static final int SOFILTER_PAGE = 3; diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 09c5f954ca17..169f66bdcd93 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -47,13 +47,13 @@ public class DBColumn private XCell xValCell; private XTextRange xValTextCell; private XTextCursor xValCellCursor; - public XNumberFormats xValCellNumberFormats; + public XCell xNameCell; private XTextRange xNameTextCell; private boolean bAlignLeft; - public Object DefaultValue; + private String CharFontName; - public int FormatKey; + private PropertyState PropertyState; public int ValColumn = 1; private int ValRow = 0; @@ -63,7 +63,7 @@ public class DBColumn private XCellRange xCellRange; public XNamed xTableName; private boolean bIsGroupColumn; - TextDocument oTextDocument; + private RecordParser CurDBMetaData; private RecordTable CurRecordTable; private TextTableHandler oTextTableHandler; diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 10e0aa372235..fc6dd01e7023 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -34,11 +34,11 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi // ReportTextDocument CurReportDocument; IReportDocument CurReportDocument; - static boolean bStopProcess; + private static String sProgressDBConnection; private static String sProgressDataImport; - private static String sProgressBaseCurRecord; - static String sProgressCurRecord; + + private static String sProgressTitle; private static String sStop; @@ -49,7 +49,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi sProgressDBConnection = m_oResource.getResText(UIConsts.RID_DB_COMMON + 34); sProgressDataImport = m_oResource.getResText(UIConsts.RID_REPORT + 67); sProgressTitle = m_oResource.getResText(UIConsts.RID_REPORT + 62); - sProgressBaseCurRecord = m_oResource.getResText(UIConsts.RID_REPORT + 63); sStop = m_oResource.getResText(UIConsts.RID_DB_COMMON + 21); } diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java index 14c9c6baa711..cd40a35e9980 100644 --- a/wizards/com/sun/star/wizards/report/RecordTable.java +++ b/wizards/com/sun/star/wizards/report/RecordTable.java @@ -33,14 +33,14 @@ import com.sun.star.wizards.text.ViewHandler; public class RecordTable { - String CurFieldName; - String LabelDescription; + + public XNamed xTableName; public XCellRange xCellRange; public XTextTable xTextTable; private TextTableHandler oTextTableHandler; public XTableColumns xTableColumns; - private XTableRows xTableRows; + public RecordTable(TextTableHandler _oTextTableHandler) { @@ -72,7 +72,7 @@ public class RecordTable xTableName = UnoRuntime.queryInterface(XNamed.class, xTextTable); xTableName.setName(ReportTextDocument.TBLRECORDSECTION); } - xTableRows = xTextTable.getRows(); + xTextTable.getRows(); xTableColumns = xTextTable.getColumns(); xCellRange = UnoRuntime.queryInterface(XCellRange.class, xTextTable); } diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 9f750692ec1c..68356b39d271 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -32,13 +32,12 @@ public class ReportFinalizer private WizardDialog CurUnoDialog; private XTextComponent xTitleTextBox; - XTextComponent[] xSaveTextBox = new XTextComponent[2]; - Object chkTemplate; + + private String CHANGEREPORTTITLE_FUNCNAME = "changeReportTitle"; private String TOGGLESUBTEMPLATECONTROLS_FUNCNAME = "toggleSubTemplateControls"; - String TemplatePath; private String StoreName; - boolean bfinalaskbeforeOverwrite; + private String DefaultName; private String OldDefaultName; private IReportDocument CurReportDocument; diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 599d376a18ed..475e2d554f19 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -37,7 +37,7 @@ public class ReportLayouter { private UnoDialog CurUnoDialog; - final int SOTXTTITLE = 28; + private final int SOCONTENTLST = 29; final static public int SOOPTLANDSCAPE = 30; final static public int SOOPTPORTRAIT = 31; diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 0cd7b9a5b102..73b249da895c 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -247,7 +247,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen Helper.setUnoPropertyValue(FirstPageStyle, SIZE, oNewSize); int iLeftMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin")); int iRightMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin")); - PageWidth = oNewSize.Width - iLeftMargin - iRightMargin; if (CurRecordTable != null) { CurRecordTable.adjustOptimalTableWidths(xMSF, oViewHandler); diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 1bb3cc93ac0e..74dcbebe16cd 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -127,19 +127,17 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme } private static String sMsgQueryCreationImpossible; private static String sReportFormNotExisting; - private static String sMsgHiddenControlMissing; + private static String sMsgEndAutopilot; - static String sMsgConnectionImpossible; - private static String sMsgNoConnection; - static String[] ReportMessages = new String[4]; + + + private void initialResources() { sReportFormNotExisting = m_resource.getResText(UIConsts.RID_REPORT + 64); sMsgQueryCreationImpossible = m_resource.getResText(UIConsts.RID_REPORT + 65); - sMsgHiddenControlMissing = m_resource.getResText(UIConsts.RID_REPORT + 66); sMsgEndAutopilot = m_resource.getResText(UIConsts.RID_DB_COMMON + 33); - sMsgNoConnection = m_resource.getResText(UIConsts.RID_DB_COMMON + 14); } private void addTextSectionCopies() diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index cbf4ee93d76b..82c8b53af8c2 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -33,8 +33,8 @@ public class DesignTemplate { private XReportDefinition m_xReportDefinition; - private XMultiServiceFactory m_xGlobalMSF; - private String m_sFilename; + + private DesignTemplate() { @@ -291,8 +291,6 @@ public class DesignTemplate private void load(XMultiServiceFactory _xMSF, String _sPath) throws com.sun.star.uno.Exception { - m_xGlobalMSF = _xMSF; - m_sFilename = _sPath; final Object aObj = _xMSF.createInstance("com.sun.star.report.ReportDefinition"); m_xReportDefinition = UnoRuntime.queryInterface(XReportDefinition.class, aObj); diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index bbc244a6e922..eff29ca31aa5 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -30,8 +30,8 @@ import com.sun.star.wizards.common.Configuration; public class CGCategory { - public String Name; - public int Index; + + private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; private XMultiServiceFactory xMSF; XNameAccess xNameAccessTablesNode; diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java index c86718cd5081..cf3fb17a49e3 100644 --- a/wizards/com/sun/star/wizards/table/CGTable.java +++ b/wizards/com/sun/star/wizards/table/CGTable.java @@ -29,8 +29,8 @@ public class CGTable private XMultiServiceFactory xMSF; XNameAccess xNameAccessFieldsNode; private XNameAccess xNameAccessTableNode; - public String Index; - public String Name; + + public CGTable(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index b7693a102f34..c0214cffe334 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -56,10 +56,8 @@ public class CallTableWizard { private PropertyValue[] m_wizardContext; - // <properties> - private String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.TABLE; - // </properties> + + /** The constructor of the inner class has a XMultiServiceFactory parameter. */ @@ -78,7 +76,7 @@ public class CallTableWizard if ( sEvent.equals(PropertyNames.START) ) { TableWizard CurTableWizard = new TableWizard( m_serviceFactory, m_wizardContext ); - Command = CurTableWizard.startTableWizard(); + CurTableWizard.startTableWizard(); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 6bbc1d0a74e3..da89154bf025 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -47,11 +47,11 @@ public class FieldFormatter implements XItemListener private XButton btnShiftUp; private XButton btnShiftDown; private short curtabindex; - String TOGGLEBUTTONS = "toggleButtons"; - String ADDFIELDNAME = "addFieldName"; - String REMOVEFIELDNAME = "removeFieldName"; + + + private String MODIFYFIELDNAME = "modifyFieldName"; - String[] fieldnames; + private String suntitled; private Integer IFieldFormatStep; diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 162edb2e3599..694418233e9e 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -34,7 +34,7 @@ public class Finalizer private short curtabindex; private XRadioButton optModifyTable; private XRadioButton optWorkWithTable; - private XRadioButton optStartFormWizard; + private XTextComponent txtTableName; private XListBox xCatalogListBox; private XListBox xSchemaListBox; @@ -239,7 +239,7 @@ public class Finalizer { UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 }); - optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null, + CurUnoDialog.insertRadioButton("optStartFormWizard", null, new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 9431b821872b..ea61d6757c0e 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -44,7 +44,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private ScenarioSelector curScenarioSelector; private FieldFormatter curFieldFormatter; private PrimaryKeyHandler curPrimaryKeyHandler; - private String sMsgWizardName = PropertyNames.EMPTY_STRING; + public HashMap<String, FieldDescription> fielditems; private int wizardmode; private String tablename; @@ -52,13 +52,12 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private String serrTableNameexists; private String scomposedtablename; private TableDescriptor curTableDescriptor; - public static final int SONULLPAGE = 0; + public static final int SOMAINPAGE = 1; public static final int SOFIELDSFORMATPAGE = 2; public static final int SOPRIMARYKEYPAGE = 3; public static final int SOFINALPAGE = 4; private String sMsgColumnAlreadyExists = PropertyNames.EMPTY_STRING; - String WizardHeaderText[] = new String[8]; private String m_tableName; @@ -389,7 +388,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener public boolean getTableResources() { - sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_TABLE + 1); slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19); slblSelFields = m_oResource.getResText(UIConsts.RID_TABLE + 25); serrToManyFields = m_oResource.getResText(UIConsts.RID_TABLE + 47); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 33739c56b1d5..7db7ea59a0d8 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -73,21 +73,21 @@ public class TextDocument public XComponent xComponent; public com.sun.star.text.XTextDocument xTextDocument; - public com.sun.star.util.XNumberFormats NumberFormats; + public com.sun.star.document.XDocumentProperties m_xDocProps; public com.sun.star.task.XStatusIndicator xProgressBar; public com.sun.star.frame.XFrame xFrame; public XText xText; public XMultiServiceFactory xMSFDoc; public XMultiServiceFactory xMSF; - private com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier; + public com.sun.star.awt.XWindowPeer xWindowPeer; - public int PageWidth; - public int ScaleWidth; - private Size DocSize; - public com.sun.star.awt.Rectangle PosSize; - private com.sun.star.lang.Locale CharLocale; - private XStorable xStorable; + + + + + + // creates an instance of TextDocument and creates a named frame. No document is actually loaded into this frame. public TextDocument(XMultiServiceFactory xMSF, XTerminateListener listener, String FrameName) @@ -207,11 +207,10 @@ public class TextDocument } xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); xText = xTextDocument.getText(); } @@ -219,11 +218,10 @@ public class TextDocument { xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow()); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); - xStorable = UnoRuntime.queryInterface(XStorable.class, xTextDocument); + UnoRuntime.queryInterface(XStorable.class, xTextDocument); xText = xTextDocument.getText(); } @@ -264,7 +262,6 @@ public class TextDocument } Object oDoc = OfficeDocument.load(xFrame, sDefaultTemplate, "_self", loadValues); xTextDocument = (com.sun.star.text.XTextDocument) oDoc; - DocSize = getPageSize(); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); ViewHandler myViewHandler = new ViewHandler(xTextDocument); @@ -318,11 +315,10 @@ public class TextDocument xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow); xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument); - xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); + UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument); m_xDocProps = xDocPropsSuppl.getDocumentProperties(); - CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale"); } public static XTextCursor createTextCursor(Object oCursorContainer) diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index ad6c2684b393..c04d3b513415 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -46,7 +46,7 @@ public class TextTableHandler public XTextTablesSupplier xTextTablesSupplier; private XMultiServiceFactory xMSFDoc; private XTextDocument xTextDocument; - private XSimpleText xSimpleText; + private NumberFormatter oNumberFormatter; private Locale aCharLocale; @@ -58,7 +58,7 @@ public class TextTableHandler this.xMSFDoc = xMSF; this.xTextDocument = xTextDocument; xTextTablesSupplier = UnoRuntime.queryInterface(XTextTablesSupplier.class, xTextDocument); - xSimpleText = UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText()); + UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText()); XNumberFormatsSupplier xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument); aCharLocale = (Locale) Helper.getUnoStructValue(xTextDocument, "CharLocale"); oNumberFormatter = new NumberFormatter(xNumberFormatsSupplier, aCharLocale); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index f6607f47df49..34e52a373bbe 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -44,28 +44,28 @@ public class AggregateComponent extends ControlScroller "SUM", "AVG", "MIN", "MAX" }; private QueryMetaData CurDBMetaData; - private XButton optDetailQuery; - private XButton optSummaryQuery; + + private String soptDetailQuery; private String soptSummaryQuery; private String slblAggregate; private String slblFieldNames; private String sDuplicateAggregateFunction; private int Count; - int iQueryType; + private final int SOADDROW = 1; private final int SOREMOVEROW = 2; - final int CONTROLROWDIST = 18; + private ArrayList<ControlRow> ControlRowVector; - String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent"; - String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent"; - String LISTBOXFUNCTIONS_ACTION_PERFORMED; - String LISTBOXFUNCTIONS_ITEM_CHANGED; - String LISTBOXFIELDNAMES_ACTION_PERFORMED; - String LISTBOXFIELDNAMES_ITEM_CHANGED; - String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow"; - String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow"; - ArrayList<String> ControlRows; + + + + + + + + + private int curHelpID; private int lastHelpIndex; @@ -78,7 +78,7 @@ public class AggregateComponent extends ControlScroller curHelpID = _firstHelpID; this.CurDBMetaData = _CurDBMetaData; Count = 1; - optDetailQuery = CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(), + CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(), new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH @@ -88,7 +88,7 @@ public class AggregateComponent extends ControlScroller 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) }); - optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), + CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index f15f7d26e4ba..d9e005043f8b 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -58,7 +58,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private int imageTextLines = 1; private boolean rowSelect = false; public int tabIndex; - public Boolean scaleImages = Boolean.TRUE; + private String m_aControlName = "il"; private int m_nCurrentSelection = -1; private int pageStart = 0; diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 171b642efd6e..b738b4af2d8e 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -28,7 +28,7 @@ public abstract class ControlScroller { protected WizardDialog CurUnoDialog; - private XMultiServiceFactory xMSF; + protected int ncurfieldcount; private int nblockincrement; private int nlineincrement; @@ -36,13 +36,13 @@ public abstract class ControlScroller private int ntotfieldcount; private XScrollBar xScrollBar; private ArrayList<PropertyValue[]> scrollfields; - private Integer ICompPosX; + protected int iCompPosX; - private Integer ICompPosY; + protected int iCompPosY; - private Integer ICompWidth; + protected int iCompWidth; - protected Integer ICompHeight; + protected int iCompHeight; private int iStartPosY; protected short curtabindex; @@ -54,7 +54,7 @@ public abstract class ControlScroller protected int curHelpIndex; private String sIncSuffix; protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>(); - protected PeerConfig oTitlePeerConfig; + private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { @@ -82,7 +82,6 @@ public abstract class ControlScroller // TODO add parameters for tabindices and helpindex protected ControlScroller(WizardDialog _CurUnoDialog, XMultiServiceFactory _xMSF, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _nblockincrement, int _nlinedistance, int _firsthelpindex) { - this.xMSF = _xMSF; this.nblockincrement = _nblockincrement; this.CurUnoDialog = _CurUnoDialog; this.iStep = _iStep; @@ -92,10 +91,7 @@ public abstract class ControlScroller IStep = new Integer(iStep); this.iCompPosX = _iCompPosX; this.iCompPosY = _iCompPosY; - this.ICompPosX = new Integer(iCompPosX); - this.ICompPosY = new Integer(iCompPosY); this.iCompWidth = _iCompWidth; - this.ICompWidth = new Integer(iCompWidth); this.iCompHeight = 2 * SORELFIRSTPOSY + nblockincrement * linedistance; iStartPosY = iCompPosY + SORELFIRSTPOSY; int ScrollHeight = iCompHeight - 2; diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index 2aad4c6706de..81119688b061 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -30,13 +30,13 @@ import com.sun.star.wizards.common.PropertyNames; public abstract class DBLimitedFieldSelection { - private XMultiServiceFactory xMSF; + protected WizardDialog CurUnoDialog; private String sNoField; protected Integer IStep; - private Integer ICompPosX; - private Integer ICompPosY; - private Integer ICompWidth; + + + protected final int rowcount = 4; private final int MAXSELINDEX = rowcount - 1; protected short curtabindex; @@ -47,15 +47,11 @@ public abstract class DBLimitedFieldSelection public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex) { this.CurUnoDialog = _CurUnoDialog; - xMSF = CurUnoDialog.xMSF; FirstHelpIndex = _FirstHelpIndex; curtabindex = (short) (iStep * 100); sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8); IStep = new Integer(iStep); iCompPosX = _iCompPosX; - ICompPosX = new Integer(iCompPosX); - ICompPosY = new Integer(iCompPosY); - ICompWidth = new Integer(iCompWidth); iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) { diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index cb3576413621..7a7047c44038 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -35,10 +35,10 @@ public class FieldSelection protected boolean AppendMode = false; protected Integer IStep; - private int CompPosX; + private int CompPosY; private int CompHeight; - private int CompWidth; + private XFieldSelectionListener xFieldSelection; private int maxfieldcount = 10000000; @@ -174,10 +174,8 @@ public class FieldSelection int ShiftButtonCount = 2; int a = 0; this.CurUnoDialog = CurUnoDialog; - this.CompPosX = CompPosX; this.CompPosY = CompPosY; this.CompHeight = CompHeight; - this.CompWidth = CompWidth; Object btnmoveall = null; Object btnremoveall = null; diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 2feef4716a77..7bfcc765fc6b 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -72,7 +72,7 @@ public class FilterComponent private int iTimeFormat; private PropertyValue[][] filterconditions; private short curtabindex; - private XMultiServiceFactory xMSF; + private final int SO_FIRSTFIELDNAME = 1; private final int SO_SECONDFIELDNAME = 2; private final int SO_THIRDFIELDNAME = 3; @@ -101,13 +101,8 @@ public class FilterComponent private final int SO_SECONDBOOLFIELDNAME = 256 + 2; private final int SO_THIRDBOOLFIELDNAME = 256 + 3; private final int SO_FOURTHBOOLFIELDNAME = 256 + 4; - int SO_BOOLEANLIST[] = - { - SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME - }; - final int SO_OPTQUERYMODE = 5; private int SOI_MATCHALL = 0; private int SOI_MATCHANY = 1; private int curHelpID; @@ -373,7 +368,6 @@ public class FilterComponent public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) { this.curHelpID = _firstHelpID; - this.xMSF = _xMSF; this.IStep = Integer.valueOf(iStep); curtabindex = UnoDialog.setInitialTabindex(iStep); diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index ffec486adc4a..67db72753d47 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -26,16 +26,16 @@ import java.util.ArrayList; public class SortingComponent { - private com.sun.star.lang.XMultiServiceFactory xMSF; + private WizardDialog CurUnoDialog; private int MaxSortIndex = -1; - public String[][] FieldNames; + private static String sNoSorting; private static String sSortCriteriaisduplicate; private static String[] sSortHeader = new String[4]; private static String[] sSortAscend = new String[4]; private static String[] sSortDescend = new String[4]; - static short[] bOldSortValues = new short[4]; + private int MAXSORTCRITERIAINDEX = 3; private final int SOFIRSTSORTLST = 0; private final int SOSECSORTLST = 1; @@ -69,7 +69,6 @@ public class SortingComponent { this.CurUnoDialog = CurUnoDialog; short curtabindex = UnoDialog.setInitialTabindex(iStep); - xMSF = CurUnoDialog.xMSF; Integer IStep = new Integer(iStep); Integer ICompPosX = new Integer(iCompPosX); Integer ICompWidth = new Integer(iCompWidth); diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 0b379f1ec637..4558077dfba7 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -34,7 +34,7 @@ public class TitlesComponent extends ControlScroller private String[] fieldnames; private Map<String, String> fieldtitleset; private String[] fieldtitles; - public XTextListener xTextListener; + private final String SOLABELPREFIX = "lblColumnName_"; private final String SOTITLEPREFIX = "lblTitleName_"; @@ -89,7 +89,7 @@ public class TitlesComponent extends ControlScroller private class ControlRow { - PropertyValue[] regproperties; + private XTextComponent xTextComponent; private ControlRow(int _index, int _iCompPosY) diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 8745987e875b..6f184f1cea30 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -50,7 +50,7 @@ public class UnoDialog implements EventNames public XComponent xComponent; public XInterface xDialogModel; private XInterface xUnoDialog; - private XPropertySet xPSetDlg; + private XVclWindowPeer xVclWindowPeer; public HashMap<String, Integer> ControlList; public Resource m_oResource; @@ -77,7 +77,7 @@ public class UnoDialog implements EventNames xControl = UnoRuntime.queryInterface(XControl.class, xUnoDialog); XControlModel xControlModel = UnoRuntime.queryInterface(XControlModel.class, xDialogModel); xControl.setModel(xControlModel); - xPSetDlg = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); + UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, xUnoDialog); xDlgNames = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel); xComponent = UnoRuntime.queryInterface(XComponent.class, xUnoDialog); diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index a927ebb39964..825eecba647d 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -48,13 +48,13 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private static final String FINISH_ACTION_PERFORMED = "finishWizard_1"; private static final String CANCEL_ACTION_PERFORMED = "cancelWizard_1"; private static final String HELP_ACTION_PERFORMED = "callHelp"; - public VetoableChangeSupport vetos = new VetoableChangeSupport(this); + private String[] sRightPaneHeaders; private int iButtonWidth = 50; private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; - protected XItemListener RoadmapItemListener; + private XControl xRoadmapControl; private XItemEventBroadcaster xRoadmapBroadcaster; private String[] sRMItemLabels; @@ -62,7 +62,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; private Resource oWizardResource; - private String sMsgEndAutopilot; + private int hid; private boolean bTerminateListenermustberemoved = true; @@ -80,7 +80,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL super(xMSF); hid = hid_; oWizardResource = new Resource(xMSF, "Common", "dbw"); - sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33); //new Resource(xMSF,"Common","com"); } diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index fbb733f522de..0cf0f17ef5fb 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -33,7 +33,7 @@ public interface EventNames public static final String EVENT_KEY_PRESSED = "KPR"; public static final String EVENT_KEY_RELEASED = "KRE"; //mouse events public static final String EVENT_MOUSE_PRESSED = "MPR"; - public static final String EVENT_MOUSE_RELEASED = "MRE"; + public static final String EVENT_MOUSE_ENTERED = "MEN"; public static final String EVENT_MOUSE_EXITED = "MEX"; //other events } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java index fa6828ae78e6..5e34469f9a49 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PalmDB.java @@ -65,8 +65,7 @@ import java.io.UnsupportedEncodingException; public final class PalmDB { - /* Backup attribute for a PDB. This corresponds to dmHdrAttrBackup. */ - public final static short PDB_HEADER_ATTR_BACKUP = 0x0008; + /** Number of bytes for the name field in the PDB. */ public final static int NAME_LENGTH = 32; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java index a8eef4a07816..6aae065380d4 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java @@ -52,11 +52,7 @@ public interface OfficeConstants { */ public final static String TAG_OFFICE_DOCUMENT_STYLES = "office:document-styles"; - /** - * Attribute tag for <i>office:class</i> of element - * <i>office:document</i>. - */ - public final static String ATTRIBUTE_OFFICE_CLASS = "office:class"; + /** Element tag for <i>office:styles</i>. */ public final static String TAG_OFFICE_STYLES = "office:styles"; @@ -86,8 +82,7 @@ public interface OfficeConstants { /** Element tag for <i>text:expression</i>. */ public final static String TAG_TEXT_EXPRESSION = "text:expression"; -/** Element tag for <i>text:user-field-get</i>. */ - public final static String TAG_TEXT_USER_FIELD_GET = "text:user-field-get"; + /** Element tag for <i>text:page-variable-get</i>. */ public final static String TAG_TEXT_PAGE_VARIABLE_GET = "text:page-variable-get"; @@ -99,23 +94,16 @@ public interface OfficeConstants { /** Element tag for <i>text:time</i>. */ public final static String TAG_TEXT_TIME = "text:time"; - /** Element tag for <i>text:page-count</i>. */ - public final static String TAG_TEXT_PAGE_COUNT = "text:page-count"; - /** Element tag for <i>text:page-number</i>. */ - public final static String TAG_TEXT_PAGE_NUMBER = "text:page-number"; - /** Element tag for <i>text:author-initials</i>. */ - public final static String TAG_TEXT_AUTHOR_INITIALS = "text:author-initials"; + + + /** Element tag for <i>text:subject</i>. */ public final static String TAG_TEXT_SUBJECT = "text:subject"; - /** Element tag for <i>text:title</i>. */ - public final static String TAG_TEXT_TITLE = "text:title"; - /** Element tag for <i>text:creation-time</i>. */ - public final static String TAG_TEXT_CREATION_TIME = "text:creation-time"; - /** Element tag for <i>text:date</i>. */ - public final static String TAG_TEXT_DATE = "text:date"; - /** Element tag for <i>text:text-input</i>. */ - public final static String TAG_TEXT_TEXT_INPUT = "text:text-input"; + + + + //end adding @@ -424,6 +412,5 @@ public interface OfficeConstants { /** StarMath XML MIME type. */ public final static String SXM_MIME_TYPE = "application/vnd.sun.xml.math"; - /** StarWriter Global XML MIME Type */ - public final static String SXG_MIME_TYPE = "application/vnd.sun.xml.writer.global"; + } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index 4de588c4e545..44eb33c3bdfc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -142,14 +142,10 @@ class alignment extends conversionAlgorithm { */ public class ParaStyle extends Style implements Cloneable { - /** The left margin property. */ - public static final int MARGIN_LEFT = 0; - /** The right margin property. */ - public static final int MARGIN_RIGHT = 1; - /** The top margin property. */ - public static final int MARGIN_TOP = 2; - /** The bottom margin property. */ - public static final int MARGIN_BOTTOM = 3; + + + + /** Indent left property. */ private static final int TEXT_INDENT = 4; /** Indent right property. */ @@ -200,8 +196,7 @@ public class ParaStyle extends Style implements Cloneable { /** Line height percentage. */ public static final int LH_PCT = 0x40000000; - /** Line height minimum value. */ - public static final int LH_ATLEAST = 0x20000000; + /** Line height mask. */ private static final int LH_VALUEMASK = 0x00FFFFFF; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index 2303bb3bb2c1..b04579bde788 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -35,7 +35,7 @@ import org.openoffice.xmerge.util.Debug; */ public class TextStyle extends Style implements Cloneable { - final protected static int FIRST_ATTR = 0x01; + /** Indicates <i>bold</i> text. */ final private static int BOLD = 0x01; /** Indicates <i>italic</i> text. */ @@ -48,8 +48,7 @@ public class TextStyle extends Style implements Cloneable { final private static int SUPERSCRIPT = 0x10; /** Indicates <i>subscripted</i> text. */ final private static int SUBSCRIPT = 0x20; - /** Indicates the last attribute. */ - final protected static int LAST_ATTR = 0x20; + /** Values of text attributes. */ private int values = 0; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java index eb50897291ed..c0925599d3ec 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java @@ -30,7 +30,7 @@ public class Format implements Cloneable { final public static int RIGHT_ALIGN = 0x01; final public static int CENTER_ALIGN = 0x02; final public static int LEFT_ALIGN = 0x03; - final public static int JUST_ALIGN = 0x04; + /** Vertical Alignment Constants. */ final public static int TOP_ALIGN = 0x01; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index 11f938bb41f2..23d6f794c6e1 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -46,7 +46,7 @@ public class SheetSettings implements OfficeConstants { private int posTop = 0; private int paneNumber = 2; - final public static int NONE = 0x00; + final private static int SPLIT = 0x01; final private static int FREEZE = 0x02; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java index a04f72c6a5d0..03722fb309ca 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java @@ -51,8 +51,7 @@ public final class Debug { /** To set a flag. */ private final static boolean SET = true; - /** To unset a flag. */ - public final static boolean UNSET = false; + private static int flags = 0; private static PrintWriter writer = null; |