[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 47 commits - comphelper/source connectivity/com connectivity/java connectivity/prj connectivity/source cui/source default_images/introabout expat/expat-2.2.0.patch expat/expat-2.2.3.patch expat/expat-winapi.patch expat/makefile.mk expat/prj extensions.lst external_deps.lst external/msvcp100 external/unowinreg external/vcredist filter/qa filter/source framework/source instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/util javaunohelper/com jurt/com jvmfwk/plugins NOTICE nss/readme.txt offapi/com ooo_custom_images/dev ooo_custom_images/dev_nologo ooo_custom_images/nologo postprocess/packcomponents postprocess/packregistry postprocess/rebase README redland/raptor scp2/source sd/source set_soenv.in setup_native/source sfx2/source solenv/bin solenv/gbuild source_soenv.sh svx/source xmlscript/source
Damjan Jovanovic
damjan at apache.org
Wed Aug 16 18:12:36 UTC 2017
NOTICE | 28
README | 10
comphelper/source/container/enumhelper.cxx | 13
connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 61
connectivity/java/sdbc_hsqldb/build.xml | 239 ++
connectivity/java/sdbc_hsqldb/makefile.mk | 40
connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java | 2
connectivity/prj/build.lst | 5
connectivity/prj/d.lst | 3
connectivity/source/drivers/kab/KCatalog.cxx | 120 -
connectivity/source/drivers/kab/KCatalog.hxx | 60
connectivity/source/drivers/kab/KColumns.cxx | 94
connectivity/source/drivers/kab/KColumns.hxx | 50
connectivity/source/drivers/kab/KConnection.cxx | 324 ---
connectivity/source/drivers/kab/KConnection.hxx | 135 -
connectivity/source/drivers/kab/KDEInit.cxx | 151 -
connectivity/source/drivers/kab/KDEInit.h | 40
connectivity/source/drivers/kab/KDatabaseMetaData.cxx | 1076 ----------
connectivity/source/drivers/kab/KDatabaseMetaData.hxx | 209 -
connectivity/source/drivers/kab/KDriver.cxx | 469 ----
connectivity/source/drivers/kab/KDriver.hxx | 219 --
connectivity/source/drivers/kab/KPreparedStatement.cxx | 386 ---
connectivity/source/drivers/kab/KPreparedStatement.hxx | 115 -
connectivity/source/drivers/kab/KResultSet.cxx | 983 ---------
connectivity/source/drivers/kab/KResultSet.hxx | 220 --
connectivity/source/drivers/kab/KResultSetMetaData.cxx | 183 -
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 88
connectivity/source/drivers/kab/KServices.cxx | 121 -
connectivity/source/drivers/kab/KStatement.cxx | 580 -----
connectivity/source/drivers/kab/KStatement.hxx | 168 -
connectivity/source/drivers/kab/KTable.cxx | 92
connectivity/source/drivers/kab/KTable.hxx | 64
connectivity/source/drivers/kab/KTables.cxx | 86
connectivity/source/drivers/kab/KTables.hxx | 57
connectivity/source/drivers/kab/exports.dxp | 2
connectivity/source/drivers/kab/kab.xcu | 42
connectivity/source/drivers/kab/kab.xml | 99
connectivity/source/drivers/kab/kab1.component | 30
connectivity/source/drivers/kab/kcondition.cxx | 225 --
connectivity/source/drivers/kab/kcondition.hxx | 158 -
connectivity/source/drivers/kab/kfields.cxx | 90
connectivity/source/drivers/kab/kfields.hxx | 43
connectivity/source/drivers/kab/korder.cxx | 84
connectivity/source/drivers/kab/korder.hxx | 70
connectivity/source/drivers/kab/makefile.mk | 144 -
cui/source/dialogs/about.src | 2
default_images/introabout/beta/intro.png |binary
default_images/introabout/intro.png |binary
default_images/introabout/logo.png |binary
expat/expat-2.2.3.patch | 59
expat/expat-winapi.patch | 6
expat/makefile.mk | 4
expat/prj/d.lst | 4
extensions.lst | 4
external/msvcp100/README_msvcX100.dll.txt | 2
external/unowinreg/README | 2
external/vcredist/README | 4
external_deps.lst | 29
filter/qa/complex/filter/detection/typeDetection/files.csv | 1
filter/source/config/fragments/filters/writer_MIZI_Hwp_97.xcu | 34
filter/source/config/fragments/types/writer_MIZI_Hwp_97.xcu | 33
framework/source/fwi/jobs/configaccess.cxx | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 168 -
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 15
instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf | 6
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 96
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 92
instsetoo_native/util/openoffice.lst | 48
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java | 41
javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 22
jurt/com/sun/star/uno/AnyConverter.java | 5
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 2
nss/readme.txt | 2
offapi/com/sun/star/sdbc/SQLException.idl | 2
ooo_custom_images/dev/introabout/intro.png |binary
ooo_custom_images/dev_nologo/introabout/intro.png |binary
ooo_custom_images/nologo/introabout/intro.png |binary
postprocess/packcomponents/makefile.mk | 4
postprocess/packregistry/makefile.mk | 3
postprocess/rebase/coffbase.txt | 1
redland/raptor/makefile.mk | 2
scp2/source/ooo/file_library_ooo.scp | 17
scp2/source/ooo/makefile.mk | 4
scp2/source/ooo/module_langpack.ulf | 12
scp2/source/supported_extensions.txt | 1
scp2/source/writer/registryitem_writer.scp | 9
sd/source/ui/dlg/custsdlg.src | 20
set_soenv.in | 9
setup_native/source/mac/ooo3_installer.icns |binary
setup_native/source/mac/ooo3_installer_bak.icns |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
setup_native/source/win32/nsis/ooosetup.ico |binary
sfx2/source/doc/objxtor.cxx | 14
solenv/bin/modules/installer/download.pm | 44
solenv/gbuild/processdeps.awk | 1
source_soenv.sh | 2
svx/source/items/svxerr.src | 2
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2
102 files changed, 650 insertions(+), 7660 deletions(-)
New commits:
commit ecd7e16c6d6277530879ed11e752d000248c56c7
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Aug 16 16:26:08 2017 +0000
Remove some incorrect API documentation for the
com.sun.star.sdbc.SQLException ErrorCode field.
Patch by: me
diff --git a/offapi/com/sun/star/sdbc/SQLException.idl b/offapi/com/sun/star/sdbc/SQLException.idl
index 37ea928950da..cf320bbe4749 100644
--- a/offapi/com/sun/star/sdbc/SQLException.idl
+++ b/offapi/com/sun/star/sdbc/SQLException.idl
@@ -56,8 +56,6 @@ published exception SQLException: com::sun::star::uno::Exception
/** returns an integer error code that is specific to each vendor. Normally this will
be the actual error code returned by the underlying database.
- A chain to the next Exception. This can be used to provide additional
- error information.
*/
long ErrorCode;
commit 4f33f6d577c3497147b7e790c8f623137252e311
Author: Don Lewis <truckman at apache.org>
Date: Wed Aug 16 15:25:38 2017 +0000
Fix the Windows 64bit shell extension build breakage caused by expat-2.2.3.
The 64 bit expat libraries also need to include loadlibrary.obj.
diff --git a/expat/expat-2.2.3.patch b/expat/expat-2.2.3.patch
index 4192cae467bc..2453518b6958 100644
--- a/expat/expat-2.2.3.patch
+++ b/expat/expat-2.2.3.patch
@@ -1,6 +1,6 @@
--- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,85 @@
+@@ -1 +1,91 @@
-dummy
+#**************************************************************
+#
@@ -72,13 +72,19 @@
+# use UNICODE only because shell/shlxthandler
+# doesn't link against ascii_expat_xmlparse
+#---------------------------------------------------------
++.IF "$(OS)"=="WNT"
++ LOADLIBOBJFILE_X64=$(SLO_X64)/loadlibrary.obj
++.ELSE
++ LOADLIBOBJFILE_X64=
++.ENDIF
+SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
+ $(SLO_X64)$/xmlrole.obj \
-+ $(SLO_X64)$/xmltok.obj
++ $(SLO_X64)$/xmltok.obj \
++ $(LOADLIBOBJFILE_X64)
+CDEFS_X64+=-DXML_UNICODE -DWIN32
+CFLAGS_X64+=-I..
+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
-+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj $(LOADLIBOBJFILE_X64)
+LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
+LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
+.ENDIF # "$(BUILD_X64)"!=""
commit f92c8cb3120b632412a0c3a06ad7ac267df15509
Author: Jim Jagielski <jim at apache.org>
Date: Tue Aug 15 15:19:50 2017 +0000
Get compiling/building again on osx/macos
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 50ddfff5e5b7..ed221e7d5ea5 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -140,7 +140,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
OUT2INC+=src/raptor.h src/raptor2.h src/raptor_config.h
.IF "$(OS)"=="MACOSX"
-OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
+OUT2LIB+=src$/.libs$/libraptor2.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor2.dylib
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
commit 10810253c9c0ab4721f398051ed5e29d916a5186
Author: Jim Jagielski <jim at apache.org>
Date: Tue Aug 15 11:51:00 2017 +0000
macOS fixes... Source the correct file and allow for macOS XCode8 SDK
diff --git a/source_soenv.sh b/source_soenv.sh
index 43ed8e1c434c..6f942207f70b 100644
--- a/source_soenv.sh
+++ b/source_soenv.sh
@@ -106,7 +106,7 @@ else
;;
# the result here (whether you get x86_64) seems to depend on $CC...
i[3456]86-*-darwin*|x86_64-*-darwin*)
- . ./MacOSXX86Env.Set.sh
+ . ./MacOSXX64Env.Set.sh
;;
powerpc-*-darwin*)
. ./MacOSXPPCEnv.Set.sh
commit 1ee80c7ffc614e3d09d158cbf06af52340556a32
Author: Don Lewis <truckman at apache.org>
Date: Tue Aug 15 09:16:55 2017 +0000
Strip carriage return characters from the output of MSVC in "make depend"
mode so that these characters don't get appended to the file names in
the dependency files. This breaks all the gbuild modules because gmake
thinks the file names have ^M appended to them and can't find them.
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
index af92e2640e08..a536c8b0351b 100644
--- a/solenv/gbuild/processdeps.awk
+++ b/solenv/gbuild/processdeps.awk
@@ -40,6 +40,7 @@
function mangle_path(path) {
gsub("\\\\", "/", path);
+ gsub("\r", "", path);
if( path ~ /^[a-zA-Z]:/ )
path = tolower(substr(path,0,1)) substr(path,2);
gsub(WORKDIR, "$(WORKDIR)/", path);
commit 4bbb85b0fc9adb175fe67ebc6f1c9ed460384fe9
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Aug 9 17:43:42 2017 +0000
Write a main/ant.properties file from main/set_soenv, which can be used in
Ant projects to work out settings, locations, and paths to dependencies
without getting them from a parent build tool (dmake/gbuild), which allows
Ant projects to build by themselves, independently of AOO, and allows them
to be cleanly opened in (at least) Eclipse.
Also port main/connectivity's sdbc_hsqldb.jar to use these changes.
Patch by: me
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
deleted file mode 100644
index 0b8b0941fb8e..000000000000
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = connectivity
-PACKAGE = com$/sun$/star$/sdbcx$/comp$/hsqldb
-TARGET = sdbc_hsqldb
-
-SECONDARY_PACKAGE = org$/hsqldb$/lib
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-# --- Files --------------------------------------------------------
-
-
-.IF "$(SYSTEM_HSQLDB)" == "YES"
-EXTRAJARFILES = $(HSQLDB_JAR)
-.ELSE
-JARFILES = hsqldb.jar
-.ENDIF
-
-JAVAFILES =\
- NativeInputStreamHelper.java\
- NativeOutputStreamHelper.java\
- NativeStorageAccess.java\
- StorageAccess.java\
- StorageFileAccess.java\
- StorageNativeInputStream.java\
- StorageNativeOutputStream.java\
- FileSystemRuntimeException.java\
- NativeLibraries.java
-
-JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-JARCOMPRESS = TRUE
-JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE)
-JARTARGET = $(TARGET).jar
-JARCLASSPATH = $(JARFILES) $(EXTRAJARFILES) ..
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
diff --git a/connectivity/java/sdbc_hsqldb/build.xml b/connectivity/java/sdbc_hsqldb/build.xml
new file mode 100644
index 000000000000..799ec87cd13a
--- /dev/null
+++ b/connectivity/java/sdbc_hsqldb/build.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+<project name="sdbc_hsqldb" default="main" basedir=".">
+
+ <!-- ================================================================= -->
+ <!-- settings -->
+ <!-- ================================================================= -->
+
+ <!-- global properties -->
+ <property file="../../../ant.properties"/>
+ <!-- version info -->
+ <property file="../../../solenv/inc/minor.mk"/>
+
+ <!-- name of this sub target used in recursive builds -->
+ <property name="target" value="sdbc_hsqldb"/>
+
+ <!-- name of jar file created, without .jar extension -->
+ <property name="jarname" value="sdbc_hsqldb"/>
+
+ <!-- relative path to project directory -->
+ <property name="prj" value="../.."/>
+
+ <!-- build output directory -->
+ <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
+ <condition property="out" value="${prj}/${OUTPATH}.cap">
+ <isset property="${profile}"/>
+ </condition>
+ <condition property="out" value="${prj}/${OUTPATH}.pro">
+ <isset property="${PRODUCT}"/>
+ </condition>
+ <property name="out" value="${prj}/${OUTPATH}"/>
+
+ <!-- build directories -->
+ <property name="build.dir" value="${out}"/>
+ <property name="build.class" value="${build.dir}/class/${target}"/>
+ <property name="build.misc" value="${build.dir}/misc/${target}"/>
+
+ <!-- start of java source code package structure -->
+ <property name="java.dir" value="src"/>
+
+ <!-- define how to handle CLASSPATH environment -->
+ <property name="build.sysclasspath" value="ignore"/>
+
+ <!-- classpath settings for compile and javadoc tasks -->
+ <condition property="jar-class-path" value="${HSQLDB_JAR}" else="hsqldb.jar">
+ <equals arg1="${SYSTEM_HSQLDB}" arg2="YES"/>
+ </condition>
+ <property name="HSQLDB_JAR" value="${OUTDIR}/bin/hsqldb.jar"/>
+ <path id="classpath">
+ <!-- 3rd party libs -->
+ <pathelement location="${HSQLDB_JAR}"/>
+ </path>
+
+ <!-- name to display in documentation -->
+ <property name="docname" value="sdbc_hsqldb"/>
+
+ <!-- set "modern" java compiler -->
+ <property name="build.compiler" value="modern"/>
+
+ <!-- set wether we want to compile with debug information -->
+ <property name="debug" value="on"/>
+
+ <!-- set wether we want to compile with optimisation -->
+ <property name="optimize" value="off"/>
+
+ <!-- set wether we want to compile with or without deprecation -->
+ <property name="deprecation" value="on"/>
+
+ <target name="info">
+ <echo message="--------------------"/>
+ <echo message="${target}"/>
+ <echo message="--------------------"/>
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- custom targets -->
+ <!-- ================================================================= -->
+
+ <!-- the main target, called in recursive builds -->
+ <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
+
+ <!-- prepare output directories -->
+ <target name="prepare">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/doc/${target}"/>
+ <mkdir dir="${build.class}"/>
+ <mkdir dir="${build.misc}"/>
+ </target>
+
+
+ <target name="res" depends="prepare">
+ <copy todir="${build.class}">
+ <fileset dir="${java.dir}">
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+
+ </fileset>
+ </copy>
+ </target>
+
+
+ <target name="compile" depends="prepare,res">
+ <javac destdir="${build.class}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ optimize="${optimize}"
+ classpathref="classpath">
+ <src path="${java.dir}"/>
+ <include name="**/*.java"/>
+ </javac>
+ </target>
+
+ <!-- check if javadoc is up to date -->
+ <target name="javadoc_check" depends="prepare" if="build.dir">
+ <uptodate property="javadocBuild.notRequired" value="true"
+ targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
+ <srcfiles dir="${java.dir}" includes="**/*.java"/>
+ </uptodate>
+ </target>
+
+ <!-- generate java documentation -->
+ <target name="javadoc" depends="prepare,javadoc_check,compile"
+ unless="javadocBuild.notRequired"
+ if="build.dir">
+
+ <javadoc destdir="${build.dir}/doc/${target}/javadoc"
+ verbose="false"
+ author="false"
+ nodeprecated="true"
+ nodeprecatedlist="true"
+ use="true"
+ Doctitle="${docname}"
+ windowtitle="${docname}"
+ classpathref="classpath">
+
+ <packageset dir="${java.dir}" defaultexcludes="yes">
+ <include name="com/**"/>
+ <include name="org/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
+ packagelistLoc="${common.doc}/jdk1.4.2"/>
+ <link offline="true"
+ href="http://java.sun.com/products/servlet/2.3/javadoc"
+ packagelistLoc="${common.doc}/servlet2.3"/>
+ <link offline="true"
+ href="http://logging.apache.org/log4j/docs/api"
+ packagelistLoc="${common.doc}/log4j-1.2.8"/>
+ <link offline="true"
+ href="http://java.sun.com/products/javabeans/glasgow/javadocs"
+ packagelistLoc="${common.doc}/jaf-1.0.2"/>
+ <link offline="true"
+ href="http://java.sun.com/products/javamail/javadocs"
+ packagelistLoc="${common.doc}/javamail-1.3.1"/>
+ <link offline="true"
+ href="http://ws.apache.org/soap/docs"
+ packagelistLoc="${common.doc}/soap-2.3.1"/>
+
+ <bottom><i>Copyright © 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
+ <header>${docname}</header>
+
+ </javadoc>
+ </target>
+
+ <!-- zip documentation and store in build/doc/${target} -->
+ <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
+ <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
+ basedir="${build.dir}/doc/${target}/javadoc"
+ update="true"/>
+ </target>
+
+ <!-- clean up -->
+ <target name="clean" depends="prepare">
+ <delete dir="${build.class}" includeEmptyDirs="true"/>
+ <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
+ </target>
+
+ <!-- create jar file -->
+ <target name="jar" depends="prepare,compile" if="build.class">
+ <jar jarfile="${build.class}/${jarname}.jar"
+ basedir="${build.class}">
+ <manifest>
+ <attribute name="Class-Path" value="${jar-class-path} .."/>
+ <attribute name="Solar-Version" value="${RSCREVISION}"/>
+ </manifest>
+ <include name="**/*.class"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.form"/>
+ <include name="**/*.gif "/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.js"/>
+ <include name="**/*.mod"/>
+ <include name="**/*.sql"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.map"/>
+ </jar>
+ </target>
+
+ <target name="test" depends="prepare">
+ </target>
+
+</project>
+
diff --git a/connectivity/java/sdbc_hsqldb/makefile.mk b/connectivity/java/sdbc_hsqldb/makefile.mk
new file mode 100644
index 000000000000..a8027ba07bc7
--- /dev/null
+++ b/connectivity/java/sdbc_hsqldb/makefile.mk
@@ -0,0 +1,39 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..$/..
+PRJNAME=connectivity
+TARGET=sdbc_hsqldb
+
+.INCLUDE : ant.mk
+
+.IF defined(debug) || defined(DEBUG)
+ANTDEBUG=true
+.ELSE
+ANTDEBUG=off
+.ENDIF
+
+ANT_FLAGS+=-Dantdebug=$(ANTDEBUG)
+
+ALLTAR: ANTBUILD
+
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
similarity index 99%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
rename to connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
index 8e6acea92bc0..db9371d7efb9 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
+++ b/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
@@ -154,7 +154,7 @@ public class StorageNativeOutputStream {
* be flushed (for example, by invoking
* OutputStream.flush) before that data will be affected by sync.
*
- * @exception IOException
+ * @exception java.io.IOException
* Thrown when the buffers cannot be flushed,
* or because the system cannot guarantee that all the
* buffers have been synchronized with physical media.
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java b/connectivity/java/sdbc_hsqldb/src/org/hsqldb/lib/FileSystemRuntimeException.java
similarity index 100%
rename from connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException.java
rename to connectivity/java/sdbc_hsqldb/src/org/hsqldb/lib/FileSystemRuntimeException.java
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index ea4cd82f912e..a16d486d3358 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,7 +1,7 @@
cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\inc nmake - all cn_inc NULL
-cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
+cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_inc NULL
cn connectivity\source\manager nmake - all cn_manager cn_dbtools cn_inc NULL
cn connectivity\source\cpool nmake - all cn_cpool cn_dbtools cn_inc NULL
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index b5ba2733baed..394bba416eba 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -20,6 +20,7 @@
..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
+..\%__SRC%\class\sdbc_hsqldb\*.jar %_DEST%\bin%_EXT%\*.jar
mkdir: %_DEST%\inc%_EXT%\connectivity
mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
diff --git a/set_soenv.in b/set_soenv.in
index 1f5ae9db8d98..b7184d24e313 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1536,6 +1536,9 @@ if(defined($outfile_bat))
die "Cannot open $outfile_bat: $!\n";
}
+open( OUT_PROPS, ">ant.properties" ) ||
+ die "Cannot open ant.properties: $!\n";
+
#
#------------------------------------------
# VII. Writing the data to the output file.
@@ -2099,6 +2102,7 @@ if(defined($outfile_bat))
#---------------------------
#
close( OUT_SH ) || print "Can't close $outfile_sh: $!";
+close( OUT_PROPS ) || print "Can't close ant.properties: $!";
if( defined($outfile_bat))
{ close( OUT_BAT ) || print "Can't close $outfile_bat: $!";
@@ -2303,6 +2307,9 @@ sub ToFile {
$envvar =~ s/\\/\\\\/g;
$envvarbash = $envvar;
+ my $antvar = $envvarbash;
+ $antvar =~ s/(\$\{?\w+\}?)/$1/eeg ;
+
if ($platform =~ m/os2/) {
# expand the variables
$envvar =~ s/(\$\{?\w+\}?)/$1/eeg ;
@@ -2316,6 +2323,7 @@ sub ToFile {
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar);
print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file
+ print OUT_PROPS "$_[ 0 ]=$antvar$newline"; # to Ant properties file
if(defined($outfile_bat)) {
print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ]$newline";
commit ee263d67004fc478c82d4476dfaec599e8ea4cf9
Author: Don Lewis <truckman at apache.org>
Date: Sat Aug 5 17:35:57 2017 +0000
Unbreak build on Windows where the xmlparse libraries require an
additional object file, loadlibrary.obj.
diff --git a/expat/expat-2.2.3.patch b/expat/expat-2.2.3.patch
index 1afb2b75a4c6..4192cae467bc 100644
--- a/expat/expat-2.2.3.patch
+++ b/expat/expat-2.2.3.patch
@@ -1,6 +1,6 @@
--- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008
+++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008
-@@ -1 +1,83 @@
+@@ -1 +1,85 @@
-dummy
+#**************************************************************
+#
@@ -45,21 +45,23 @@
+CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY
+.ENDIF # "$(OS)"=="MACOSX"
+
-+SLOFILES=$(SLO)$/xmlparse.obj \
-+ $(SLO)$/xmlrole.obj \
-+ $(SLO)$/xmltok.obj
-+
+SECOND_BUILD=UNICODE
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
+UNICODECDEFS+=-DXML_UNICODE
+
++.IF "$(OS)"=="WNT"
++ LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
++.ELSE
++ LOADLIBOBJFILE=
++.ENDIF
++
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
-+LIB1OBJFILES=$(SLO)$/xmlparse.obj
++LIB1OBJFILES=$(SLO)$/xmlparse.obj $(LOADLIBOBJFILE)
+
+LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
+LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
-+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) $(LOADLIBOBJFILE)
+
+LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
+LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
commit ce17156eca18958638d1939da0b99a396b23f333
Author: Matthias Seidel <mseidel at apache.org>
Date: Sat Aug 5 09:27:33 2017 +0000
Added more statements for nsis languages, reordered
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4a47ea77d9fa..788e04d0621f 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1175,8 +1175,11 @@ sub nsis_language_converter
# are needed in the NSIS environment.
# Directory: <NSIS-Dir>/Contrib/Language files
if ( $language eq "en-US" ) { $nsislanguage = "English"; }
+ elsif ( $language eq "af" ) { $nsislanguage = "Afrikaans"; }
elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
+ elsif ( $language eq "hy" ) { $nsislanguage = "Armenian"; }
+ elsif ( $language eq "ast" ) { $nsislanguage = "Asturian"; }
elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
elsif ( $language eq "bg" ) { $nsislanguage = "Bulgarian"; }
elsif ( $language eq "ca" ) { $nsislanguage = "Catalan"; }
@@ -1184,45 +1187,50 @@ sub nsis_language_converter
elsif ( $language eq "cs" ) { $nsislanguage = "Czech"; }
elsif ( $language eq "da" ) { $nsislanguage = "Danish"; }
elsif ( $language eq "nl" ) { $nsislanguage = "Dutch"; }
- elsif ( $language eq "de" ) { $nsislanguage = "German"; }
- elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
+ elsif ( $language eq "en-GB" ) { $nsislanguage = "English"; }
elsif ( $language eq "et" ) { $nsislanguage = "Estonian"; }
elsif ( $language eq "fa" ) { $nsislanguage = "Farsi"; }
- elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
elsif ( $language eq "fi" ) { $nsislanguage = "Finnish"; }
elsif ( $language eq "fr" ) { $nsislanguage = "French"; }
- elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
+ elsif ( $language eq "gl" ) { $nsislanguage = "Galician"; }
+ elsif ( $language eq "de" ) { $nsislanguage = "German"; }
+ elsif ( $language eq "el" ) { $nsislanguage = "Greek"; }
elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; }
+ elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; }
elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; }
elsif ( $language eq "it" ) { $nsislanguage = "Italian"; }
+ elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
+ elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
elsif ( $language eq "lt" ) { $nsislanguage = "Lithuanian"; }
+ elsif ( $language eq "de-LU" ) { $nsislanguage = "Luxembourgish"; }
elsif ( $language eq "mk" ) { $nsislanguage = "Macedonian"; }
elsif ( $language eq "mn" ) { $nsislanguage = "Mongolian"; }
elsif ( $language eq "nb" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no-NO" ) { $nsislanguage = "Norwegian"; }
- elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
- elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
- elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
- elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
+ elsif ( $language eq "nn" ) { $nsislanguage = "NorwegianNynorsk"; }
elsif ( $language eq "pl" ) { $nsislanguage = "Polish"; }
- elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
elsif ( $language eq "pt" ) { $nsislanguage = "Portuguese"; }
+ elsif ( $language eq "pt-BR" ) { $nsislanguage = "PortugueseBR"; }
elsif ( $language eq "ro" ) { $nsislanguage = "Romanian"; }
elsif ( $language eq "ru" ) { $nsislanguage = "Russian"; }
- elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
+ elsif ( $language eq "gd" ) { $nsislanguage = "ScotsGaelic"; }
elsif ( $language eq "sr" ) { $nsislanguage = "Serbian"; }
elsif ( $language eq "sr-SP" ) { $nsislanguage = "Serbian"; }
- elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
- elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
- elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
- elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
- elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
- elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
+ elsif ( $language eq "sh" ) { $nsislanguage = "SerbianLatin"; }
elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
+ elsif ( $language eq "sl" ) { $nsislanguage = "Slovenian"; }
+ elsif ( $language eq "sk" ) { $nsislanguage = "Slovak"; }
+ elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
+ elsif ( $language eq "sv" ) { $nsislanguage = "Swedish"; }
+ elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
+ elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
+ elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
+ elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
+ elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
else
{
$installer::logger::Lang->printf("NSIS language_converter : Could not find nsis language for %s!\n", $language);
commit 2347f1177c9180161eb75d134448cb3e0263b373
Author: Matthias Seidel <mseidel at apache.org>
Date: Fri Aug 4 14:19:16 2017 +0000
Small optical changes to Windows installer (LanguagePack)
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index f57fc588b01b..0f422f275bc4 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -9,7 +9,7 @@ AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
-AdminChangeFolder DlgLine Line 136 234 241 0 1
+AdminChangeFolder DlgLine Line 134 234 243 0 1
AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
@@ -25,7 +25,7 @@ AdminNetworkLocation Branding2 Text 3 228 130 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
-AdminNetworkLocation DlgLine Line 136 234 241 0 1
+AdminNetworkLocation DlgLine Line 134 234 243 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
@@ -51,7 +51,7 @@ CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
-CustomerInformation DlgLine Line 136 234 241 0 1
+CustomerInformation DlgLine Line 134 234 243 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
@@ -69,7 +69,7 @@ CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
-CustomSetup DlgLine Line 136 234 241 0 1
+CustomSetup DlgLine Line 134 234 243 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
@@ -85,7 +85,7 @@ CustomSetupTips BannerLine Line 0 44 376 0 1
CustomSetupTips Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
CustomSetupTips Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 136 234 241 0 1
+CustomSetupTips DlgLine Line 134 234 243 0 1
CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
@@ -106,7 +106,7 @@ DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
-DatabaseFolder DlgLine Line 136 234 241 0 1
+DatabaseFolder DlgLine Line 134 234 243 0 1
DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
@@ -120,7 +120,7 @@ DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24 5242881 OpenFolderIco
DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_304
-DestinationFolder DlgLine Line 136 234 241 0 1
+DestinationFolder DlgLine Line 134 234 243 0 1
DestinationFolder DlgTitle Text 13 6 280 25 65539 {&MSSansBold8}[ProductName]
DestinationFolder Location Text 57 128 240 40 3 _BrowseProperty [INSTALLLOCATION]
DestinationFolder LocLabel Text 57 115 290 10 3 OOO_CONTROL_92
@@ -136,7 +136,7 @@ DiskSpaceRequirements BannerLine Line 0 44 376 0 1
DiskSpaceRequirements Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
DiskSpaceRequirements Branding2 Text 3 228 130 13 65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
-DiskSpaceRequirements DlgLine Line 136 234 241 0 1
+DiskSpaceRequirements DlgLine Line 134 234 243 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
@@ -146,7 +146,7 @@ FilesInUse BannerLine Line 0 44 376 0 1
FilesInUse Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
FilesInUse Branding2 Text 3 228 130 13 65537 [ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
-FilesInUse DlgLine Line 136 234 241 0 1
+FilesInUse DlgLine Line 134 234 243 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
@@ -163,7 +163,7 @@ FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 C
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
-FileTypeDialog DlgLine Line 136 234 241 0 1
+FileTypeDialog DlgLine Line 134 234 243 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
@@ -176,7 +176,7 @@ InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 302 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
-InstallChangeFolder DlgLine Line 136 234 241 0 1
+InstallChangeFolder DlgLine Line 134 234 243 0 1
InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
@@ -199,7 +199,7 @@ LicenseAgreement Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
LicenseAgreement Branding2 Text 3 228 130 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 136 234 241 0 1
+LicenseAgreement DlgLine Line 134 234 243 0 1
LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
@@ -210,7 +210,7 @@ MaintenanceType Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
MaintenanceType Branding2 Text 3 228 130 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
-MaintenanceType DlgLine Line 136 234 241 0 1
+MaintenanceType DlgLine Line 134 234 243 0 1
MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
@@ -230,7 +230,7 @@ OutOfSpace BannerLine Line 0 44 376 0 1
OutOfSpace Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
OutOfSpace Branding2 Text 3 228 130 13 65537 [ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
-OutOfSpace DlgLine Line 136 234 241 0 1
+OutOfSpace DlgLine Line 134 234 243 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
@@ -249,7 +249,7 @@ ReadyToInstall Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
ReadyToInstall Branding2 Text 3 228 130 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
-ReadyToInstall DlgLine Line 136 234 241 0 1
+ReadyToInstall DlgLine Line 134 234 243 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
@@ -366,7 +366,7 @@ SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
-SetupType DlgLine Line 136 234 241 0 1
+SetupType DlgLine Line 134 234 243 0 1
SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
@@ -375,6 +375,6 @@ SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
SplashBitmap Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
SplashBitmap Branding2 Text 3 228 130 13 65537 [ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
-SplashBitmap DlgLine Line 136 234 241 0 1
+SplashBitmap DlgLine Line 134 234 243 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
SplashBitmap Next PushButton 230 243 66 17 3 OOO_CONTROL_266 Cancel
commit 9900a206622d8b7543ea0db3e0c8fa3cc07bc566
Author: Jim Jagielski <jim at apache.org>
Date: Thu Aug 3 02:08:16 2017 +0000
Expat is now at v 2.2.3
diff --git a/expat/expat-2.2.1.patch b/expat/expat-2.2.3.patch
similarity index 65%
rename from expat/expat-2.2.1.patch
rename to expat/expat-2.2.3.patch
index d38da2146589..1afb2b75a4c6 100644
--- a/expat/expat-2.2.1.patch
+++ b/expat/expat-2.2.3.patch
@@ -1,5 +1,5 @@
---- misc/expat-2.2.1/lib/makefile.mk Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.2.1/lib/makefile.mk Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008
@@ -1 +1,83 @@
-dummy
+#**************************************************************
@@ -85,51 +85,3 @@
+.INCLUDE : set_wntx64.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_wntx64.mk
---- misc/expat-2.2.1/lib/siphash.h Sat Jun 17 09:07:38 2017
-+++ misc/build/expat-2.2.1/lib/siphash.h Fri Jun 30 15:45:22 2017
-@@ -76,7 +76,13 @@
- #define SIPHASH_H
-
- #include <stddef.h> /* size_t */
-+#if defined(_MSC_VER) && _MSC_VER < 1600
-+typedef unsigned __int64 uint64_t;
-+typedef unsigned __int32 uint32_t;
-+typedef unsigned __int8 uint8_t;
-+#else
- #include <stdint.h> /* uint64_t uint32_t uint8_t */
-+#endif
-
-
- #define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))
---- misc/expat-2.2.1/configure.ac
-+++ misc/build/expat-2.2.1/configure.ac
-@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
-
-
- AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
--AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-+AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <stdlib.h> /* for NULL */
- #include <sys/random.h>
- int main() {
---- misc/expat-2.2.1/configure 2017-07-12 17:04:34.000000000 +0200
-+++ misc/build/expat-2.2.1/configure 2017-07-12 17:05:59.000000000 +0200
-@@ -16341,7 +16341,7 @@
- }
-
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
-+if ac_fn_c_try_link "$LINENO"; then :
-
-
- $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
-@@ -16386,7 +16386,8 @@
- conftest$ac_exeext conftest.$ac_ext
-
- fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
-
- for ac_header in fcntl.h unistd.h
diff --git a/expat/expat-winapi.patch b/expat/expat-winapi.patch
index f736e1612066..17667ace6795 100644
--- a/expat/expat-winapi.patch
+++ b/expat/expat-winapi.patch
@@ -1,6 +1,6 @@
-diff -ur misc/expat-2.2.1/lib/expat_external.h misc/build/expat-2.2.0/lib/expat_external.h
---- misc/expat-2.2.1/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700
-+++ misc/build/expat-2.2.1/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700
+diff -ur misc/expat-2.2.3/lib/expat_external.h misc/build/expat-2.2.3/lib/expat_external.h
+--- misc/expat-2.2.3/lib/expat_external.h 2016-06-21 05:58:38.000000000 -0700
++++ misc/build/expat-2.2.3/lib/expat_external.h 2016-07-31 17:10:53.551556000 -0700
@@ -7,10 +7,6 @@
/* External API definitions */
diff --git a/expat/makefile.mk b/expat/makefile.mk
index ba00da2db9b4..f83d7912cd87 100644
--- a/expat/makefile.mk
+++ b/expat/makefile.mk
@@ -38,8 +38,8 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat-2.2.1
-TARFILE_MD5=d9c3baeab58774cefc2f04faf29f2cf8
+TARFILE_NAME=expat-2.2.3
+TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334
ADDITIONAL_FILES=lib$/makefile.mk
PATCH_FILES=$(TARFILE_NAME).patch \
expat-winapi.patch
diff --git a/expat/prj/d.lst b/expat/prj/d.lst
index b78e1b1b64b3..951ac278a623 100644
--- a/expat/prj/d.lst
+++ b/expat/prj/d.lst
@@ -1,7 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.2.1\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.2.1\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
diff --git a/external_deps.lst b/external_deps.lst
index 756121a17c3e..8d749c2e16d4 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -218,9 +218,9 @@ if (SYSTEM_VIGRA != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_EXPAT != YES)
- MD5 = d9c3baeab58774cefc2f04faf29f2cf8
- name = expat-2.2.1.tar.bz2
- URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.1/expat-2.2.1.tar.bz2
+ MD5 = f053af63ef5f39bd9b78d01fbc203334
+ name = expat-2.2.3.tar.bz2
+ URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
commit 980d6c071604ab25ada40983aebaba669e729767
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Aug 2 16:39:19 2017 +0000
Added statement for eu (Basque)
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 6251d9fe1242..4a47ea77d9fa 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1177,6 +1177,7 @@ sub nsis_language_converter
if ( $language eq "en-US" ) { $nsislanguage = "English"; }
elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
+ elsif ( $language eq "eu" ) { $nsislanguage = "Basque"; }
elsif ( $language eq "bg" ) { $nsislanguage = "Bulgarian"; }
elsif ( $language eq "ca" ) { $nsislanguage = "Catalan"; }
elsif ( $language eq "hr" ) { $nsislanguage = "Croatian"; }
commit e471770f4b6d1149b5a49af031d18a42efdafbe7
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Aug 2 09:30:27 2017 +0000
#i127491# Added statement for nb (Norsk Bokmal)
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index f82db286329d..6251d9fe1242 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1199,6 +1199,7 @@ sub nsis_language_converter
elsif ( $language eq "lt" ) { $nsislanguage = "Lithuanian"; }
elsif ( $language eq "mk" ) { $nsislanguage = "Macedonian"; }
elsif ( $language eq "mn" ) { $nsislanguage = "Mongolian"; }
+ elsif ( $language eq "nb" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "no-NO" ) { $nsislanguage = "Norwegian"; }
elsif ( $language eq "es" ) { $nsislanguage = "Spanish"; }
@@ -1364,7 +1365,7 @@ sub get_language_string_from_language_block
##################################################################
# Windows: Replacing strings in NSIS nsh file
# nsh file syntax:
-# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
+# !define MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
##################################################################
sub replace_identifier_in_nshfile
commit ab2fbb32ace0a4148ff7d583711ba41c34ec687a
Author: Jim Jagielski <jim at apache.org>
Date: Tue Aug 1 21:12:22 2017 +0000
Fold in fix for https://github.com/libexpat/libexpat/issues/52
diff --git a/expat/expat-2.2.1.patch b/expat/expat-2.2.1.patch
index 2379d1446e72..d38da2146589 100644
--- a/expat/expat-2.2.1.patch
+++ b/expat/expat-2.2.1.patch
@@ -101,3 +101,35 @@
#define SIP_ROTL(x, b) (uint64_t)(((x) << (b)) | ( (x) >> (64 - (b))))
+--- misc/expat-2.2.1/configure.ac
++++ misc/build/expat-2.2.1/configure.ac
+@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([
+
+
+ AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)])
+-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #include <stdlib.h> /* for NULL */
+ #include <sys/random.h>
+ int main() {
+--- misc/expat-2.2.1/configure 2017-07-12 17:04:34.000000000 +0200
++++ misc/build/expat-2.2.1/configure 2017-07-12 17:05:59.000000000 +0200
+@@ -16341,7 +16341,7 @@
+ }
+
+ _ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
++if ac_fn_c_try_link "$LINENO"; then :
+
+
+ $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
+@@ -16386,7 +16386,8 @@
+ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+
+ for ac_header in fcntl.h unistd.h
commit 2032d20d7d83578a7f4c23fb633289497bffed15
Author: Matthias Seidel <mseidel at apache.org>
Date: Wed Jul 26 08:15:58 2017 +0000
Small optical changes to Windows installer (OpenOffice)
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
index 0733c4d868ca..3ed1fe32a736 100644
Binary files a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 1142348f65b8..f856b29eb6b1 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -2,14 +2,14 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-AdminChangeFolder BannerLine Line 0 44 374 0 1
+AdminChangeFolder BannerLine Line 0 44 376 0 1
AdminChangeFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
AdminChangeFolder Branding2 Text 3 228 88 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
-AdminChangeFolder DlgLine Line 90 234 284 0 1
+AdminChangeFolder DlgLine Line 70 234 307 0 1
AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
@@ -19,13 +19,13 @@ AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
-AdminNetworkLocation BannerLine Line 0 44 374 0 1
+AdminNetworkLocation BannerLine Line 0 44 376 0 1
AdminNetworkLocation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
AdminNetworkLocation Branding2 Text 3 228 88 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
-AdminNetworkLocation DlgLine Line 90 234 284 0 1
+AdminNetworkLocation DlgLine Line 70 234 307 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
@@ -33,7 +33,7 @@ AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
-AdminWelcome DlgLine Line 0 234 326 0 1
+AdminWelcome DlgLine Line 0 234 376 0 1
AdminWelcome Image Bitmap 0 0 122 234 1 ImageBmp
AdminWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_26 Cancel
AdminWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_27
@@ -47,14 +47,14 @@ CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomerInformation BannerLine Line 0 44 374 0 1
+CustomerInformation BannerLine Line 0 44 376 0 1
CustomerInformation Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
CustomerInformation Branding2 Text 3 228 88 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
-CustomerInformation DlgLine Line 90 234 284 0 1
+CustomerInformation DlgLine Line 70 234 307 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
@@ -65,14 +65,14 @@ CustomerInformation SerialLabel Text 21 127 109 10 2 OOO_CONTROL_45 SerialNumbe
CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomSetup BannerLine Line 0 44 374 0 1
+CustomSetup BannerLine Line 0 44 376 0 1
CustomSetup Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
CustomSetup Branding2 Text 3 228 88 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
-CustomSetup DlgLine Line 90 234 284 0 1
+CustomSetup DlgLine Line 70 234 307 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
@@ -84,11 +84,11 @@ CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomSetupTips BannerLine Line 0 44 374 0 1
+CustomSetupTips BannerLine Line 0 44 376 0 1
CustomSetupTips Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
CustomSetupTips Branding2 Text 3 228 88 13 65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 90 234 284 0 1
+CustomSetupTips DlgLine Line 70 234 307 0 1
CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
@@ -102,48 +102,48 @@ CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-DatabaseFolder BannerLine Line 0 44 374 0 1
+DatabaseFolder BannerLine Line 0 44 376 0 1
DatabaseFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
DatabaseFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
-DatabaseFolder DlgLine Line 90 234 284 0 1
+DatabaseFolder DlgLine Line 70 234 307 0 1
DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-DestinationFolder BannerLine Line 0 44 374 0 1
+DestinationFolder BannerLine Line 0 44 376 0 1
DestinationFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
DestinationFolder Branding2 Text 3 228 88 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 52 24 24 5242881 OpenFolderIco
DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_89
-DestinationFolder DlgLine Line 90 234 284 0 1
+DestinationFolder DlgLine Line 70 234 307 0 1
DestinationFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_90
DestinationFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_91
DestinationFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_92
DestinationFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_93 Cancel
DiskSpaceRequirements Banner Bitmap 297 0 77 44 1 BannerBmp
-DiskSpaceRequirements BannerLine Line 0 44 374 0 1
+DiskSpaceRequirements BannerLine Line 0 44 376 0 1
DiskSpaceRequirements Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
DiskSpaceRequirements Branding2 Text 3 228 88 13 65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
-DiskSpaceRequirements DlgLine Line 90 234 284 0 1
+DiskSpaceRequirements DlgLine Line 70 234 307 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
FilesInUse Banner Bitmap 297 0 77 44 1 BannerBmp
-FilesInUse BannerLine Line 0 44 374 0 1
+FilesInUse BannerLine Line 0 44 376 0 1
FilesInUse Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
FilesInUse Branding2 Text 3 228 88 13 65537 [ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
-FilesInUse DlgLine Line 90 234 284 0 1
+FilesInUse DlgLine Line 70 234 307 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
@@ -152,7 +152,7 @@ FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 297 0 77 44 1 BannerBmp
-FileTypeDialog BannerLine Line 0 44 374 0 1
+FileTypeDialog BannerLine Line 0 44 376 0 1
FileTypeDialog Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
FileTypeDialog Branding2 Text 3 228 88 13 65537 [ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
@@ -160,20 +160,20 @@ FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 C
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
-FileTypeDialog DlgLine Line 90 234 284 0 1
+FileTypeDialog DlgLine Line 70 234 307 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-InstallChangeFolder BannerLine Line 0 44 374 0 1
+InstallChangeFolder BannerLine Line 0 44 376 0 1
InstallChangeFolder Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
InstallChangeFolder Branding2 Text 3 228 88 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 277 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
-InstallChangeFolder DlgLine Line 90 234 284 0 1
+InstallChangeFolder DlgLine Line 70 234 307 0 1
InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
InstallChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_117
@@ -184,7 +184,7 @@ InstallChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONT
InstallWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_122 Copyright
InstallWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_123 Back
InstallWelcome Copyright Text 135 144 228 73 65539 OOO_CONTROL_124 Next
-InstallWelcome DlgLine Line 0 234 374 0 1
+InstallWelcome DlgLine Line 0 234 376 0 1
InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
@@ -194,34 +194,34 @@ LanguageInfo1 OK PushButton 100 57 66 17 3 OOO_CONTROL_10
LanguageInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_317
LanguageSelection Back PushButton 164 243 66 17 3 OOO_CONTROL_122 CheckBox1
LanguageSelection Banner Bitmap 297 0 77 44 1 BannerBmp
-LanguageSelection BannerLine Line 0 44 374 0 1
+LanguageSelection BannerLine Line 0 44 376 0 1
LanguageSelection Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
LanguageSelection Branding2 Text 3 228 88 13 65537 [ProductName]
LanguageSelection Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Back
LanguageSelection DlgDesc Text 21 23 292 25 65539 OOO_CONTROL_267
-LanguageSelection DlgLine Line 90 234 284 0 1
+LanguageSelection DlgLine Line 70 234 307 0 1
LanguageSelection DlgTitle Text 13 6 292 25 65539 OOO_CONTROL_268
LanguageSelection Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
+LicenseAgreement BannerLine Line 0 44 376 0 1
LicenseAgreement Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
LicenseAgreement Branding2 Text 3 228 88 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 90 234 284 0 1
+LicenseAgreement DlgLine Line 70 234 307 0 1
LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
-MaintenanceType BannerLine Line 0 44 374 0 1
+MaintenanceType BannerLine Line 0 44 376 0 1
MaintenanceType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
MaintenanceType Branding2 Text 3 228 88 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
-MaintenanceType DlgLine Line 90 234 284 0 1
+MaintenanceType DlgLine Line 70 234 307 0 1
MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
@@ -233,36 +233,36 @@ MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_144
MaintenanceType Text3 Text 80 192 260 35 3 OOO_CONTROL_145
MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
-MaintenanceWelcome DlgLine Line 0 234 374 0 1
+MaintenanceWelcome DlgLine Line 0 234 376 0 1
MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 297 0 77 44 1 BannerBmp
-OutOfSpace BannerLine Line 0 44 374 0 1
+OutOfSpace BannerLine Line 0 44 376 0 1
OutOfSpace Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
OutOfSpace Branding2 Text 3 228 88 13 65537 [ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
-OutOfSpace DlgLine Line 90 234 284 0 1
+OutOfSpace DlgLine Line 70 234 307 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
PatchWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_159 Back
-PatchWelcome DlgLine Line 0 234 374 0 1
+PatchWelcome DlgLine Line 0 234 376 0 1
PatchWelcome Image Bitmap 0 0 122 234 1 ImageBmp
PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 297 0 77 44 1 BannerBmp
-ReadyToInstall BannerLine Line 0 44 374 0 1
+ReadyToInstall BannerLine Line 0 44 376 0 1
ReadyToInstall Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
ReadyToInstall Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
-ReadyToInstall DlgLine Line 90 234 284 0 1
+ReadyToInstall DlgLine Line 70 234 307 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
@@ -273,12 +273,12 @@ ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTRO
ReadyToInstall UpdateCheckBox CheckBox 21 120 200 10 3 REMOVEOLDPRODUCTS OOO_CONTROL_320
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp
-ReadyToRemove BannerLine Line 0 44 374 0 1
+ReadyToRemove BannerLine Line 0 44 376 0 1
ReadyToRemove Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
ReadyToRemove Branding2 Text 3 228 88 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
-ReadyToRemove DlgLine Line 90 234 284 0 1
+ReadyToRemove DlgLine Line 70 234 307 0 1
ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
ReadyToRemove DlgText2 Text 21 102 330 24 3
@@ -286,7 +286,7 @@ ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
-SetupCompleteError DlgLine Line 0 234 374 0 1
+SetupCompleteError DlgLine Line 0 234 376 0 1
SetupCompleteError Finish PushButton 230 243 66 17 3 OOO_CONTROL_185 Cancel
SetupCompleteError FinishText1 Text 135 80 228 50 65539 OOO_CONTROL_186
SetupCompleteError FinishText2 Text 135 135 228 25 65539 OOO_CONTROL_187
@@ -301,7 +301,7 @@ SetupCompleteSuccess CheckBoxUpdates CheckBox 135 164 10 9 2 ISCHECKFORPRODUCTUP
SetupCompleteSuccess CheckForUpdatesText Text 152 162 190 30 65538 OOO_CONTROL_194
SetupCompleteSuccess CheckLaunchProgram CheckBox 151 114 10 9 2 LAUNCHPROGRAM
SetupCompleteSuccess CheckLaunchReadme CheckBox 151 148 10 9 2 LAUNCHREADME
-SetupCompleteSuccess DlgLine Line 0 234 374 0 1
+SetupCompleteSuccess DlgLine Line 0 234 376 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1 ImageBmp CheckBoxUpdates
SetupCompleteSuccess LaunchProgramText Text 164 112 198 15 65538 OOO_CONTROL_195
SetupCompleteSuccess LaunchReadmeText Text 164 148 198 13 65538 OOO_CONTROL_196
@@ -325,14 +325,14 @@ SetupInitialization ActionData Text 135 125 228 12 65539
SetupInitialization ActionText Text 135 109 220 36 65539
SetupInitialization Back PushButton 164 243 66 17 1 OOO_CONTROL_214
SetupInitialization Cancel PushButton 301 243 66 17 3 OOO_CONTROL_215
-SetupInitialization DlgLine Line 0 234 374 0 1
+SetupInitialization DlgLine Line 0 234 376 0 1
SetupInitialization Image Bitmap 0 0 122 234 1 ImageBmp
SetupInitialization Next PushButton 230 243 66 17 1 OOO_CONTROL_216
SetupInitialization TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_217
SetupInitialization TextLine2 Text 135 55 228 30 65539 OOO_CONTROL_218
SetupInterrupted Back PushButton 164 243 66 17 1 OOO_CONTROL_219
SetupInterrupted Cancel PushButton 301 243 66 17 1 OOO_CONTROL_220
-SetupInterrupted DlgLine Line 0 234 374 0 1
+SetupInterrupted DlgLine Line 0 234 376 0 1
SetupInterrupted Finish PushButton 230 243 66 17 3 OOO_CONTROL_221
SetupInterrupted FinishText1 Text 135 80 228 50 65539 OOO_CONTROL_222
SetupInterrupted FinishText2 Text 135 135 228 25 65539 OOO_CONTROL_223
@@ -345,13 +345,13 @@ SetupProgress ActionProgress95 ProgressBar 59 113 275 12 65537 OOO_CONTROL_228
SetupProgress ActionText Text 59 100 275 12 3
SetupProgress Back PushButton 164 243 66 17 1 OOO_CONTROL_230 Next
SetupProgress Banner Bitmap 297 0 77 44 1 BannerBmp
-SetupProgress BannerLine Line 0 44 374 0 1
+SetupProgress BannerLine Line 0 44 376 0 1
SetupProgress Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
SetupProgress Branding2 Text 3 228 88 13 65537 [ProductName]
SetupProgress Cancel PushButton 301 243 66 17 3 OOO_CONTROL_233 Back
SetupProgress DlgDesc Text 21 23 272 25 65538 OOO_CONTROL_234
SetupProgress DlgDesc2 Text 21 23 272 25 65538 OOO_CONTROL_235
-SetupProgress DlgLine Line 90 234 284 0 1
+SetupProgress DlgLine Line 70 234 307 0 1
SetupProgress DlgText Text 59 51 275 30 65538 OOO_CONTROL_236
SetupProgress DlgText2 Text 59 51 275 30 65538 OOO_CONTROL_237
SetupProgress DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_238
@@ -364,7 +364,7 @@ SetupProgress ShowTime Text 155 139 17 12 2
SetupProgress TextTime Text 59 139 96 12 2 OOO_CONTROL_244
SetupResume Back PushButton 164 243 66 17 1 OOO_CONTROL_245 Next
SetupResume Cancel PushButton 301 243 66 17 3 OOO_CONTROL_246 Back
-SetupResume DlgLine Line 0 234 374 0 1
+SetupResume DlgLine Line 0 234 376 0 1
SetupResume Image Bitmap 0 0 122 234 1 ImageBmp
SetupResume Next PushButton 230 243 66 17 3 OOO_CONTROL_247 Cancel
SetupResume PreselectedText Text 135 55 228 45 65539 OOO_CONTROL_248
@@ -372,7 +372,7 @@ SetupResume ResumeText Text 135 46 228 45 65539 OOO_CONTROL_249
SetupResume TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_250
SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next
SetupType Banner Bitmap 297 0 77 44 1 BannerBmp
-SetupType BannerLine Line 0 44 374 0 1
+SetupType BannerLine Line 0 44 376 0 1
SetupType Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
SetupType Branding2 Text 3 228 88 13 65537 [ProductName]
SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
@@ -381,7 +381,7 @@ SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco
SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256
SetupType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_257
-SetupType DlgLine Line 90 234 284 0 1
+SetupType DlgLine Line 70 234 307 0 1
SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258
SetupType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_259
SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel
@@ -390,6 +390,6 @@ SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
SplashBitmap Branding1 Text 4 229 88 13 3 {&MSSWhiteSerif8}[ProductName]
SplashBitmap Branding2 Text 3 228 88 13 65537 [ProductName]
SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
-SplashBitmap DlgLine Line 90 234 284 0 1
+SplashBitmap DlgLine Line 70 234 307 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
SplashBitmap Next PushButton 230 243 66 17 3 OOO_CONTROL_266 Cancel
commit c4a9e58550c5bc416ab6bed125e53dc06371002b
Author: Matthias Seidel <mseidel at apache.org>
Date: Sun Jul 23 20:07:36 2017 +0000
Small optical changes to Windows installer (LanguagePack)
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
index 0733c4d868ca..3ed1fe32a736 100644
Binary files a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp and b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e5be5e4d6ea7..f57fc588b01b 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -2,14 +2,14 @@ Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help
s72 s50 s20 i2 i2 i2 i2 I4 S50 L0 S50 L50
WINDOWSENCODINGTEMPLATE Control Dialog_ Control
AdminChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-AdminChangeFolder BannerLine Line 0 44 374 0 1
-AdminChangeFolder Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-AdminChangeFolder Branding2 Text 3 228 140 13 65537 [ProductName]
+AdminChangeFolder BannerLine Line 0 44 376 0 1
+AdminChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+AdminChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
AdminChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_3 ComboText
AdminChangeFolder Combo DirectoryCombo 21 64 277 80 458755 TARGETDIR Up
AdminChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_5 Combo
AdminChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_6
-AdminChangeFolder DlgLine Line 145 234 229 0 1
+AdminChangeFolder DlgLine Line 136 234 241 0 1
AdminChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_7
AdminChangeFolder List DirectoryList 21 90 332 97 7 TARGETDIR TailText
AdminChangeFolder NewFolder PushButton 335 66 19 19 3670019 NewFolderIco List OOO_CONTROL_9
@@ -19,13 +19,13 @@ AdminChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_12 Tail
AdminChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
AdminNetworkLocation Back PushButton 164 243 66 17 3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 297 0 77 44 1 BannerBmp
-AdminNetworkLocation BannerLine Line 0 44 374 0 1
-AdminNetworkLocation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-AdminNetworkLocation Branding2 Text 3 228 140 13 65537 [ProductName]
+AdminNetworkLocation BannerLine Line 0 44 376 0 1
+AdminNetworkLocation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+AdminNetworkLocation Branding2 Text 3 228 130 13 65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17 3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_19
-AdminNetworkLocation DlgLine Line 145 234 229 0 1
+AdminNetworkLocation DlgLine Line 136 234 241 0 1
AdminNetworkLocation DlgText Text 21 51 326 40 3 OOO_CONTROL_20
AdminNetworkLocation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_21
AdminNetworkLocation InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_22 Cancel
@@ -33,7 +33,7 @@ AdminNetworkLocation LBBrowse Text 21 90 100 10 3 OOO_CONTROL_23 SetupPathEdit
AdminNetworkLocation SetupPathEdit PathEdit 21 102 330 17 3 TARGETDIR Browse
AdminWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_24 Next
AdminWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_25 Back
-AdminWelcome DlgLine Line 0 234 326 0 1
+AdminWelcome DlgLine Line 0 234 376 0 1
AdminWelcome Image Bitmap 0 0 122 234 1 ImageBmp
AdminWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_26 Cancel
AdminWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_27
@@ -44,14 +44,14 @@ CancelSetup Text Text 48 15 194 30 3 OOO_CONTROL_30
CancelSetup Yes PushButton 62 57 66 17 3 OOO_CONTROL_31 No
CustomerInformation Back PushButton 164 243 66 17 3 OOO_CONTROL_32 Next
CustomerInformation Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomerInformation BannerLine Line 0 44 374 0 1
-CustomerInformation Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomerInformation Branding2 Text 3 228 140 13 65537 [ProductName]
+CustomerInformation BannerLine Line 0 44 376 0 1
+CustomerInformation Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+CustomerInformation Branding2 Text 3 228 130 13 65537 [ProductName]
CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformation CompanyLabel Text 21 89 75 10 3 OOO_CONTROL_37 CompanyEdit
CustomerInformation DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_38
-CustomerInformation DlgLine Line 145 234 229 0 1
+CustomerInformation DlgLine Line 136 234 241 0 1
CustomerInformation DlgRadioGroupText Text 21 161 300 14 3 OOO_CONTROL_39
CustomerInformation DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_40
CustomerInformation NameEdit Edit 21 63 237 17 3 USERNAME OOO_CONTROL_41 CompanyLabel
@@ -62,14 +62,14 @@ CustomerInformation SerialLabel Text 21 127 109 10 2 OOO_CONTROL_45 SerialNumbe
CustomerInformation SerialNumber MaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup
CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
CustomSetup Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomSetup Branding2 Text 3 228 140 13 65537 [ProductName]
+CustomSetup BannerLine Line 0 44 376 0 1
+CustomSetup Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+CustomSetup Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
CustomSetup ChangeFolder PushButton 301 203 66 17 3 OOO_CONTROL_50 Help
CustomSetup Details PushButton 93 243 66 17 3 OOO_CONTROL_51 Back
CustomSetup DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_52
-CustomSetup DlgLine Line 145 234 229 0 1
+CustomSetup DlgLine Line 136 234 241 0 1
CustomSetup DlgText Text 9 51 360 10 3 OOO_CONTROL_53
CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
CustomSetup FeatureGroup GroupBox 235 67 131 120 1 OOO_CONTROL_55
@@ -81,11 +81,11 @@ CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
CustomSetup Size Text 241 133 120 50 3 OOO_CONTROL_61
CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
CustomSetupTips Banner Bitmap 297 0 77 44 1 BannerBmp
-CustomSetupTips BannerLine Line 0 44 374 0 1
-CustomSetupTips Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-CustomSetupTips Branding2 Text 3 228 140 13 65537 [ProductName]
+CustomSetupTips BannerLine Line 0 44 376 0 1
+CustomSetupTips Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+CustomSetupTips Branding2 Text 3 228 130 13 65537 [ProductName]
CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 145 234 229 0 1
+CustomSetupTips DlgLine Line 136 234 241 0 1
CustomSetupTips DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_65
CustomSetupTips DontInstall Icon 21 155 24 24 5242881 DontInstallIco
CustomSetupTips DontInstallText Text 60 155 300 20 3 OOO_CONTROL_66
@@ -99,28 +99,28 @@ CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
DatabaseFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_74 Next
DatabaseFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-DatabaseFolder BannerLine Line 0 44 374 0 1
-DatabaseFolder Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-DatabaseFolder Branding2 Text 3 228 140 13 65537 [ProductName]
+DatabaseFolder BannerLine Line 0 44 376 0 1
+DatabaseFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+DatabaseFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DatabaseFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_77 ChangeFolder
DatabaseFolder ChangeFolder PushButton 301 65 66 17 3 OOO_CONTROL_78 Back
DatabaseFolder DatabaseFolder Icon 21 52 24 24 5242881 OpenFolderIco
DatabaseFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_79
-DatabaseFolder DlgLine Line 145 234 229 0 1
+DatabaseFolder DlgLine Line 136 234 241 0 1
DatabaseFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_80
DatabaseFolder Location Text 57 65 240 40 3 _BrowseProperty OOO_CONTROL_81
DatabaseFolder LocLabel Text 57 52 290 10 3 OOO_CONTROL_82
DatabaseFolder Next PushButton 230 243 66 17 3 OOO_CONTROL_83 Cancel
DestinationFolder Back PushButton 164 243 66 17 3 OOO_CONTROL_84 Next
DestinationFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-DestinationFolder BannerLine Line 0 44 374 0 1
-DestinationFolder Branding1 Text 4 229 110 13 3 {&MSSWhiteSerif8}[ProductName]
-DestinationFolder Branding2 Text 3 228 110 13 65537 [ProductName]
+DestinationFolder BannerLine Line 0 44 376 0 1
+DestinationFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+DestinationFolder Branding2 Text 3 228 130 13 65537 [ProductName]
DestinationFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_87 ChangeFolder
DestinationFolder ChangeFolder PushButton 301 125 66 17 3 OOO_CONTROL_88 Back
DestinationFolder DestFolder Icon 21 112 24 24 5242881 OpenFolderIco
DestinationFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_304
-DestinationFolder DlgLine Line 114 234 260 0 1
+DestinationFolder DlgLine Line 136 234 241 0 1
DestinationFolder DlgTitle Text 13 6 280 25 65539 {&MSSansBold8}[ProductName]
DestinationFolder Location Text 57 128 240 40 3 _BrowseProperty [INSTALLLOCATION]
DestinationFolder LocLabel Text 57 115 290 10 3 OOO_CONTROL_92
@@ -132,21 +132,21 @@ DestinationFolder LabelStartInstall2 Text 21 82 290 30 2 OOO_CONTROL_305
DestinationFolder LabelInvalidDir2 Text 21 82 290 30 2 OOO_CONTROL_307
DestinationFolder LabelWrongProduct2 Text 21 82 290 30 2 OOO_CONTROL_306
DiskSpaceRequirements Banner Bitmap 297 0 77 44 1 BannerBmp
-DiskSpaceRequirements BannerLine Line 0 44 374 0 1
-DiskSpaceRequirements Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-DiskSpaceRequirements Branding2 Text 3 228 140 13 65537 [ProductName]
+DiskSpaceRequirements BannerLine Line 0 44 376 0 1
+DiskSpaceRequirements Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+DiskSpaceRequirements Branding2 Text 3 228 130 13 65537 [ProductName]
DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
-DiskSpaceRequirements DlgLine Line 145 234 229 0 1
+DiskSpaceRequirements DlgLine Line 136 234 241 0 1
DiskSpaceRequirements DlgText Text 10 185 358 41 3 OOO_CONTROL_97
DiskSpaceRequirements DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_98
DiskSpaceRequirements List VolumeCostList 8 55 358 125 393223 {120}{70}{70}{70}{70}
DiskSpaceRequirements OK PushButton 301 243 66 17 3 OOO_CONTROL_100
FilesInUse Banner Bitmap 297 0 77 44 1 BannerBmp
-FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-FilesInUse Branding2 Text 3 228 140 13 65537 [ProductName]
+FilesInUse BannerLine Line 0 44 376 0 1
+FilesInUse Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+FilesInUse Branding2 Text 3 228 130 13 65537 [ProductName]
FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
-FilesInUse DlgLine Line 145 234 229 0 1
+FilesInUse DlgLine Line 136 234 241 0 1
FilesInUse DlgText Text 21 51 348 29 3 OOO_CONTROL_104
FilesInUse DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_105
FilesInUse Exit PushButton 301 243 66 17 3 OOO_CONTROL_106 List
@@ -155,28 +155,28 @@ FilesInUse List ListBox 21 87 331 135 7 FileInUseProcess Retry
FilesInUse Retry PushButton 164 243 66 17 3 OOO_CONTROL_108 Ignore
FileTypeDialog Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
FileTypeDialog Banner Bitmap 297 0 77 44 1 BannerBmp
-FileTypeDialog BannerLine Line 0 44 374 0 1
-FileTypeDialog Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-FileTypeDialog Branding2 Text 3 228 140 13 65537 [ProductName]
+FileTypeDialog BannerLine Line 0 44 376 0 1
+FileTypeDialog Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+FileTypeDialog Branding2 Text 3 228 130 13 65537 [ProductName]
FileTypeDialog Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 CheckBox1
FileTypeDialog CheckBox1 CheckBox 41 106 200 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
FileTypeDialog CheckBox2 CheckBox 41 131 200 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
FileTypeDialog CheckBox3 CheckBox 41 156 200 10 3 SELECT_POWERPOINT OOO_CONTROL_272 Back
FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
-FileTypeDialog DlgLine Line 145 234 229 0 1
+FileTypeDialog DlgLine Line 136 234 241 0 1
FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
FileTypeDialog DlgText2 Text 21 190 326 30 3 OOO_CONTROL_309
FileTypeDialog DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_278
FileTypeDialog Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
InstallChangeFolder Banner Bitmap 297 0 77 44 1 BannerBmp
-InstallChangeFolder BannerLine Line 0 44 374 0 1
-InstallChangeFolder Branding1 Text 4 229 110 13 3 {&MSSWhiteSerif8}[ProductName]
-InstallChangeFolder Branding2 Text 3 228 110 13 65537 [ProductName]
+InstallChangeFolder BannerLine Line 0 44 376 0 1
+InstallChangeFolder Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+InstallChangeFolder Branding2 Text 3 228 130 13 65537 [ProductName]
InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
InstallChangeFolder Combo DirectoryCombo 21 64 302 80 4128779 _BrowseProperty Up
InstallChangeFolder ComboText Text 21 50 99 14 3 OOO_CONTROL_113 Combo
InstallChangeFolder DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_114
-InstallChangeFolder DlgLine Line 114 234 260 0 1
+InstallChangeFolder DlgLine Line 136 234 241 0 1
InstallChangeFolder DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_115
InstallChangeFolder List DirectoryList 21 90 332 97 15 _BrowseProperty TailText
InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
@@ -186,7 +186,7 @@ InstallChangeFolder Up PushButton 333 64 19 19 3670019 UpIco List OOO_CONTROL_1
InstallWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_122 Copyright
InstallWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_123 Back
InstallWelcome Copyright Text 135 144 228 73 65539 OOO_CONTROL_124 Next
-InstallWelcome DlgLine Line 0 234 374 0 1
+InstallWelcome DlgLine Line 0 234 376 0 1
InstallWelcome Image Bitmap 0 0 122 234 1 ImageBmp
InstallWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_125 Cancel
InstallWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_126
@@ -194,23 +194,23 @@ InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
LicenseAgreement Agree RadioButtonGroup 8 190 330 40 3 AgreeToLicense Back
LicenseAgreement Back PushButton 164 243 66 17 3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 297 0 77 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-LicenseAgreement Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-LicenseAgreement Branding2 Text 3 228 140 13 65537 [ProductName]
+LicenseAgreement BannerLine Line 0 44 376 0 1
+LicenseAgreement Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+LicenseAgreement Branding2 Text 3 228 130 13 65537 [ProductName]
LicenseAgreement Cancel PushButton 301 243 66 17 3 OOO_CONTROL_131 Agree
LicenseAgreement DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_132
-LicenseAgreement DlgLine Line 145 234 229 0 1
+LicenseAgreement DlgLine Line 136 234 241 0 1
LicenseAgreement DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_133
LicenseAgreement Memo ScrollableText 8 54 358 130 7
LicenseAgreement Next PushButton 230 243 66 17 3 OOO_CONTROL_134 Cancel
MaintenanceType Back PushButton 164 243 66 17 3 OOO_CONTROL_135 Next
MaintenanceType Banner Bitmap 297 0 77 44 1 BannerBmp
-MaintenanceType BannerLine Line 0 44 374 0 1
-MaintenanceType Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-MaintenanceType Branding2 Text 3 228 140 13 65537 [ProductName]
+MaintenanceType BannerLine Line 0 44 376 0 1
+MaintenanceType Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+MaintenanceType Branding2 Text 3 228 130 13 65537 [ProductName]
MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup
MaintenanceType DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_139
-MaintenanceType DlgLine Line 145 234 229 0 1
+MaintenanceType DlgLine Line 136 234 241 0 1
MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco
@@ -220,36 +220,36 @@ MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_144
MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_145
MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next
MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back
-MaintenanceWelcome DlgLine Line 0 234 374 0 1
+MaintenanceWelcome DlgLine Line 0 234 376 0 1
MaintenanceWelcome Image Bitmap 0 0 122 234 1 ImageBmp
MaintenanceWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_148 Cancel
MaintenanceWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_149
MaintenanceWelcome TextLine2 Text 135 55 228 50 65539 OOO_CONTROL_150
OutOfSpace Banner Bitmap 297 0 77 44 1 BannerBmp
-OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-OutOfSpace Branding2 Text 3 228 140 13 65537 [ProductName]
+OutOfSpace BannerLine Line 0 44 376 0 1
+OutOfSpace Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+OutOfSpace Branding2 Text 3 228 130 13 65537 [ProductName]
OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
-OutOfSpace DlgLine Line 145 234 229 0 1
+OutOfSpace DlgLine Line 136 234 241 0 1
OutOfSpace DlgText Text 21 51 326 43 3 OOO_CONTROL_154
OutOfSpace DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_155
OutOfSpace List VolumeCostList 21 95 332 120 393223 OOO_CONTROL_156
OutOfSpace Resume PushButton 301 243 66 17 3 OOO_CONTROL_157
PatchWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_158 Next
PatchWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_159 Back
-PatchWelcome DlgLine Line 0 234 374 0 1
+PatchWelcome DlgLine Line 0 234 376 0 1
PatchWelcome Image Bitmap 0 0 122 234 1 ImageBmp
PatchWelcome Next PushButton 230 243 66 17 3 OOO_CONTROL_160 Cancel
PatchWelcome TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_161
PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162
ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow
ReadyToInstall Banner Bitmap 297 0 77 44 1 BannerBmp
-ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-ReadyToInstall Branding2 Text 3 228 140 13 65537 [ProductName]
+ReadyToInstall BannerLine Line 0 44 376 0 1
+ReadyToInstall Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+ReadyToInstall Branding2 Text 3 228 130 13 65537 [ProductName]
ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back
ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
-ReadyToInstall DlgLine Line 145 234 229 0 1
+ReadyToInstall DlgLine Line 136 234 241 0 1
ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168
ReadyToInstall DlgText1 Text 21 70 330 24 3 OOO_CONTROL_169
ReadyToInstall DlgTitle Text 13 6 280 25 65538 OOO_CONTROL_170
@@ -258,12 +258,12 @@ ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 297 0 77 44 1 BannerBmp
-ReadyToRemove BannerLine Line 0 44 374 0 1
-ReadyToRemove Branding1 Text 4 229 140 13 3 {&MSSWhiteSerif8}[ProductName]
-ReadyToRemove Branding2 Text 3 228 140 13 65537 [ProductName]
+ReadyToRemove BannerLine Line 0 44 376 0 1
+ReadyToRemove Branding1 Text 4 229 130 13 3 {&MSSWhiteSerif8}[ProductName]
+ReadyToRemove Branding2 Text 3 228 130 13 65537 [ProductName]
ReadyToRemove Cancel PushButton 301 243 66 17 3 OOO_CONTROL_177 Back
ReadyToRemove DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_178
-ReadyToRemove DlgLine Line 145 234 229 0 1
+ReadyToRemove DlgLine Line 136 234 241 0 1
ReadyToRemove DlgText Text 21 51 326 24 3 OOO_CONTROL_179
ReadyToRemove DlgText1 Text 21 79 330 23 3 OOO_CONTROL_180
ReadyToRemove DlgText2 Text 21 102 330 24 3
@@ -271,7 +271,7 @@ ReadyToRemove DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_181
ReadyToRemove RemoveNow PushButton 230 243 66 17 3 OOO_CONTROL_182 Cancel
SetupCompleteError Back PushButton 164 243 66 17 1 OOO_CONTROL_183 Finish
SetupCompleteError Cancel PushButton 301 243 66 17 1 OOO_CONTROL_184 Back
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list