[libreoffice] next milestone

Caolan McNamara caolanm at fedoraproject.org
Mon Oct 11 13:47:58 UTC 2010


commit 9af7fae9b1c692778cc4ccbbca3f9553259da2af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 11 14:48:01 2010 +0100

    next milestone

 .gitignore                                         |   41 +-
 libreoffice.spec                                   |  201 +-
 openoffice.org-2.3.0.ooo76649.httpencoding.patch   |   13 -
 ...ffice.org-3.0.0.ooo88341.sc.verticalboxes.patch |   98 +-
 ...fice.org-3.1.0.ooo102061.sc.cellanchoring.patch |   60 +-
 ...3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch |   23 -
 ...ice.org-3.2.0.ooo106502.svx.fixspelltimer.patch |   13 -
 ...e.org-3.2.0.ooo110142.svx.safercolornames.patch |   31 -
 ...3.2.0.ooo111741.extras.malformed-xml-file.patch |   24 -
 openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch  |   17 -
 ....rh632236.writerfilter.cleanup-cell-props.patch |   37 -
 ....0.ooo100686.wizards.types.not.mediatypes.patch |   49 -
 openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch  |   83 -
 ...office.org-3.3.0.ooo107490.cppu.lifecycle.patch |  208 --
 ...oo108246.svx.hide-sql-group-when-inactive.patch |   97 -
 openoffice.org-3.3.0.ooo111758.sd.xerror.patch     |   21 -
 ...g-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch |   16 -
 ....ooo112384.sw.export.doc.styledoesntexist.patch |   11 -
 ...ffice.org-3.3.0.ooo114012.sd.bada11ychain.patch |   66 -
 ...g-3.3.0.ooo114703.vcl.betterlocalize.font.patch |   30 -
 ...ice.org-3.3.0.rh637738.libgcrypt.addmutex.patch |  167 --
 ...rg-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch |   64 -
 redhat-agreement.xsl                               |   12 -
 sources                                            |   41 +-
 workspace.cmcfixes77.patch                         | 1378 ----------
 workspace.cmcfixes78.patch                         |   11 -
 workspace.cmcfixes79.patch                         |  379 ---
 workspace.dtardon03.patch                          |  286 --
 workspace.gtk3.patch                               | 2761 --------------------
 workspace.impress195.patch                         |  287 --
 workspace.srb1.patch                               |   31 -
 workspace.vcl113.patch                             |  490 ----
 workspace.vcl114.patch                             |   57 -
 workspace.vcl115.patch                             |   13 -
 34 files changed, 203 insertions(+), 6913 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94338c8..b86c436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,25 +6,24 @@
 /acor_lt.zip
 /ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 /fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-/libreoffice-artwork-3.2.99.1.tar.bz2
-/libreoffice-base-3.2.99.1.tar.bz2
-/libreoffice-bootstrap-3.2.99.1.tar.bz2
-/libreoffice-calc-3.2.99.1.tar.bz2
-/libreoffice-components-3.2.99.1.tar.bz2
-/libreoffice-extensions-3.2.99.1.tar.bz2
-/libreoffice-extras-3.2.99.1.tar.bz2
-/libreoffice-filters-3.2.99.1.tar.bz2
-/libreoffice-help-3.2.99.1.tar.bz2
-/libreoffice-impress-3.2.99.1.tar.bz2
-/libreoffice-l10n-3.2.99.1.tar.bz2
-/libreoffice-libs-core-3.2.99.1.tar.bz2
-/libreoffice-libs-extern-3.2.99.1.tar.bz2
-/libreoffice-libs-extern-sys-3.2.99.1.tar.bz2
-/libreoffice-libs-gui-3.2.99.1.tar.bz2
-/libreoffice-postprocess-3.2.99.1.tar.bz2
-/libreoffice-sdk-3.2.99.1.tar.bz2
-/libreoffice-testing-3.2.99.1.tar.bz2
-/libreoffice-ure-3.2.99.1.tar.bz2
-/libreoffice-writer-3.2.99.1.tar.bz2
 /redhat-langpacks.tar.gz
-/redhat-registry.tar.gz
+/libreoffice-artwork-3.2.99.2.tar.bz2
+/libreoffice-base-3.2.99.2.tar.bz2
+/libreoffice-bootstrap-3.2.99.2.tar.bz2
+/libreoffice-calc-3.2.99.2.tar.bz2
+/libreoffice-components-3.2.99.2.tar.bz2
+/libreoffice-extensions-3.2.99.2.tar.bz2
+/libreoffice-extras-3.2.99.2.tar.bz2
+/libreoffice-filters-3.2.99.2.tar.bz2
+/libreoffice-help-3.2.99.2.tar.bz2
+/libreoffice-impress-3.2.99.2.tar.bz2
+/libreoffice-l10n-3.2.99.2.tar.bz2
+/libreoffice-libs-core-3.2.99.2.tar.bz2
+/libreoffice-libs-extern-3.2.99.2.tar.bz2
+/libreoffice-libs-extern-sys-3.2.99.2.tar.bz2
+/libreoffice-libs-gui-3.2.99.2.tar.bz2
+/libreoffice-postprocess-3.2.99.2.tar.bz2
+/libreoffice-sdk-3.2.99.2.tar.bz2
+/libreoffice-testing-3.2.99.2.tar.bz2
+/libreoffice-ure-3.2.99.2.tar.bz2
+/libreoffice-writer-3.2.99.2.tar.bz2
diff --git a/libreoffice.spec b/libreoffice.spec
index d4df772..bb2a676 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,38 +27,36 @@
 
 Summary:        Free Software Productivity Suite
 Name:           libreoffice
