[Libreoffice-commits] .: 9 commits - configure.in instsetoo_native/util scp2/source scp2/util set_soenv.in
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jun 17 04:46:38 PDT 2011
configure.in | 28 ++++++++++++++++++++++++++++
instsetoo_native/util/openoffice.lst | 28 ++++++++++++++--------------
scp2/source/ooo/common_brand.scp | 2 +-
scp2/source/ooo/makefile.mk | 4 ++++
scp2/util/makefile.mk | 4 ++--
set_soenv.in | 1 +
6 files changed, 50 insertions(+), 17 deletions(-)
New commits:
commit bfad5dae5132208f945e05b66fb8f7f69b63122b
Merge: 3e0a570... 9dacc3f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 17 13:46:17 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
commit 3e0a5702b9deffa009256ff6d15b4b3109b97bf0
Merge: 25d2d64... e37badf...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Jun 17 13:44:18 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
Makefile.in
bootstrap.1
configure.in
solenv/inc/minor.mk
diff --cc configure.in
index 5177e4e,de3cab0..d709f41
--- a/configure.in
+++ b/configure.in
@@@ -466,12 -475,12 +466,18 @@@ AC_ARG_ENABLE(lomenubar
[Enable global menu support.]),
,)
+ AC_ARG_ENABLE(online-update,
+ AS_HELP_STRING([--enable-online-update],
+ [Enable the online update service that will check for new versions of
+ LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]),
+ ,)
+
+AC_ARG_ENABLE(release-build,
+ AS_HELP_STRING([--enable-release-build],
+ [Enable release build.
+ See http://wiki.documentfoundation.org/DevBuild]),
+,)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@@ -7851,19 -7508,28 +7857,41 @@@ f
AC_SUBST(ENABLE_LOMENUBAR)
dnl ===================================================================
+ dnl Test whether to enable online update service
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to enable online update])
+ ENABLE_ONLINE_UPDATE=
+ if test "z$enable_online_update" = "z" ; then
+ if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then
+ AC_MSG_RESULT([yes])
+ ENABLE_ONLINE_UPDATE="TRUE"
+ else
+ AC_MSG_RESULT([no])
+ fi
+ else
+ if test "z$enable_online_update" = "zyes" ; then
+ AC_MSG_RESULT([yes])
+ ENABLE_ONLINE_UPDATE="TRUE"
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+ AC_SUBST(ENABLE_ONLINE_UPDATE)
+
+ dnl ===================================================================
+dnl Test whether build target is Release Build
+dnl ===================================================================
+AC_MSG_CHECKING([whether build target is Release Build])
+if test "z$enable_release_build" = "z" -o "z$enable_release_build" = "zno" ; then
+ AC_MSG_RESULT([no])
+ ENABLE_RELEASE_BUILD="FALSE"
+else
+ AC_MSG_RESULT([yes])
+ ENABLE_RELEASE_BUILD="TRUE"
+fi
+AC_SUBST(ENABLE_RELEASE_BUILD)
+
+dnl ===================================================================
dnl Test whether to enable ActiveX embedding
dnl ===================================================================
if test "$_os" = "WINNT"; then
diff --cc set_soenv.in
index b9e42a8,f015bab..863a391
--- a/set_soenv.in
+++ b/set_soenv.in
@@@ -1960,11 -1977,13 +1960,12 @@@ ToFile( "WITH_EXTRA_SAMPLE", "@WI
ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" );
ToFile( "SYSTEM_TRANSLATE_TOOLKIT", "@SYSTEM_TRANSLATE_TOOLKIT@", "e" );
ToFile( "SYSTEM_DB", "@SYSTEM_DB@", "e" );
-ToFile( "DB_VERSION", "@DB_VERSION@", "e" );
+ToFile( "SYSTEM_DB_CFLAGS", "@SYSTEM_DB_CFLAGS@", "e" );
ToFile( "DB_LIB", "@DB_LIB@", "e" );
ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
-ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" );
+ ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
commit e37badf947de7bc1545d042fb1517883cd937ca1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Jun 16 19:12:35 2011 +0200
Make the online update service configurable (via --enable-online-update).
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/configure.in b/configure.in
index 5ad2e37..de3cab0 100755
--- a/configure.in
+++ b/configure.in
@@ -475,6 +475,12 @@ AC_ARG_ENABLE(lomenubar,
[Enable global menu support.]),
,)
+AC_ARG_ENABLE(online-update,
+ AS_HELP_STRING([--enable-online-update],
+ [Enable the online update service that will check for new versions of
+ LibreOffice. By default, it is on on Windows and Mac, and off on Linux.]),
+,)
+
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
@@ -7502,6 +7508,28 @@ fi
AC_SUBST(ENABLE_LOMENUBAR)
dnl ===================================================================
+dnl Test whether to enable online update service
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable online update])
+ENABLE_ONLINE_UPDATE=
+if test "z$enable_online_update" = "z" ; then
+ if test "$_os" = "WINNT" -o "$_os" = "Darwin" ; then
+ AC_MSG_RESULT([yes])
+ ENABLE_ONLINE_UPDATE="TRUE"
+ else
+ AC_MSG_RESULT([no])
+ fi
+else
+ if test "z$enable_online_update" = "zyes" ; then
+ AC_MSG_RESULT([yes])
+ ENABLE_ONLINE_UPDATE="TRUE"
+ else
+ AC_MSG_RESULT([no])
+ fi
+fi
+AC_SUBST(ENABLE_ONLINE_UPDATE)
+
+dnl ===================================================================
dnl Test whether to enable ActiveX embedding
dnl ===================================================================
if test "$_os" = "WINNT"; then
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 47e5f9f..2557f0d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1152,7 +1152,7 @@ ProfileItem gid_Brand_Profileitem_Version_Updateurl
Section = "Version";
Order = 15;
Key = "UpdateURL";
- #if defined(BUILD_SPECIAL)
+ #if defined(ENABLE_ONLINE_UPDATE)
#ifdef WNT
Value = "${UPDATEURL}";
#else // defined WNT
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 86ef48c..e553440 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -45,6 +45,10 @@ SCPDEFS+=-D_MSC
SCPDEFS+=-DBUILD_SPECIAL
.ENDIF
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
+SCPDEFS+=-DENABLE_ONLINE_UPDATE
+.ENDIF
+
.IF "$(BUILD_X64)"!=""
SCPDEFS+=-DBUILD_X64
.ENDIF
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index a7873d1..9030699 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -215,7 +215,7 @@ SCP1FILES += cairocanvas.par
SCP1FILES += layout.par
.ENDIF # ENABLE_LAYOUT == TRUE
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
SCP1FILES += \
module_onlineupdate.par \
file_onlineupdate.par
@@ -392,7 +392,7 @@ SCP2FILES += \
SCP2FILES += layout.par
.ENDIF # ENABLE_LAYOUT == TRUE
-.IF "$(BUILD_SPECIAL)"!=""
+.IF "$(ENABLE_ONLINE_UPDATE)"!=""
SCP2FILES += \
module_onlineupdate.par \
file_onlineupdate.par
diff --git a/set_soenv.in b/set_soenv.in
index 779fb3e..f015bab 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1983,6 +1983,7 @@ ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" );
ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" );
+ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" );
ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
commit 4b333b2c9b4f35a58c1f1b5183013837f6380181
Author: Robert Nagy <robert at openbsd.org>
Date: Wed Jun 15 12:55:51 2011 +0200
only fetch external tarballs if --disable-fetch-external is not defined
diff --git a/Makefile.in b/Makefile.in
index 37c1389..ced0ed2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,12 @@ dmake/dmake at EXEEXT@:
./bootstrap
src.downloaded: ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
@. ./*[Ee]nv.[Ss]et.sh && \
$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+else
+ @echo "Automatic fetching of external tarballs is disabled."
+endif
fetch: src.downloaded
diff --git a/bootstrap.1 b/bootstrap.1
index 3daa1e2..dcee078 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -75,6 +75,6 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
if [ ! -d $SRC_ROOT/src ] ; then
mkdir $SRC_ROOT/src
fi
-if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
+if [ "$DO_FETCH_TARBALLS" = "YES" ]; then
$SRC_ROOT/download $SRC_ROOT/ooo.lst
fi
diff --git a/configure.in b/configure.in
index 3257668..5ad2e37 100755
--- a/configure.in
+++ b/configure.in
@@ -1729,7 +1729,7 @@ AC_SUBST(TARFILE_LOCATION)
if test "z$enable_fetch_external" != "zno" \
&& test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
- DO_FETCH_TARBALLS="yes"
+ DO_FETCH_TARBALLS="YES"
fi
AC_SUBST(DO_FETCH_TARBALLS)
diff --git a/set_soenv.in b/set_soenv.in
index 414dae2..779fb3e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1694,7 +1694,6 @@ ToFile( "PSPRINT", "TRUE", "e" );
ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
ToFile( "nodep", "@nodep@", "e" );
ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" );
ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@", "e" );
ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" );
commit 2b4067e05c12dec97b6569dd936de393529fbc6c
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 14 16:53:23 2011 +0200
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
commit 13fa70e33729adb00b70ee1d740b973a36053be5
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Jun 14 16:18:47 2011 +0200
bump product version to 3.4.1-rc1, release number to 101
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 3b9a02d..67b8b8a 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -5,8 +5,8 @@ Globals
variables
{
OOOBASEVERSION 3.4
- OOOPACKAGEVERSION 3.4.0
- UREPACKAGEVERSION 3.4.0
+ OOOPACKAGEVERSION 3.4.1
+ UREPACKAGEVERSION 3.4.1
URELAYERVERSION 1
BASISROOTNAME LibreOffice
UNIXBASISROOTNAME libreoffice3.4
@@ -62,7 +62,7 @@ LibreOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
+ ABOUTBOXPRODUCTVERSION 3.4.1
BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -74,7 +74,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -130,7 +130,7 @@ LibreOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
+ ABOUTBOXPRODUCTVERSION 3.4.1
BASEPRODUCTVERSION 3.4
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -141,7 +141,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -196,7 +196,7 @@ LibreOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
+ ABOUTBOXPRODUCTVERSION 3.4.1
BASEPRODUCTVERSION 3.4
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX libobasis-dev
@@ -211,7 +211,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -309,7 +309,7 @@ LibreOffice_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -357,7 +357,7 @@ LibreOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.4
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX libobasis-dev
UREPACKAGEPREFIX lodev
@@ -408,7 +408,7 @@ OxygenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
+ ABOUTBOXPRODUCTVERSION 3.4.1
BASEPRODUCTVERSION 3.4
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
@@ -420,7 +420,7 @@ OxygenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -478,7 +478,7 @@ OxygenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.4
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.4.0
+ ABOUTBOXPRODUCTVERSION 3.4.1
BASEPRODUCTVERSION 3.4
UPDATEURL http://update.libreoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.libreoffice.org/OOo3.0/notification.jsp?version=ODF
@@ -489,7 +489,7 @@ OxygenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.4.0
+ PACKAGEVERSION 3.4.1
PACKAGEREVISION {buildid}
LICENSENAME LGPL
SERVICESPROJEKT 1
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index abc4c85..711b66f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=340
-RSCREVISION=340m1(Build:11)
-BUILD=11
+RSCREVISION=340m1(Build:101)
+BUILD=101
LAST_MINOR=m1
SOURCEVERSION=OOO340
commit b48d1ba56a2a67f785651881705c872925cecc1c
Author: Andras Timar <atimar at suse.com>
Date: Tue Jun 7 20:28:21 2011 +0200
fix Y coordinate in previous commit
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 6933d03..bd48e9a 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -81,7 +81,7 @@ 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 133 120 65 3 OOO_CONTROL_61
+CustomSetup Size Text 241 148 120 65 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
commit 8fddc393a1608e3a8e1a515123c976a2d5bb14ac
Author: Andras Timar <atimar at suse.com>
Date: Tue Jun 7 20:11:26 2011 +0200
fdo#36990 fix layout of MSI Custom Install dialog (esp. German)
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 1142348..6933d03 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -69,19 +69,19 @@ CustomSetup BannerLine Line 0 44 374 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 ChangeFolder PushButton 164 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 DlgText Text 9 51 360 10 3 OOO_CONTROL_53
+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 120 1 OOO_CONTROL_55
+CustomSetup FeatureGroup GroupBox 235 67 131 152 1 OOO_CONTROL_55
CustomSetup Help PushButton 22 243 66 17 3 OOO_CONTROL_56 Details
-CustomSetup InstallLabel Text 8 190 360 10 3 OOO_CONTROL_57
-CustomSetup ItemDescription Text 241 80 120 50 3 OOO_CONTROL_58
-CustomSetup Location Text 8 203 291 20 3 OOO_CONTROL_59
+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 133 120 50 3 OOO_CONTROL_61
+CustomSetup Size Text 241 133 120 65 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
commit 86b9e2e64e2f049be5af3d898dbf5e1da0c833b5
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date: Fri May 27 16:51:05 2011 +0200
move default language independent layout templates
from /share/template
to /share/template/common
Signed-off-by: Petr Mladek <pmladek at suse.cz>
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 3807bde..0491782 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -970,11 +970,6 @@ Directory gid_Dir_Share_Template_Wizard
DosName = "wizard";
End
-Directory gid_Dir_Share_Template_Layout
- ParentID = gid_Dir_Template;
- DosName = "layout";
-End
-
Directory gid_Dir_Share_Template_Wizard_Bitmap
ParentID = gid_Dir_Share_Template_Wizard;
DosName = "bitmap";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 7cf102c..f5be8c8 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -351,7 +351,7 @@ File gid_File_Extra_Tplpresntimpr_Lang
End
File gid_File_Extra_Tpllayoutimpr
- Dir = gid_Dir_Share_Template_Layout;
+ Dir = gid_Dir_Template_Common_Layout;
ARCHIVE_TXT_FILE_BODY;
Name = "tpllayoutimpr.zip";
End
More information about the Libreoffice-commits
mailing list