summaryrefslogtreecommitdiff
path: root/mdds
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:09:46 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:09:46 +0200
commitcb67577abe5266592b90bdb89c8f607d1a026c22 (patch)
tree8a044ede48dafab1aec98a7b30a8bc0286aaae9b /mdds
parent8b77bb4c59ba60d2a99a1f72b37e5638d5632c60 (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 12ade21f2da019495cdf95361f89728be55fdc08 (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:25 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit 0f2ebd417c72a38f52b3afc23b2aab277efed3a7 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Wed Sep 15 08:28:44 2010 +0200 Committing the files for WPG and WPS importer I forgot to commit yesterday .../source/config/fragments/filters/MS_Works.xcu | 13 + .../fragments/filters/WordPerfectGraphics.xcu | 13 + .../fragments/types/draw_WordPerfect_Graphics.xcu | 12 + .../fragments/types/writer_MS_Works_Document.xcu | 12 + writerperfect/source/wpgimp/OdgExporter.cxx | 510 ++++++++++++++++++++ writerperfect/source/wpgimp/OdgExporter.hxx | 78 +++ writerperfect/source/wpgimp/WPGImportFilter.cxx | 302 ++++++++++++ writerperfect/source/wpgimp/WPGImportFilter.hxx | 128 +++++ writerperfect/source/wpgimp/makefile.mk | 35 ++ .../source/wpgimp/wpgimport_genericfilter.cxx | 101 ++++ writerperfect/source/wpsimp/MSWorksCollector.cxx | 48 ++ writerperfect/source/wpsimp/MSWorksCollector.hxx | 41 ++ .../source/wpsimp/MSWorksImportFilter.cxx | 277 +++++++++++ .../source/wpsimp/MSWorksImportFilter.hxx | 129 +++++ writerperfect/source/wpsimp/makefile.mk | 29 ++ .../source/wpsimp/msworks_genericfilter.cxx | 101 ++++ 16 files changed, 1829 insertions(+), 0 deletions(-) commit 21bda698dca66817dcf7dd6509779961caf52e72 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 17:23:00 2010 +0200 Fix numbering restart on ppt import Set proper default for numbering scheme high bits, such that changes in bullet property don't automatically restart numbering. This fixes n#632546 filter/source/msfilter/svdfppt.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c3021283557ae52aa6929492b9546259564955b3 Author: Florian Reuter <freuter@novell.com> Date: Tue Sep 14 16:12:59 2010 +0200 sw-import-html-controls.diff: n#485609 filter/inc/filter/msfilter/msocximex.hxx | 34 ++++++++++ filter/source/msfilter/msocximex.cxx | 100 +++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 1 deletions(-) commit 3482beaa65306f4b32b28e5926445e15c029aac2 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Sep 14 14:16:20 2010 +0200 g++44-debug.diff: Fixed some imports for debug more .../source/dmapper/DomainMapperTableHandler.cxx | 4 ++++ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) commit cd737ce7f536264b71b80c061b91765db560d345 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:30:28 2010 +0200 wpgimporter.diff: WPG Import filter filter/source/config/fragments/fcfg_draw.mk | 7 +++- writerperfect/prj/build.lst | 5 ++- writerperfect/source/filter/DocumentHandler.cxx | 2 +- writerperfect/util/makefile.mk | 35 +++++++++++++++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) commit f409dd088f95b2e00c59dc5642769b95245ba7fc Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:07:30 2010 +0200 wpsimport-writerperfect.diff: WPS Import filter - core implementation. writerperfect/prj/build.lst | 5 +- writerperfect/prj/d.lst | 4 +- writerperfect/source/filter/DocumentCollector.cxx | 2 +- writerperfect/source/filter/DocumentCollector.hxx | 7 ++- writerperfect/source/filter/DocumentHandler.cxx | 10 ++-- writerperfect/source/filter/SectionStyle.cxx | 2 +- writerperfect/source/filter/makefile.mk | 12 +++-- writerperfect/source/stream/WPXSvStream.cxx | 2 +- writerperfect/source/stream/WPXSvStream.h | 3 +- writerperfect/source/stream/makefile.mk | 6 +++ .../source/wpdimp/WordPerfectCollector.cxx | 5 +- .../source/wpdimp/WordPerfectCollector.hxx | 4 +- writerperfect/source/wpdimp/makefile.mk | 12 +++-- writerperfect/util/makefile.mk | 47 +++++++++++++++++-- 14 files changed, 88 insertions(+), 33 deletions(-) commit 103315662b3bc0701174bc66c047211549b8837b Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 11:03:41 2010 +0200 wpsimport-filter.diff: WPS Import filter - filter module changes filter/source/config/fragments/fcfg_writer.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 36b8dc56ea589b2064ce70687e5f75c973a0385a Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 10:36:11 2010 +0200 writerperfect-nocondensedparagraphs.diff: no negative paragraph height. writerperfect/source/filter/TextRunStyle.cxx | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) commit 7d1ef3204f28dd1222cde8acf64d7c948a2fbc3a Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 09:58:36 2010 +0200 svg-import-empty-gradient-fix.diff: guard against empty gradient stops n#560255 filter/source/svg/svgreader.cxx | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) commit e7ebe0078a17e47b701781657d63dfaf687d33a3 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 09:57:31 2010 +0200 svg-import-opacity-fix.diff: fixing handling of opacity attribute filter/source/svg/gfxtypes.hxx | 2 ++ filter/source/svg/svgreader.cxx | 38 ++++++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 16 deletions(-) commit a50c1d659fcf774493d2f0408474da2717ad4815 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Sep 14 09:56:06 2010 +0200 svg-import-eh-fix.diff: eat exceptions before they reach unaware code filter/source/svg/svgfilter.cxx | 9 ++++++++- filter/source/svg/svgreader.cxx | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) commit 27913e127acb3f5ab8447dee6d458a4f430192e9 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Sep 14 09:54:19 2010 +0200 svg-import-convlength-fix.diff: fixing relative size calculation filter/source/svg/units.cxx | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) commit 7aa4106187316461ea8e986343c5c9995c45a297 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 09:51:31 2010 +0200 svg-import-textimport.diff: much improved text import filter/source/svg/gfxtypes.hxx | 29 ++------ filter/source/svg/svgreader.cxx | 138 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 141 insertions(+), 26 deletions(-) commit 8f76a23286bcf997d7cf369f984d21b459086941 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 09:49:34 2010 +0200 svg-import-painturi-fix.diff: improves parsing of paint fragments filter/source/svg/parserfragments.cxx | 128 ++++++++++++++++++++++----------- filter/source/svg/parserfragments.hxx | 24 ++++++ filter/source/svg/svgreader.cxx | 33 +++++++-- 3 files changed, 136 insertions(+), 49 deletions(-) commit c3935f2d15d810240b9ab3a943308e52b2fff862 Author: Thorsten Behrens <tbehrens@novell.com> Date: Tue Sep 14 09:47:53 2010 +0200 svg-import-viewbox-fix.diff: fixes some nastiness with viewbox filter/source/svg/parserfragments.cxx | 3 ++- filter/source/svg/svgreader.cxx | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) commit bd1429cfb3244ecb97a31cce633b0f0f44ac9ab4 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 09:42:47 2010 +0200 svg-import-filter-gfxfilter.diff: SVG Graphics filter implementation .../config/fragments/fcfg_internalgraphics.mk | 1 + .../internalgraphicfilters/svg_Import.xcu | 10 + filter/source/svg/exports.map | 10 + filter/source/svg/makefile.mk | 3 +- filter/source/svg/svgfilter.cxx | 8 + filter/source/svg/svgfilter.hxx | 7 + filter/source/svg/svgreader.cxx | 756 +++++++++++++++++++- filter/source/svg/test/makefile.mk | 1 + 8 files changed, 791 insertions(+), 5 deletions(-) commit 428f18501084a2826098086e4b93491d5c286865 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 09:36:14 2010 +0200 svg-import-filter.diff: SVG Import Filter implementation in filter module .../source/config/fragments/fcfg_drawgraphics.mk | 1 + .../filters/SVG___Scalable_Vector_Graphics.xcu | 13 + .../types/svg_Scalable_Vector_Graphics.xcu | 6 +- filter/source/svg/b2dellipse.cxx | 139 ++ filter/source/svg/b2dellipse.hxx | 77 + filter/source/svg/gentoken.pl | 58 + filter/source/svg/gfxtypes.hxx | 356 ++++ filter/source/svg/makefile.mk | 52 +- filter/source/svg/parserfragments.cxx | 553 ++++++ filter/source/svg/parserfragments.hxx | 50 + filter/source/svg/spirit_supplements.hxx | 115 ++ filter/source/svg/svgfilter.cxx | 107 +- filter/source/svg/svgfilter.hxx | 39 +- filter/source/svg/svgimport.cxx | 191 +-- filter/source/svg/svgreader.cxx | 1876 ++++++++++++++++++++ filter/source/svg/svgreader.hxx | 43 + filter/source/svg/test/makefile.mk | 114 ++ filter/source/svg/test/odfserializer.cxx | 140 ++ filter/source/svg/test/odfserializer.hxx | 31 + filter/source/svg/test/parsertest.cxx | 209 +++ filter/source/svg/test/svg2odf.cxx | 124 ++ filter/source/svg/tokenmap.cxx | 62 + filter/source/svg/tokenmap.hxx | 32 + filter/source/svg/tokens.txt | 403 +++++ filter/source/svg/units.cxx | 99 + filter/source/svg/units.hxx | 60 + 26 files changed, 4695 insertions(+), 255 deletions(-) commit 86eb534d44466a250a5b6d2c1cf8a89ab05c4724 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Mon Sep 13 17:15:50 2010 +0200 sw-rtf-num-fix.diff:Fixes for RTF numbering export n#569266 filter/source/msfilter/escherex.cxx | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) commit fde04d90ad6f9dc9ee5ceabef764226a7b6e6c97 Merge: 2d5dbd8 6dd15e6 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 7 09:33:02 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 6dd15e6df47bf325b181d7d5f4b3f6d6173078ff (tag: refs/tags/ooo/OOO330_m9, tag: refs/tags/ooo/OOO330_m8, tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6) Merge: c67d516 1c171cd Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Thu Aug 26 13:07:19 2010 +0200 CWS-TOOLING: integrate CWS fwk152 commit c67d516cfab3e7e7ee2963ad392994450eb93eef Merge: f4156eb 982ecf0 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 14:29:06 2010 +0200 CWS-TOOLING: integrate CWS ooo33gsl06 commit f4156eb007d61093963788643ad52975ec0cc8e1 Merge: ef585a8 fdf636e Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Wed Aug 25 12:49:35 2010 +0200 CWS-TOOLING: integrate CWS mib18 commit ef585a86b8729b5f7d7f8ed818708bd36badcc07 (tag: refs/tags/ooo/OOO330_m5) Merge: d8c8ba2 914d037 Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 12:47:07 2010 +0200 CWS-TOOLING: integrate CWS jl157 commit d8c8ba2d381732ca71724f5a3f5ddfbebb1e9ce8 Merge: aa1c808 ad6d830 Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 12:43:13 2010 +0200 CWS-TOOLING: integrate CWS mav56 commit 982ecf08d1833142536eccdc09e268b7d458153d Author: Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> Date: Tue Aug 17 12:59:19 2010 +0200 ooo33gsl06: #i113919# fix page range behavior for 3.3 filter/source/pdf/pdfexport.cxx | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) commit fdf636e667b123146033a30112006e9ff86caa6b Merge: 990f9b8 aa1c808 Author: Daniel Rentz <dr@openoffice.org> Date: Fri Aug 13 11:29:46 2010 +0200 mib18: rebase to OOO330m4 commit ad6d830997c359dc6e12e2d77f196004d311352e Author: Mikhail Voytenko <mav@openoffice.org> Date: Tue Aug 10 11:05:20 2010 +0200 mav56: #163253# tread invalid path segments correctly filter/source/xsltdialog/xmlfilterjar.cxx | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 914d037413e3320acc21df9d688efabb3f926dee Author: Joachim Lingner <jl@openoffice.org> Date: Thu Aug 5 16:09:11 2010 +0200 jl157 #161910# inserting comments unoxml/source/dom/node.cxx | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 1c171cd82e2d8bce9a018585d0d7395e042aadd4 Author: Mikhail Voytenko <mav@openoffice.org> Date: Thu Aug 5 12:54:16 2010 +0200 fwk152: #i112895# integrate the patch .../config/fragments/filters/MathML_XML__Math_.xcu | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 8ebd262150dac474c2403d240753471f81b0b98c Author: Joachim Lingner <jl@openoffice.org> Date: Thu Aug 5 12:22:22 2010 +0200 jl157 #161910# make access to static map in unoxml threadsafe unoxml/source/dom/node.cxx | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 990f9b8afae7e287a7b28c0b5db4575549dfe468 Author: Daniel Rentz <dr@openoffice.org> Date: Wed Aug 4 18:55:53 2010 +0200 mib18: fix broken d.lst oox/prj/d.lst | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
Notes
split repo tag: filters_OOO_BUILD_3_2_98_1
Diffstat (limited to 'mdds')
0 files changed, 0 insertions, 0 deletions