-Version:        3.2.99.1
-Release:        2%{?dist}
+Version:        3.2.99.2
+Release:        1%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:        http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.2.99.1.tar.bz2
-Source1:        http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.2.99.1.tar.bz2
-Source2:        http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.2.99.1.tar.bz2
-Source3:        http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.2.99.1.tar.bz2
-Source4:        http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.2.99.1.tar.bz2
-Source5:        http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.2.99.1.tar.bz2
-Source6:        http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.2.99.1.tar.bz2
-Source7:        http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.2.99.1.tar.bz2
-Source8:        http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.2.99.1.tar.bz2
-Source9:        http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.2.99.1.tar.bz2
-Source10:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.2.99.1.tar.bz2
-Source11:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.2.99.1.tar.bz2
-Source12:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.2.99.1.tar.bz2
-Source13:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.2.99.1.tar.bz2
-Source14:       http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.2.99.1.tar.bz2
-Source15:       http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.2.99.1.tar.bz2
-Source16:       http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.2.99.1.tar.bz2
-Source17:       http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.2.99.1.tar.bz2
-Source18:       http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.2.99.1.tar.bz2
+Source0:        http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.2.99.2.tar.bz2
+Source1:        http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.2.99.2.tar.bz2
+Source2:        http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.2.99.2.tar.bz2
+Source3:        http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.2.99.2.tar.bz2
+Source4:        http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.2.99.2.tar.bz2
+Source5:        http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.2.99.2.tar.bz2
+Source6:        http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.2.99.2.tar.bz2
+Source7:        http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.2.99.2.tar.bz2
+Source8:        http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.2.99.2.tar.bz2
+Source9:        http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.2.99.2.tar.bz2
+Source10:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.2.99.2.tar.bz2
+Source11:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.2.99.2.tar.bz2
+Source12:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.2.99.2.tar.bz2
+Source13:       http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.2.99.2.tar.bz2
+Source14:       http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.2.99.2.tar.bz2
+Source15:       http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.2.99.2.tar.bz2
+Source16:       http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.2.99.2.tar.bz2
+Source17:       http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.2.99.2.tar.bz2
+Source18:       http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.2.99.2.tar.bz2
 Source19:       http://cgit.freedesktop.org/ooo-build/ooo-build/plain/src/evolocal.odb
 Source20:       http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-Source21:       redhat-registry.tar.gz
-Source22:       redhat-langpacks.tar.gz
-Source23:       redhat-agreement.xsl
-Source24:       http://www.openoffice.org/nonav/issues/showattachment.cgi/66959/acor_lt.zip
-Source25:       libreoffice-multiliblauncher.sh
+Source21:       redhat-langpacks.tar.gz
+Source22:       http://www.openoffice.org/nonav/issues/showattachment.cgi/66959/acor_lt.zip
+Source23:       libreoffice-multiliblauncher.sh
 Source26:       http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
 Source27:       http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 Source28:       http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -68,7 +66,7 @@ Source31:       http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a99
 Source32:       http://hg.services.openoffice.org/binaries/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 
 Source33:       description.xml
 Source34:       manifest.xml
-Source35:       http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-3.2.99.1.tar.bz2
+Source35:       http://download.documentfoundation.org/libreoffice/src/libreoffice-l10n-3.2.99.2.tar.bz2
 BuildRequires:  zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
 BuildRequires:  binutils, java-devel >= 1.6.0, boost-devel, zlib-devel
 BuildRequires:  python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -90,45 +88,18 @@ Patch1:  openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch2:  openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 Patch3:  openoffice.org-2.0.2.rh188467.printingdefaults.patch
 Patch4:  openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch5:  openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch6:  openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch7:  openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch8:  workspace.dtardon03.patch
-Patch9:  openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch10: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch11: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch12: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch13: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch14: workspace.impress195.patch
-Patch15: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch16: workspace.srb1.patch
-Patch17: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch18: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch19: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch20: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch21: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch22: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch23: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch24: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch25: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch26: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch27: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch28: workspace.vcl113.patch
-Patch29: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch30: workspace.gtk3.patch
-Patch31: workspace.cmcfixes77.patch
-Patch32: workspace.vcl114.patch
-Patch33: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
-Patch34: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
-Patch35: workspace.vcl115.patch
-Patch36: workspace.cmcfixes78.patch
-Patch37: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
-Patch38: workspace.cmcfixes79.patch
-Patch39: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
-Patch40: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
-Patch41: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
-Patch42: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
-Patch43: libreoffice-buildfix.patch
+Patch5:  openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch6:  openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch7:  openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch8:   openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch9:  openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch10: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch11: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch12: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch13: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch14: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch15: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
+Patch16: libreoffice-buildfix.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1413,45 +1384,18 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll
 %patch2  -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch3  -p1
 %patch4  -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch5  -p0 -b .ooo76649.httpencoding.patch
