[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 4 commits - configure.ac icon-themes/breeze icon-themes/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-themes/tango instsetoo_native/inc_openoffice instsetoo_native/util
Marina Latini (CIB) (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 14 15:03:15 UTC 2019
configure.ac | 4
icon-themes/breeze/sfx2/res/logo.png |binary
icon-themes/breeze/sfx2/res/startcenter-logo.png |binary
icon-themes/colibre/sfx2/res/logo.png |binary
icon-themes/colibre/sfx2/res/startcenter-logo.png |binary
icon-themes/elementary/sfx2/res/logo.png |binary
icon-themes/elementary/sfx2/res/startcenter-logo.png |binary
icon-themes/karasa_jaga/sfx2/res/logo.png |binary
icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png |binary
icon-themes/sifr/sfx2/res/logo.png |binary
icon-themes/sifr/sfx2/res/startcenter-logo.png |binary
icon-themes/tango/sfx2/res/logo.png |binary
icon-themes/tango/sfx2/res/startcenter-logo.png |binary
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 62 -
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 578 +++++-----
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt | 62 -
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 2
instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt | 25
instsetoo_native/util/openoffice.lst.in | 6
19 files changed, 360 insertions(+), 379 deletions(-)
New commits:
commit 1dc18167121cc1931893e5b48f3bf8c5426023cf
Author: Marina Latini (CIB) <Marina.Latini at cib.de>
AuthorDate: Thu Jul 25 09:16:58 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Aug 14 17:00:47 2019 +0200
Branded logo for the startcenter
All the icon-themes are now using the CIB logo
in the start center.
The CIB icon set is including only the logo
and the start center banner.
That theme can be used also for custom builds
where are required different logos.
Change-Id: If5bbf5899088af0e1f37c0a56b74ab399b10b5e0
diff --git a/icon-themes/breeze/sfx2/res/logo.png b/icon-themes/breeze/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/breeze/sfx2/res/logo.png differ
diff --git a/icon-themes/breeze/sfx2/res/startcenter-logo.png b/icon-themes/breeze/sfx2/res/startcenter-logo.png
new file mode 100755
index 000000000000..17ae1e937963
Binary files /dev/null and b/icon-themes/breeze/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/colibre/sfx2/res/logo.png b/icon-themes/colibre/sfx2/res/logo.png
index 3ae20b710bba..ace737a89fd9 100644
Binary files a/icon-themes/colibre/sfx2/res/logo.png and b/icon-themes/colibre/sfx2/res/logo.png differ
diff --git a/icon-themes/colibre/sfx2/res/startcenter-logo.png b/icon-themes/colibre/sfx2/res/startcenter-logo.png
index 78bc4ebd9e20..17ae1e937963 100644
Binary files a/icon-themes/colibre/sfx2/res/startcenter-logo.png and b/icon-themes/colibre/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/elementary/sfx2/res/logo.png b/icon-themes/elementary/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/elementary/sfx2/res/logo.png differ
diff --git a/icon-themes/elementary/sfx2/res/startcenter-logo.png b/icon-themes/elementary/sfx2/res/startcenter-logo.png
index de93baa47a99..17ae1e937963 100644
Binary files a/icon-themes/elementary/sfx2/res/startcenter-logo.png and b/icon-themes/elementary/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/karasa_jaga/sfx2/res/logo.png b/icon-themes/karasa_jaga/sfx2/res/logo.png
index 9ba6acaaaa0d..ace737a89fd9 100644
Binary files a/icon-themes/karasa_jaga/sfx2/res/logo.png and b/icon-themes/karasa_jaga/sfx2/res/logo.png differ
diff --git a/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png b/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png
index 7d86c09d18fd..17ae1e937963 100755
Binary files a/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png and b/icon-themes/karasa_jaga/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/sifr/sfx2/res/logo.png b/icon-themes/sifr/sfx2/res/logo.png
new file mode 100755
index 000000000000..ace737a89fd9
Binary files /dev/null and b/icon-themes/sifr/sfx2/res/logo.png differ
diff --git a/icon-themes/sifr/sfx2/res/startcenter-logo.png b/icon-themes/sifr/sfx2/res/startcenter-logo.png
new file mode 100755
index 000000000000..17ae1e937963
Binary files /dev/null and b/icon-themes/sifr/sfx2/res/startcenter-logo.png differ
diff --git a/icon-themes/tango/sfx2/res/logo.png b/icon-themes/tango/sfx2/res/logo.png
index 9ba6acaaaa0d..ace737a89fd9 100644
Binary files a/icon-themes/tango/sfx2/res/logo.png and b/icon-themes/tango/sfx2/res/logo.png differ
diff --git a/icon-themes/tango/sfx2/res/startcenter-logo.png b/icon-themes/tango/sfx2/res/startcenter-logo.png
index 78bc4ebd9e20..17ae1e937963 100644
Binary files a/icon-themes/tango/sfx2/res/startcenter-logo.png and b/icon-themes/tango/sfx2/res/startcenter-logo.png differ
commit 612cf07ca6442d49f0022f043a4c8012d9fe6398
Author: Marina Latini (CIB) <Marina.Latini at cib.de>
AuthorDate: Tue Jul 23 17:49:13 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Aug 14 17:00:47 2019 +0200
Make splash screen info more visible
Splashcreen text and frame color are now white
for a better contrast on the CIB dark red.
Change-Id: I1991c0326c5257e664c18c09e3799865ce6cdc8a
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 6feb827aed65..569c6ed8f9c3 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -15,14 +15,14 @@ Globals
BASISPACKAGEPREFIX libreofficepoweredbycibbasis
UREPACKAGEPREFIX libreofficepoweredbycib
SOLSUREPACKAGEPREFIX libreoffice
- PROGRESSBARCOLOR 85,90,95
+ PROGRESSBARCOLOR 255,255,255
PROGRESSSIZE 460,6
PROGRESSSIZEHIGH 617,12
PROGRESSPOSITION 26,235
PROGRESSPOSITIONHIGH 46,212
- PROGRESSFRAMECOLOR 85,90,95
+ PROGRESSFRAMECOLOR 255,255,255
PROGRESSTEXTBASELINE 230
- PROGRESSTEXTCOLOR 85,90,95
+ PROGRESSTEXTCOLOR 255,255,255
NATIVEPROGRESS false
REGISTRYLAYERNAME Layers
SERVICEPACK 1
commit 06042858b3a4644bf5a0aba9cd7ca595a4822efa
Author: Marina Latini (CIB) <Marina.Latini at cib.de>
AuthorDate: Tue Jul 23 17:04:03 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Aug 14 17:00:47 2019 +0200
CIB branded folder to default list
Added the branding CIB folder to the default list.
The folder can be used also for providing custom
branding.
On Windows the configuration can be also
enforced via GPO.
diff --git a/configure.ac b/configure.ac
index 7ebdc176ed9c..165dc63f3c92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1552,7 +1552,7 @@ AC_ARG_WITH(galleries,
AC_ARG_WITH(theme,
AS_HELP_STRING([--with-theme="theme1 theme2..."],
[Choose which themes to include. By default those themes with an '*' are included.
- Possible choices: *breeze, *breeze_dark, *colibre, *elementary, *karasa_jaga, *sifr, *sifr_dark, *tango.]),
+ Possible choices: *breeze, *breeze_dark, *CIB, *colibre, *elementary, *karasa_jaga, *sifr, *sifr_dark, *tango.]),
,)
libo_FUZZ_ARG_WITH(helppack-integration,
@@ -11276,7 +11276,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which themes to include])
# if none given use default subset of available themes
if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
- with_theme="breeze breeze_dark colibre elementary karasa_jaga sifr sifr_dark tango"
+ with_theme="breeze breeze_dark CIB colibre elementary karasa_jaga sifr sifr_dark tango"
fi
WITH_THEMES=""
commit bada2a3aac72a6817d40d0c39fdf2ce30d8d157a
Author: Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Mon Jun 17 19:13:18 2019 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Aug 14 17:00:46 2019 +0200
tdf#99891 Update installer fonts to match newer versions of Windows
Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34
Reviewed-on: https://gerrit.libreoffice.org/74185
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov <antilibreoffice at gmail.com>
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 7f9eb7ee16c7..145549ef3f65 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -26,7 +26,7 @@ en-US = "&Look in:"
en-US = "Browse to the destination folder."
[OOO_CONTROL_7]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
+en-US = "{&DialogDefaultBold}Change Current Destination Folder"
[OOO_CONTROL_9]
en-US = "Create new folder|"
@@ -74,7 +74,7 @@ en-US = "Cancel"
en-US = "&Next >"
[OOO_CONTROL_27]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
+en-US = "{&DialogDefaultBold}Welcome to the Installation Wizard for [ProductName]"
[OOO_CONTROL_28]
en-US = "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next."
@@ -95,7 +95,7 @@ en-US = "< &Back"
en-US = "Cancel"
[OOO_CONTROL_36]
-en-US = "{\Tahoma8}{80}"
+en-US = "{\DialogDefault}{80}"
[OOO_CONTROL_37]
en-US = "&Organization:"
@@ -107,10 +107,10 @@ en-US = "Please enter your information."
en-US = "Install this application for:"
[OOO_CONTROL_40]
-en-US = "{&MSSansBold8}User Information"
+en-US = "{&DialogDefaultBold}User Information"
[OOO_CONTROL_41]
-en-US = "{\Tahoma8}{50}"
+en-US = "{\DialogDefault}{50}"
[OOO_CONTROL_42]
en-US = "&User Name:"
@@ -137,7 +137,7 @@ en-US = "Select the program features you want installed."
en-US = "Click on an icon in the list below to change how a feature is installed."
[OOO_CONTROL_54]
-en-US = "{&MSSansBold8}Custom Setup"
+en-US = "{&DialogDefaultBold}Custom Setup"
[OOO_CONTROL_55]
en-US = "Feature Description:"
@@ -164,7 +164,7 @@ en-US = "Feature size"
en-US = "Custom Setup allows you to selectively install program features."
[OOO_CONTROL_65]
-en-US = "{&MSSansBold8}Custom Setup Tips"
+en-US = "{&DialogDefaultBold}Custom Setup Tips"
[OOO_CONTROL_66]
en-US = "Will not be installed."
@@ -203,7 +203,7 @@ en-US = "&Change..."
en-US = "Click Next to install to this folder, or click Change to install to a different folder."
[OOO_CONTROL_90]
-en-US = "{&MSSansBold8}Destination Folder"
+en-US = "{&DialogDefaultBold}Destination Folder"
[OOO_CONTROL_91]
en-US = "[INSTALLDIR]"
@@ -221,7 +221,7 @@ en-US = "The disk space required for the installation of the selected features."
en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives."
[OOO_CONTROL_98]
-en-US = "{&MSSansBold8}Disk Space Requirements"
+en-US = "{&DialogDefaultBold}Disk Space Requirements"
[OOO_CONTROL_100]
en-US = "OK"
@@ -233,7 +233,7 @@ en-US = "Some files that need to be updated are currently in use."
en-US = "The following applications are using files that need to be updated by this setup. Close these applications and click Retry to continue."
[OOO_CONTROL_105]
-en-US = "{&MSSansBold8}Files in Use"
+en-US = "{&DialogDefaultBold}Files in Use"
[OOO_CONTROL_106]
en-US = "&Exit"
@@ -254,7 +254,7 @@ en-US = "&Look in:"
en-US = "Browse to the destination folder."
[OOO_CONTROL_115]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
+en-US = "{&DialogDefaultBold}Change Current Destination Folder"
[OOO_CONTROL_117]
en-US = "Create New Folder|"
@@ -281,7 +281,7 @@ en-US = "Build contributed in collaboration with the community by [Manufacturer]
en-US = "&Next >"
[OOO_CONTROL_126]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
+en-US = "{&DialogHeading}Welcome to the Installation Wizard for [ProductName]"
[OOO_CONTROL_127]
en-US = "The Installation Wizard will install [ProductName] on your computer. To continue, click Next."
@@ -296,7 +296,7 @@ en-US = "Cancel"
en-US = "Please read the following license agreement carefully."
[OOO_CONTROL_133]
-en-US = "{&MSSansBold8}License Agreement"
+en-US = "{&DialogDefaultBold}License Agreement"
[OOO_CONTROL_134]
en-US = "&Next >"
@@ -311,7 +311,7 @@ en-US = "Cancel"
en-US = "Modify, repair, or remove the program."
[OOO_CONTROL_140]
-en-US = "{&MSSansBold8}Program Maintenance"
+en-US = "{&DialogDefaultBold}Program Maintenance"
[OOO_CONTROL_141]
en-US = "&Next >"
@@ -335,7 +335,7 @@ en-US = "Cancel"
en-US = "&Next >"
[OOO_CONTROL_149]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
+en-US = "{&DialogDefaultBold}Welcome to the Installation Wizard for [ProductName]"
[OOO_CONTROL_150]
en-US = "The Installation Wizard will allow you to modify, repair, or remove [ProductName]. To continue, click Next."
@@ -347,7 +347,7 @@ en-US = "Disk space required for the installation exceeds available disk space."
en-US = "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives."
[OOO_CONTROL_155]
-en-US = "{&MSSansBold8}Out of Disk Space"
+en-US = "{&DialogDefaultBold}Out of Disk Space"
[OOO_CONTROL_156]
en-US = "{120}{70}{70}{70}{70}"
@@ -365,7 +365,7 @@ en-US = "Cancel"
en-US = "&Update >"
[OOO_CONTROL_161]
-en-US = "{&TahomaBold10}Welcome to the Patch for [ProductName]"
+en-US = "{&DialogHeading}Welcome to the Patch for [ProductName]"
[OOO_CONTROL_162]
en-US = "The Installation Wizard will install the Patch for [ProductName] on your computer. To continue, click Update."
@@ -386,13 +386,13 @@ en-US = "Click Install to begin the installation."
en-US = "If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard."
[OOO_CONTROL_170]
-en-US = "{&MSSansBold8}Ready to Modify the Program"
+en-US = "{&DialogDefaultBold}Ready to Modify the Program"
[OOO_CONTROL_171]
-en-US = "{&MSSansBold8}Ready to Repair the Program"
+en-US = "{&DialogDefaultBold}Ready to Repair the Program"
[OOO_CONTROL_172]
-en-US = "{&MSSansBold8}Ready to Install the Program"
+en-US = "{&DialogDefaultBold}Ready to Install the Program"
[OOO_CONTROL_173]
en-US = "&Install"
@@ -413,7 +413,7 @@ en-US = "Click Remove to remove [ProductName] from your computer. After removal,
en-US = "If you want to review or change any settings, click Back."
[OOO_CONTROL_181]
-en-US = "{&MSSansBold8}Remove the Program"
+en-US = "{&DialogDefaultBold}Remove the Program"
[OOO_CONTROL_182]
en-US = "&Remove"
@@ -440,7 +440,7 @@ en-US = "You can either keep any existing installed elements on your system to c
en-US = "Click Restore or Continue Later to exit the wizard."
[OOO_CONTROL_190]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
+en-US = "{&DialogHeading}Installation Wizard Completed"
[OOO_CONTROL_191]
en-US = "The wizard was interrupted before [ProductName] could be completely installed."
@@ -455,7 +455,7 @@ en-US = "Cancel"
en-US = "&Finish"
[OOO_CONTROL_198]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
+en-US = "{&DialogHeading}Installation Wizard Completed"
[OOO_CONTROL_199]
en-US = "The Installation Wizard has successfully installed [ProductName]. Click Finish to exit the wizard."
@@ -497,7 +497,7 @@ en-US = "Cancel"
en-US = "&Next >"
[OOO_CONTROL_217]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
+en-US = "{&DialogHeading}Welcome to the Installation Wizard for [ProductName]"
[OOO_CONTROL_218]
en-US = "[ProductName] Setup is preparing the Installation Wizard which will guide you through the program setup process. Please wait."
@@ -524,7 +524,7 @@ en-US = "You can either keep any existing installed elements on your system to c
en-US = "Click Restore or Continue Later to exit the wizard."
[OOO_CONTROL_226]
-en-US = "{&TahomaBold10}Installation Wizard Completed"
+en-US = "{&DialogHeading}Installation Wizard Completed"
[OOO_CONTROL_227]
en-US = "The wizard was interrupted before [ProductName] could be completely installed."
@@ -551,10 +551,10 @@ en-US = "Please wait while the Installation Wizard installs [ProductName]. This
en-US = "Please wait while the Installation Wizard uninstalls [ProductName]. This may take several minutes."
[OOO_CONTROL_238]
-en-US = "{&MSSansBold8}Installing [ProductName]"
+en-US = "{&DialogDefaultBold}Installing [ProductName]"
[OOO_CONTROL_239]
-en-US = "{&MSSansBold8}Uninstalling [ProductName]"
+en-US = "{&DialogDefaultBold}Uninstalling [ProductName]"
[OOO_CONTROL_240]
en-US = "Sec."
@@ -584,7 +584,7 @@ en-US = "The Installation Wizard will complete the installation of [ProductName]
en-US = "The Installation Wizard will complete the suspended installation of [ProductName] on your computer. To continue, click Next."
[OOO_CONTROL_250]
-en-US = "{&TahomaBold10}Resuming the Installation Wizard for [ProductName]"
+en-US = "{&DialogHeading}Resuming the Installation Wizard for [ProductName]"
[OOO_CONTROL_251]
en-US = "< &Back"
@@ -605,7 +605,7 @@ en-US = "Choose the setup type that best suits your needs."
en-US = "Please select a setup type."
[OOO_CONTROL_259]
-en-US = "{&MSSansBold8}Setup Type"
+en-US = "{&DialogDefaultBold}Setup Type"
[OOO_CONTROL_260]
en-US = "&Next >"
@@ -641,7 +641,7 @@ en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office
en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now."
[OOO_CONTROL_278]
-en-US = "{&MSSansBold8}File Type"
+en-US = "{&DialogDefaultBold}File Type"
[OOO_CONTROL_300]
en-US = "A version of [DEFINEDPRODUCT] [DEFINEDVERSION] was found by the [ProductName] Installation Wizard. This version will be updated."
@@ -692,7 +692,7 @@ en-US = "Some files that need to be updated are currently in use."
en-US = "The following applications are using files that need to be updated by this setup. You can let Installation Wizard close them and attempt to restart them or reboot the machine later."
[OOO_CONTROL_324]
-en-US = "{&MSSansBold8}Files in Use"
+en-US = "{&DialogDefaultBold}Files in Use"
[OOO_CONTROL_325]
en-US = "Cancel"
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 9871b7d3b8cd..38115f33f2c4 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -1,323 +1,323 @@
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
65001 Control Dialog_ Control
-AdminChangeFolder Banner Bitmap 0 0 374 44 1 BannerBmp
-AdminChangeFolder BannerLine Line 0 44 374 0 1
-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 0 234 374 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
-AdminChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_10 Cancel
-AdminChangeFolder Tail PathEdit 21 207 332 17 3 TARGETDIR OK
-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 0 0 374 44 1 BannerBmp
-AdminNetworkLocation BannerLine Line 0 44 374 0 1
-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 0 234 374 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
-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
+AdminChangeFolder Banner Bitmap 0 0 474 44 1 BannerBmp
+AdminChangeFolder BannerLine Line 0 44 474 0 1
+AdminChangeFolder Cancel PushButton 401 243 66 17 3 OOO_CONTROL_3 ComboText
+AdminChangeFolder Combo DirectoryCombo 21 64 377 80 458755 TARGETDIR Up
+AdminChangeFolder ComboText Text 21 50 199 14 3 OOO_CONTROL_5 Combo
+AdminChangeFolder DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_6
+AdminChangeFolder DlgLine Line 0 234 474 0 1
+AdminChangeFolder DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_7
+AdminChangeFolder List DirectoryList 21 90 432 97 7 TARGETDIR TailText
+AdminChangeFolder NewFolder PushButton 435 64 19 19 3670019 NewFolderIco List OOO_CONTROL_9
+AdminChangeFolder OK PushButton 330 243 66 17 3 OOO_CONTROL_10 Cancel
+AdminChangeFolder Tail PathEdit 21 207 432 19 3 TARGETDIR OK
+AdminChangeFolder TailText Text 21 193 199 13 3 OOO_CONTROL_12 Tail
+AdminChangeFolder Up PushButton 410 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_13
+AdminNetworkLocation Back PushButton 264 243 66 17 3 OOO_CONTROL_14 InstallNow
+AdminNetworkLocation Banner Bitmap 0 0 474 44 1 BannerBmp
+AdminNetworkLocation BannerLine Line 0 44 474 0 1
+AdminNetworkLocation Browse PushButton 386 143 66 17 3 OOO_CONTROL_17 Back
+AdminNetworkLocation Cancel PushButton 401 243 66 17 3 OOO_CONTROL_18 LBBrowse
+AdminNetworkLocation DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_19
+AdminNetworkLocation DlgLine Line 0 234 474 0 1
+AdminNetworkLocation DlgText Text 21 51 426 59 3 OOO_CONTROL_20
+AdminNetworkLocation DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_21
+AdminNetworkLocation InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_22 Cancel
+AdminNetworkLocation LBBrowse Text 21 109 200 10 3 OOO_CONTROL_23 SetupPathEdit
+AdminNetworkLocation SetupPathEdit PathEdit 21 121 430 19 3 TARGETDIR Browse
+AdminWelcome Back PushButton 264 243 66 17 1 OOO_CONTROL_24 Next
+AdminWelcome Cancel PushButton 401 243 66 17 3 OOO_CONTROL_25 Back
+AdminWelcome DlgLine Line 0 234 474 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
-AdminWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_28
+AdminWelcome Next PushButton 330 243 66 17 3 OOO_CONTROL_26 Cancel
+AdminWelcome TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_27
+AdminWelcome TextLine2 Text 135 55 328 45 65539 OOO_CONTROL_28
ApplicationInfo1 Icon Icon 15 15 24 24 5242881 CautionIco
-ApplicationInfo1 OK PushButton 100 57 66 17 3 OOO_CONTROL_10
-ApplicationInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_318
+ApplicationInfo1 OK PushButton 122 76 66 17 3 OOO_CONTROL_10
+ApplicationInfo1 Text Text 48 15 245 50 3 OOO_CONTROL_318
CancelSetup Icon Icon 15 15 24 24 5242881 CautionIco
-CancelSetup No PushButton 135 57 66 17 3 OOO_CONTROL_29 Yes
-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 0 0 374 44 1 BannerBmp
-CustomerInformation BannerLine Line 0 44 374 0 1
-CustomerInformation Cancel PushButton 301 243 66 17 3 OOO_CONTROL_35 NameLabel
-CustomerInformation CompanyEdit Edit 21 100 237 17 3 COMPANYNAME OOO_CONTROL_36 RadioGroup
-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 0 234 374 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
-CustomerInformation NameLabel Text 21 52 75 10 3 OOO_CONTROL_42 NameEdit
-CustomerInformation Next PushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel
-CustomerInformation RadioGroup RadioButtonGroup 63 170 300 50 3 ApplicationUsers Back
-CustomSetup Back PushButton 164 243 66 17 3 OOO_CONTROL_46 Next
-CustomSetup Banner Bitmap 0 0 374 44 1 BannerBmp
-CustomSetup BannerLine Line 0 44 374 0 1
-CustomSetup Cancel PushButton 301 243 66 17 3 OOO_CONTROL_49 Tree
-CustomSetup ChangeFolder PushButton 164 203 66 17 3 OOO_CONTROL_50 Help
+CancelSetup No PushButton 135 76 66 17 3 OOO_CONTROL_29 Yes
+CancelSetup Text Text 48 15 194 49 3 OOO_CONTROL_30
+CancelSetup Yes PushButton 62 76 66 17 3 OOO_CONTROL_31 No
+CustomerInformation Back PushButton 264 243 66 17 3 OOO_CONTROL_32 Next
+CustomerInformation Banner Bitmap 0 0 474 44 1 BannerBmp
+CustomerInformation BannerLine Line 0 44 474 0 1
+CustomerInformation Cancel PushButton 401 243 66 17 3 OOO_CONTROL_35 NameLabel
+CustomerInformation CompanyEdit Edit 21 105 420 19 3 COMPANYNAME OOO_CONTROL_36 RadioGroup
+CustomerInformation CompanyLabel Text 21 89 175 17 3 OOO_CONTROL_37 CompanyEdit
+CustomerInformation DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_38
+CustomerInformation DlgLine Line 0 234 474 0 1
+CustomerInformation DlgRadioGroupText Text 21 161 400 14 3 OOO_CONTROL_39
+CustomerInformation DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_40
+CustomerInformation NameEdit Edit 21 69 420 19 3 USERNAME OOO_CONTROL_41 CompanyLabel
+CustomerInformation NameLabel Text 21 52 175 10 3 OOO_CONTROL_42 NameEdit
+CustomerInformation Next PushButton 330 243 66 17 3 OOO_CONTROL_43 Cancel
+CustomerInformation RadioGroup RadioButtonGroup 21 170 400 50 3 ApplicationUsers Back
+CustomSetup Back PushButton 264 243 66 17 3 OOO_CONTROL_46 Next
+CustomSetup Banner Bitmap 0 0 474 44 1 BannerBmp
+CustomSetup BannerLine Line 0 44 474 0 1
+CustomSetup Cancel PushButton 401 243 66 17 3 OOO_CONTROL_49 Tree
+CustomSetup ChangeFolder PushButton 214 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 0 234 374 0 1
-CustomSetup DlgText Text 9 47 360 20 3 OOO_CONTROL_53
-CustomSetup DlgTitle Text 9 6 284 25 65539 OOO_CONTROL_54
-CustomSetup FeatureGroup GroupBox 235 67 131 152 1 OOO_CONTROL_55
+CustomSetup DlgDesc Text 17 23 376 25 65539 OOO_CONTROL_52
+CustomSetup DlgLine Line 0 234 474 0 1
+CustomSetup DlgText Text 9 47 460 20 3 OOO_CONTROL_53
+CustomSetup DlgTitle Text 9 6 384 25 65539 OOO_CONTROL_54
+CustomSetup FeatureGroup GroupBox 285 67 181 153 1 OOO_CONTROL_55
CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
-CustomSetup InstallLabel Text 8 190 220 10 3 OOO_CONTROL_57
-CustomSetup ItemDescription Text 241 80 120 65 3 OOO_CONTROL_58
-CustomSetup Location Text 8 203 154 20 3 OOO_CONTROL_59
-CustomSetup Next PushButton 230 243 66 17 3 OOO_CONTROL_60 Cancel
-CustomSetup Size Text 241 148 120 65 3 OOO_CONTROL_61
-CustomSetup Tree SelectionTree 8 70 220 118 7 _BrowseProperty ChangeFolder
-CustomSetupTips Banner Bitmap 0 0 374 44 1 BannerBmp
-CustomSetupTips BannerLine Line 0 44 374 0 1
-CustomSetupTips DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_64
-CustomSetupTips DlgLine Line 0 234 374 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
+CustomSetup InstallLabel Text 8 190 150 10 3 OOO_CONTROL_57
+CustomSetup ItemDescription Text 291 80 173 65 3 OOO_CONTROL_58
+CustomSetup Location Text 8 203 204 20 3 OOO_CONTROL_59
+CustomSetup Next PushButton 330 243 66 17 3 OOO_CONTROL_60 Cancel
+CustomSetup Size Text 291 148 173 72 3 OOO_CONTROL_61
+CustomSetup Tree SelectionTree 8 70 270 118 7 _BrowseProperty ChangeFolder
+CustomSetupTips Banner Bitmap 0 0 474 44 1 BannerBmp
+CustomSetupTips BannerLine Line 0 44 474 0 1
+CustomSetupTips DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_64
+CustomSetupTips DlgLine Line 0 234 474 0 1
+CustomSetupTips DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_65
+CustomSetupTips DontInstall Icon 21 167 24 24 5242881 DontInstallIco
+CustomSetupTips DontInstallText Text 60 167 400 20 3 OOO_CONTROL_66
CustomSetupTips Install Icon 21 105 24 24 5242881 InstallIco
-CustomSetupTips InstallPartial Icon 21 130 24 24 5242881 InstallPartialIco
+CustomSetupTips InstallPartial Icon 21 136 24 24 5242881 InstallPartialIco
CustomSetupTips InstallStateMenu Icon 21 52 24 24 5242881 InstallStateMenuIco
-CustomSetupTips InstallStateText Text 21 91 300 10 3 OOO_CONTROL_68
-CustomSetupTips InstallText Text 60 105 300 20 3 OOO_CONTROL_69
-CustomSetupTips MenuText Text 50 52 300 36 3 OOO_CONTROL_70
-CustomSetupTips OK PushButton 301 243 66 17 3 OOO_CONTROL_72
-CustomSetupTips PartialText Text 60 130 300 20 3 OOO_CONTROL_73
-DiskSpaceRequirements Banner Bitmap 0 0 374 44 1 BannerBmp
-DiskSpaceRequirements BannerLine Line 0 44 374 0 1
-DiskSpaceRequirements DlgDesc Text 17 23 276 25 65539 OOO_CONTROL_96
-DiskSpaceRequirements DlgLine Line 0 234 374 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 0 0 374 44 1 BannerBmp
-FilesInUse BannerLine Line 0 44 374 0 1
-FilesInUse DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_103
-FilesInUse DlgLine Line 0 234 374 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
-FilesInUse Ignore PushButton 230 243 66 17 3 OOO_CONTROL_107 Exit
-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 0 0 374 44 1 BannerBmp
-FileTypeDialog BannerLine Line 0 44 374 0 1
-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 CheckBox4
-FileTypeDialog CheckBox4 CheckBox 41 181 200 10 3 SELECT_VISIO OOO_CONTROL_273 Back
-FileTypeDialog DlgDesc Text 21 20 272 25 65539 OOO_CONTROL_274
-FileTypeDialog DlgLine Line 0 234 374 0 1
-FileTypeDialog DlgText Text 21 56 326 40 3 OOO_CONTROL_275
-FileTypeDialog DlgText2 Text 21 200 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 0 0 374 44 1 BannerBmp
-InstallChangeFolder BannerLine Line 0 44 374 0 1
-InstallChangeFolder Cancel PushButton 301 243 66 17 3 OOO_CONTROL_111 ComboText
-InstallChangeFolder Combo DirectoryCombo 21 64 277 80 4128779 _BrowseProperty Up
+CustomSetupTips InstallStateText Text 21 88 400 10 3 OOO_CONTROL_68
+CustomSetupTips InstallText Text 60 105 400 20 3 OOO_CONTROL_69
+CustomSetupTips MenuText Text 50 52 400 36 3 OOO_CONTROL_70
+CustomSetupTips OK PushButton 401 243 66 17 3 OOO_CONTROL_72
+CustomSetupTips PartialText Text 60 130 400 36 3 OOO_CONTROL_73
+DiskSpaceRequirements Banner Bitmap 0 0 474 44 1 BannerBmp
+DiskSpaceRequirements BannerLine Line 0 44 474 0 1
+DiskSpaceRequirements DlgDesc Text 17 23 376 25 65539 OOO_CONTROL_96
+DiskSpaceRequirements DlgLine Line 0 234 474 0 1
+DiskSpaceRequirements DlgText Text 10 185 458 41 3 OOO_CONTROL_97
+DiskSpaceRequirements DlgTitle Text 9 6 384 25 65539 OOO_CONTROL_98
+DiskSpaceRequirements List VolumeCostList 8 55 458 125 393223 {120}{70}{70}{70}{70}
+DiskSpaceRequirements OK PushButton 401 243 66 17 3 OOO_CONTROL_100
+FilesInUse Banner Bitmap 0 0 474 44 1 BannerBmp
+FilesInUse BannerLine Line 0 44 474 0 1
+FilesInUse DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_103
+FilesInUse DlgLine Line 0 234 474 0 1
+FilesInUse DlgText Text 21 51 448 29 3 OOO_CONTROL_104
+FilesInUse DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_105
+FilesInUse Exit PushButton 401 243 66 17 3 OOO_CONTROL_106 List
+FilesInUse Ignore PushButton 330 243 66 17 3 OOO_CONTROL_107 Exit
+FilesInUse List ListBox 21 87 431 135 7 FileInUseProcess Retry
+FilesInUse Retry PushButton 264 243 66 17 3 OOO_CONTROL_108 Ignore
+FileTypeDialog Back PushButton 264 243 66 17 3 OOO_CONTROL_135 Next
+FileTypeDialog Banner Bitmap 0 0 474 44 1 BannerBmp
+FileTypeDialog BannerLine Line 0 44 474 0 1
+FileTypeDialog Cancel PushButton 401 243 66 17 3 OOO_CONTROL_138 CheckBox1
+FileTypeDialog CheckBox1 CheckBox 41 106 300 10 3 SELECT_WORD OOO_CONTROL_270 CheckBox2
+FileTypeDialog CheckBox2 CheckBox 41 131 300 10 3 SELECT_EXCEL OOO_CONTROL_271 CheckBox3
+FileTypeDialog CheckBox3 CheckBox 41 156 300 10 3 SELECT_POWERPOINT OOO_CONTROL_272 CheckBox4
+FileTypeDialog CheckBox4 CheckBox 41 181 300 10 3 SELECT_VISIO OOO_CONTROL_273 Back
+FileTypeDialog DlgDesc Text 21 20 372 25 65539 OOO_CONTROL_274
+FileTypeDialog DlgLine Line 0 234 474 0 1
+FileTypeDialog DlgText Text 21 56 426 40 3 OOO_CONTROL_275
+FileTypeDialog DlgText2 Text 21 200 426 30 3 OOO_CONTROL_309
+FileTypeDialog DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_278
+FileTypeDialog Next PushButton 330 243 66 17 3 OOO_CONTROL_134 Cancel
+InstallChangeFolder Banner Bitmap 0 0 474 44 1 BannerBmp
+InstallChangeFolder BannerLine Line 0 44 474 0 1
+InstallChangeFolder Cancel PushButton 401 243 66 17 3 OOO_CONTROL_111 ComboText
+InstallChangeFolder Combo DirectoryCombo 21 64 377 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 0 234 374 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
-InstallChangeFolder OK PushButton 230 243 66 17 3 OOO_CONTROL_118 Cancel
-InstallChangeFolder Tail PathEdit 21 207 332 17 15 _BrowseProperty OK
+InstallChangeFolder DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_114
+InstallChangeFolder DlgLine Line 0 234 474 0 1
+InstallChangeFolder DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_115
+InstallChangeFolder List DirectoryList 21 90 432 97 15 _BrowseProperty TailText
+InstallChangeFolder NewFolder PushButton 435 64 19 19 3670019 NewFolderIco List OOO_CONTROL_117
+InstallChangeFolder OK PushButton 330 243 66 17 3 OOO_CONTROL_118 Cancel
+InstallChangeFolder Tail PathEdit 21 207 432 19 15 _BrowseProperty OK
InstallChangeFolder TailText Text 21 193 99 13 3 OOO_CONTROL_120 Tail
-InstallChangeFolder Up PushButton 310 66 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
-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
+InstallChangeFolder Up PushButton 410 64 19 19 3670019 UpIco NewFolder OOO_CONTROL_121
+InstallWelcome Back PushButton 264 243 66 17 1 OOO_CONTROL_122 Copyright
+InstallWelcome Cancel PushButton 401 243 66 17 3 OOO_CONTROL_123 Back
+InstallWelcome Copyright Text 135 144 328 73 65539 OOO_CONTROL_124 Next
+InstallWelcome DlgLine Line 0 234 474 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
-InstallWelcome TextLine2 Text 135 55 228 45 65539 OOO_CONTROL_127
+InstallWelcome Next PushButton 330 243 66 17 3 OOO_CONTROL_125 Cancel
+InstallWelcome TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_126
+InstallWelcome TextLine2 Text 135 55 328 45 65539 OOO_CONTROL_127
LanguageInfo1 Icon Icon 15 15 24 24 5242881 CautionIco
-LanguageInfo1 OK PushButton 100 57 66 17 3 OOO_CONTROL_10
-LanguageInfo1 Text Text 48 15 194 30 3 OOO_CONTROL_317
+LanguageInfo1 OK PushButton 122 74 66 17 3 OOO_CONTROL_10
+LanguageInfo1 Text Text 48 15 224 47 3 OOO_CONTROL_317
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 0 0 374 44 1 BannerBmp
-LicenseAgreement BannerLine Line 0 44 374 0 1
-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 0 234 374 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 0 0 374 44 1 BannerBmp
-MaintenanceType BannerLine Line 0 44 374 0 1
-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 0 234 374 0 1
-MaintenanceType DlgTitle Text 13 6 280 25 65539 OOO_CONTROL_140
+LicenseAgreement Back PushButton 264 243 66 17 3 OOO_CONTROL_128 Next
+LicenseAgreement Banner Bitmap 0 0 474 44 1 BannerBmp
+LicenseAgreement BannerLine Line 0 44 474 0 1
+LicenseAgreement Cancel PushButton 401 243 66 17 3 OOO_CONTROL_131 Agree
+LicenseAgreement DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_132
+LicenseAgreement DlgLine Line 0 234 474 0 1
+LicenseAgreement DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_133
+LicenseAgreement Memo ScrollableText 8 54 458 130 7
+LicenseAgreement Next PushButton 330 243 66 17 3 OOO_CONTROL_134 Cancel
+MaintenanceType Back PushButton 264 243 66 17 3 OOO_CONTROL_135 Next
+MaintenanceType Banner Bitmap 0 0 474 44 1 BannerBmp
+MaintenanceType BannerLine Line 0 44 474 0 1
+MaintenanceType Cancel PushButton 401 243 66 17 3 OOO_CONTROL_138 RadioGroup
+MaintenanceType DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_139
+MaintenanceType DlgLine Line 0 234 474 0 1
+MaintenanceType DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_140
MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco
MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco
MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco
-MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel
+MaintenanceType Next PushButton 330 243 66 17 3 OOO_CONTROL_141 Cancel
MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back
-MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_143
-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
+MaintenanceType Text1 Text 80 72 360 52 3 OOO_CONTROL_143
+MaintenanceType Text2 Text 80 135 360 35 3 OOO_CONTROL_144
+MaintenanceType Text3 Text 80 197 360 35 3 OOO_CONTROL_145
+MaintenanceWelcome Back PushButton 264 243 66 17 1 OOO_CONTROL_146 Next
+MaintenanceWelcome Cancel PushButton 401 243 66 17 3 OOO_CONTROL_147 Back
+MaintenanceWelcome DlgLine Line 0 234 474 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
-MsiRMFilesInUse Banner Bitmap 0 0 374 44 1 BannerBmp
-MsiRMFilesInUse DlgTitle Text 13 6 280 15 196611 OOO_CONTROL_324
-MsiRMFilesInUse DlgDesc Text 21 23 272 25 196611 OOO_CONTROL_322
-MsiRMFilesInUse BannerLine Line 0 44 374 0 1
-MsiRMFilesInUse DlgText Text 21 51 326 43 3 OOO_CONTROL_323
-MsiRMFilesInUse List ListBox 21 95 332 85 7 FileInUseProcess
+MaintenanceWelcome Next PushButton 330 243 66 17 3 OOO_CONTROL_148 Cancel
+MaintenanceWelcome TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_149
+MaintenanceWelcome TextLine2 Text 135 55 328 50 65539 OOO_CONTROL_150
+MsiRMFilesInUse Banner Bitmap 0 0 474 44 1 BannerBmp
+MsiRMFilesInUse DlgTitle Text 13 6 380 15 196611 OOO_CONTROL_324
+MsiRMFilesInUse DlgDesc Text 21 23 372 25 196611 OOO_CONTROL_322
+MsiRMFilesInUse BannerLine Line 0 44 474 0 1
+MsiRMFilesInUse DlgText Text 21 51 426 43 3 OOO_CONTROL_323
+MsiRMFilesInUse List ListBox 21 95 432 85 7 FileInUseProcess
MsiRMFilesInUse ShutdownOption RadioButtonGroup 26 190 305 45 3 MsiUIRMOption OK
-MsiRMFilesInUse DlgLine Line 0 234 374 0 1
-MsiRMFilesInUse OK PushButton 230 243 66 17 3 OOO_CONTROL_326 Cancel
-MsiRMFilesInUse Cancel PushButton 301 243 66 17 3 OOO_CONTROL_325 ShutdownOption
-OutOfSpace Banner Bitmap 0 0 374 44 1 BannerBmp
-OutOfSpace BannerLine Line 0 44 374 0 1
-OutOfSpace DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_153
-OutOfSpace DlgLine Line 0 234 374 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
+MsiRMFilesInUse DlgLine Line 0 234 474 0 1
+MsiRMFilesInUse OK PushButton 330 243 66 17 3 OOO_CONTROL_326 Cancel
+MsiRMFilesInUse Cancel PushButton 401 243 66 17 3 OOO_CONTROL_325 ShutdownOption
+OutOfSpace Banner Bitmap 0 0 474 44 1 BannerBmp
+OutOfSpace BannerLine Line 0 44 474 0 1
+OutOfSpace DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_153
+OutOfSpace DlgLine Line 0 234 474 0 1
+OutOfSpace DlgText Text 21 51 426 43 3 OOO_CONTROL_154
+OutOfSpace DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_155
+OutOfSpace List VolumeCostList 21 95 432 120 393223 OOO_CONTROL_156
+OutOfSpace Resume PushButton 401 243 66 17 3 OOO_CONTROL_157
+PatchWelcome Back PushButton 264 243 66 17 1 OOO_CONTROL_158 Next
+PatchWelcome Cancel PushButton 401 243 66 17 3 OOO_CONTROL_159 Back
+PatchWelcome DlgLine Line 0 234 474 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 0 0 374 44 1 BannerBmp
-ReadyToInstall BannerLine Line 0 44 374 0 1
-ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 DesktopLink
-ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167
-ReadyToInstall DlgLine Line 0 234 374 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
-ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171
-ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172
-ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel
+PatchWelcome Next PushButton 330 243 66 17 3 OOO_CONTROL_160 Cancel
+PatchWelcome TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_161
+PatchWelcome TextLine2 Text 135 54 328 45 65539 OOO_CONTROL_162
+ReadyToInstall Back PushButton 264 243 66 17 3 OOO_CONTROL_163 InstallNow
+ReadyToInstall Banner Bitmap 0 0 474 44 1 BannerBmp
+ReadyToInstall BannerLine Line 0 44 474 0 1
+ReadyToInstall Cancel PushButton 401 243 66 17 3 OOO_CONTROL_166 DesktopLink
+ReadyToInstall DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_167
+ReadyToInstall DlgLine Line 0 234 474 0 1
+ReadyToInstall DlgText Text 21 51 426 20 3 OOO_CONTROL_168
+ReadyToInstall DlgText1 Text 21 70 430 24 3 OOO_CONTROL_169
+ReadyToInstall DlgTitle Text 13 6 380 25 65538 OOO_CONTROL_170
+ReadyToInstall DlgTitle2 Text 13 6 380 25 65538 OOO_CONTROL_171
+ReadyToInstall DlgTitle3 Text 13 6 380 25 65538 OOO_CONTROL_172
+ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel
ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart
ReadyToInstall EnableQuickstart CheckBox 21 125 300 10 3 QUICKSTART OOO_CONTROL_321 Back
-ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow
-ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp
-ReadyToRemove BannerLine Line 0 44 374 0 1
-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 0 234 374 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
-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 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
+ReadyToRemove Back PushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow
+ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp
+ReadyToRemove BannerLine Line 0 44 474 0 1
+ReadyToRemove Cancel PushButton 401 243 66 17 3 OOO_CONTROL_177 Back
+ReadyToRemove DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_178
+ReadyToRemove DlgLine Line 0 234 474 0 1
+ReadyToRemove DlgText Text 21 51 426 24 3 OOO_CONTROL_179
+ReadyToRemove DlgText1 Text 21 79 430 23 3 OOO_CONTROL_180
+ReadyToRemove DlgText2 Text 21 102 430 24 3
+ReadyToRemove DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_181
+ReadyToRemove RemoveNow PushButton 330 243 66 17 3 OOO_CONTROL_182 Cancel
+SetupCompleteError Back PushButton 264 243 66 17 1 OOO_CONTROL_183 Finish
+SetupCompleteError Cancel PushButton 401 243 66 17 1 OOO_CONTROL_184 Back
+SetupCompleteError DlgLine Line 0 234 474 0 1
+SetupCompleteError Finish PushButton 330 243 66 17 3 OOO_CONTROL_185 Cancel
+SetupCompleteError FinishText1 Text 135 80 328 50 65539 OOO_CONTROL_186
+SetupCompleteError FinishText2 Text 135 135 328 25 65539 OOO_CONTROL_187
SetupCompleteError Image Bitmap 0 0 122 234 1 ImageBmp
-SetupCompleteError RestContText1 Text 135 80 228 50 65539 OOO_CONTROL_188
-SetupCompleteError RestContText2 Text 135 135 228 25 65539 OOO_CONTROL_189
-SetupCompleteError TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_190
-SetupCompleteError TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_191
-SetupCompleteSuccess Back PushButton 164 243 66 17 1 OOO_CONTROL_192 OK
-SetupCompleteSuccess Cancel PushButton 301 243 66 17 1 OOO_CONTROL_193 Image
-SetupCompleteSuccess DlgLine Line 0 234 374 0 1
+SetupCompleteError RestContText1 Text 135 80 328 50 65539 OOO_CONTROL_188
+SetupCompleteError RestContText2 Text 135 135 328 25 65539 OOO_CONTROL_189
+SetupCompleteError TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_190
+SetupCompleteError TextLine2 Text 135 55 328 25 65539 OOO_CONTROL_191
+SetupCompleteSuccess Back PushButton 264 243 66 17 1 OOO_CONTROL_192 OK
+SetupCompleteSuccess Cancel PushButton 401 243 66 17 1 OOO_CONTROL_193 Image
+SetupCompleteSuccess DlgLine Line 0 234 474 0 1
SetupCompleteSuccess Image Bitmap 0 0 122 234 1 ImageBmp Back
-SetupCompleteSuccess OK PushButton 230 243 66 17 3 OOO_CONTROL_197 Cancel
-SetupCompleteSuccess TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_198
-SetupCompleteSuccess TextLine2 Text 135 55 228 45 65538 OOO_CONTROL_199
-SetupCompleteSuccess TextLine3 Text 135 55 228 45 65538 OOO_CONTROL_200
-SetupError A PushButton 192 80 66 17 3 OOO_CONTROL_204
-SetupError C PushButton 192 80 66 17 3 OOO_CONTROL_205
-SetupError ErrorText Text 50 15 200 50 3 OOO_CONTROL_206
-SetupError I PushButton 192 80 66 17 3 OOO_CONTROL_207
-SetupError N PushButton 192 80 66 17 3 OOO_CONTROL_208
-SetupError O PushButton 192 80 66 17 3 OOO_CONTROL_209
-SetupError R PushButton 192 80 66 17 3 OOO_CONTROL_210
+SetupCompleteSuccess OK PushButton 330 243 66 17 3 OOO_CONTROL_197 Cancel
+SetupCompleteSuccess TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_198
+SetupCompleteSuccess TextLine2 Text 135 55 328 45 65538 OOO_CONTROL_199
+SetupCompleteSuccess TextLine3 Text 135 55 328 45 65538 OOO_CONTROL_200
+SetupError A PushButton 222 97 66 17 3 OOO_CONTROL_204
+SetupError C PushButton 222 97 66 17 3 OOO_CONTROL_205
+SetupError ErrorText Text 50 15 230 67 3 OOO_CONTROL_206
+SetupError I PushButton 222 97 66 17 3 OOO_CONTROL_207
+SetupError N PushButton 222 97 66 17 3 OOO_CONTROL_208
+SetupError O PushButton 222 97 66 17 3 OOO_CONTROL_209
+SetupError R PushButton 222 97 66 17 3 OOO_CONTROL_210
SetupError ErrorIcon Icon 15 15 24 24 5242881 CautionIco
-SetupError Y PushButton 192 80 66 17 3 OOO_CONTROL_211
-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
+SetupError Y PushButton 222 97 66 17 3 OOO_CONTROL_211
+SetupInitialization ActionData Text 135 125 328 12 65539
+SetupInitialization ActionText Text 135 109 320 36 65539
+SetupInitialization Back PushButton 264 243 66 17 1 OOO_CONTROL_214
+SetupInitialization Cancel PushButton 401 243 66 17 3 OOO_CONTROL_215
+SetupInitialization DlgLine Line 0 234 474 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 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
+SetupInitialization Next PushButton 330 243 66 17 1 OOO_CONTROL_216
+SetupInitialization TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_217
+SetupInitialization TextLine2 Text 135 55 328 47 65539 OOO_CONTROL_218
+SetupInterrupted Back PushButton 264 243 66 17 1 OOO_CONTROL_219
+SetupInterrupted Cancel PushButton 401 243 66 17 1 OOO_CONTROL_220
+SetupInterrupted DlgLine Line 0 234 474 0 1
+SetupInterrupted Finish PushButton 330 243 66 17 3 OOO_CONTROL_221
+SetupInterrupted FinishText1 Text 135 80 328 50 65539 OOO_CONTROL_222
+SetupInterrupted FinishText2 Text 135 135 328 25 65539 OOO_CONTROL_223
SetupInterrupted Image Bitmap 0 0 122 234 1 ImageBmp
-SetupInterrupted RestContText1 Text 135 80 228 50 65539 OOO_CONTROL_224
-SetupInterrupted RestContText2 Text 135 135 228 25 65539 OOO_CONTROL_225
-SetupInterrupted TextLine1 Text 135 8 225 45 65539 OOO_CONTROL_226
-SetupInterrupted TextLine2 Text 135 55 228 25 65539 OOO_CONTROL_227
-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 0 0 374 44 1 BannerBmp
-SetupProgress BannerLine Line 0 44 374 0 1
-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 0 234 374 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
-SetupProgress DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_239
-SetupProgress LbSec Text 172 139 32 12 2 OOO_CONTROL_240
-SetupProgress LbStatus Text 59 85 70 12 3 OOO_CONTROL_241
-SetupProgress Next PushButton 230 243 66 17 1 OOO_CONTROL_242 Cancel
+SetupInterrupted RestContText1 Text 135 80 328 50 65539 OOO_CONTROL_224
+SetupInterrupted RestContText2 Text 135 135 328 25 65539 OOO_CONTROL_225
+SetupInterrupted TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_226
+SetupInterrupted TextLine2 Text 135 55 328 25 65539 OOO_CONTROL_227
+SetupProgress ActionProgress95 ProgressBar 59 113 375 12 65537 OOO_CONTROL_228
+SetupProgress ActionText Text 59 100 375 12 3
+SetupProgress Back PushButton 264 243 66 17 1 OOO_CONTROL_230 Next
+SetupProgress Banner Bitmap 0 0 474 44 1 BannerBmp
+SetupProgress BannerLine Line 0 44 474 0 1
+SetupProgress Cancel PushButton 401 243 66 17 3 OOO_CONTROL_233 Back
+SetupProgress DlgDesc Text 21 23 372 25 65538 OOO_CONTROL_234
+SetupProgress DlgDesc2 Text 21 23 372 25 65538 OOO_CONTROL_235
+SetupProgress DlgLine Line 0 234 474 0 1
+SetupProgress DlgText Text 59 51 375 30 65538 OOO_CONTROL_236
+SetupProgress DlgText2 Text 59 51 375 30 65538 OOO_CONTROL_237
+SetupProgress DlgTitle Text 13 6 380 25 65538 OOO_CONTROL_238
+SetupProgress DlgTitle2 Text 13 6 380 25 65538 OOO_CONTROL_239
+SetupProgress LbSec Text 172 139 132 12 2 OOO_CONTROL_240
+SetupProgress LbStatus Text 59 85 170 12 3 OOO_CONTROL_241
+SetupProgress Next PushButton 330 243 66 17 1 OOO_CONTROL_242 Cancel
SetupProgress SetupIcon Icon 21 51 24 24 5242881 SetupIco
-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
+SetupProgress ShowTime Text 155 139 117 12 2
+SetupProgress TextTime Text 59 139 196 12 2 OOO_CONTROL_244
+SetupResume Back PushButton 264 243 66 17 1 OOO_CONTROL_245 Next
+SetupResume Cancel PushButton 401 243 66 17 3 OOO_CONTROL_246 Back
+SetupResume DlgLine Line 0 234 474 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
-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 0 0 374 44 1 BannerBmp
-SetupType BannerLine Line 0 44 374 0 1
-SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup
+SetupResume Next PushButton 330 243 66 17 3 OOO_CONTROL_247 Cancel
+SetupResume PreselectedText Text 135 55 328 45 65539 OOO_CONTROL_248
+SetupResume ResumeText Text 135 46 328 45 65539 OOO_CONTROL_249
+SetupResume TextLine1 Text 135 8 325 45 65539 OOO_CONTROL_250
+SetupType Back PushButton 264 243 66 17 3 OOO_CONTROL_251 Next
+SetupType Banner Bitmap 0 0 474 44 1 BannerBmp
+SetupType BannerLine Line 0 44 474 0 1
+SetupType Cancel PushButton 401 243 66 17 3 OOO_CONTROL_254 RadioGroup
SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco
-SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255
+SetupType CompText Text 80 94 346 40 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 0 234 374 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
-SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back
-SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next
-SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back
-SplashBitmap DlgLine Line 0 234 374 0 1
+SetupType CustText Text 80 154 346 40 3 OOO_CONTROL_256
+SetupType DlgDesc Text 21 23 372 25 65539 OOO_CONTROL_257
+SetupType DlgLine Line 0 234 474 0 1
+SetupType DlgText Text 21 51 426 10 3 OOO_CONTROL_258
+SetupType DlgTitle Text 13 6 380 25 65539 OOO_CONTROL_259
+SetupType Next PushButton 330 243 66 17 3 OOO_CONTROL_260 Cancel
+SetupType RadioGroup RadioButtonGroup 21 79 364 120 3 _IsSetupTypeMin Back
+SplashBitmap Back PushButton 264 243 66 17 1 OOO_CONTROL_262 Next
+SplashBitmap Cancel PushButton 401 243 66 17 3 OOO_CONTROL_265 Back
+SplashBitmap DlgLine Line 0 234 474 0 1
SplashBitmap Image Bitmap 13 12 114 211 1 ImageBmp
-SplashBitmap Next PushButton 230 243 66 17 3 OOO_CONTROL_266 Cancel
+SplashBitmap Next PushButton 330 243 66 17 3 OOO_CONTROL_266 Cancel
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
index 73d6ad862c26..9b3995807f83 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt
@@ -1,34 +1,34 @@
Dialog HCentering VCentering Width Height Attributes Title Control_First Control_Default Control_Cancel
s72 i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
-AdminChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
-AdminNetworkLocation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
-AdminWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-ApplicationInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-CancelSetup 50 50 260 85 3 [ProductName] [Setup] No No No
-CustomerInformation 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
-CustomSetup 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
-CustomSetupTips 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-DiskSpaceRequirements 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-FilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
-FileTypeDialog 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
-InstallChangeFolder 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
-InstallWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-LanguageInfo1 50 50 260 85 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-LicenseAgreement 50 50 374 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel
-MaintenanceType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
-MaintenanceWelcome 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-MsiRMFilesInUse 50 50 374 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK Cancel
-OutOfSpace 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
-PatchWelcome 50 50 374 266 3 [ProductName] Patch - [STR_INSTALLATION_WIZARD] Next Next Cancel
-ReadyToInstall 50 50 374 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
-ReadyToRemove 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RemoveNow RemoveNow Cancel
-SetupCompleteError 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
-SetupCompleteSuccess 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
-SetupError 50 10 270 110 65543 [ProductName] [STR_INSTALLATION_WIZARD] ErrorText O C
-SetupInitialization 50 50 374 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
-SetupInterrupted 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
-SetupProgress 50 50 374 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
-SetupResume 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
-SetupType 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
-SplashBitmap 50 50 374 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
+AdminChangeFolder 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
+AdminNetworkLocation 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
+AdminWelcome 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
+ApplicationInfo1 50 50 300 104 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
+CancelSetup 50 50 260 104 3 [ProductName] [Setup] No No No
+CustomerInformation 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] NameLabel Next Cancel
+CustomSetup 50 50 474 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] Tree Next Cancel
+CustomSetupTips 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
+DiskSpaceRequirements 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
+FilesInUse 50 50 474 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] Retry Retry Exit
+FileTypeDialog 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] CheckBox1 Next Cancel
+InstallChangeFolder 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] TailText OK Cancel
+InstallWelcome 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
+LanguageInfo1 50 50 300 102 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
+LicenseAgreement 50 50 474 266 2 [ProductName] - [STR_INSTALLATION_WIZARD] Agree Next Cancel
+MaintenanceType 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
+MaintenanceWelcome 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
+MsiRMFilesInUse 50 50 474 266 19 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK Cancel
+OutOfSpace 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Resume Resume Resume
+PatchWelcome 50 50 474 266 3 [ProductName] Patch - [STR_INSTALLATION_WIZARD] Next Next Cancel
+ReadyToInstall 50 50 474 266 35 [ProductName] - [STR_INSTALLATION_WIZARD] InstallNow InstallNow Cancel
+ReadyToRemove 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RemoveNow RemoveNow Cancel
+SetupCompleteError 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
+SetupCompleteSuccess 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] OK OK OK
+SetupError 50 10 300 127 65543 [ProductName] [STR_INSTALLATION_WIZARD] ErrorText O C
+SetupInitialization 50 50 474 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
+SetupInterrupted 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Finish Finish Finish
+SetupProgress 50 50 474 266 5 [ProductName] - [STR_INSTALLATION_WIZARD] Cancel Cancel Cancel
+SetupResume 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
+SetupType 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] RadioGroup Next Cancel
+SplashBitmap 50 50 474 266 3 [ProductName] - [STR_INSTALLATION_WIZARD] Next Next Cancel
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index b9b53a02e3ac..03fab1ce9347 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -11,7 +11,7 @@ ARPCONTACT OOO_ARPCONTACTTEMPLATE
ARPHELPLINK OOO_ARPHELPLINKTEMPLATE
ARPURLINFOABOUT OOO_ARPURLINFOABOUTTEMPLATE
ARPURLUPDATEINFO OOO_ARPURLUPDATEINFOTEMPLATE
-DefaultUIFont Tahoma8
+DefaultUIFont DialogDefault
DialogCaption Windows Installer
DiskPrompt [1]
Display_IsBitmapDlg 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt
index b4575c15dfc2..404cbc58ba39 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt
@@ -1,25 +1,6 @@
TextStyle FaceName Size Color StyleBits
s72 s32 i2 I4 I2
TextStyle TextStyle
-Arial8 Arial 8
-Arial9 Arial 9
-ArialBlue10 Arial 10 16711680
-ArialBlueStrike10 Arial 10 16711680 8
-CourierNew8 Courier New 8
-CourierNew9 Courier New 9
-MSGothic9 MS Gothic 9
-MSSansBold8 Tahoma 8 1
-MSSansSerif8 MS Sans Serif 8
-MSSansSerif9 MS Sans Serif 9
-MSSGreySerif8 MS Sans Serif 8 8421504
-MSSWhiteSerif8 Tahoma 8 16777215
-Tahoma10 Tahoma 10
-Tahoma8 Tahoma 8
-Tahoma9 Tahoma 9
-TahomaBold10 Tahoma 10 1
-TahomaBold8 Tahoma 8 1
-Times8 Times New Roman 8
-Times9 Times New Roman 9
-TimesItalic12 Times New Roman 12 2
-TimesItalicBlue10 Times New Roman 10 16711680 2
-TimesRed16 Times New Roman 16 255
+DialogDefault Segoe UI 9
+DialogDefaultBold Segoe UI 9 1
+DialogHeading Segoe UI 11 1
More information about the Libreoffice-commits
mailing list