April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit OpenOffice_org-l10n-extras for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-l10n-extras for openSUSE:Factory checked in at Mon Apr 26 22:54:29 CEST 2010. -------- --- OpenOffice_org-l10n-extras/OpenOffice_org-l10n-extras.changes 2010-03-25 21:48:50.000000000 +0100 +++ OpenOffice_org-l10n-extras/OpenOffice_org-l10n-extras.changes 2010-04-23 15:21:18.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-extras.tar.bz2 New: ---- ooo320-m15-extras.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-l10n-extras.spec ++++++ --- /var/tmp/diff_new_pack.JcRFCR/_old 2010-04-26 22:54:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JcRFCR/_new 2010-04-26 22:54:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-l10n-extras (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-l10n-extras (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-l10n-extras -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece extras #!BuildIgnore: OpenOffice_org # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-21 @@ -35,7 +35,7 @@ %define ooo_prefix %_libdir %define ooo_home ooo3 %define ooo_basis_dir basis3.2 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-extras.tar.bz2 -> ooo320-m15-extras.tar.bz2 ++++++ OpenOffice_org-l10n-extras/ooo320-m12-extras.tar.bz2 OpenOffice_org-l10n-extras/ooo320-m15-extras.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-branding-upstream for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-branding-upstream for openSUSE:Factory checked in at Mon Apr 26 22:53:56 CEST 2010. -------- --- OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2010-03-25 21:48:27.000000000 +0100 +++ OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2010-04-23 15:20:02.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to version 3.2.0.99.3 + + replaced about.bmp with about.png + + added intro.png + + added sofficerc + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.IqICWf/_old 2010-04-26 22:52:20.000000000 +0200 +++ /var/tmp/diff_new_pack.IqICWf/_new 2010-04-26 22:52:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-branding-upstream (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-branding-upstream (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,12 @@ Name: OpenOffice_org-branding-upstream -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 #!BuildIgnore: OpenOffice_org -BuildRequires: OpenOffice_org-artwork-devel >= 2.99 +BuildRequires: OpenOffice_org-bootstrap >= 3.2.0.99.3 +BuildRequires: OpenOffice_org-artwork-devel >= 3.2.0.99.3 %define ooo_basis_dir basis3.2 %define ooo_home ooo3 License: LGPLv3 @@ -37,21 +38,30 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch -#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp -#BRAND: type: PC bitmap data, Windows 3.x format, 440 x 286 x 24 (BMP) +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.png +#BRAND: type: PNG image data, 440 x 286, 8-bit/color RGB, non-interlaced #BRAND: purpose: "splash" image displayed for a short time, when the application is launching #BRAND: text: should mention the app name "OpenOffice.org" and the major version "3" #BRAND: context: no border is being displayed around the splash windows #BRAND: the picture is overlapped by the progress bar: x,y=212,216; w,h=263,8 #BRAND: the default progress bar color is 0,0,128 (blue) #BRAND: the progress bar has 1 pixel width white border -#BRAND: -#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.bmp -#BRAND: type: PC bitmap data, Windows 3.x format, 415 x 95 x 24 (BMP) +# +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 440 x 286 x 24 +#BRAND: purpose: BMP variant of the above picture; it is needed in our build +#BRAND: until we enhance oosplash to read PNG +# +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.png +#BRAND: type: PNG image data, 415 x 95, 8-bit/color RGB, non-interlaced #BRAND: purpose: displayed on top of the Help/About OpenOffice.org dialog #BRAND: text: should mention the app name "OpenOffice.org" and the major version "3" #BRAND: context: there are displayed several lines of some text below the picture #BRAND: the text is black on a white background +# +#BRAND: source: %ooo_build_tag-bootstrap.tar.bz2:src/sofficerc-upstream +#BRAND: type: text config file (ini-files-like) +#BRAND: purpose: defines the position, size and, color of the status bar %description This package includes the original branding for the OpenOffice.org @@ -65,7 +75,11 @@ %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/program -install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/about.bmp \ +install -m 644 %_datadir/%ooo_home/ooo-build/src/sofficerc-upstream \ + $RPM_BUILD_ROOT%_datadir/%ooo_home/program/sofficerc +install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/about.png \ + $RPM_BUILD_ROOT%_datadir/%ooo_home/program +install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/intro.png \ $RPM_BUILD_ROOT%_datadir/%ooo_home/program install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/intro.bmp \ $RPM_BUILD_ROOT%_datadir/%ooo_home/program ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-help-en-US for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-help-en-US for openSUSE:Factory checked in at Mon Apr 26 22:52:02 CEST 2010. -------- --- OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2010-03-25 21:48:38.000000000 +0100 +++ OpenOffice_org-help-en-US/OpenOffice_org-help-en-US.changes 2010-04-23 15:20:53.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- OpenOffice_org-help-group1.changes: same change OpenOffice_org-help-group2.changes: same change OpenOffice_org-help-group3.changes: same change OpenOffice_org-help-group4.changes: same change OpenOffice_org-help-group5.changes: same change calling whatdependson for head-i586 Old: ---- ooo320-m12-help.tar.bz2 New: ---- ooo320-m15-help.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-help-en-US.spec ++++++ --- /var/tmp/diff_new_pack.lSM6It/_old 2010-04-26 22:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.lSM6It/_new 2010-04-26 22:51:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-en-US (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-help-en-US (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-en-US -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece help %define ooo_langs "en-US" %define ooo_basis_dir basis3.2 @@ -39,7 +39,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ OpenOffice_org-help-group1.spec ++++++ --- /var/tmp/diff_new_pack.lSM6It/_old 2010-04-26 22:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.lSM6It/_new 2010-04-26 22:51:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-help-group1 (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-help-group1 (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-help-group1 -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -58,7 +58,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on OpenOffice_org-help-group2.spec: same change OpenOffice_org-help-group3.spec: same change OpenOffice_org-help-group4.spec: same change OpenOffice_org-help-group5.spec: same change ++++++ OpenOffice_org-help-en-US.spec.in ++++++ --- /var/tmp/diff_new_pack.lSM6It/_old 2010-04-26 22:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.lSM6It/_new 2010-04-26 22:51:23.000000000 +0200 @@ -20,9 +20,9 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-en-US -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece help %define ooo_langs "en-US" %define ooo_basis_dir basis3.2 @@ -40,7 +40,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on ++++++ OpenOffice_org-help-groupX.spec.in ++++++ --- /var/tmp/diff_new_pack.lSM6It/_old 2010-04-26 22:51:23.000000000 +0200 +++ /var/tmp/diff_new_pack.lSM6It/_new 2010-04-26 22:51:23.000000000 +0200 @@ -20,9 +20,9 @@ @DO_NOT_EDIT_COMMENT@ Name: OpenOffice_org-help-group@GROUP_NUMBER@ -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece help # test_build_langs: 1 = de and cs # 2 = all supported languages @@ -59,7 +59,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPL v3 only Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-help.tar.bz2 -> ooo320-m15-help.tar.bz2 ++++++ ++++ 646607 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-base for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-base for openSUSE:Factory checked in at Mon Apr 26 22:50:37 CEST 2010. -------- --- OpenOffice_org-base/OpenOffice_org-base.changes 2010-03-25 21:48:17.000000000 +0100 +++ OpenOffice_org-base/OpenOffice_org-base.changes 2010-04-23 15:19:34.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-base.tar.bz2 New: ---- ooo320-m15-base.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-base.spec ++++++ --- /var/tmp/diff_new_pack.B5yKNm/_old 2010-04-26 22:50:28.000000000 +0200 +++ /var/tmp/diff_new_pack.B5yKNm/_new 2010-04-26 22:50:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-base (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-base (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-base -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece base #!BuildIgnore: OpenOffice_org BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip update-desktop-files xml-commons-apis xorg-x11 zip @@ -30,7 +30,7 @@ BuildRequires: OpenOffice_org-libs-core-devel = %version %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-base.tar.bz2 -> ooo320-m15-base.tar.bz2 ++++++ ++++ 596777 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-calc for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-calc for openSUSE:Factory checked in at Mon Apr 26 22:50:08 CEST 2010. -------- --- OpenOffice_org-calc/OpenOffice_org-calc.changes 2010-03-25 21:48:29.000000000 +0100 +++ OpenOffice_org-calc/OpenOffice_org-calc.changes 2010-04-23 15:20:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-calc.tar.bz2 New: ---- ooo320-m15-calc.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-calc.spec ++++++ --- /var/tmp/diff_new_pack.X4K14d/_old 2010-04-26 22:49:49.000000000 +0200 +++ /var/tmp/diff_new_pack.X4K14d/_new 2010-04-26 22:49:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-calc (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-calc (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-calc -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece calc #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -34,7 +34,7 @@ BuildRequires: procps %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-calc.tar.bz2 -> ooo320-m15-calc.tar.bz2 ++++++ ++++ 1834807 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-impress for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-impress for openSUSE:Factory checked in at Mon Apr 26 22:49:28 CEST 2010. -------- --- OpenOffice_org-impress/OpenOffice_org-impress.changes 2010-03-25 21:48:45.000000000 +0100 +++ OpenOffice_org-impress/OpenOffice_org-impress.changes 2010-04-23 15:21:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-impress.tar.bz2 New: ---- ooo320-m15-impress.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-impress.spec ++++++ --- /var/tmp/diff_new_pack.5mHAyp/_old 2010-04-26 22:49:19.000000000 +0200 +++ /var/tmp/diff_new_pack.5mHAyp/_new 2010-04-26 22:49:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-impress (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-impress (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-impress -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece impress #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -40,7 +40,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-impress.tar.bz2 -> ooo320-m15-impress.tar.bz2 ++++++ ++++ 855203 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-writer for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-writer for openSUSE:Factory checked in at Mon Apr 26 22:49:01 CEST 2010. -------- --- OpenOffice_org-writer/OpenOffice_org-writer.changes 2010-03-25 21:49:05.000000000 +0100 +++ OpenOffice_org-writer/OpenOffice_org-writer.changes 2010-04-23 15:25:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-writer.tar.bz2 New: ---- ooo320-m15-writer.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-writer.spec ++++++ --- /var/tmp/diff_new_pack.CaM6Dr/_old 2010-04-26 22:48:24.000000000 +0200 +++ /var/tmp/diff_new_pack.CaM6Dr/_new 2010-04-26 22:48:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-writer (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-writer (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-writer -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece writer #!BuildIgnore: OpenOffice_org #!BuildIgnore: OpenOffice_org-filters-optional @@ -38,7 +38,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-writer.tar.bz2 -> ooo320-m15-writer.tar.bz2 ++++++ ++++ 2032578 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-components for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Mon Apr 26 22:48:07 CEST 2010. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2010-03-25 21:48:31.000000000 +0100 +++ OpenOffice_org-components/OpenOffice_org-components.changes 2010-04-23 15:20:16.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-components.tar.bz2 New: ---- ooo320-m15-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.O2tytK/_old 2010-04-26 22:47:32.000000000 +0200 +++ /var/tmp/diff_new_pack.O2tytK/_new 2010-04-26 22:47:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-components (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,9 +21,9 @@ Name: OpenOffice_org-components # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece components #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -52,8 +52,8 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 -License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT +%define ooo_build_tag ooo320-m15 +License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Requires: OpenOffice_org-libs-core = %version ++++++ ooo320-m12-components.tar.bz2 -> ooo320-m15-components.tar.bz2 ++++++ ++++ 1265862 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-filters for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-filters for openSUSE:Factory checked in at Mon Apr 26 22:47:11 CEST 2010. -------- --- OpenOffice_org-filters/OpenOffice_org-filters.changes 2010-03-25 21:48:35.000000000 +0100 +++ OpenOffice_org-filters/OpenOffice_org-filters.changes 2010-04-23 15:20:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-filters.tar.bz2 New: ---- ooo320-m15-filters.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-filters.spec ++++++ --- /var/tmp/diff_new_pack.Jinh80/_old 2010-04-26 22:45:18.000000000 +0200 +++ /var/tmp/diff_new_pack.Jinh80/_new 2010-04-26 22:45:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-filters (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-filters (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-filters -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece filters #!BuildIgnore: OpenOffice_org BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip @@ -41,7 +41,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 +%define ooo_build_tag ooo320-m15 License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m12-filters.tar.bz2 -> ooo320-m15-filters.tar.bz2 ++++++ OpenOffice_org-filters/ooo320-m12-filters.tar.bz2 OpenOffice_org-filters/ooo320-m15-filters.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org-libs-core for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '10

26 Apr '10

Hello community, here is the log from the commit of package OpenOffice_org-libs-core for openSUSE:Factory checked in at Mon Apr 26 22:45:02 CEST 2010. -------- --- OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2010-03-25 21:48:51.000000000 +0100 +++ OpenOffice_org-libs-core/OpenOffice_org-libs-core.changes 2010-04-26 16:21:25.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 26 15:23:33 CEST 2010 - pmladek(a)suse.cz + +- added hotfix to start with fresh user configuration (bnc#599590) + +------------------------------------------------------------------- +Fri Apr 23 11:30:30 CEST 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m15 +- updated ooo-build to version 3.2.0.99.3 (3.2.1-beta3) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m12-libs-core.tar.bz2 New: ---- desktop-config-migration.diff ooo320-m15-libs-core.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-libs-core.spec ++++++ --- /var/tmp/diff_new_pack.FOlcYg/_old 2010-04-26 22:41:41.000000000 +0200 +++ /var/tmp/diff_new_pack.FOlcYg/_new 2010-04-26 22:41:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-libs-core (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-libs-core (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-libs-core -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 %define piece libs-core # version of the postgresql driver %define postgresql_version 0.7.6a @@ -48,14 +48,15 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m12 -License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT +%define ooo_build_tag ooo320-m15 +License: LGPLv3 Group: Productivity/Office/Suite AutoReqProv: on Requires: OpenOffice_org-libs-gui = %version Summary: OpenOffice.org Core Libraries Url: http://www.openoffice.org/ Source0: %ooo_build_tag-%piece.tar.bz2 +Patch1000: desktop-config-migration.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc @@ -173,6 +174,9 @@ %setup -c -q -n %ooo_build_tag-%piece # hack to move sources to a reasonable location mv ooo/*/* . && rm -rf ooo +# +mkdir -p ooo-build/hotfixes +cp %{P:1000} ooo-build/hotfixes %build # setup env. ++++++ desktop-config-migration.diff ++++++ --- desktop/source/app/app.cxx.old 2010-04-13 14:30:50.000000000 +0200 +++ desktop/source/app/app.cxx 2010-04-13 15:30:18.000000000 +0200 @@ -1457,6 +1457,9 @@ void Desktop::Main() } #endif + if (Migration::checkMigration()) + Migration::doMigration(); + // keep a language options instance... pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); --- desktop/source/migration/migration.cxx.old 2010-04-14 17:20:22.000000000 +0200 +++ desktop/source/migration/migration.cxx 2010-04-26 15:00:50.000000000 +0200 @@ -55,6 +55,10 @@ #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> +#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> +#include <com/sun/star/ui/XAcceleratorConfiguration.hpp> +#include <com/sun/star/awt/Key.hpp> +#include <com/sun/star/awt/KeyEvent.hpp> using namespace rtl; using namespace osl; @@ -69,6 +73,9 @@ using namespace com::sun::star::configur using com::sun::star::uno::Exception; using namespace com::sun::star; +#define ascii( asc ) \ + ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( asc ) ) + namespace desktop { @@ -124,27 +131,155 @@ OUString Migration::getOldVersionName() return getImpl()->getOldVersionName(); } +MigrationImpl::VersionNumber::VersionNumber() : + mnMajor(0), mnMinor(0), mnMicro(0) +{ +} + +MigrationImpl::VersionNumber::VersionNumber(sal_Int32 nMajor, sal_Int32 nMinor, sal_Int32 nMicro) : + mnMajor(nMajor), mnMinor(nMinor), mnMicro(nMicro) +{ +} + OUString MigrationImpl::getOldVersionName() { return m_aInfo.productname; } -sal_Bool MigrationImpl::checkMigration() +static bool splitVersionString(const OUString& rVer, MigrationImpl::VersionNumber& rVerNum) { - if (m_aInfo.userdata.getLength() > 0 && ! checkMigrationCompleted()) - return sal_True; - else + rVerNum.mnMajor = 0; + rVerNum.mnMinor = 0; + rVerNum.mnMicro = 0; + + sal_Int32 nLen = rVer.getLength(); + const sal_Unicode* pStr = rVer.getStr(); + OUStringBuffer buf; + sal_uInt8 nPos = 0; // 0 = major; 1 = minor; 2 = micro + for (sal_Int32 i = 0; i < nLen; ++i) + { + const sal_Unicode c = pStr[i]; + if (c >= sal_Unicode('0') && c <= sal_Unicode('9')) + buf.append(c); + else if (c == sal_Unicode('.')) + { + if (buf.getLength() == 0) + // no numbers. + return false; + + sal_Int32 nTmp = buf.makeStringAndClear().toInt32(); + if (nTmp < 0 || nTmp > 255) + // only 0 - 255 allowed in a version number. + return false; + + switch (nPos) + { + case 0: rVerNum.mnMajor = static_cast<sal_uInt8>(nTmp); break; + case 1: rVerNum.mnMinor = static_cast<sal_uInt8>(nTmp); break; + case 2: rVerNum.mnMicro = static_cast<sal_uInt8>(nTmp); break; + } + + nPos += 1; + if (nPos > 2) + return true; + } + else + return false; + } + + return true; +} + +/** returns -1 if rVer1 < rVer2, 0 if rVer1 == rVer2, or 1 if rVer1 > + rVer2. */ +static short compareVersion(const MigrationImpl::VersionNumber& rVer1, + const MigrationImpl::VersionNumber& rVer2) +{ + // major version + if (rVer1.mnMajor < rVer2.mnMajor) + return -1; + if (rVer1.mnMajor > rVer2.mnMajor) + return 1; + + // minor version + if (rVer1.mnMinor < rVer2.mnMinor) + return -1; + if (rVer1.mnMinor > rVer2.mnMinor) + return 1; + + // micro version + if (rVer1.mnMicro < rVer2.mnMicro) + return -1; + if (rVer1.mnMicro > rVer2.mnMicro) + return 1; + + return 0; +} + +static sal_Bool isMigrationNeeded(const OUString& rConfVerStr, const OUString& rAppVerStr, + MigrationImpl::VersionNumber& rConfVerNum, + MigrationImpl::VersionNumber& rAppVerNum) +{ + if (!splitVersionString(rConfVerStr, rConfVerNum)) return sal_False; + + if (!splitVersionString(rAppVerStr, rAppVerNum)) + return sal_False; + +#if OSL_DEBUG_LEVEL > 0 + fprintf(stdout, "desktop::isMigrationNeeded: config ver = %d.%d.%d\n", + rConfVerNum.mnMajor,rConfVerNum.mnMinor,rConfVerNum.mnMicro); + + fprintf(stdout, "desktop::isMigrationNeeded: app ver = %d.%d.%d\n", + rAppVerNum.mnMajor,rAppVerNum.mnMinor,rAppVerNum.mnMicro); +#endif + + if (compareVersion(rConfVerNum, rAppVerNum) < 0) + return sal_True; + + return sal_False; } +sal_Bool MigrationImpl::checkMigration() +{ + if (m_bMigrationCompleted) + // migration is already complete. + return sal_False; + + try + { + uno::Reference< XPropertySet > aPropSet(getConfigAccess("org.openoffice.Setup/Product"), uno::UNO_QUERY_THROW); + uno::Any any = aPropSet->getPropertyValue(ascii("ooSetupVersionAboutBox")); + if (!(any >>= m_aAppVerStr)) + // Current version unknown. Don't do migration (this should not happen). + return sal_False; + + aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration"), uno::UNO_QUERY_THROW); + any = aPropSet->getPropertyValue(ascii("ooLastVersionTouched")); + OUString aLastVersion; + if (!(any >>= aLastVersion)) + { + // last touched version unknown. Do the migration. + splitVersionString(m_aAppVerStr, m_aAppVerNum); + m_aConfigVerNum.mnMajor = 0; + m_aConfigVerNum.mnMinor = 0; + m_aConfigVerNum.mnMicro = 0; + return sal_True; + } + + return isMigrationNeeded(aLastVersion, m_aAppVerStr, m_aConfigVerNum, m_aAppVerNum); + } + catch (const Exception&) + { + } + return sal_True; +} + MigrationImpl::MigrationImpl(const uno::Reference< XMultiServiceFactory >& xFactory) - : m_vrVersions(new strings_v) + : m_vrVersions(NULL) , m_xFactory(xFactory) + , m_bMigrationCompleted(false) { - readAvailableMigrations(m_vMigrationsAvailable); - sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable); - if ( nIndex >= 0 ) - m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name); } MigrationImpl::~MigrationImpl() @@ -154,33 +289,52 @@ MigrationImpl::~MigrationImpl() sal_Bool MigrationImpl::doMigration() { - // compile file and service list for migration - m_vrFileList = compileFileList(); - m_vrServiceList = compileServiceList(); +#if OSL_DEBUG_LEVEL > 0 + fprintf( stderr, "Migrating user configuration to newer OOo version.\n" ); +#endif + + sal_Bool result = sal_True; + + if (compareVersion(m_aConfigVerNum, VersionNumber(3,0,0)) < 0) + { + try + { + if (initDirectoryMigration()) + { + copyFiles(); - sal_Bool result = sal_False; - try{ - copyFiles(); - - // execute the migration items from Setup.xcu - // and refresh the cache - copyConfig(); - refresh(); - - // execute custom migration services from Setup.xcu - // and refresh the cache - runServices(); - refresh(); - - result = sal_True; - } catch (...) - { - OString aMsg("An unexpected exception was thrown during migration"); - aMsg += "\nOldVersion: " + OUStringToOString(m_aInfo.productname, RTL_TEXTENCODING_ASCII_US); - aMsg += "\nDataPath : " + OUStringToOString(m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US); - OSL_ENSURE(sal_False, aMsg.getStr()); + // execute the migration items from Setup.xcu + // and refresh the cache + copyConfig(); + refresh(); + + // execute custom migration services from Setup.xcu + // and refresh the cache + runServices(); + refresh(); + } + } + catch (...) + { + OString aMsg("An unexpected exception was thrown during migration"); + aMsg += "\nOldVersion: " + OUStringToOString(m_aInfo.productname, RTL_TEXTENCODING_ASCII_US); + aMsg += "\nDataPath : " + OUStringToOString(m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US); + OSL_ENSURE(sal_False, aMsg.getStr()); + result = sal_False; + } } + try + { + // migrate the configuration values. + transCalcFormulaConfig(); + transKeyConfig(); + cleanCSVImportCharSet(); + } + catch (...) + { + result = sal_False; + } // prevent running the migration multiple times setMigrationCompleted(); return result; @@ -197,31 +351,126 @@ void MigrationImpl::refresh() } -void MigrationImpl::setMigrationCompleted() +void MigrationImpl::transKeyConfig() { - try { - uno::Reference< XPropertySet > aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true), uno::UNO_QUERY_THROW); - aPropertySet->setPropertyValue(OUString::createFromAscii("MigrationCompleted"), uno::makeAny(sal_True)); - uno::Reference< XChangesBatch >(aPropertySet, uno::UNO_QUERY_THROW)->commitChanges(); - } catch (...) { - // fail silently + using namespace ::com::sun::star; + using namespace ::com::sun::star::ui; + +#if OSL_DEBUG_LEVEL > 0 + fprintf(stdout, "MigrationImpl::transKeyConfig: config ver = %ld.%ld.%ld\n", + long(m_aConfigVerNum.mnMajor), long(m_aConfigVerNum.mnMinor), long(m_aConfigVerNum.mnMicro)); + + fprintf(stdout, "MigrationImpl::transKeyConfig: app ver = %ld.%ld.%ld\n", + long(m_aAppVerNum.mnMajor), long(m_aAppVerNum.mnMinor), long(m_aAppVerNum.mnMicro)); +#endif + + if (compareVersion(m_aConfigVerNum, VersionNumber(2,4,0)) < 0) + { + // For config versions older than 2.4.0 only. + + uno::Reference< XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier( + m_xFactory->createInstance( + ascii("com.sun.star.ui.ModuleUIConfigurationManagerSupplier")), uno::UNO_QUERY_THROW); + + // Grab the Calc configuration. + uno::Reference< XUIConfigurationManager > xConfigMgr = + xModuleCfgSupplier->getUIConfigurationManager( + ascii("com.sun.star.sheet.SpreadsheetDocument")); + + if (xConfigMgr.is()) + { + uno::Reference< XAcceleratorConfiguration > xScAccel( + xConfigMgr->getShortCutManager(), uno::UNO_QUERY_THROW); + + // Backsapce key + awt::KeyEvent aBackEv; + aBackEv.KeyCode = awt::Key::BACKSPACE; + aBackEv.Modifiers = 0; + xScAccel->setKeyEvent(aBackEv, ascii(".uno:Delete")); + + // Delete key + awt::KeyEvent aDeleteEv; + aDeleteEv.KeyCode = awt::Key::DELETE; + aDeleteEv.Modifiers = 0; + xScAccel->setKeyEvent(aDeleteEv, ascii(".uno:ClearContents")); + + xScAccel->store(); + } } } -sal_Bool MigrationImpl::checkMigrationCompleted() +void MigrationImpl::cleanCSVImportCharSet() { - sal_Bool bMigrationCompleted = sal_False; - try { - uno::Reference< XPropertySet > aPropertySet( - getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW); - aPropertySet->getPropertyValue( - OUString::createFromAscii("MigrationCompleted")) >>= bMigrationCompleted; - } catch (Exception&) { - // just return false... + // Overwrite the character set value for CSV import to -1 (unset) on every + // upgrade, to prevent it from being incorrectly set to Unicode. (n#376473) + + uno::Reference< XPropertySet > aPropSet; + aPropSet.set(getConfigAccess("org.openoffice.Office.Calc/Dialogs/CSVImport", true), uno::UNO_QUERY_THROW); + aPropSet->setPropertyValue(ascii("CharSet"), uno::makeAny(static_cast<sal_Int32>(-1))); + uno::Reference< XChangesBatch >(aPropSet, uno::UNO_QUERY_THROW)->commitChanges(); +} + +void MigrationImpl::transCalcFormulaConfig() +{ + // Prior to 3.1.0, formula settings were stored in + // Calc/Calculate/FormulaSyntax. Migrate that to + // Calc/Formula/Syntax/Grammar. + + if (compareVersion(m_aConfigVerNum, VersionNumber(3,1,0)) >= 0) + return; + + try + { + uno::Reference<XPropertySet> xPropSet1( + getConfigAccess("org.openoffice.Office.Calc/Calculate/Other", true), uno::UNO_QUERY_THROW); + + sal_Int32 nFormulaSyntax = 0; + xPropSet1->getPropertyValue(ascii("FormulaSyntax")) >>= nFormulaSyntax; + + uno::Reference<XPropertySet> xPropSet2( + getConfigAccess("org.openoffice.Office.Calc/Formula/Syntax", true), uno::UNO_QUERY_THROW); + xPropSet2->setPropertyValue(ascii("Grammar"), uno::makeAny(nFormulaSyntax)); + uno::Reference<XChangesBatch>(xPropSet2, uno::UNO_QUERY_THROW)->commitChanges(); + } + catch (const Exception&) + { } - return bMigrationCompleted; } +void MigrationImpl::setMigrationCompleted() +{ + try + { + uno::Reference< XPropertySet > aPropSet; + if (m_aAppVerStr.getLength() > 0) + { + aPropSet.set(getConfigAccess("org.openoffice.Setup/Configuration", true), uno::UNO_QUERY_THROW); + aPropSet->setPropertyValue(ascii("ooLastVersionTouched"), uno::makeAny(m_aAppVerStr)); + uno::Reference< XChangesBatch >(aPropSet, uno::UNO_QUERY_THROW)->commitChanges(); + } + + m_bMigrationCompleted = true; + } + catch (const Exception&) + { + } +} + +bool MigrationImpl::initDirectoryMigration() +{ + m_vrVersions.reset(new strings_v); + readAvailableMigrations(m_vMigrationsAvailable); + sal_Int32 nIndex = findPreferedMigrationProcess(m_vMigrationsAvailable); + if ( nIndex >= 0 ) + { + m_vrMigrations = readMigrationSteps(m_vMigrationsAvailable[nIndex].name); + // compile file and service list for migration + m_vrFileList = compileFileList(); + m_vrServiceList = compileServiceList(); + return true; + } + return false; +} static void insertSorted(migrations_available& rAvailableMigrations, supported_migration& aSupportedMigration) { bool bInserted( false ); --- desktop/source/migration/migration_impl.hxx.old 2010-04-01 16:31:14.000000000 +0200 +++ desktop/source/migration/migration_impl.hxx 2010-04-13 15:30:18.000000000 +0200 @@ -83,6 +83,16 @@ typedef std::vector< supported_migration class MigrationImpl { +public: + struct VersionNumber + { + sal_Int32 mnMajor; + sal_Int32 mnMinor; + sal_Int32 mnMicro; + + explicit VersionNumber(); + explicit VersionNumber(sal_Int32 nMajor, sal_Int32 nMinor, sal_Int32 nMicro); + }; private: strings_vr m_vrVersions; @@ -94,6 +104,12 @@ private: strings_vr m_vrFileList; // final list of files to be copied strings_vr m_vrConfigList; // final list of nodes to be copied strings_vr m_vrServiceList; // final list of services to be called + ::rtl::OUString m_aAppVerStr; + bool m_bMigrationCompleted; + VersionNumber m_aAppVerNum; + VersionNumber m_aConfigVerNum; + + bool initDirectoryMigration(); // functions to control the migration process bool readAvailableMigrations(migrations_available&); @@ -115,9 +131,11 @@ private: void copyConfig(); void runServices(); void refresh(); + void transKeyConfig(); + void cleanCSVImportCharSet(); + void transCalcFormulaConfig(); void setMigrationCompleted(); - sal_Bool checkMigrationCompleted(); public: MigrationImpl(const NS_UNO::Reference< NS_CSS::lang::XMultiServiceFactory >&); --- officecfg/registry/schema/org/openoffice/Setup.xcs.old 2010-04-01 16:35:33.000000000 +0200 +++ officecfg/registry/schema/org/openoffice/Setup.xcs 2010-04-13 15:30:18.000000000 +0200 @@ -446,6 +446,14 @@ <desc>Deprecated</desc> </info> </prop> + <prop oor:name="ooLastVersionTouched" oor:type="xs:string"> + <info> + <author>Kohei Yoshida</author> + <desc>Specifies the version of OOo that touched the configration for the last time. The format must + be in the form of major.minor.micro (e.g. 2.3.1). Note that this value may not always be present if the + last touched version is very old.</desc> + </info> + </prop> </group> <group oor:name="Migration"> <info> ++++++ ooo320-m12-libs-core.tar.bz2 -> ooo320-m15-libs-core.tar.bz2 ++++++ OpenOffice_org-libs-core/ooo320-m12-libs-core.tar.bz2 OpenOffice_org-libs-core/ooo320-m15-libs-core.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0