-%patch6  -p1 -b .ooo86080.unopkg.bodge.patch
-%patch7  -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch8  -p0 -b .workspace.dtardon03.patch
-%patch9  -p0 -b .gccXXXXX.solenv.javaregistration.patch
-%patch10 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch11 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch12 -p0 -b .ooo101274.opening-a-directory.patch
-%patch13 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch14 -p0 -b .workspace.impress195.patch
-%patch15 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch16 -p1 -b .workspace.srb1.patch
-%patch17 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch18 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch19 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch20 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch21 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch22 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch23 -p0 -b .ooo111758.sd.xerror.patch
-%patch24 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch25 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch26 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch27 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch28 -p0 -b .workspace.vcl113.patch
-%patch29 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch30 -p0 -b .workspace.gtk3.patch
-%patch31 -p1 -b .workspace.cmcfixes77.patch
-%patch32 -p0 -b .workspace.vcl114.patch
-%patch33 -p0 -b .ooo113273.desktop.resolvelinks.patch
-%patch34 -p0 -b .ooo106591.sal.tradcopy.patch
-%patch35 -p1 -b .workspace.vcl115.patch
-%patch36 -p1 -b .workspace.cmcfixes78.patch
-%patch37 -p0 -b .ooo114012.sd.bada11ychain.patch
-%patch38 -p1 -b .workspace.cmcfixes79.patch
-%patch39 -p1 -b .ooo114703.vcl.betterlocalize.font.patch
-%patch40 -p0 -b .rh637738.libgcrypt.addmutex.patch
-%patch41 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
-%patch42 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
-%patch43 -p1 -b .libreoffice-buildfix.patch
+%patch5  -p1 -b .ooo86080.unopkg.bodge.patch
+%patch6  -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch7  -p0 -b .gccXXXXX.solenv.javaregistration.patch
+%patch8  -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch9  -p0 -b .ooo101274.opening-a-directory.patch
+%patch10 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch11 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch12 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch13 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch14 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch15 -p0 -b .ooo113273.desktop.resolvelinks.patch
+%patch16 -p1 -b .libreoffice-buildfix.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1635,15 +1579,6 @@ pushd $RPM_BUILD_ROOT/%{sdkinstdir}
     find examples -type f -exec chmod -x {} \;
 popd
 
-#add our custom configuration options
-#enable gtk file dialog as the default
-rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
-#default autorecovery settings
-#system libtextcat fingerprint location
-#rhbz#484055 system autocorr location
-#rhbz#451512 set better math print options
-tar xzf %{SOURCE21} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
-
 #add the debugging libsalalloc_malloc.so.3 library
 cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
 chmod -x $RPM_BUILD_ROOT/%{basisinstdir}/program/testtoolrc
@@ -1677,7 +1612,7 @@ popd
 pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
 
 # ooo#108049
-cp -p %{SOURCE24} acor_lt-LT.dat
+cp -p %{SOURCE22} acor_lt-LT.dat
 
 #en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa
 en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT"
@@ -1771,7 +1706,7 @@ sh      help    western         mai     help    western \
 ro      nohelp  western
 )
 
-tar xzf %{SOURCE22}
+tar xzf %{SOURCE21}
 
 i=0
 while [ $i -lt ${#langpackdetails[@]} ]; do
@@ -1890,12 +1825,12 @@ echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oobase
 echo exec libreoffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
 
-cp -f %{SOURCE25} $RPM_BUILD_ROOT/%{_bindir}/unopkg
+cp -f %{SOURCE23} $RPM_BUILD_ROOT/%{_bindir}/unopkg
 sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
 sed -i -e "s/BRAND/libreoffice/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
 
-cp -f %{SOURCE25} $RPM_BUILD_ROOT/%{_bindir}/libreoffice
+cp -f %{SOURCE23} $RPM_BUILD_ROOT/%{_bindir}/libreoffice
 sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/libreoffice
 sed -i -e "s/BRAND/libreoffice/g" $RPM_BUILD_ROOT/%{_bindir}/libreoffice
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/libreoffice
@@ -3192,6 +3127,36 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Mon Oct 11 2010 Caolán McNamara <caolanm at redhat.com> 3.2.99.2-1
+- next LibreOffice milestone
+- drop integrated openoffice.org-2.3.0.ooo76649.httpencoding.patch
+- drop integrated workspace.dtardon03.patch
+- drop integrated openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+- drop integrated workspace.impress195.patch
+- drop integrated workspace.srb1.patch
+- drop integrated openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+- drop integrated openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+- drop integrated openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+- drop integrated openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+- drop integrated openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+- drop integrated openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+- drop integrated openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+- drop integrated openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+- drop integrated workspace.vcl113.patch
+- drop integrated openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+- drop integrated workspace.cmcfixes77.patch
+- drop integrated workspace.vcl114.patch
+- drop integrated openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
+- drop integrated workspace.vcl115.patch
+- drop integrated workspace.cmcfixes78.patch
+- drop integrated openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
+- drop integrated workspace.cmcfixes79.patch
+- drop integrated openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
+- drop integrated openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
+- drop integrated openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
+- drop integrated openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
+- drop workspace.gtk3.patch
+
 * Wed Oct 06 2010 Caolán McNamara <caolanm at redhat.com> 3.2.99.1-2
 - Related: rhbz#639945 pull in review changes
   + redland build-fix
diff --git a/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
index 72369d8..1a6ed83 100644
--- a/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+++ b/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
@@ -20,21 +20,22 @@ retrieving revision 1.54.216.1
 diff -u -r1.54.216.1 output2.cxx
 --- openoffice.org.orig/sc/source/ui/view/output2.cxx	18 Jan 2008 12:02:36 -0000	1.54.216.1
 +++ openoffice.org/sc/source/ui/view/output2.cxx	16 Apr 2008 12:19:34 -0000
-@@ -1907,6 +1907,21 @@
-     }
+@@ -2378,6 +2378,22 @@
+ 
  }
  
