[Libreoffice-commits] core.git: 5 commits - officecfg/registry starmath/source stoc/source
Thomas Arnhold
thomas at arnhold.org
Tue Apr 9 16:28:09 PDT 2013
officecfg/registry/schema/org/openoffice/Inet.xcs | 65 ---
officecfg/registry/schema/org/openoffice/Office/Java.xcs | 266 ---------------
officecfg/registry/schema/org/openoffice/Office/Math.xcs | 11
starmath/source/cfgitem.cxx | 2
stoc/source/javavm/javavm.cxx | 19 -
5 files changed, 1 insertion(+), 362 deletions(-)
New commits:
commit 1c86d43ca8bf6f1eac93791068ec016d5637efcd
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 10 01:25:35 2013 +0200
API CHANGE: cleanup of Math.xcs
Remove deprecated items. All are unused in the code.
since 2002 (ce44de00):
Misc/NoSymbolsWarning
Change-Id: I98c828c81315ecbfbaa09c2571582199d2f6e833
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 374b886..b494bd7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -318,17 +318,6 @@
<info>
<desc>Contains miscellaneous settings.</desc>
</info>
- <prop oor:name="NoSymbolsWarning" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: Math/Misc -->
- <!-- OldLocation: Soffice.cfg -->
- <!-- UIHints: - -->
- <info>
- <deprecated/>
- <desc>Specifies that, if true, a warning message is shown when the symbol file used by the formulas is missing.</desc>
- <label>Missing symbols warning.</label>
- </info>
- <value>true</value>
- </prop>
<prop oor:name="IgnoreSpacesRight" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: Math/Misc -->
<!-- OldLocation: Soffice.cfg -->
commit 074e27c1baeb632b09666bc17a7f7afbed7b7393
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 10 01:24:49 2013 +0200
remove commented out code
Change-Id: I754a34a88a7f976714827bd8e8986b854d5da692
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index e180fca..979ee43 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -98,7 +98,6 @@ static const char * aMathPropNames[] =
"Print/Size",
"Print/ZoomFactor",
"LoadSave/IsSaveOnlyUsedSymbols",
- //"Misc/NoSymbolsWarning", @deprecated
"Misc/IgnoreSpacesRight",
"View/ToolboxVisible",
"View/AutoRedraw",
@@ -193,7 +192,6 @@ struct SmCfgOther
bool bToolboxVisible;
bool bAutoRedraw;
bool bFormulaCursor;
- //sal_Bool bNoSymbolsWarning;
SmCfgOther();
};
commit 7c48a2a83f4a92200c7f2b0f259bf1684d253436
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 10 01:14:11 2013 +0200
API CHANGE: cleanup of Java.xcs
Remove deprecated items. All are unused in the code.
since 2002 (d8155fb9):
Install/AdditionalClasspath
Install/AdditionalSearchPath
Install/ExcludeVersion
Install/InstallationPackage
Install/PackageInstallationDirectory
Install/RequiredVersion
Install/Vendor
Install/VerifiedVersion
Install/Version
VirtualMachine/DebugPort
VirtualMachine/DisableAsyncGC
VirtualMachine/EnableClassGC
VirtualMachine/EnableVerboseGC
VirtualMachine/EnvironmentType
VirtualMachine/JavaLibPath
VirtualMachine/JavaStackSize
VirtualMachine/MaxHeapSize
VirtualMachine/MinHeapSize
VirtualMachine/NativeStackSize
VirtualMachine/RunTimeLib
VirtualMachine/SystemClassPath
VirtualMachine/VMType
VirtualMachine/Verbose
VirtualMachine/VerifyMode
Change-Id: Iefde5b6d4ff57dc708059681a247efa419c11013
diff --git a/officecfg/registry/schema/org/openoffice/Office/Java.xcs b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
index fe0dcfb..c7a3e9ca 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Java.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Java.xcs
@@ -46,26 +46,6 @@
</info>
<value>NULL</value>
</prop>
- <prop oor:name="RunTimeLib" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Specifies the JVM shared library that is used.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="SystemClassPath" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Contains jars of the Office installation and may also contain other jars or folders.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
<prop oor:name="Enable" oor:type="xs:boolean" oor:nillable="false">
<!-- OldPath: Java -->
<!-- OldLocation: java.ini -->
@@ -132,157 +112,6 @@
<desc> Indicates that JVM supports debugging.</desc>
</info>
</prop>
- <prop oor:name="DebugPort" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the port for debugging.</desc>
- </info>
- </prop>
- <prop oor:name="EnableVerboseGC" oor:type="xs:boolean">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Turns on verbose garbage collection.</desc>
- </info>
- </prop>
- <prop oor:name="Verbose" oor:type="xs:boolean">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Turns on verbose mode for Java execution.</desc>
- </info>
- </prop>
- <prop oor:name="NativeStackSize" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the native stack size.</desc>
- </info>
- </prop>
- <prop oor:name="JavaStackSize" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the Java stack size.</desc>
- </info>
- </prop>
- <prop oor:name="VerifyMode" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the verify mode.</desc>
- </info>
- <constraints>
- <enumeration oor:value="0">
- <info>
- <deprecated/>
- <desc>Verify mode 0</desc>
- </info>
- </enumeration>
- <enumeration oor:value="1">
- <info>
- <deprecated/>
- <desc>Verify mode 1</desc>
- </info>
- </enumeration>
- <enumeration oor:value="2">
- <info>
- <deprecated/>
- <desc>Verify mode 2</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- <prop oor:name="MinHeapSize" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the minimum size of the heap.</desc>
- </info>
- </prop>
- <prop oor:name="MaxHeapSize" oor:type="xs:int">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Determines the maximum size of the heap.</desc>
- </info>
- </prop>
- <prop oor:name="DisableAsyncGC" oor:type="xs:boolean">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Disables asynchronous garbage collection.</desc>
- </info>
- </prop>
- <prop oor:name="EnableClassGC" oor:type="xs:boolean">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Enables garbage collection.</desc>
- </info>
- </prop>
- <prop oor:name="VMType" oor:type="xs:string">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Specifies values for different VM types.</desc>
- </info>
- <constraints>
- <enumeration oor:value="Classic">
- <info>
- <desc>Classic VM</desc>
- </info>
- </enumeration>
- <enumeration oor:value="Hotspot">
- <info>
- <desc>Hotspot VM</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- <prop oor:name="EnvironmentType" oor:type="xs:string">
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Indicates if a JRE or SDK is used.</desc>
- </info>
- <constraints>
- <enumeration oor:value="JDK">
- <info>
- <desc>JDKxxx or j2sdkxxx</desc>
- </info>
- </enumeration>
- <enumeration oor:value="JRE">
- <info>
- <desc>JRExxx</desc>
- </info>
- </enumeration>
- </constraints>
- </prop>
- <prop oor:name="JavaLibPath" oor:type="xs:string" oor:nillable="false">
- <!-- Platform: UNIX -->
- <!-- OldPath: Java -->
- <!-- OldLocation: java.ini -->
- <info>
- <deprecated/>
- <desc>Contains directories which contain shared libraries that are used by the Java runtime library.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
<prop oor:name="Properties" oor:type="oor:string-list">
<!-- OldPath: Java -->
<!-- OldLocation: java.ini -->
@@ -292,101 +121,6 @@
</info>
</prop>
</group>
- <group oor:name="Install">
- <info>
- <deprecated/>
- <desc>Provides information which are used by jvmsetup. </desc>
- </info>
- <prop oor:name="PackageInstallationDirectory" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Specifies the name of the folder that will contain the JRE installation (depends on the JRE package).</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="VerifiedVersion" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Contains a space separated list of verified Java versions.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="Version" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Specifies the version of the JRE which is provided by the setup.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="Vendor" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Specifies the vendor of the JRE package.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="RequiredVersion" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Specifies that all Java installations with a lower version will be ignored by the Java setup (jvmsetup.exe).</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="InstallationPackage" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Specifies the JRE package which can be installed during the Java setup.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="ExcludeVersion" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Contains a space separated list of Java versions which should be ignored by the Java setup (jvmsetup.exe).</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="AdditionalSearchPath" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Locates resources.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="AdditionalClasspath" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Install -->
- <!-- OldLocation: java.ini -->
- <info>
- <desc>Contains the Office's jar files. The Java setup uses it to form the SystemClasspath.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- </group>
</component>
</oor:component-schema>
-
-
-
-
-
-
-
-
commit ad8ca80c42d2e2b8996d3cf528183710e8ea3395
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 10 00:56:25 2013 +0200
API CHANGE: cleanup of Inet.xcs
Remove deprecated items. All are unused in the code.
since 2002 (4f36fcfa):
Settings/ooInetDNSServer
Settings/ooInetSOCKSProxyName
Settings/ooInetSOCKSProxyPort
Change-Id: I79cd561d1e94e14bf7730f70eac1c08bbc8fe7e4
diff --git a/officecfg/registry/schema/org/openoffice/Inet.xcs b/officecfg/registry/schema/org/openoffice/Inet.xcs
index 2d05763..14abf18 100644
--- a/officecfg/registry/schema/org/openoffice/Inet.xcs
+++ b/officecfg/registry/schema/org/openoffice/Inet.xcs
@@ -25,17 +25,6 @@
<info>
<desc>Contains Internet-related configurations (servers, proxies, etc.).</desc>
</info>
- <prop oor:name="ooInetDNSServer" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Inet/DNS -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools - Options - Internet - Protocol -->
- <info>
- <deprecated/>
- <desc>Specifies the IP address of the DNS server. If the string is empty, the DNS server will be specified automatically.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
<prop oor:name="ooInetNoProxy" oor:type="xs:string" oor:nillable="false">
<!-- OldPath: Inet/NoProxy -->
<!-- OldLocation: soffice.ini -->
@@ -161,61 +150,7 @@
</maxInclusive>
</constraints>
</prop>
- <prop oor:name="ooInetSOCKSProxyName" oor:type="xs:string" oor:nillable="false">
- <!-- OldPath: Inet/SOCKSProxyName -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools Options Internet Proxy -->
- <info>
- <deprecated/>
- <desc>Specifies the name of the Socks proxy server.</desc>
- </info>
- <value/>
- <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->
- </prop>
- <prop oor:name="ooInetSOCKSProxyPort" oor:type="xs:int">
- <!-- OldPath: Inet/SOCKSProxyPort -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools Options Internet Proxy -->
- <info>
- <deprecated/>
- <desc>Specifies the port of the Socks proxy server.</desc>
- </info>
- <constraints>
- <minInclusive oor:value="0">
- <info>
- <desc>Specifies the minimum allowed port number.</desc>
- </info>
- </minInclusive>
- <maxInclusive oor:value="65535">
- <info>
- <desc>Specifies the maximum allowed port number.</desc>
- </info>
- </maxInclusive>
- </constraints>
- </prop>
</group>
</component>
</oor:component-schema>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
commit 20a4cbc6c3d143d2c005475237018e1a00b9ea53
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Apr 10 00:56:13 2013 +0200
remove commented out code
Change-Id: Ia79f094e33435386aeaf59929edb4372b38adb22
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 2600f94..584a8ae 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -358,24 +358,7 @@ void getINetPropsFromConfig(stoc_javavm::JVM * pjvm,
pjvm->pushProp(httpNonProxyHosts);
pjvm->pushProp(ftpNonProxyHosts);
}
-
- // read socks settings
-/* Reference<XRegistryKey> socksProxy_name = xRegistryRootKey->openKey("Settings/ooInetSOCKSProxyName");
- if (socksProxy_name.is() && httpProxy_name->getStringValue().getLength()) {
- OUString socksHost = "socksProxyHost=";
- socksHost += socksProxy_name->getStringValue();
-
- // read http proxy port
- Reference<XRegistryKey> socksProxy_port = xRegistryRootKey->openKey("Settings/ooInetSOCKSProxyPort");
- if (socksProxy_port.is() && socksProxy_port->getLongValue()) {
- OUString socksPort = "socksProxyPort=";
- socksPort += OUString::valueOf(socksProxy_port->getLongValue());
-
- pjvm->pushProp(socksHost);
- pjvm->pushProp(socksPort);
- }
- }
-*/ }
+ }
xConfRegistry_simple->close();
}
More information about the Libreoffice-commits
mailing list