++
 +bool ScOutputData::UseNormalClip(SCROW nCellY, const SfxItemSet* pCondSet)
 +{
 +    bool bNormalClip = false;
-+	//	Don't clip for text height when printing rows with optimal height,
-+	//	except when font size is from conditional formatting.
-+	//!	Allow clipping when vertically merged?
-+	if ( eType != OUTTYPE_PRINTER ||
-+		( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
-+		( pCondSet && SFX_ITEM_SET ==
-+			pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
-+		bNormalClip = TRUE;
++       //      Don't clip for text height when printing rows with optimal height,
++       //      except when font size is from conditional formatting.
++       //!     Allow clipping when vertically merged?
++       if ( eType != OUTTYPE_PRINTER ||
++               ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
++               ( pCondSet && SFX_ITEM_SET ==
++                       pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
++               bNormalClip = TRUE;
 +    return bNormalClip;
 +}
 +
@@ -42,26 +43,26 @@ diff -u -r1.54.216.1 output2.cxx
  void ScOutputData::DrawEdit(BOOL bPixelToLogic)
  {
      vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
-@@ -2524,13 +2539,8 @@
- 											(ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
- 									BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
+@@ -2892,13 +2908,8 @@
+                                             (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
+                                     BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
  
--									//	Don't clip for text height when printing rows with optimal height,
--									//	except when font size is from conditional formatting.
--									//!	Allow clipping when vertically merged?
--									if ( eType != OUTTYPE_PRINTER ||
--										( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
--										( pCondSet && SFX_ITEM_SET ==
--											pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
+-                                    //	Don't clip for text height when printing rows with optimal height,
+-                                    //	except when font size is from conditional formatting.
+-                                    //!	Allow clipping when vertically merged?
+-                                    if ( eType != OUTTYPE_PRINTER ||
+-                                        ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) ||
+-                                        ( pCondSet && SFX_ITEM_SET ==
+-                                            pCondSet->GetItemState(ATTR_FONT_HEIGHT, TRUE) ) )
 +					
 +									if (UseNormalClip(nCellY, pCondSet))
- 										bClip = TRUE;
- 									else
- 										bSimClip = TRUE;
-@@ -2580,6 +2590,18 @@
+                                         bClip = TRUE;
+                                     else
+                                         bSimClip = TRUE;
+@@ -2948,6 +2959,18 @@
  #endif
  
- 								Rectangle aLogicClip;
+                                 Rectangle aLogicClip;
 +                                if (
 +										((nAttrRotate == 9000) || (nAttrRotate == 27000)) &&
 +										(!(eOrient==SVX_ORIENTATION_STANDARD && !bAsianVertical)) &&
@@ -74,29 +75,30 @@ diff -u -r1.54.216.1 output2.cxx
 +										bSimClip = TRUE;
 +								}
 +
- 								if (bClip || bSimClip)
- 								{
- 									// Clip marks are already handled in GetOutputArea
-@@ -2635,10 +2657,20 @@
- 									}
- 									else
- 									{
-+										long nDiff = 0;
- 										if (eHorJust==SVX_HOR_JUSTIFY_RIGHT)
--											aLogicStart.X() += nAvailWidth - nEngineWidth;
-+											nDiff = nAvailWidth - nEngineWidth;
- 										else if (eHorJust==SVX_HOR_JUSTIFY_CENTER)
--											aLogicStart.X() += (nAvailWidth - nEngineWidth) / 2;
-+											nDiff = (nAvailWidth - nEngineWidth) / 2;
+                                 if (bClip || bSimClip)
+                                 {
+                                     // Clip marks are already handled in GetOutputArea
+@@ -3776,11 +3799,21 @@
+                                     else
+                                     {
+                                         //	bei gedrehtem Text ist Standard zentriert
++                                        long nDiff = 0;
+                                         if (eHorJust==SVX_HOR_JUSTIFY_RIGHT)
+-                                            aLogicStart.X() += nAvailWidth - nEngineWidth;
++                                            nDiff = nAvailWidth - nEngineWidth;
+                                         else if (eHorJust==SVX_HOR_JUSTIFY_CENTER ||
+                                                  eHorJust==SVX_HOR_JUSTIFY_STANDARD)
+-                                            aLogicStart.X() += (nAvailWidth - nEngineWidth) / 2;
++                                            nDiff = (nAvailWidth - nEngineWidth) / 2;
 +
-+										if (nEngineWidth > nAvailWidth)
-+										{
++                                        if (nEngineWidth > nAvailWidth)
++                                        {
 +                                            if (nAttrRotate == 9000)
-+										        nDiff = 0;
-+											else if (nAttrRotate == 27000)
-+										        nDiff = nAvailWidth - nEngineWidth;
-+										}
-+										aLogicStart.X() += nDiff;
- 									}
- 								}
++                                               nDiff = 0;
++                                            else if (nAttrRotate == 27000)
++                                               nDiff = nAvailWidth - nEngineWidth;
++                                        }
++                                        aLogicStart.X() += nDiff;
+                                     }
+                                 }
  
diff --git a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
index 1f781a4..b01288d 100644
--- a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+++ b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
@@ -1365,52 +1365,52 @@ diff -ru sc.orig/source/filter/xml/XMLTableShapeResizer.hxx sc/source/filter/xml
 diff -ru sc.orig/source/ui/Accessibility/AccessibleDocument.cxx sc/source/ui/Accessibility/AccessibleDocument.cxx
 --- sc.orig/source/ui/Accessibility/AccessibleDocument.cxx	2009-06-04 12:39:41.000000000 +0100
 +++ sc/source/ui/Accessibility/AccessibleDocument.cxx	2009-06-04 12:40:23.000000000 +0100
-@@ -44,6 +44,7 @@
+@@ -41,6 +41,7 @@
  #include "drawview.hxx"
  #include "gridwin.hxx"
  #include "AccessibleEditObject.hxx"
 +#include "userdat.hxx"
  #include "scresid.hxx"
- #ifndef SC_SC_HRC
  #include "sc.hrc"
-@@ -1017,35 +1018,10 @@
+ #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+@@ -977,35 +978,10 @@
          uno::Reference<beans::XPropertySet> xShapeProp(xShape, uno::UNO_QUERY);
- 	    if (pShapeImp && xShapeProp.is())
- 	    {
--		    SdrObject *pSdrObj = pShapeImp->GetSdrObject();
--		    if (pSdrObj)
+         if (pShapeImp && xShapeProp.is())
+         {
+-            SdrObject *pSdrObj = pShapeImp->GetSdrObject();
+-            if (pSdrObj)
 +		    if (SdrObject *pSdrObj = pShapeImp->GetSdrObject())
- 		    {
--			    if (ScDrawLayer::GetAnchor(pSdrObj) == SCA_CELL)
--			    {
+             {
+-                if (ScDrawLayer::GetAnchor(pSdrObj) == SCA_CELL)
+-                {
 -                    ScDocument* pDoc = mpViewShell->GetViewData()->GetDocument();
--				    if (pDoc)
--				    {
+-                    if (pDoc)
+-                    {
 -                        rtl::OUString sCaptionShape(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CaptionShape"));
--					    awt::Point aPoint(xShape->getPosition());
--					    awt::Size aSize(xShape->getSize());
--					    rtl::OUString sType(xShape->getShapeType());
--					    Rectangle aRectangle(aPoint.X, aPoint.Y, aPoint.X + aSize.Width, aPoint.Y + aSize.Height);
--					    if ( sType.equals(sCaptionShape) )
--					    {
--						    awt::Point aRelativeCaptionPoint;
+-                        awt::Point aPoint(xShape->getPosition());
+-                        awt::Size aSize(xShape->getSize());
+-                        rtl::OUString sType(xShape->getShapeType());
+-                        Rectangle aRectangle(aPoint.X, aPoint.Y, aPoint.X + aSize.Width, aPoint.Y + aSize.Height);
+-                        if ( sType.equals(sCaptionShape) )
+-                        {
+-                            awt::Point aRelativeCaptionPoint;
 -                            rtl::OUString sCaptionPoint( RTL_CONSTASCII_USTRINGPARAM( "CaptionPoint" ));
--						    xShapeProp->getPropertyValue( sCaptionPoint ) >>= aRelativeCaptionPoint;
--						    Point aCoreRelativeCaptionPoint(aRelativeCaptionPoint.X, aRelativeCaptionPoint.Y);
--						    Point aCoreAbsoluteCaptionPoint(aPoint.X, aPoint.Y);
--						    aCoreAbsoluteCaptionPoint += aCoreRelativeCaptionPoint;
--						    aRectangle.Union(Rectangle(aCoreAbsoluteCaptionPoint, aCoreAbsoluteCaptionPoint));
--					    }
--					    ScRange aRange = pDoc->GetRange(mpAccessibleDocument->getVisibleTable(), aRectangle);
+-                            xShapeProp->getPropertyValue( sCaptionPoint ) >>= aRelativeCaptionPoint;
+-                            Point aCoreRelativeCaptionPoint(aRelativeCaptionPoint.X, aRelativeCaptionPoint.Y);
+-                            Point aCoreAbsoluteCaptionPoint(aPoint.X, aPoint.Y);
+-                            aCoreAbsoluteCaptionPoint += aCoreRelativeCaptionPoint;
+-                            aRectangle.Union(Rectangle(aCoreAbsoluteCaptionPoint, aCoreAbsoluteCaptionPoint));
+-                        }
+-                        ScRange aRange = pDoc->GetRange(mpAccessibleDocument->getVisibleTable(), aRectangle);
 -                        pAddress = new ScAddress(aRange.aStart);
--				    }
--			    }
+-                    }
+-                }
 -//			    else
 -//				    do nothing, because it is always a NULL Pointer
 +				if (ScDrawObjData *pAnchor = ScDrawLayer::GetObjData(pSdrObj))
 +					return new ScAddress(pAnchor->maStart);
- 		    }
- 	    }
+             }
+         }
      }
 diff -ru sc.orig/source/ui/drawfunc/drawsh2.cxx sc/source/ui/drawfunc/drawsh2.cxx
 --- sc.orig/source/ui/drawfunc/drawsh2.cxx	2009-06-04 12:39:40.000000000 +0100
diff --git a/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch b/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
index 960dc32..9916bd3 100644
--- a/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+++ b/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
@@ -397,214 +397,6 @@
 -.ENDIF
 -.ENDIF
 -
---- sax/source/tools/fastserializer.cxx	2010-06-22 12:54:56.000000000 +0100
-+++ sax/source/tools/fastserializer.cxx	2010-06-22 13:14:30.000000000 +0100
-@@ -27,6 +27,7 @@
- 
- #include "fastserializer.hxx"
- #include <rtl/ustrbuf.hxx>
-+#include <rtl/byteseq.hxx>
- 
- #include <com/sun/star/xml/Attribute.hpp>
- #include <com/sun/star/xml/FastAttribute.hpp>
-@@ -41,6 +42,7 @@
- using ::com::sun::star::uno::Reference;
- using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::Sequence;
-+using ::com::sun::star::uno::toUnoSequence;
- using ::com::sun::star::xml::FastAttribute;
- using ::com::sun::star::xml::Attribute;
- using ::com::sun::star::xml::sax::SAXException;
-@@ -52,15 +54,15 @@
- using ::com::sun::star::io::IOException;
- using ::com::sun::star::io::BufferSizeExceededException;
- 
--static Sequence< sal_Int8 > aClosingBracket((sal_Int8 *)">", 1);
--static Sequence< sal_Int8 > aSlashAndClosingBracket((sal_Int8 *)"/>", 2);
--static Sequence< sal_Int8 > aColon((sal_Int8 *)":", 1);
--static Sequence< sal_Int8 > aOpeningBracket((sal_Int8 *)"<", 1);
--static Sequence< sal_Int8 > aOpeningBracketAndSlash((sal_Int8 *)"</", 2);
--static Sequence< sal_Int8 > aQuote((sal_Int8 *)"\"", 1);
--static Sequence< sal_Int8 > aEqualSignAndQuote((sal_Int8 *)"=\"", 2);
--static Sequence< sal_Int8 > aSpace((sal_Int8 *)" ", 1);
--static Sequence< sal_Int8 > aXmlHeader((sal_Int8*) "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n", 56);
-+static rtl::ByteSequence aClosingBracket((const sal_Int8 *)">", 1);
-+static rtl::ByteSequence aSlashAndClosingBracket((const sal_Int8 *)"/>", 2);
-+static rtl::ByteSequence aColon((const sal_Int8 *)":", 1);
-+static rtl::ByteSequence aOpeningBracket((const sal_Int8 *)"<", 1);
-+static rtl::ByteSequence aOpeningBracketAndSlash((const sal_Int8 *)"</", 2);
-+static rtl::ByteSequence aQuote((const sal_Int8 *)"\"", 1);
-+static rtl::ByteSequence aEqualSignAndQuote((const sal_Int8 *)"=\"", 2);
-+static rtl::ByteSequence aSpace((const sal_Int8 *)" ", 1);
-+static rtl::ByteSequence aXmlHeader((const sal_Int8*) "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n", 56);
- 
- #define HAS_NAMESPACE(x) ((x & 0xffff0000) != 0)
- #define NAMESPACE(x) (x >> 16)
-@@ -74,7 +76,7 @@
- 	{
- 		if (!mxOutputStream.is())
- 			return;
--		writeBytes(aXmlHeader);
-+		writeBytes(toUnoSequence(aXmlHeader));
- 	}
- 
- 	OUString FastSaxSerializer::escapeXml( const OUString& s )
-@@ -116,7 +118,7 @@
-     {
-         if( HAS_NAMESPACE( nElement ) ) {
-             writeBytes(mxFastTokenHandler->getUTF8Identifier(NAMESPACE(nElement)));
--            writeBytes(aColon);
-+            writeBytes(toUnoSequence(aColon));
-             writeBytes(mxFastTokenHandler->getUTF8Identifier(TOKEN(nElement)));
-         } else
-             writeBytes(mxFastTokenHandler->getUTF8Identifier(nElement));
-@@ -128,12 +130,12 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracket);
-+		writeBytes(toUnoSequence(aOpeningBracket));
- 
-         writeId(Element);
- 		writeFastAttributeList(Attribs);
- 
--		writeBytes(aClosingBracket);
-+		writeBytes(toUnoSequence(aClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::startUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs )
-@@ -142,19 +144,19 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracket);
-+		writeBytes(toUnoSequence(aOpeningBracket));
- 
- 		if (Namespace.getLength())
- 		{
- 			write(Namespace);
--			writeBytes(aColon);
-+			writeBytes(toUnoSequence(aColon));
- 		}
- 		
- 		write(Name);
- 		
- 		writeFastAttributeList(Attribs);
- 			
--		writeBytes(aClosingBracket);
-+		writeBytes(toUnoSequence(aClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::endFastElement( ::sal_Int32 Element )
-@@ -163,11 +165,11 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracketAndSlash);
-+		writeBytes(toUnoSequence(aOpeningBracketAndSlash));
- 
-         writeId(Element);
- 
--		writeBytes(aClosingBracket);
-+		writeBytes(toUnoSequence(aClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::endUnknownElement( const OUString& Namespace, const OUString& Name )
-@@ -176,17 +178,17 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracketAndSlash);
-+		writeBytes(toUnoSequence(aOpeningBracketAndSlash));
- 
- 		if (Namespace.getLength())
- 		{
- 			write(Namespace);
--			writeBytes(aColon);
-+			writeBytes(toUnoSequence(aColon));
- 		}
- 		
- 		write(Name);
- 		
--		writeBytes(aClosingBracket);
-+		writeBytes(toUnoSequence(aClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::singleFastElement( ::sal_Int32 Element, const Reference< XFastAttributeList >& Attribs )
-@@ -195,12 +197,12 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracket);
-+		writeBytes(toUnoSequence(aOpeningBracket));
- 
-         writeId(Element);
- 		writeFastAttributeList(Attribs);
- 
--		writeBytes(aSlashAndClosingBracket);
-+		writeBytes(toUnoSequence(aSlashAndClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::singleUnknownElement( const OUString& Namespace, const OUString& Name, const Reference< XFastAttributeList >& Attribs )
-@@ -209,19 +211,19 @@
- 		if (!mxOutputStream.is())
- 			return;
- 
--		writeBytes(aOpeningBracket);
-+		writeBytes(toUnoSequence(aOpeningBracket));
- 
- 		if (Namespace.getLength())
- 		{
- 			write(Namespace);
--			writeBytes(aColon);
-+			writeBytes(toUnoSequence(aColon));
- 		}
- 		
- 		write(Name);
- 
- 		writeFastAttributeList(Attribs);
- 			
--		writeBytes(aSlashAndClosingBracket);
-+		writeBytes(toUnoSequence(aSlashAndClosingBracket));
- 	}
- 
-     void SAL_CALL FastSaxSerializer::characters( const OUString& aChars )
-@@ -251,12 +253,12 @@
- 		sal_Int32 nAttrLength = aAttrSeq.getLength();
- 		for (sal_Int32 i = 0; i < nAttrLength; i++)
- 		{
--			writeBytes(aSpace);
-+			writeBytes(toUnoSequence(aSpace));
- 
- 			write(pAttr[i].Name);
--			writeBytes(aEqualSignAndQuote);
-+			writeBytes(toUnoSequence(aEqualSignAndQuote));
- 			write(escapeXml(pAttr[i].Value));
--			writeBytes(aQuote);
-+			writeBytes(toUnoSequence(aQuote));
- 		}
- 		
- 		Sequence< FastAttribute > aFastAttrSeq = Attribs->getFastAttributes();
-@@ -264,16 +266,16 @@
- 		sal_Int32 nFastAttrLength = aFastAttrSeq.getLength();
- 		for (sal_Int32 j = 0; j < nFastAttrLength; j++)
- 		{
--			writeBytes(aSpace);
-+			writeBytes(toUnoSequence(aSpace));
- 
-             sal_Int32 nToken = pFastAttr[j].Token;
-             writeId(nToken);
- 			
--			writeBytes(aEqualSignAndQuote);
-+			writeBytes(toUnoSequence(aEqualSignAndQuote));
- 	
- 			write(escapeXml(Attribs->getValue(pFastAttr[j].Token)));
- 			
--			writeBytes(aQuote);
-+			writeBytes(toUnoSequence(aQuote));
- 		}
- 	}
- 
 --- package/inc/ZipPackageFolder.hxx	2010-06-22 11:49:17.000000000 +0100
 +++ package/inc/ZipPackageFolder.hxx	2010-06-22 12:50:26.000000000 +0100
 @@ -53,8 +53,6 @@
diff --git a/sources b/sources
index 148d246..24927f7 100644
--- a/sources
+++ b/sources
@@ -6,25 +6,24 @@ a7983f859eafb2677d7ff386a023bc40  a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
 8c994b7e7873b30d70dccc3918cdfbc0  acor_lt.zip
 ada24d37d8d638b3d8a9985e80bc2978  ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
 fdb27bfe2dbe2e7b57ae194d9bf36bab  fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-5340511b6bc2043f642be4ee1e8bf3a7  libreoffice-artwork-3.2.99.1.tar.bz2
-6ef55d438e487e243f96e5c7ce3fe6ec  libreoffice-base-3.2.99.1.tar.bz2
-57b68ba83440a900533b40063191cfa5  libreoffice-bootstrap-3.2.99.1.tar.bz2
-daa04e0294bee6c285f004896aa609c8  libreoffice-calc-3.2.99.1.tar.bz2
-8a9393624078d473ac4480cb6b549c20  libreoffice-components-3.2.99.1.tar.bz2
-271da86a068de92d57e4f9c65d512cc5  libreoffice-extensions-3.2.99.1.tar.bz2
-436f19879bd561eef407ce74a3e9f18e  libreoffice-extras-3.2.99.1.tar.bz2
-42332f99506dff9780ebcd5d65b60034  libreoffice-filters-3.2.99.1.tar.bz2
-fe17733e7afa553d25b57fb9c7dcfa2c  libreoffice-help-3.2.99.1.tar.bz2
-d6dc499bc930629304b1aa3abdfada76  libreoffice-impress-3.2.99.1.tar.bz2
-921f6e161f33b66fbc7c550bfeb74e6f  libreoffice-l10n-3.2.99.1.tar.bz2
-9c5bdbb9aac46518aeb033e3a63184e2  libreoffice-libs-core-3.2.99.1.tar.bz2
-5299b08196e521e1fcd4f7665ab0aea9  libreoffice-libs-extern-3.2.99.1.tar.bz2
-d9d45344146d591c51f944fcdc62ee6c  libreoffice-libs-extern-sys-3.2.99.1.tar.bz2
-f8638cdfbd58b2a367cf3fe70b4b0c44  libreoffice-libs-gui-3.2.99.1.tar.bz2
-9df015c8299af8bf8b88d5b6288fd6fa  libreoffice-postprocess-3.2.99.1.tar.bz2
-acbc48dba8bff10b1b5cf46f57597549  libreoffice-sdk-3.2.99.1.tar.bz2
-2cf115243dcfa686868e49927437d61f  libreoffice-testing-3.2.99.1.tar.bz2
-310bf13fb37477cb0b533e92596c4c23  libreoffice-ure-3.2.99.1.tar.bz2
-1fb344dd20334f42d7632e2f76ffb54c  libreoffice-writer-3.2.99.1.tar.bz2
 7d38610a11453ee5d12aefe7abda7e91  redhat-langpacks.tar.gz
-f7d976ca8f993913c7b20d88f9961082  redhat-registry.tar.gz
+06023a85090474a186e6ce6473c40127  libreoffice-artwork-3.2.99.2.tar.bz2
+fd6ba9df4a24940acba3f860bf6a59fa  libreoffice-base-3.2.99.2.tar.bz2
+fd9c003b86eb42fca0856399dbb41e5e  libreoffice-bootstrap-3.2.99.2.tar.bz2
+09d69784cf1f2fa1dd579f1352255a39  libreoffice-calc-3.2.99.2.tar.bz2
+f2bbc54234ef0e8cc2a9833d8a9794d2  libreoffice-components-3.2.99.2.tar.bz2
+dcfacc8ee8f9cf507fbe6584e120feb0  libreoffice-extensions-3.2.99.2.tar.bz2
+5a3f5a1fa57fc002886ab877145f5d83  libreoffice-extras-3.2.99.2.tar.bz2
+88ce0e284e72a9e7f7c41aa464e26f1f  libreoffice-filters-3.2.99.2.tar.bz2
+954247706070d40150c1f29d926d6bfa  libreoffice-help-3.2.99.2.tar.bz2
+b732c9854c7667cd17ab5c5217813157  libreoffice-impress-3.2.99.2.tar.bz2
+a1ed0d867eda10b1f8721948d0a9982f  libreoffice-l10n-3.2.99.2.tar.bz2
+bd0ba58f97e26413ff33305ded0f68e9  libreoffice-libs-core-3.2.99.2.tar.bz2
+82090695974145d43f217c1469336583  libreoffice-libs-extern-3.2.99.2.tar.bz2
+36f3d9e5b266ac4c487608110f45dda6  libreoffice-libs-extern-sys-3.2.99.2.tar.bz2
+04275c10b9b2fe64cf92aeb8da74221e  libreoffice-libs-gui-3.2.99.2.tar.bz2
+c6dc3c8beebd362b655e1bfd8118fa3c  libreoffice-postprocess-3.2.99.2.tar.bz2
+5273c85300724600e557147d4cbf9fae  libreoffice-sdk-3.2.99.2.tar.bz2
+f658ee713f18e3c00125d363fc862c85  libreoffice-testing-3.2.99.2.tar.bz2
+15b0c3b5d99335f2a6e034841918e8fe  libreoffice-ure-3.2.99.2.tar.bz2
+31909d2508ae56ff971a871fc7404c87  libreoffice-writer-3.2.99.2.tar.bz2


More information about the scm-commits mailing list